From f4fd3dbd4097ecb426ee158e44d51648ae78baa9 Mon Sep 17 00:00:00 2001
From: Geno <genofire@fireorbit.de>
Date: Sun, 18 Jan 2015 17:56:28 +0100
Subject: [PATCH] company profil umstellung #89

---
 app/View/Elements/barleft.ctp |   2 +-
 app/View/User/company.ctp     | 110 ++++++++++++++--------------------
 app/webroot/css/dreamjob.css  |  33 +++-------
 3 files changed, 55 insertions(+), 90 deletions(-)

diff --git a/app/View/Elements/barleft.ctp b/app/View/Elements/barleft.ctp
index 57528c1..fe5ed73 100755
--- a/app/View/Elements/barleft.ctp
+++ b/app/View/Elements/barleft.ctp
@@ -3,7 +3,7 @@
  *
  */
  
-if($isLoggedin){
+if(!empty($isLoggedin)){
 ?>
 
 
diff --git a/app/View/User/company.ctp b/app/View/User/company.ctp
index 5b173dc..a168e2b 100644
--- a/app/View/User/company.ctp
+++ b/app/View/User/company.ctp
@@ -5,81 +5,61 @@
  $avatar = false;
  if($profil['AppUser']['avatar'])
 		$avatar = true;
-
 ?>
-<div class="box-extra">
-    <?php if($avatar or $edit){ ?>
-        <div class="box-extra-left infofield">
-            <div class="box">
-            <?php
-		$url = $MEDIA.DS.$profil['AppUser']['avatar'];
-		if($edit and !isset($url))
-			$url = 'img/icon_company.png';
-            ?>
-                        <img src="<?=$url;?>"/>
+<div class="box company-header">
+ <?php if($avatar or $edit){ ?>
+  <div class="logo">
+    <i>
+    <?php
+		 $url = $MEDIA.DS.$profil['AppUser']['avatar'];
+		 if($edit and !isset($url))
+			 $url = 'img/icon_company.png';
+    ?>
+    <img src="<?=$url;?>"/>
 		<?php if($edit): ?>
 		<div class="imgsubtitle edit">
 			<?php
-			$link = '<span class="glyphicon glyphicon-picture"></span>'.__('dreamjob.image.edit');
-			echo $this->Html->link($link,array('controller' => 'user', 'action' => 'avatar_upload'),array('data-target'=>'#popup','data-toggle'=>"modal",'title'=>__('dreamjob.image.edit'),"ref"=>"eventOff",'escape'=>false));
+		  	$link = '<span class="glyphicon glyphicon-picture"></span>'.__('dreamjob.image.edit');
+		  	echo $this->Html->link($link,array('controller' => 'user', 'action' => 'avatar_upload'),array('data-target'=>'#popup','data-toggle'=>"modal",'title'=>__('dreamjob.image.edit'),"ref"=>"eventOff",'escape'=>false));
 			?>
 		</div>
 		<?php endif; ?>
-            </div>
-            <?php if(!empty($profil['DreamjobCompany']['website'])){?>
-                <p>
-                    <?=__("dreamjob.website");?><br/>
-                    <a href="<?=$profil['DreamjobCompany']['website'];?>" rel="external" target="_blank">
-                        <?=$profil['DreamjobCompany']['website'];?>
-                    </a>
-                </p>
-            <?php } ?>
+		</i>
+  </div>
+            
+<?php } ?>     
+            
+            
+    <h1><?=$profil['AppUser']['nickname'];?></h1>
+    <div class="columns">
+        <div class="bar">
+		        <?php if(!empty($profil['DreamjobCompany']['website'])){?>
+		        <p>
+		            <?=__("dreamjob.website");?><br/>
+		            <a href="<?=$profil['DreamjobCompany']['website'];?>" rel="external" target="_blank">
+		                <?=$profil['DreamjobCompany']['website'];?>
+		            </a>
+		        </p>
+		        <?php } ?>
             <p>
-                <?=__("dreamjob.mail");?><br/>
-                <a href="mailto:<?=$profil['User']['mail'];?>">
-                    <?=__('dreamjob.mail.contact');?>
-                </a>
+				      <?=__("dreamjob.mail");?><br/>
+				      <a href="mailto:<?=$profil['User']['mail'];?>"><?=__('dreamjob.mail.contact');?></a>
             </p>
-            <br/>
         </div>
-    <?php } ?>
-    <div class="box">
-
-        <h1><?=$profil['AppUser']['nickname'];?></h1>
-        <div class="columns">
-	            <?php if(!$avatar and !$edit){ ?>
-                <div class="bar">
-				    <?php if(!empty($profil['DreamjobCompany']['website'])){?>
-				        <p>
-				            <?=__("dreamjob.website");?><br/>
-				            <a href="<?=$profil['DreamjobCompany']['website'];?>" rel="external" target="_blank">
-				                <?=$profil['DreamjobCompany']['website'];?>
-				            </a>
-				        </p>
-				    <?php } ?>
-                    <p>
-						<?=__("dreamjob.mail");?><br/>
-						<a href="mailto:<?=$profil['User']['mail'];?>">
-						    <?=__('dreamjob.mail.contact');?>
-						</a>
-                    </p>
-                </div>
-            <?php } ?>
-            <div class="bar">
-                <p>
-	                <?=__("dreamjob.owner");?>:<br/>
-	                <?=$profil['DreamjobCompany']['owner'];?>
-                </p>
-                <p>
-			<?=__("dreamjob.branch");?>:<br/>
-	                <?=$profil['DreamjobListBranch']['name'];?>
-                </p>
-            </div>
-            <div class="bar">
-                <h3><?=__("dreamjob.address");?></h3>
-                <?=$profil['DreamjobUser']['street'];?><br/>
-                <?=$profil['DreamjobUser']['postcode']." ".$profil['DreamjobListCity']['name'];?>
-            </div>
+        <div class="bar">
+            <p>
+              <?=__("dreamjob.owner");?>:<br/>
+              <?=$profil['DreamjobCompany']['owner'];?>
+            </p>
+            <p>
+	            <?=__("dreamjob.branch");?>:<br/>
+              <?=$profil['DreamjobListBranch']['name'];?>
+            </p>
+        </div>
+        <div class="bar">
+            <h3><?=__("dreamjob.address");?></h3>
+            <?=$profil['DreamjobUser']['street'];?><br/>
+            <?=$profil['DreamjobUser']['postcode']." ".$profil['DreamjobListCity']['name'];?>
         </div>
     </div>
 </div>
diff --git a/app/webroot/css/dreamjob.css b/app/webroot/css/dreamjob.css
index 34ff442..b3d1f53 100755
--- a/app/webroot/css/dreamjob.css
+++ b/app/webroot/css/dreamjob.css
@@ -251,34 +251,19 @@ body.loading #container{
 /*
  * Extra
  */
-.box-extra{
-    display:table;
-    margin-bottom: 15px;
-}
-.box-extra-left{
-    display:table-cell;
-    width:290px;
-    min-height: 270px;
+.company-header .logo{
     float:left;
 }
-.box-extra-left > .box{
-    width:250px;
-    height: 250px;
-    padding: 10px;
-    vertical-align: middle;
-    display:table-cell;
+.company-header .logo+h1{
+    display:inline-block;
+    margin-left:30px;
+    margin-top:55px;
 }
-.box-extra-left > .box > img{
-    max-height: 250px;
-    max-width: 250px;
+.company-header .imgsubtitle.edit{
+    width:150px;
+    margin-top:0px;
 }
 
-.box-extra-left+.box{
-    display:table-cell;
-    width: 100%;
-    min-height: 250px;
-    vertical-align: top;
-}
 .opening-header h1 > span{
     display:table-cell;
     vertical-align:middle;
@@ -298,7 +283,7 @@ body.loading #container{
     min-height:120px;
     min-width:100%;
 }
-.opening-header .logo i{
+.opening-header .logo i,.company-header .logo i{
     width:150px;
     height:150px;
     vertical-align:middle;