diff --git a/app/Controller/Component/MiconwareSessionComponent.php b/app/Controller/Component/MiconwareSessionComponent.php index ef62e6f..8526b53 100755 --- a/app/Controller/Component/MiconwareSessionComponent.php +++ b/app/Controller/Component/MiconwareSessionComponent.php @@ -34,6 +34,7 @@ class MiconwareSessionComponent extends Component { 'label' => array('class' => 'col-lg-3 control-label'), 'between' => '
', 'after' => '
', + 'error' => array('attribute'=>array('wrap'=>'span','class'=>'help-block')), 'class' => 'form-control ')) ); } diff --git a/app/Controller/UserController.php b/app/Controller/UserController.php index 59e93c3..72ffb3e 100755 --- a/app/Controller/UserController.php +++ b/app/Controller/UserController.php @@ -10,7 +10,7 @@ class UserController extends AppController { * @var array */ - public $uses = array('DreamjobListGraducation','DreamjobWorker','DreamjobCompany','DreamjobPageText','DreamjobPageImage','DreamjobJobOpening'); + public $uses = array('DreamjobListGraducation','DreamjobWorker','DreamjobCompany','DreamjobPageText','DreamjobPageImage','DreamjobJobOpening','DreamjobCvCategory'); /** * Displays a view @@ -64,6 +64,11 @@ class UserController extends AppController { $page = $this->DreamjobPageImage->find('first', array('conditions' => array("DreamjobPageInh.id" => $this->request->params['page'],'DreamjobPageInh.user_id' => $profil['AppUser']['id'])) ); + }else{ + if(isset($profil['DreamjobWorker'])){ + $cv = $this->DreamjobCvCategory->find('all',array('conditions' => array('worker_id'=> $profil['AppUser']['id']))); + $this->set("cv",$cv); + } } } }else diff --git a/app/View/Home/home.ctp b/app/View/Home/home.ctp index 572f437..94df0d5 100755 --- a/app/View/Home/home.ctp +++ b/app/View/Home/home.ctp @@ -41,7 +41,8 @@
Test Profile

Html->link("Miconware", '/user/24/'); ?>mail:imberg@miconware.de - PW:sebi

-

Html->link("Sebi", '/user/4/'); ?>mail:- - PW:-

+

Html->link("Martin", '/user/3/'); ?>mail:mueller@miconware.de - PW:sebi

+

Html->link("sebi", '/user/4/'); ?>mail:mueller@mic-soft.com - PW:-

Html->link(__('forget password'), '/password/forgot/'); ?> Html->link(__('register'), '/register/'); ?> diff --git a/app/View/User/worker.ctp b/app/View/User/worker.ctp index a07602e..925500c 100644 --- a/app/View/User/worker.ctp +++ b/app/View/User/worker.ctp @@ -45,10 +45,8 @@ if(( !empty($COMPANY) and is_array($COMPANY) and count($COMPANY) > 0 and ($COMPA if(!empty($page)){ echo $this->element('user_page'); }else{ - ?> -

- element('user_worker_cv'); + } ?>
diff --git a/app/webroot/css/dreamjob.css b/app/webroot/css/dreamjob.css index 4dae575..78ab25d 100755 --- a/app/webroot/css/dreamjob.css +++ b/app/webroot/css/dreamjob.css @@ -378,6 +378,14 @@ body.loading #container{ font-weight:bold; font-size:16px; } +.cv{ + width:100%; + color:black; +} +.cv td{ + width:50%; +} + .infofield{ color:black; } diff --git a/lib/Cake/View/Helper/FormHelper.php b/lib/Cake/View/Helper/FormHelper.php index c168c00..f3cd9e7 100755 --- a/lib/Cake/View/Helper/FormHelper.php +++ b/lib/Cake/View/Helper/FormHelper.php @@ -999,7 +999,8 @@ class FormHelper extends AppHelper { if ($type !== 'hidden' && $error !== false) { $errMsg = $this->error($fieldName, $error); if ($errMsg) { - $divOptions = $this->addClass($divOptions, 'error'); + $divOptions = $this->addClass($divOptions, 'has-error'); + $divOptions = $this->addClass($divOptions, 'has-feedback'); if ($errorMessage) { $out['error'] = $errMsg; }