Merge branch 'master' of http://git.dev.miconware.de/dreamjob

app/Config/routes.php

@@ -33,9 +33,9 @@
 	
 	Router::connect('/company', array('controller' => 'home', 'action' => 'company'));
 	
-	Router::connect('/registration', array('controller' => 'registration', 'action' => 'main'));
+        Router::connect('/company/registration', array('controller' => 'registration', 'action' => 'company'));
-	Router::connect('/registration/user', array('controller' => 'registration', 'action' => 'worker'));
+	//Router::connect('/registration', array('controller' => 'registration', 'action' => 'main'));
-	Router::connect('/registration/company', array('controller' => 'registration', 'action' => 'company'));
+	Router::connect('/registration', array('controller' => 'registration', 'action' => 'worker'));
 	Router::connect('/registration/active/:code', array('controller' => 'registration', 'action' => 'active'),array("code" => ".+"));
 	
 	Router::connect('/profil', array('controller' => 'user', 'action' => 'profil'));

app/Controller/Component/MiconwareSessionComponent.php

@@ -5,7 +5,7 @@ class MiconwareSessionComponent extends Component {
 	public $components = array('Session');
 	public $self_worker_obj;
 	public $self_company_obj;
-	
+	public static $strip_tags='<b><i><br><ol><ul><li><h1><h2><h3><h4><h5><h6><blockquote><u><img><a><span><div><pre><code>';
 	public function init($controller){
 		$controller->Security->requireSecure();
 		$this->User = ClassRegistry::init('User');
@@ -20,7 +20,7 @@ class MiconwareSessionComponent extends Component {
 		}
 		$controller->set("isStaff",$this->isStaff());
 		$controller->set("MEDIA",'/uploads');
-		$controller->set("strip_tags",'<b><i><br><ol><ul><li><h1><h2><h3><h4><h5><h6><blockquote><u><img><a><span><div><pre><code>');
+		$controller->set("strip_tags",self::$strip_tags);
 		$controller->set('default_sForm',array(
 			'inputDefaults' => array(
 				'div' => array('class' => 'control-group'),

app/Controller/HomeController.php

@@ -22,7 +22,7 @@ class HomeController extends AppController {
 	 *	or MissingViewException in debug mode.
 	 */
 	
-	private static $opening_limit = 3;
+	private static $opening_limit = 5;
 	
 	function beforeFilter(){
 		$this->Security->unlockedActions[]="login";
@@ -116,7 +116,7 @@ class HomeController extends AppController {
 			$Email->from(array($this->request->data['mail']['adresse'] => $this->request->data['mail']['first_name'].' '.$this->request->data['mail']['last_name']));
 			$Email->subject('[Dreamjob-Kontakt-Firma]'.$this->request->data['mail']['subject']);
 			$Email->template('contact');
-			$Email->viewVars(array('text'=>$this->request->data));
+			$Email->viewVars(array('text'=>$this->request->data,'strip_tags'=>$this->MiconwareSession->strip_tags));
 			if($Email->send())
 				$this->MiconwareSession->setFlash(__('dreamjob.contactSend'),'flash',array('alert'=>'success'));
 			else

app/Controller/JobController.php

@@ -9,7 +9,6 @@ class JobController extends AppController {
      *
      * @var array
      */
-	 
     public $uses = array('DreamjobJobOpening', 'DreamjobJobFavority', 'DreamjobJobApplication', 'DreamjobPageText', 'DreamjobPageImage', 'DreamjobJobMsg', 'DreamjobCvEntry', 'DreamjobListCvCategory', 'DreamjobListBranch', 'DreamjobListCity');
 
     /**
@@ -20,9 +19,6 @@ class JobController extends AppController {
      * @throws NotFoundException When the view file could not be found
      * 	or MissingViewException in debug mode.
      */
-	 
-	 
-
     public function openingList() {
         $this->MiconwareSession->init($this);
 
@@ -58,9 +54,13 @@ class JobController extends AppController {
                 $this->DreamjobJobOpening->data['DreamjobJobOpening']['company_id'] = $c['AppUser']['id'];
                 if ($this->DreamjobJobOpening->save()) {
                     $this->MiconwareSession->setFlash(__('dreamjob.opening.save.add'), 'flash', array('alert' => 'success'));
+                    if($this->request->data['DreamjobJobOpening']['active'] and $this->request->data['DreamjobJobOpening']['startdate'] <= date("Y-m-d") and $this->request->data['DreamjobJobOpening']['enddate'] >= date("Y-m-d", strtotime("+1 day") ) )
+                        return $this->redirect(array('action' => 'openingGet','id'=>$this->DreamjobJobOpening->id));
                 } else {
                     $this->MiconwareSession->setFlash(__('dreamjob.opening.save.error'), 'flash', array('alert' => 'danger'));
                 }
+            }else{
+                $this->request->data['DreamjobJobOpening']['active']=true;
             }
             $this->set('kindofjobs', $this->DreamjobJobOpening->DreamjobListKindofjob->find('list'));
             $this->set('graducations', $this->DreamjobJobOpening->DreamjobListGraducation->find('list'));
@@ -72,6 +72,7 @@ class JobController extends AppController {
             $this->render('/Home/error');
         }
     }
+
     public function openingEdit() {
         $this->MiconwareSession->init($this);
         $this->MiconwareSession->initWeb($this);
@@ -92,7 +93,8 @@ class JobController extends AppController {
                     $this->DreamjobJobOpening->data['DreamjobJobOpening']['company_id'] = $cid;
                     if ($this->DreamjobJobOpening->save($this->DreamjobJobOpening->data)) {
                         $this->MiconwareSession->setFlash(__('dreamjob.opening.save'), 'flash', array('alert' => 'success'));
-
+                        if($this->request->data['DreamjobJobOpening']['active'] and $this->request->data['DreamjobJobOpening']['startdate'] <= date("Y-m-d") and $this->request->data['DreamjobJobOpening']['enddate'] >= date("Y-m-d", strtotime("+1 day") ) )
+                            return $this->redirect(array('action' => 'openingGet','id'=>$this->request->params['id']));
                     } else
                         $this->MiconwareSession->setFlash(__('dreamjob.opening.save.error'), 'flash', array('alert' => 'danger'));
                 }
@@ -178,6 +180,7 @@ class JobController extends AppController {
             $this->render('/Job/favorite');
         }
     }
+
     public function applicationList() {
         $this->MiconwareSession->init($this);
 
@@ -194,6 +197,7 @@ class JobController extends AppController {
             $this->render('/Job/applicationWorker_list');
         }
     }
+
     public function applicationGet() {
         $this->MiconwareSession->init($this);
 
@@ -241,7 +245,6 @@ class JobController extends AppController {
                     $this->DreamjobJobMsg->updateAll(array("saw" => true), array("DreamjobJobMsg.fromcompany" => true, "DreamjobJobMsg.application_id" => $this->request->params['id']));
                 if (is_array($COMPANY) and count($COMPANY) > 0)
                     $this->DreamjobJobMsg->updateAll(array("saw" => true), array("DreamjobJobMsg.fromcompany" => false, "DreamjobJobMsg.application_id" => $this->request->params['id']));
-				
             }else {
                 $this->set('msg', false);
                 // CV
@@ -255,12 +258,10 @@ class JobController extends AppController {
                         /* $this->set('pageInh',$this->DreamjobJobApplication->Page->find('first',
                           array('conditions' => array("Page.id" => $this->request->params['page']))
                           )); */
-						$page = $this->DreamjobJobApplication->PageText->find('first',
+                        $page = $this->DreamjobJobApplication->PageText->find('first', array('conditions' => array("PageText.page_ptr_id" => $this->request->params['page']))
-								array('conditions' => array("PageText.page_ptr_id" => $this->request->params['page']))
                         );
                         if (!is_array($page) or count($page) <= 0)
-							$page = $this->DreamjobJobApplication->PageImage->find('first',
+                            $page = $this->DreamjobJobApplication->PageImage->find('first', array('conditions' => array("PageImage.page_ptr_id" => $this->request->params['page']))
-								array('conditions' => array("PageImage.page_ptr_id" => $this->request->params['page']))
                             );
                         $this->set('page', $page);
                     }
@@ -270,6 +271,7 @@ class JobController extends AppController {
             $this->render('/Job/application');
         }
     }
+
     public function applicationByOpening() {
         $this->MiconwareSession->init($this);
 
@@ -295,6 +297,7 @@ class JobController extends AppController {
             $filter_archiv = false;
             $condition = array('DreamjobJobOpening.company_id' => $COMPANY['AppUser']['id'], 'DreamjobJobApplication.opening_id' => $this->request->params['id']);
             if (isset($this->request->query['filter']) and $this->request->query['filter'] == 'all') {
+                
             } elseif (isset($this->request->query['filter']) and $this->request->query['filter'] == 'archiv') {
                 $condition['closed'] = true;
                 $filter_archiv = true;
@@ -317,6 +320,7 @@ class JobController extends AppController {
             $this->render('/Job/applicationCompany_list');
         }
     }
+
     public function applicationSend() {
         $this->MiconwareSession->init($this);
         $this->MiconwareSession->initWeb($this);
@@ -344,9 +348,9 @@ class JobController extends AppController {
                             $this->request->data['DreamjobJobApplicationPage'][] = array('page_id' => $id);
                         $result = $this->DreamjobJobApplication->sendApplication($this->request->data);
                         if ($result) {
-							$this->MiconwareSession->setFlash(__('dreamjob.opening.save.add'),'flash',array('alert'=>'success'));
+                            $this->MiconwareSession->setFlash(__('dreamjob.application.send.success'), 'flash', array('alert' => 'success'));
                         } else {
-							$this->MiconwareSession->setFlash(__('dreamjob.opening.save.error'),'flash',array('alert'=>'danger'));
+                            $this->MiconwareSession->setFlash(__('dreamjob.application.send.error'), 'flash', array('alert' => 'danger'));
                         }
                     } else {
                         $this->MiconwareSession->setFlash(__('dreamjob.agb.error.notAccept'), 'flash', array('alert' => 'danger'));
@@ -357,9 +361,11 @@ class JobController extends AppController {
                 $this->render('/Job/application_send');
             }
         } else {
-			$this->set('error', 'dreamjob.error.noCompany');
+            $this->set('error', 'dreamjob.error.noWorker');
             $this->render('/Home/error');
         }
     }
+
 }
+
 ?>

app/Controller/RegistrationController.php

@@ -66,7 +66,9 @@ class RegistrationController extends AppController {
 				}else{
 					$this->MiconwareSession->setFlash(__('dreamjob.agb.error.notAccept'),'flash',array('alert'=>'danger'));
 				}
-			}
+			}else
+                            if(empty($this->request->data['DreamjobCompany']['website']))
+                                $this->request->data['DreamjobCompany']['website'] ='http://';
 			$this->set('result',$regResult);
 			$this->set('cities',$this->DreamjobListCity->find('list'));
 			$this->set('branches',$this->DreamjobListBranch->find('list'));

app/Controller/UserController.php

@@ -295,6 +295,8 @@ class UserController extends AppController {
 				}
 
 			}
+                        if(empty($profil['DreamjobCompany']['website']))
+                            $profil['DreamjobCompany']['website'] = 'http://';
 			$this->request->data = $profil;
 			$this->set('profil',$profil);
 			$this->set('graducations',$this->DreamjobListGraducation->find('list'));

app/Locale/cake.pot

@@ -22,3 +22,39 @@ msgstr ""
 msgid "An Internal Error Has Occurred."
 msgstr ""
 
+msgid "January"
+msgstr "Januar"
+
+msgid "February"
+msgstr "Februar"
+
+msgid "March"
+msgstr "März"
+
+msgid "April"
+msgstr "April"
+
+msgid "May"
+msgstr "Mai"
+
+msgid "June"
+msgstr "Juni"
+
+msgid "July"
+msgstr "Juli"
+
+msgid "August"
+msgstr "August"
+
+msgid "September"
+msgstr "September"
+
+msgid "October"
+msgstr "Oktober"
+
+msgid "November"
+msgstr "November"
+
+msgid "December"
+msgstr "Dezember" 
+

app/Locale/default.pot

@@ -1124,6 +1124,16 @@ msgid "dreamjob.contactSend.error"
 msgstr ""
 
 
+#
+msgid "dreamjob.application.send.success"
+msgstr ""
+
+#
+msgid "dreamjob.application.send.error"
+msgstr ""
+
+
+
 
 #
 # Generierte Fehlermeldungen eigenarbeit!
@@ -1143,6 +1153,13 @@ msgstr ""
 msgid "dreamjob.error.noCompany.text"
 msgstr ""
 
+# -
+msgid "dreamjob.error.noWorker.title"
+msgstr ""
+
+msgid "dreamjob.error.noWorker.text"
+msgstr ""
+
 # -
 msgid "dreamjob.error.loggedin.title"
 msgstr ""

app/Locale/deu/LC_MESSAGES/cake.po

@@ -0,0 +1,60 @@
+# LANGUAGE translation of CakePHP Application
+# Copyright YEAR NAME <EMAIL@ADDRESS>
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"POT-Creation-Date: 2014-04-29 22:09+0200\n"
+"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
+"Last-Translator: NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: View/Errors/error500.ctp:8
+msgid "Error"
+msgstr ""
+
+#: View/Errors/error500.ctp:9
+msgid "An Internal Error Has Occurred."
+msgstr ""
+
+msgid "January"
+msgstr "Januar"
+
+msgid "February"
+msgstr "Februar"
+
+msgid "March"
+msgstr "März"
+
+msgid "April"
+msgstr "April"
+
+msgid "May"
+msgstr "Mai"
+
+msgid "June"
+msgstr "Juni"
+
+msgid "July"
+msgstr "Juli"
+
+msgid "August"
+msgstr "August"
+
+msgid "September"
+msgstr "September"
+
+msgid "October"
+msgstr "Oktober"
+
+msgid "November"
+msgstr "November"
+
+msgid "December"
+msgstr "Dezember" 
+

app/Model/DreamjobCompany.php

@@ -46,6 +46,7 @@ class DreamjobCompany extends AppModel {
 		$Email->template('registration_company');
 		$key = substr($data['User']['code'],2);
 		$Email->viewVars(array('data'=>$data,'key'=>$key));
+                $Email->attachments(array('dak.jpg' => WWW_ROOT.DS.'mail'.DS.'dak.jpg'));
 		return $Email->send();
 	}
 

app/Model/DreamjobListBranch.php

@@ -26,7 +26,7 @@ class DreamjobListBranch extends AppModel {
  * @var string
  */
 	public $displayField = 'name';
-
+        public $order = 'name';
 /**
  * Validation rules
  *

app/Model/DreamjobListCity.php

@@ -26,6 +26,7 @@ class DreamjobListCity extends AppModel {
  * @var string
  */
 	public $displayField = 'name';
+        public $order = 'name';
 
 /**
  * Validation rules

app/Model/DreamjobListCountry.php

@@ -19,6 +19,7 @@ class DreamjobListCountry extends AppModel {
  * @var mixed False or table name
  */
 	public $useTable = 'mic_dj_list_country';
+        public $order = 'name';
 
 /**
  * Display field

app/Model/DreamjobListGraducation.php

@@ -26,6 +26,7 @@ class DreamjobListGraducation extends AppModel {
  * @var string
  */
 	public $displayField = 'name';
+        public $order = 'name';
 
 /**
  * Validation rules

app/Model/DreamjobListJob.php

@@ -26,6 +26,7 @@ class DreamjobListJob extends AppModel {
  * @var string
  */
 	public $displayField = 'name';
+        public $order = 'name';
 
 /**
  * Validation rules

app/Model/DreamjobListKindofjob.php

@@ -26,6 +26,7 @@ class DreamjobListKindofjob extends AppModel {
  * @var string
  */
 	public $displayField = 'name';
+        public $order = 'name';
 
 /**
  * Validation rules

app/Model/DreamjobWorker.php

@@ -47,6 +47,7 @@ class DreamjobWorker extends AppModel {
 		$Email->template('registration_worker');
 		$key = substr($data['User']['code'],2);
 		$Email->viewVars(array('data'=>$data,'key'=>$key));
+                $Email->attachments(array('dak.jpg' => WWW_ROOT.DS.'mail'.DS.'dak.jpg'));
 		return $Email->send();
 	}
 	

app/View/Elements/barleft.ctp

@@ -10,7 +10,7 @@ if($isLoggedin){
 <style type="text/css">
 <!--
 #narbar{
-	min-width:1160px;
+	min-width:1192px;
 }
 .bar #barleft {
 	position:relative;
@@ -18,7 +18,7 @@ if($isLoggedin){
 }
 .column-center{
 	padding-left:50px;
-	width:1160px;
+	width:1192px;
 }
 -->
 </style>
@@ -39,7 +39,7 @@ if($isLoggedin){
 	<style type="text/css">
 <!--
 #narbar{
-	min-width:1220px;
+	min-width:1252px;
 }
 .bar #barleft {
 	width:140px;
@@ -52,7 +52,7 @@ if($isLoggedin){
 }
 .column-center{
 	padding-left:130px;
-	width:1220px;
+	width:1252px;
 }
 -->
 </style>
@@ -63,7 +63,7 @@ if($isLoggedin){
 	<style type="text/css">
 <!--
 #narbar{
-	min-width:1220px;
+	min-width:1252px;
 }
 .bar #barleft {
 	width:140px;
@@ -76,7 +76,7 @@ if($isLoggedin){
 }
 .column-center{
 	padding-left:130px;
-	width:1220px;
+	width:1252px;
 }
 -->
 </style>

app/View/Elements/barright.ctp

@@ -3,5 +3,4 @@
  *
  */
 ?>
-<img src="/uploads/1_-adv.jpg"/>
+<a href="https://www.dak.de/dak/formulare/Das_Gesundheitspaket-1320736.html" rel="external"><img src="/uploads/1_-adv.jpg"/></a>
-

app/View/Elements/job_opening_item.ctp

@@ -38,10 +38,10 @@ if($opening['AppUser']['take_systemwide']){
     <?php if(!$opening_in_app){ ?>    
         <span style="float: right;margin-right:60px;">
         	<?php
-				$image='favority_off.png';
+				if(!$opening_in_fav)
-				if($opening_in_fav)
+                                    echo $this->Html->image('favority_off.png',array('url' => array('controller'=>'job','action'=>'openingGet','id'=>$opening['DreamjobJobOpening']['id'],'favorite'=>'favorite')));
-					$image='favority_on.png';
+                                else
-				echo $this->Html->image($image,array('url' => array('controller'=>'job','action'=>'openingGet','id'=>$opening['DreamjobJobOpening']['id'],'favorite'=>'favorite')));
+                                    echo $this->Html->link('<span class="glyphicon glyphicon-trash"></span>',array('controller'=>'job','action'=>'openingGet','id'=>$opening['DreamjobJobOpening']['id'],'favorite'=>'favorite'),array('style'=>'color:black;font-size:16px;margin-right:5px;','escape'=>false));
         	?>
         </span>
 		<?php } ?>

app/View/Elements/navbar.ctp

@@ -1,20 +1,16 @@
-<?php
-if(!empty($isLoggedin)){
-?>
 <ul>
-    <?php if(!empty($isStaff)){ ?>
-        <li<?php if(isset($MENU_ADMIN)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.admin'),'/admin/');?></li>
-    <?php } ?>
     <li<?php if(isset($MENU_START)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.startpage'),array('controller'=>'home','action'=>'home'));?></li>
-    <?php if(!$COMPANY): ?>
+    <?php if(!empty($COMPANY)): ?>
-    <li<?php if(isset($MENU_SEARCH)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.search'),array('controller'=>'search','action'=>'opening'));?></li>
-	<?php elseif($COMPANY): ?>
         <li<?php if(isset($MENU_SEARCH)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.search'),array('controller'=>'search','action'=>'worker'));?></li>
+	<?php else: ?>
+	    <li<?php if(isset($MENU_SEARCH)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.search'),array('controller'=>'search','action'=>'opening'));?></li>
     <?php endif; ?>
     <li<?php if(isset($MENU_SERVICE)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.service'),'/service/');?></li>
+    <?php if(!empty($isLoggedin)){  ?>
        <li><?=$this->Html->link(__('dreamjob.logout'),array('controller'=>'home','action'=>'logout'));?></li>
+    <?php } ?>
 </ul>
-<?php }else{ ?>
+<?php if(empty($isLoggedin)){  ?>
 <div>
 <?php
 	echo $this->Form->create(null, array('inputDefaults'=> array('div' => false,'label'=>false,

app/View/Elements/user_worker_cv_edit.ctp

@@ -33,22 +33,27 @@ echo $this->Html->link($text,array('controller'=>'user','action'=>'profil'),arra
 							echo $this->Time->format('d.m.Y', $profil['AppUser']['bday']);
 					?>
 				</td>
+                                <td></td>
 			</tr>
 			<tr>
 				<td><?=__("dreamjob.workexperience");?></td>
 				<td><?=$profil['DreamjobWorker']['workexperience'].' '.__('dreamjob.years');?></td>
+                                <td></td>
 			</tr>
 			<tr>
 				<td><?=__("dreamjob.graducation.worker");?></td>
 				<td><?=$profil['DreamjobListGraducation']['name'];?></td>
+                                <td></td>
 			</tr>
 			<tr>
 				<td><?=__("dreamjob.city");?></td>
 				<td><?=$profil['DreamjobListCity']['name'];?></td>
+                                <td></td>
 			</tr>
 			<tr>
 				<td><?=__("dreamjob.country.worker");?></td>
 				<td><?=$profil['DreamjobWorker']['country'];?></td>
+                                <td></td>
 			</tr>
 		<?php } ?>
 	<?php
@@ -106,6 +111,7 @@ echo $this->Html->link($text,array('controller'=>'user','action'=>'profil'),arra
 		<?php
 		 }
 		?>
+                <td><a class="btn btn-default btn-del rmEvnt" ref="eventOff"><span class="glyphicon glyphicon-trash"></span></a></td>
 		<?=$this->Form->input('DreamjobCvEntry.'.$i.'.category_id',array('type'=>'hidden'));?>
 		<?=$this->Form->input('DreamjobCvEntry.'.$i.'.id',array('type'=>'hidden'));?>
 	</tr>
@@ -165,6 +171,7 @@ echo $this->Html->link($text,array('controller'=>'user','action'=>'profil'),arra
 		<?php
 		 }
 		?>
+                <td><a class="btn btn-default btn-del rmEvnt" ref="eventOff"><span class="glyphicon glyphicon-trash"></span></a></td>
 		<?=$this->Form->input('DreamjobCvEntry..category_id',array('type'=>'hidden','value'=>$cvc_item['DreamjobListCvCategory']['id']));?>
 	</tr>
 	</tbody>

app/View/Elements/user_worker_item.ctp

@@ -50,11 +50,11 @@
 		<div class="btn-group-vertical">
 		<?php
 		 if(isset($enableOpening) and $enableOpening){
-			$status = 'dreamjob.application.close';
+			$status = __('dreamjob.application.close');
 			$statusApp = null;
 			$archiv = array("archiv"=> $profil['DreamjobJobApplication']['id']);
 			if(!$profil['DreamjobJobApplication']['closed']){
-				$status = 'dreamjob.application.close.activet';
+				$status = __('dreamjob.application.close.actived');
 				$statusApp= count($profil['DreamjobJobMsg']);
 				$newcount=0;
 				foreach($profil['DreamjobJobMsg'] as $msg)
@@ -67,7 +67,7 @@
 			}else{
 				$statusApp = __('dreamjob.application');
 			}
-			echo $this->Html->link(__($status),array('controller'=>'job', 'action'=>'applicationByOpening', 'id'=> $profil['DreamjobJobApplication']['opening_id'],'?'=>$archiv),array("class" => "btn btn-default",'escape' => false));
+			echo $this->Html->link($status,array('controller'=>'job', 'action'=>'applicationByOpening', 'id'=> $profil['DreamjobJobApplication']['opening_id'],'?'=>$archiv),array("class" => "btn btn-default",'escape' => false));
 			echo $this->Html->link($statusApp,array('controller'=>'job', 'action'=>'applicationGet', 'id'=> $profil['DreamjobJobApplication']['id']),array("class" => "btn btn-default",'escape' => false));
 		 }else{
 		 echo $this->Html->link(__('dreamjob.details'),array('controller'=>'user', 'action'=>'profil', 'id'=> $profil[$AppUser]['id']),array("class" => "btn btn-default"));

app/View/Emails/html/contact.ctp

@@ -1,12 +1,12 @@
 <table>
 	<tr>
-		<td><?=$data['mail']['adresse'];?></td>
+		<td><?=$text['mail']['adresse'];?></td>
-		<td><?=$data['mail']['last_name'].', '.$data['mail']['first_name'];></td>
+		<td><?=$text['mail']['last_name'].', '.$text['mail']['first_name'];?></td>
 	</tr>
 	<tr>
-		<td colspan="2"><?=$this->request->data['mail']['subject']);?></td>
+		<td colspan="2"><?=$text['mail']['subject'];?></td>
 	</tr>
 	<tr>
-		<td colspan="2"><?=strip_tags($data['mail']['text'],$strip_tags);?></td>
+		<td colspan="2"><?=strip_tags($text['mail']['text'],$strip_tags);?></td>
 	</tr>
 </table>

app/View/Emails/html/registration_company.ctp

@@ -1,4 +1,4 @@
-Sehr geehrter <?=$data['DreamjobUser']['owner'];?>!<br/><br/>
+Sehr geehrter <?=$data['DreamjobCompany']['owner'];?>!<br/><br/>
 
 Herzlich Willkommen bei dreamJOB, der Plattform f&uuml;r Ihr komplette Ausschreibungsverfahren. <br/><br/>
 
@@ -8,7 +8,7 @@ Um Ihren Account freizuschalten, klicken Sie bitte auf folgenden Link:<br/>
 $url = $this->Html->url(array('controller' => 'registration', 'action' => 'active','code'=>$key,
     '?'=>array('mail'=>$data['User']['mail']),'full_base' => true) );
 echo $this->Html->link('Link', $url);
-?>
+?><br/><br/>
 Bei Fragen wenden Sie sich gerne an unser Team:<br/>
 
 <a href="mailto:service@dream-job.eu">service@dream-job.eu</a><br/><br/>

app/View/Emails/text/contact.ctp

@@ -1,12 +1,12 @@
-<?=$data['mail']['adresse'];?>\n
+<?=$text['mail']['adresse'];?>
-<?=$data['mail']['last_name'].', '.$data['mail']['first_name'];>\n
+<?=$text['mail']['last_name'].', '.$text['mail']['first_name'];?>
-\n
+
-\n
+
-<?=$this->request->data['mail']['subject']);?>\n
+<?=$text['mail']['subject'];?>
-\n
+
-\n
+
 <?php
-$Document = strip_tags($data['mail']['text'],$strip_tags);
+$Document = strip_tags($text['mail']['text'],$strip_tags);
 
 $Rules = array ('@<script[^>]*?>.*?</script>@si',
                     '@<[\/\!]*?[^<>]*?>@si',

app/View/Emails/text/registration_company.ctp

@@ -1,4 +1,4 @@
-Sehr geehrter <?=$data['DreamjobUser']['owner'];?>!
+Sehr geehrter <?=$data['DreamjobCompany']['owner'];?>!
 
 Herzlich Willkommen bei dreamJOB, der Plattform für Ihr komplette Ausschreibungsverfahren.
 

app/View/Home/company.ctp

@@ -6,7 +6,7 @@
 <div class="box start-search-box">
 	<div class="img">
 		<?=$this->Html->image('start-company.jpg'); ?>
-		<?=$this->Html->link(__('dreamjob.registration.to'),array('controller'=>'search', 'action'=>'opening'),array("class" => "btn btn-primary"));?>
+		<?=$this->Html->link(__('dreamjob.registration.to'),array('controller'=>'registration', 'action'=>'company'),array("class" => "btn btn-primary"));?>
 	</div>
 	<div class="bluebox">
 		Stellen ausschreiben<br/>
@@ -33,7 +33,8 @@
 		- Unser kostenloses Angebot<br/>
 		- was dreamJOB Ihnen bietet<br/>
 		<br/>
-		<?=$this->Html->image('start-company-broschuere.jpg'); ?>
+                
+		<?=$this->Html->link($this->Html->image('start-company-broschuere.jpg'),$this->Html->url('/files/dreamJOBinfo.pdf'),array('ref' => 'eventOff','escape'=>false,'target'=>'_blank')); ?>
 	</div>
 	<div class="bar" style="width:20px;"></div>
 	<div class="box bar" style="font-size:16px;">
@@ -53,7 +54,7 @@
 		 echo $this->Form->input('mail.text',array('placeholder'=>'Nachricht'));
 		 ?>
 		 <div class="buttonrow">
-				<?=$this->Form->button(__('dreamjob.application.send'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?>
+				<?=$this->Form->button('senden',array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?>
 			</div>
 		 <?php
 		 echo $this->Form->end();

app/View/Job/application.ctp

@@ -27,10 +27,10 @@
 			$str = __('dreamjob.application.close');
 			if($application['DreamjobJobApplication']['closed'])
 				$str = __('dreamjob.application.close.actived');
-		?>
+                    echo $this->Html->link($str,array('controller'=>'job','action'=>'applicationGet','id'=>$application['DreamjobJobApplication']['id'],'hiv'=>'hiv'));
-			<?=$this->Html->link($str,array('controller'=>'job','action'=>'applicationGet','id'=>$application['DreamjobJobApplication']['id'],'hiv'=>'hiv')); ?>
+		 }else{ 
-		<?php } ?>
+                    echo $this->Html->link(__('dreamjob.application.mappePDF'),array('controller'=>'pdf','action'=>'applicationGetPdf','id'=>$application['DreamjobJobApplication']['id']),array('rel'=>'external','target'=>'_blank'));
-		&nbsp;
+                 } ?>
 	</span>
 	<span style="float: right;">
 		<?php if($msg){
@@ -129,7 +129,7 @@
 			<?php echo $this->Form->create('DreamjobJobMsg',$default_Form); ?>
 				<fieldset>
 					<legend><?=__("dreamjob.message");?></legend>
-					<?=$this->Form->textarea('DreamjobJobMsg.text',array("class"=>'form-control',"rows"=>10)); ?>
+                                        <div><?=$this->Form->textarea('DreamjobJobMsg.text',array("class"=>'form-control',"rows"=>10)); ?></div>
 					<div class="buttonrow">
 						<?=$this->Form->button(__('dreamjob.save'),array('div' => false,'class'=>"btn btn-default",'type' => 'submit'));?>
 					</div>

app/View/Job/application_send.ctp

@@ -25,8 +25,8 @@
 			 echo $this->Form->hidden('DreamjobJobApplication.opening_id'); 
 			 echo $this->Form->hidden('DreamjobJobApplication.worker_id'); 
 			 echo $this->Form->text('DreamjobJobApplication.subject',array('label'=>false,'placeholder'=>__('dreamjob.opening.subject.placeholder'),'class'=>'form-control')).'<br/>';
-			 echo $this->Form->textarea('DreamjobJobApplication.text',array("class"=>'form-control',"rows"=>10));
                         ?>
+			 <div><?=$this->Form->textarea('DreamjobJobApplication.text',array("class"=>'form-control',"rows"=>10));?></div>
 			
 			<legend><?=__("dreamjob.application.addPages");?></legend>
 			<?php

app/View/Job/opening_edit.ctp

@@ -21,7 +21,7 @@ echo $this->Form->create('DreamjobJobOpening',$default_Form);
             </c:choose>
             */
             echo $this->Form->hidden("DreamjobJobOpening.company_id");
-            if(!empty($this->request->data['DreamjobJobOpening']))
+            if(!empty($this->request->data['DreamjobJobOpening']['title']))
 	            echo $this->request->data['DreamjobJobOpening']['title'];
 	        else
 	        	echo __("dreamjob.opening.addForm");
@@ -44,7 +44,7 @@ echo $this->Form->create('DreamjobJobOpening',$default_Form);
         	  echo $this->Form->input('DreamjobJobOpening.postcode',array('placeholder'=>__('dreamjob.postcode.placeholder'),'label'=>array('text'=>__("dreamjob.postcode"),"class"=>$default_Form['inputDefaults']['label']['class'])));
         	  echo $this->Form->input('DreamjobJobOpening.city_id',array("label" => array('text'=>__("dreamjob.city"),"class"=>$default_Form['inputDefaults']['label']['class']))); ?>
         <legend><?=__("dreamjob.text");?></legend>
-        <?php echo $this->Form->textarea('DreamjobJobOpening.text',array("class"=>'form-control',"rows"=>10)); ?>
+        <div><?php echo $this->Form->textarea('DreamjobJobOpening.text',array("class"=>'form-control',"rows"=>10)); ?></div>
         <div class="buttonrow">
         	<?=$this->Form->button(__('dreamjob.save'),array('div' => false,'class'=>"btn btn-primary",'type' => 'submit'));?>
     	</div>

app/View/Layouts/default.ctp

@@ -9,7 +9,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 		<?php
 		echo $this->Html->charset();
-		echo $this->Html->css(array('bootstrap.min','bootstrap-wysihtml5','dreamjob'));
+		echo $this->Html->css(array('bootstrap.min','bootstrap-wysihtml5','wysiwyg-color','select2','select2-bootstrap','dreamjob'));
 		echo $this->Html->meta('icon', $this->Html->url('/favicon.ico'));
 		?>
 	</head>
@@ -125,7 +125,7 @@
 		</div>
 		<!-- java script -->
 		<?php
-		echo $this->Html->script(array('jquery.min', 'bootstrap.min', 'jquery-ui','bootstrap-wysihtml5',	'dreamjob'));
+		echo $this->Html->script(array('jquery.min', 'bootstrap.min', 'jquery-ui','bootstrap-wysihtml5','select2.min','select2_locale_de','dreamjob'));
 		?>
 		<!-- extraScript -->
 		<?php

app/webroot/css/dreamjob.css

@@ -159,7 +159,14 @@ body.loading #container{
     color:white;
     text-decoration: none;
 }
-
+/*
+ *
+ */
+#alert.old .alert{
+    background-color: #E9E9E9;
+    border-color: #BABABA;
+    color: #9B9B9B;
+}
 /*
  * Main
  */
@@ -195,7 +202,7 @@ body.loading #container{
     margin: 8px;
 }
 #barright{
-    width: 130px;
+    width: 162px;
     padding-left:20px;
     padding-top:10px;
     padding-bottom:10px;
@@ -204,12 +211,12 @@ body.loading #container{
     max-width:100%;
 }
 .column-center{ 
-    width:1110px;
+    width:1142px;
     display: table-cell;
     vertical-align: top;
     margin: 0px;
     padding-top: 20px;
-    padding-right:130px;
+    padding-right:162px;
 	//width:960px;
 }
 #container{
@@ -225,26 +232,26 @@ body.loading #container{
 }
 .box-extra-left{
     display:table-cell;
-    width:240px;
+    width:290px;
-    min-height: 220px;
+    min-height: 270px;
     float:left;
 }
 .box-extra-left > .box{
-    width:200px;
+    width:250px;
-    height: 200px;
+    height: 250px;
     padding: 10px;
     vertical-align: middle;
     display:table-cell;
 }
 .box-extra-left > .box > img{
-    max-height: 200px;
+    max-height: 250px;
-    max-width: 200px;
+    max-width: 250px;
 }
 
 .box-extra-left+.box{
     display:table-cell;
     width: 100%;
-    min-height: 200px;
+    min-height: 250px;
     vertical-align: top;
 }
 
@@ -301,17 +308,16 @@ body.loading #container{
     vertical-align: middle;
     text-align: center;
     width: 250px;
-    height: 86px;
+    //height: 86px;
 }
 .openingitem .icon img{
     max-height: 86px;
     max-width: 86px;
 }
 .openingitem .icon span{
-    white-space:nowrap;
     text-align: center;
     display: block;
-    height:16px;
+    margin-bottom:5px;
     color: #4F4F4F;
     font-weight: normal;
 }
@@ -432,6 +438,10 @@ body.loading #container{
     font-style:italic;
     font-size:12px;
 }
+.cv td span.glyphicon{
+    font-size:14px;
+    font-style:normal;
+}
 .cv tr span.label{
 	width:10%;
 	font-style:normal;

app/webroot/css/select2-bootstrap.css

@@ -0,0 +1,88 @@
+.form-control .select2-choice {
+    border: 0;
+    border-radius: 2px;
+    height:32px;
+}
+
+.form-control .select2-choice .select2-arrow {
+    border-radius: 0 2px 2px 0;   
+}
+
+.form-control.select2-container {
+    padding: 0;
+}
+
+.form-control.select2-container.select2-dropdown-open {
+    border-color: #5897FB;
+    border-radius: 3px 3px 0 0;
+    height:32px;
+}
+
+.form-control .select2-container.select2-dropdown-open .select2-choices {
+    border-radius: 3px 3px 0 0;
+}
+
+.form-control.select2-container .select2-choices {
+    border: 0 !important;
+    border-radius: 3px;
+}
+
+.control-group.warning .select2-container .select2-choice,
+.control-group.warning .select2-container .select2-choices,
+.control-group.warning .select2-container-active .select2-choice,
+.control-group.warning .select2-container-active .select2-choices,
+.control-group.warning .select2-dropdown-open.select2-drop-above .select2-choice,
+.control-group.warning .select2-dropdown-open.select2-drop-above .select2-choices,
+.control-group.warning .select2-container-multi.select2-container-active .select2-choices {
+    border: 1px solid #C09853 !important;
+}
+
+.control-group.warning .select2-container .select2-choice div {
+    border-left: 1px solid #C09853 !important;
+    background: #FCF8E3 !important;
+}
+
+.control-group.error .select2-container .select2-choice,
+.control-group.error .select2-container .select2-choices,
+.control-group.error .select2-container-active .select2-choice,
+.control-group.error .select2-container-active .select2-choices,
+.control-group.error .select2-dropdown-open.select2-drop-above .select2-choice,
+.control-group.error .select2-dropdown-open.select2-drop-above .select2-choices,
+.control-group.error .select2-container-multi.select2-container-active .select2-choices {
+    border: 1px solid #B94A48 !important;
+}
+
+.control-group.error .select2-container .select2-choice div {
+    border-left: 1px solid #B94A48 !important;
+    background: #F2DEDE !important;
+}
+
+.control-group.info .select2-container .select2-choice,
+.control-group.info .select2-container .select2-choices,
+.control-group.info .select2-container-active .select2-choice,
+.control-group.info .select2-container-active .select2-choices,
+.control-group.info .select2-dropdown-open.select2-drop-above .select2-choice,
+.control-group.info .select2-dropdown-open.select2-drop-above .select2-choices,
+.control-group.info .select2-container-multi.select2-container-active .select2-choices {
+    border: 1px solid #3A87AD !important;
+}
+
+.control-group.info .select2-container .select2-choice div {
+    border-left: 1px solid #3A87AD !important;
+    background: #D9EDF7 !important;
+}
+
+.control-group.success .select2-container .select2-choice,
+.control-group.success .select2-container .select2-choices,
+.control-group.success .select2-container-active .select2-choice,
+.control-group.success .select2-container-active .select2-choices,
+.control-group.success .select2-dropdown-open.select2-drop-above .select2-choice,
+.control-group.success .select2-dropdown-open.select2-drop-above .select2-choices,
+.control-group.success .select2-container-multi.select2-container-active .select2-choices {
+    border: 1px solid #468847 !important;
+}
+
+.control-group.success .select2-container .select2-choice div {
+    border-left: 1px solid #468847 !important;
+    background: #DFF0D8 !important;
+}

app/webroot/css/select2.css

@@ -0,0 +1,646 @@
+/*
+Version: 3.4.8 Timestamp: Thu May  1 09:50:32 EDT 2014
+*/
+.select2-container {
+    margin: 0;
+    position: relative;
+    display: inline-block;
+    /* inline-block for ie7 */
+    zoom: 1;
+    *display: inline;
+    vertical-align: middle;
+}
+
+.select2-container,
+.select2-drop,
+.select2-search,
+.select2-search input {
+  /*
+    Force border-box so that % widths fit the parent
+    container without overlap because of margin/padding.
+    More Info : http://www.quirksmode.org/css/box.html
+  */
+  -webkit-box-sizing: border-box; /* webkit */
+     -moz-box-sizing: border-box; /* firefox */
+          box-sizing: border-box; /* css3 */
+}
+
+.select2-container .select2-choice {
+    display: block;
+    height: 26px;
+    padding: 0 0 0 8px;
+    overflow: hidden;
+    position: relative;
+
+    border: 1px solid #aaa;
+    white-space: nowrap;
+    line-height: 26px;
+    color: #444;
+    text-decoration: none;
+
+    border-radius: 4px;
+
+    background-clip: padding-box;
+
+    -webkit-touch-callout: none;
+      -webkit-user-select: none;
+         -moz-user-select: none;
+          -ms-user-select: none;
+              user-select: none;
+
+    background-color: #fff;
+    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eee), color-stop(0.5, #fff));
+    background-image: -webkit-linear-gradient(center bottom, #eee 0%, #fff 50%);
+    background-image: -moz-linear-gradient(center bottom, #eee 0%, #fff 50%);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#ffffff', endColorstr = '#eeeeee', GradientType = 0);
+    background-image: linear-gradient(to top, #eee 0%, #fff 50%);
+}
+
+.select2-container.select2-drop-above .select2-choice {
+    border-bottom-color: #aaa;
+
+    border-radius: 0 0 4px 4px;
+
+    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eee), color-stop(0.9, #fff));
+    background-image: -webkit-linear-gradient(center bottom, #eee 0%, #fff 90%);
+    background-image: -moz-linear-gradient(center bottom, #eee 0%, #fff 90%);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eeeeee', GradientType=0);
+    background-image: linear-gradient(to bottom, #eee 0%, #fff 90%);
+}
+
+.select2-container.select2-allowclear .select2-choice .select2-chosen {
+    margin-right: 42px;
+}
+
+.select2-container .select2-choice > .select2-chosen {
+    margin-right: 26px;
+    display: block;
+    overflow: hidden;
+
+    white-space: nowrap;
+
+    text-overflow: ellipsis;
+    float: none;
+    width: auto;
+}
+
+.select2-container .select2-choice abbr {
+    display: none;
+    width: 12px;
+    height: 12px;
+    position: absolute;
+    right: 24px;
+    top: 8px;
+
+    font-size: 1px;
+    text-decoration: none;
+
+    border: 0;
+    background: url('select2.png') right top no-repeat;
+    cursor: pointer;
+    outline: 0;
+}
+
+.select2-container.select2-allowclear .select2-choice abbr {
+    display: inline-block;
+}
+
+.select2-container .select2-choice abbr:hover {
+    background-position: right -11px;
+    cursor: pointer;
+}
+
+.select2-drop-mask {
+    border: 0;
+    margin: 0;
+    padding: 0;
+    position: fixed;
+    left: 0;
+    top: 0;
+    min-height: 100%;
+    min-width: 100%;
+    height: auto;
+    width: auto;
+    opacity: 0;
+    z-index: 9998;
+    /* styles required for IE to work */
+    background-color: #fff;
+    filter: alpha(opacity=0);
+}
+
+.select2-drop {
+    width: 100%;
+    margin-top: -1px;
+    position: absolute;
+    z-index: 9999;
+    top: 100%;
+
+    background: #fff;
+    color: #000;
+    border: 1px solid #aaa;
+    border-top: 0;
+
+    border-radius: 0 0 4px 4px;
+
+    -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+            box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+}
+
+.select2-drop.select2-drop-above {
+    margin-top: 1px;
+    border-top: 1px solid #aaa;
+    border-bottom: 0;
+
+    border-radius: 4px 4px 0 0;
+
+    -webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+            box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+}
+
+.select2-drop-active {
+    border: 1px solid #5897fb;
+    border-top: none;
+}
+
+.select2-drop.select2-drop-above.select2-drop-active {
+    border-top: 1px solid #5897fb;
+}
+
+.select2-drop-auto-width {
+    border-top: 1px solid #aaa;
+    width: auto;
+}
+
+.select2-drop-auto-width .select2-search {
+    padding-top: 4px;
+}
+
+.select2-container .select2-choice .select2-arrow {
+    display: inline-block;
+    width: 18px;
+    height: 100%;
+    position: absolute;
+    right: 0;
+    top: 0;
+
+    border-left: 1px solid #aaa;
+    border-radius: 0 4px 4px 0;
+
+    background-clip: padding-box;
+
+    background: #ccc;
+    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #ccc), color-stop(0.6, #eee));
+    background-image: -webkit-linear-gradient(center bottom, #ccc 0%, #eee 60%);
+    background-image: -moz-linear-gradient(center bottom, #ccc 0%, #eee 60%);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#eeeeee', endColorstr = '#cccccc', GradientType = 0);
+    background-image: linear-gradient(to top, #ccc 0%, #eee 60%);
+}
+
+.select2-container .select2-choice .select2-arrow b {
+    display: block;
+    width: 100%;
+    height: 100%;
+    background: url('select2.png') no-repeat 0 1px;
+}
+
+.select2-search {
+    display: inline-block;
+    width: 100%;
+    min-height: 26px;
+    margin: 0;
+    padding-left: 4px;
+    padding-right: 4px;
+
+    position: relative;
+    z-index: 10000;
+
+    white-space: nowrap;
+}
+
+.select2-search input {
+    width: 100%;
+    height: auto !important;
+    min-height: 26px;
+    padding: 4px 20px 4px 5px;
+    margin: 0;
+
+    outline: 0;
+    font-family: sans-serif;
+    font-size: 1em;
+
+    border: 1px solid #aaa;
+    border-radius: 0;
+
+    -webkit-box-shadow: none;
+            box-shadow: none;
+
+    background: #fff url('select2.png') no-repeat 100% -22px;
+    background: url('select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
+    background: url('select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
+    background: url('select2.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
+    background: url('select2.png') no-repeat 100% -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
+}
+
+.select2-drop.select2-drop-above .select2-search input {
+    margin-top: 4px;
+}
+
+.select2-search input.select2-active {
+    background: #fff url('select2-spinner.gif') no-repeat 100%;
+    background: url('select2-spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
+    background: url('select2-spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
+    background: url('select2-spinner.gif') no-repeat 100%, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
+    background: url('select2-spinner.gif') no-repeat 100%, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
+}
+
+.select2-container-active .select2-choice,
+.select2-container-active .select2-choices {
+    border: 1px solid #5897fb;
+    outline: none;
+
+    -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .3);
+            box-shadow: 0 0 5px rgba(0, 0, 0, .3);
+}
+
+.select2-dropdown-open .select2-choice {
+    border-bottom-color: transparent;
+    -webkit-box-shadow: 0 1px 0 #fff inset;
+            box-shadow: 0 1px 0 #fff inset;
+
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+
+    background-color: #eee;
+    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #fff), color-stop(0.5, #eee));
+    background-image: -webkit-linear-gradient(center bottom, #fff 0%, #eee 50%);
+    background-image: -moz-linear-gradient(center bottom, #fff 0%, #eee 50%);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#ffffff', GradientType=0);
+    background-image: linear-gradient(to top, #fff 0%, #eee 50%);
+}
+
+.select2-dropdown-open.select2-drop-above .select2-choice,
+.select2-dropdown-open.select2-drop-above .select2-choices {
+    border: 1px solid #5897fb;
+    border-top-color: transparent;
+
+    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #fff), color-stop(0.5, #eee));
+    background-image: -webkit-linear-gradient(center top, #fff 0%, #eee 50%);
+    background-image: -moz-linear-gradient(center top, #fff 0%, #eee 50%);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#ffffff', GradientType=0);
+    background-image: linear-gradient(to bottom, #fff 0%, #eee 50%);
+}
+
+.select2-dropdown-open .select2-choice .select2-arrow {
+    background: transparent;
+    border-left: none;
+    filter: none;
+}
+.select2-dropdown-open .select2-choice .select2-arrow b {
+    background-position: -18px 1px;
+}
+
+.select2-hidden-accessible {
+    border: 0;
+    clip: rect(0 0 0 0);
+    height: 1px;
+    margin: -1px;
+    overflow: hidden;
+    padding: 0;
+    position: absolute;
+    width: 1px;
+}
+
+/* results */
+.select2-results {
+    max-height: 200px;
+    padding: 0 0 0 4px;
+    margin: 4px 4px 4px 0;
+    position: relative;
+    overflow-x: hidden;
+    overflow-y: auto;
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
+.select2-results ul.select2-result-sub {
+    margin: 0;
+    padding-left: 0;
+}
+
+.select2-results li {
+    list-style: none;
+    display: list-item;
+    background-image: none;
+}
+
+.select2-results li.select2-result-with-children > .select2-result-label {
+    font-weight: bold;
+}
+
+.select2-results .select2-result-label {
+    padding: 3px 7px 4px;
+    margin: 0;
+    cursor: pointer;
+
+    min-height: 1em;
+
+    -webkit-touch-callout: none;
+      -webkit-user-select: none;
+         -moz-user-select: none;
+          -ms-user-select: none;
+              user-select: none;
+}
+
+.select2-results-dept-1 .select2-result-label { padding-left: 20px }
+.select2-results-dept-2 .select2-result-label { padding-left: 40px }
+.select2-results-dept-3 .select2-result-label { padding-left: 60px }
+.select2-results-dept-4 .select2-result-label { padding-left: 80px }
+.select2-results-dept-5 .select2-result-label { padding-left: 100px }
+.select2-results-dept-6 .select2-result-label { padding-left: 110px }
+.select2-results-dept-7 .select2-result-label { padding-left: 120px }
+
+.select2-results .select2-highlighted {
+    background: #3875d7;
+    color: #fff;
+}
+
+.select2-results li em {
+    background: #feffde;
+    font-style: normal;
+}
+
+.select2-results .select2-highlighted em {
+    background: transparent;
+}
+
+.select2-results .select2-highlighted ul {
+    background: #fff;
+    color: #000;
+}
+
+
+.select2-results .select2-no-results,
+.select2-results .select2-searching,
+.select2-results .select2-selection-limit {
+    background: #f4f4f4;
+    display: list-item;
+    padding-left: 5px;
+}
+
+/*
+disabled look for disabled choices in the results dropdown
+*/
+.select2-results .select2-disabled.select2-highlighted {
+    color: #666;
+    background: #f4f4f4;
+    display: list-item;
+    cursor: default;
+}
+.select2-results .select2-disabled {
+  background: #f4f4f4;
+  display: list-item;
+  cursor: default;
+}
+
+.select2-results .select2-selected {
+    display: none;
+}
+
+.select2-more-results.select2-active {
+    background: #f4f4f4 url('select2-spinner.gif') no-repeat 100%;
+}
+
+.select2-more-results {
+    background: #f4f4f4;
+    display: list-item;
+}
+
+/* disabled styles */
+
+.select2-container.select2-container-disabled .select2-choice {
+    background-color: #f4f4f4;
+    background-image: none;
+    border: 1px solid #ddd;
+    cursor: default;
+}
+
+.select2-container.select2-container-disabled .select2-choice .select2-arrow {
+    background-color: #f4f4f4;
+    background-image: none;
+    border-left: 0;
+}
+
+.select2-container.select2-container-disabled .select2-choice abbr {
+    display: none;
+}
+
+
+/* multiselect */
+
+.select2-container-multi .select2-choices {
+    height: auto !important;
+    height: 1%;
+    margin: 0;
+    padding: 0;
+    position: relative;
+
+    border: 1px solid #aaa;
+    cursor: text;
+    overflow: hidden;
+
+    background-color: #fff;
+    background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(1%, #eee), color-stop(15%, #fff));
+    background-image: -webkit-linear-gradient(top, #eee 1%, #fff 15%);
+    background-image: -moz-linear-gradient(top, #eee 1%, #fff 15%);
+    background-image: linear-gradient(to bottom, #eee 1%, #fff 15%);
+}
+
+.select2-locked {
+  padding: 3px 5px 3px 5px !important;
+}
+
+.select2-container-multi .select2-choices {
+    min-height: 26px;
+}
+
+.select2-container-multi.select2-container-active .select2-choices {
+    border: 1px solid #5897fb;
+    outline: none;
+
+    -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .3);
+            box-shadow: 0 0 5px rgba(0, 0, 0, .3);
+}
+.select2-container-multi .select2-choices li {
+    float: left;
+    list-style: none;
+}
+html[dir="rtl"] .select2-container-multi .select2-choices li
+{
+    float: right;
+}
+.select2-container-multi .select2-choices .select2-search-field {
+    margin: 0;
+    padding: 0;
+    white-space: nowrap;
+}
+
+.select2-container-multi .select2-choices .select2-search-field input {
+    padding: 5px;
+    margin: 1px 0;
+
+    font-family: sans-serif;
+    font-size: 100%;
+    color: #666;
+    outline: 0;
+    border: 0;
+    -webkit-box-shadow: none;
+            box-shadow: none;
+    background: transparent !important;
+}
+
+.select2-container-multi .select2-choices .select2-search-field input.select2-active {
+    background: #fff url('select2-spinner.gif') no-repeat 100% !important;
+}
+
+.select2-default {
+    color: #999 !important;
+}
+
+.select2-container-multi .select2-choices .select2-search-choice {
+    padding: 3px 5px 3px 18px;
+    margin: 3px 0 3px 5px;
+    position: relative;
+
+    line-height: 13px;
+    color: #333;
+    cursor: default;
+    border: 1px solid #aaaaaa;
+
+    border-radius: 3px;
+
+    -webkit-box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
+            box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
+
+    background-clip: padding-box;
+
+    -webkit-touch-callout: none;
+      -webkit-user-select: none;
+         -moz-user-select: none;
+          -ms-user-select: none;
+              user-select: none;
+
+    background-color: #e4e4e4;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#f4f4f4', GradientType=0);
+    background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eee));
+    background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+    background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+    background-image: linear-gradient(to top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
+}
+html[dir="rtl"] .select2-container-multi .select2-choices .select2-search-choice
+{
+    margin-left: 0;
+    margin-right: 5px;
+}
+.select2-container-multi .select2-choices .select2-search-choice .select2-chosen {
+    cursor: default;
+}
+.select2-container-multi .select2-choices .select2-search-choice-focus {
+    background: #d4d4d4;
+}
+
+.select2-search-choice-close {
+    display: block;
+    width: 12px;
+    height: 13px;
+    position: absolute;
+    right: 3px;
+    top: 4px;
+
+    font-size: 1px;
+    outline: none;
+    background: url('select2.png') right top no-repeat;
+}
+html[dir="rtl"] .select2-search-choice-close {
+    right: auto;
+    left: 3px;
+}
+
+.select2-container-multi .select2-search-choice-close {
+    left: 3px;
+}
+
+.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover {
+  background-position: right -11px;
+}
+.select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close {
+    background-position: right -11px;
+}
+
+/* disabled styles */
+.select2-container-multi.select2-container-disabled .select2-choices {
+    background-color: #f4f4f4;
+    background-image: none;
+    border: 1px solid #ddd;
+    cursor: default;
+}
+
+.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice {
+    padding: 3px 5px 3px 5px;
+    border: 1px solid #ddd;
+    background-image: none;
+    background-color: #f4f4f4;
+}
+
+.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice .select2-search-choice-close {    display: none;
+    background: none;
+}
+/* end multiselect */
+
+
+.select2-result-selectable .select2-match,
+.select2-result-unselectable .select2-match {
+    text-decoration: underline;
+}
+
+.select2-offscreen, .select2-offscreen:focus {
+    clip: rect(0 0 0 0) !important;
+    width: 1px !important;
+    height: 1px !important;
+    border: 0 !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    overflow: hidden !important;
+    position: absolute !important;
+    outline: 0 !important;
+    left: 0px !important;
+    top: 0px !important;
+}
+
+.select2-display-none {
+    display: none;
+}
+
+.select2-measure-scrollbar {
+    position: absolute;
+    top: -10000px;
+    left: -10000px;
+    width: 100px;
+    height: 100px;
+    overflow: scroll;
+}
+
+/* Retina-ize icons */
+
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 2dppx)  {
+    .select2-search input,
+    .select2-search-choice-close,
+    .select2-container .select2-choice abbr,
+    .select2-container .select2-choice .select2-arrow b {
+        background-image: url('select2x2.png') !important;
+        background-repeat: no-repeat !important;
+        background-size: 60px 40px !important;
+    }
+
+    .select2-search input {
+        background-position: 100% -21px !important;
+    }
+}

app/webroot/css/wysiwyg-color.css

@@ -0,0 +1,67 @@
+.wysiwyg-color-black {
+  color: black;
+}
+
+.wysiwyg-color-silver {
+  color: silver;
+}
+
+.wysiwyg-color-gray {
+  color: gray;
+}
+
+.wysiwyg-color-white {
+  color: white;
+}
+
+.wysiwyg-color-maroon {
+  color: maroon;
+}
+
+.wysiwyg-color-red {
+  color: red;
+}
+
+.wysiwyg-color-purple {
+  color: purple;
+}
+
+.wysiwyg-color-fuchsia {
+  color: fuchsia;
+}
+
+.wysiwyg-color-green {
+  color: green;
+}
+
+.wysiwyg-color-lime {
+  color: lime;
+}
+
+.wysiwyg-color-olive {
+  color: olive;
+}
+
+.wysiwyg-color-yellow {
+  color: yellow;
+}
+
+.wysiwyg-color-navy {
+  color: navy;
+}
+
+.wysiwyg-color-blue {
+  color: blue;
+}
+
+.wysiwyg-color-teal {
+  color: teal;
+}
+
+.wysiwyg-color-aqua {
+  color: aqua;
+}
+
+.wysiwyg-color-orange {
+  color: orange;
+}

app/webroot/js/bootstrap-wysihtml5.js

@@ -222,7 +222,7 @@ e),c.addClass(this.iframe,e));(e="string"===typeof this.config.placeholder?this.
 b.quirks.ensureProperClearing(this);a.clearsListsInContentEditableCorrectly()||b.quirks.ensureProperClearingOfLists(this);this.initSync&&this.config.sync&&this.initSync();this.textarea.hide();this.parent.fire("beforeload").fire("load")},_initAutoLinking:function(){var d=this,e=a.canDisableAutoLinking(),f=a.doesAutoLinkingInContentEditable();e&&this.commands.exec("autoUrlDetect",!1);if(this.config.autoLink){(!f||f&&e)&&this.parent.observe("newword:composer",function(){d.selection.executeAndRestore(function(a,
 b){c.autoLink(b.parentNode)})});var g=this.sandbox.getDocument().getElementsByTagName("a"),i=c.autoLink.URL_REG_EXP,h=function(a){a=b.lang.string(c.getTextContent(a)).trim();"www."===a.substr(0,4)&&(a="http://"+a);return a};c.observe(this.element,"keydown",function(a){if(g.length){var a=d.selection.getSelectedNode(a.target.ownerDocument),b=c.getParentElement(a,{nodeName:"A"},4),e;b&&(e=h(b),setTimeout(function(){var a=h(b);a!==e&&a.match(i)&&b.setAttribute("href",a)},0))}})}},_initObjectResizing:function(){var d=
 ["width","height"],e=d.length,f=this.element;this.commands.exec("enableObjectResizing",this.config.allowObjectResizing);this.config.allowObjectResizing?a.supportsEvent("resizeend")&&c.observe(f,"resizeend",function(a){for(var a=a.target||a.srcElement,c=a.style,h=0,k;h<e;h++)k=d[h],c[k]&&(a.setAttribute(k,parseInt(c[k],10)),c[k]="");b.quirks.redraw(f)}):a.supportsEvent("resizestart")&&c.observe(f,"resizestart",function(a){a.preventDefault()})},_initUndoManager:function(){new b.UndoManager(this.parent)}})})(wysihtml5);
-(function(b){var c=b.dom,a=document,d=window,e=a.createElement("div"),f="background-color color cursor font-family font-size font-style font-variant font-weight line-height letter-spacing text-align text-decoration text-indent text-rendering word-break word-wrap word-spacing".split(" "),g="background-color border-collapse border-bottom-color border-bottom-style border-bottom-width border-left-color border-left-style border-left-width border-right-color border-right-style border-right-width border-top-color border-top-style border-top-width clear display float margin-bottom margin-left margin-right margin-top outline-color outline-offset outline-width outline-style padding-left padding-right padding-top padding-bottom position top left right bottom z-index vertical-align text-align -webkit-box-sizing -moz-box-sizing -ms-box-sizing box-sizing -webkit-box-shadow -moz-box-shadow -ms-box-shadow box-shadow -webkit-border-top-right-radius -moz-border-radius-topright border-top-right-radius -webkit-border-bottom-right-radius -moz-border-radius-bottomright border-bottom-right-radius -webkit-border-bottom-left-radius -moz-border-radius-bottomleft border-bottom-left-radius -webkit-border-top-left-radius -moz-border-radius-topleft border-top-left-radius width height".split(" "),
+(function(b){var c=b.dom,a=document,d=window,e=a.createElement("div"),f="background-color color cursor font-family font-size font-style font-variant font-weight letter-spacing text-align text-decoration text-indent text-rendering word-break word-wrap word-spacing".split(" "),g="background-color border-collapse border-bottom-color border-bottom-style border-bottom-width border-left-color border-left-style border-left-width border-right-color border-right-style border-right-width border-top-color border-top-style border-top-width clear display float margin-bottom margin-left margin-right margin-top outline-color outline-offset outline-width outline-style padding-left padding-right padding-top padding-bottom position top left right bottom z-index vertical-align text-align -webkit-box-sizing -moz-box-sizing -ms-box-sizing box-sizing -webkit-box-shadow -moz-box-shadow -ms-box-shadow box-shadow -webkit-border-top-right-radius -moz-border-radius-topright border-top-right-radius -webkit-border-bottom-right-radius -moz-border-radius-bottomright border-bottom-right-radius -webkit-border-bottom-left-radius -moz-border-radius-bottomleft border-bottom-left-radius -webkit-border-top-left-radius -moz-border-radius-topleft border-top-left-radius width height".split(" "),
 i="width height top left right bottom".split(" "),h=["html             { height: 100%; }","body             { min-height: 100%; padding: 0; margin: 0; margin-top: -1px; padding-top: 1px; }","._wysihtml5-temp { display: none; }",b.browser.isGecko?"body.placeholder { color: graytext !important; }":"body.placeholder { color: #a9a9a9 !important; }","body[disabled]   { background-color: #eee !important; color: #999 !important; cursor: default !important; }","img:-moz-broken  { -moz-force-broken-image-icon: 1; height: 24px; width: 24px; }"],
 k=function(b){if(b.setActive)try{b.setActive()}catch(e){}else{var f=b.style,h=a.documentElement.scrollTop||a.body.scrollTop,g=a.documentElement.scrollLeft||a.body.scrollLeft,f={position:f.position,top:f.top,left:f.left,WebkitUserSelect:f.WebkitUserSelect};c.setStyles({position:"absolute",top:"-99999px",left:"-99999px",WebkitUserSelect:"none"}).on(b);b.focus();c.setStyles(f).on(b);d.scrollTo&&d.scrollTo(g,h)}};b.views.Composer.prototype.style=function(){var j=this,n=a.querySelector(":focus"),p=this.textarea.element,
 q=p.hasAttribute("placeholder"),r=q&&p.getAttribute("placeholder");this.focusStylesHost=this.focusStylesHost||e.cloneNode(!1);this.blurStylesHost=this.blurStylesHost||e.cloneNode(!1);q&&p.removeAttribute("placeholder");p===n&&p.blur();c.copyStyles(g).from(p).to(this.iframe).andTo(this.blurStylesHost);c.copyStyles(f).from(p).to(this.element).andTo(this.blurStylesHost);c.insertCSS(h).into(this.element.ownerDocument);k(p);c.copyStyles(g).from(p).to(this.focusStylesHost);c.copyStyles(f).from(p).to(this.focusStylesHost);
@@ -700,7 +700,7 @@ _initParser:function(){this.observe("paste:composer",function(){var a=this;a.com
                 "pre": 1
             }
         },
-        stylesheets: ["./lib/css/wysiwyg-color.css"], // (path_to_project/lib/css/wysiwyg-color.css)
+        stylesheets: ["./css/wysiwyg-color.css"], // (path_to_project/lib/css/wysiwyg-color.css)
         locale: "en"
     };
 

app/webroot/js/dreamjob.js

@@ -41,10 +41,13 @@
 			
 			$("#alert .alert").alert();
 			$(where+' textarea').wysihtml5();
+                        $(where+' select').each(function(){
+                            $(this).select2({allowClear: true});
+                        });
 			$(where+' .dropdown-toggle').dropdown();
 			
 			$(where+" a").each(function(that){
-				if($(this).attr("rel")!=="external" && $(this).attr("ref")!=="eventOff" && !$(this).parents('ul').hasClass("wysihtml5-toolbar"))
+				if($(this).attr("rel")!=="external" && $(this).attr("ref")!=="eventOff" && !$(this).parents('ul').hasClass("wysihtml5-toolbar") && !$(this).hasClass(".select2-choice"))
 					$(this).click(function(e){
 						load($(this).attr('href'),{},($(this).attr('rel')=="tab"));
 						return false;  
@@ -144,14 +147,17 @@
 			});
 			//$(where+" form label.has-error").parent(".form-group").addClass("has-error")
         }
-        function setContent(data,back,tab){
+        function setContent(data,back,tab,backignore){
                 alert = data.split('<!-- alert -->')[1].split('<!-- /alert -->')[0];
+                $('#alert').removeClass('old');
                 if( alert.trim().length > 0){
                     $('#alert').html(alert);
+                }else if(!backignore){
+                    $('#alert').addClass('old');
                 }
                 
                 if(back){
-                    load(back,{},tab);
+                    load(back,{'backignore':true},tab);
                 }else if(tab){
                     navbar = data.split('<!-- tab -->')[1].split('<!-- /tab -->')[0];
                     $('#tab').html(navbar);
@@ -182,6 +188,7 @@
                 alert = "<div class=\"alert alert-danger\">"+data.statusText+
                         "<button type=\"button\" class=\"close\" data-dismiss=\"alert\">&times;</button>"
                         + "</div>";
+                $('#alert').removeClass('old');
                 $('#alert').html(alert);
                 event("#alert");
                     $('#container').html(data.responseText);
@@ -191,6 +198,7 @@
             data = {};
             typemethode = "GET";
             back = false;
+            backignore = false;
             history = true;
             if(conf['data'])
                 data = conf['data'];
@@ -198,14 +206,17 @@
                 typemethode = conf['type'];
             if(conf['back'] && conf['back'].indexOf("logout")== -1 && conf['back'].indexOf("login")== -1 )
                 back = conf['back'];
+            if(conf['backignore'])
+                backignore = conf['backignore'];
             if(conf['history'])
                 history = conf['history'];
+            
             //e.preventDefault(); 
             /*	
             if uncomment the above line, html5 nonsupported browers won't change the url but will display the ajax content;
             if commented, html5 nonsupported browers will reload the page to the specified link. 
             */	
-            $.ajax({url:pageurl,data:data,type:typemethode,success:function(data){setContent(data,back,tab);} ,error:function(data){setContentError(data,back,tab);}});
+            $.ajax({url:pageurl,data:data,type:typemethode,success:function(data){setContent(data,back,tab,backignore);} ,error:function(data){setContentError(data,back,tab);}});
             if(history && pageurl!=window.location){
                     window.history.pushState({path:pageurl},'',pageurl);	
             }

app/webroot/js/select2_locale_de.js

@@ -0,0 +1,15 @@
+/**
+ * Select2 German translation
+ */
+(function ($) {
+    "use strict";
+
+    $.extend($.fn.select2.defaults, {
+        formatNoMatches: function () { return "Keine Übereinstimmungen gefunden"; },
+        formatInputTooShort: function (input, min) { var n = min - input.length; return "Bitte " + n + " Zeichen mehr eingeben"; },
+        formatInputTooLong: function (input, max) { var n = input.length - max; return "Bitte " + n + " Zeichen weniger eingeben"; },
+        formatSelectionTooBig: function (limit) { return "Sie können nur " + limit + " Eintr" + (limit === 1 ? "ag" : "äge") + " auswählen"; },
+        formatLoadMore: function (pageNumber) { return "Lade mehr Ergebnisse…"; },
+        formatSearching: function () { return "Suche…"; }
+    });
+})(jQuery);

lib/Cake/View/Helper/FormHelper.php

@@ -1058,7 +1058,7 @@ class FormHelper extends AppHelper {
 				$options['value'] = $selected;
 				return $this->dateTime($fieldName, $dateFormat, $timeFormat, $options);
 			case 'textarea':
-				return $this->textarea($fieldName, $options + array('cols' => '30', 'rows' => '6'));
+				return $this->textarea($fieldName, $options + array('cols' => '30', 'rows' => '22'));
 			case 'url':
 				return $this->text($fieldName, array('type' => 'url') + $options);
 			default:

update.sql

@@ -8,7 +8,7 @@
 -- Tabellenstruktur für Tabelle `mic_dj_job_opening_worker`
 --
 
-
+Update `mic_dj_list_branch` `a` join `mic_dj_list_branch` `d` on `d`.`id` = `a`.`id` set `a`.`name`=replace(`d`.`name`,' ','') where `a`.`name` like ' %'
 
 CREATE TABLE IF NOT EXISTS `mic_dj_jobs_opening_worker` (
   `id` int(11) NOT NULL AUTO_INCREMENT,