diff --git a/app/Locale/default.pot b/app/Locale/default.pot index 15799b0..2027f0c 100644 --- a/app/Locale/default.pot +++ b/app/Locale/default.pot @@ -1107,6 +1107,14 @@ msgstr "" msgid "dreamjob.avatar" msgstr "" +# +msgid "dreamjob.favority.adding" +msgstr "" + +# +msgid "dreamjob.favority.removeing" +msgstr "" + # # Generierte Fehlermeldungen eigenarbeit! # diff --git a/app/View/Emails/html/registration.ctp b/app/View/Emails/html/registration.ctp index 76be453..fefa2fd 100644 --- a/app/View/Emails/html/registration.ctp +++ b/app/View/Emails/html/registration.ctp @@ -2,6 +2,5 @@ Html->url(array('controller' => 'registration', 'action' => 'active','code'=>$key, '?'=>array('mail'=>$data['User']['mail']),'full_base' => true) ); - echo $this->Html->link($url,array('controller' => 'registration', 'action' => 'active','code'=>$key, - '?'=>array('mail'=>$data['User']['mail']),'full_base' => true) ); + echo $this->Html->link($url, $url); ?> diff --git a/app/View/Job/application_send.ctp b/app/View/Job/application_send.ctp index 02d0e9f..fd07d8d 100644 --- a/app/View/Job/application_send.ctp +++ b/app/View/Job/application_send.ctp @@ -11,11 +11,21 @@ Form->create('DreamjobJobApplication',$default_Form); ?>
+
+
+
+
+
+
+
+
+
+
Form->hidden('DreamjobJobApplication.id'); echo $this->Form->hidden('DreamjobJobApplication.opening_id'); echo $this->Form->hidden('DreamjobJobApplication.worker_id'); - echo $this->Form->input('DreamjobJobApplication.subject',array('placeholder'=>__('dreamjob.opening.subject.placeholder'),'label'=>array('text'=>__("dreamjob.application.subject"),"class"=>$default_Form['inputDefaults']['label']['class']))).'
'; + echo $this->Form->text('DreamjobJobApplication.subject',array('label'=>false,'placeholder'=>__('dreamjob.opening.subject.placeholder'),'class'=>'form-control')).'
'; echo $this->Form->textarea('DreamjobJobApplication.text',array("class"=>'form-control',"rows"=>10)); ?> diff --git a/app/View/Job/opening.ctp b/app/View/Job/opening.ctp index eb56cbf..7d3eb53 100644 --- a/app/View/Job/opening.ctp +++ b/app/View/Job/opening.ctp @@ -28,10 +28,10 @@ echo $this->Html->link(__('dreamjob.my.application'),array('controller'=>'job','action'=>'applicationGet','id'=>$opening_inApp['id'])); else{ //TODO isFavority - $link='dreamjob.favority.adding'; + $link=__('dreamjob.favority.adding'); if($fav) - $link='dreamjob.favority.removeing'; - echo $this->Html->link(__($link),array('controller'=>'job','action'=>'openingGet','id'=>$opening['DreamjobJobOpening']['id'],'favorite'=>'favorite')); + $link=__('dreamjob.favority.removeing'); + echo $this->Html->link($link,array('controller'=>'job','action'=>'openingGet','id'=>$opening['DreamjobJobOpening']['id'],'favorite'=>'favorite')); } ?>