From a2f89fe0e27bc2fa1f1c8cc2036771e9b73ef1ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=BCller?= <mueller@miconware.de>
Date: Thu, 1 May 2014 11:34:11 +0200
Subject: [PATCH] css

---
 app/Locale/default.pot                |  8 ++++++++
 app/View/Emails/html/registration.ctp |  3 +--
 app/View/Job/application_send.ctp     | 12 +++++++++++-
 app/View/Job/opening.ctp              |  6 +++---
 4 files changed, 23 insertions(+), 6 deletions(-)

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 @@
 <?php
 	$url = $this->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 @@
 	<?php echo $this->Form->create('DreamjobJobApplication',$default_Form); ?>
 		<fieldset>
 			<legend><?=__("dreamjob.application.form");?></legend>
+			<?=$WORKER['AppUser']['first_name'].' '.$WORKER['AppUser']['last_name'];?><br/>
+			<?=$WORKER['DreamjobUser']['street'];?><br/>
+			<?=$WORKER['DreamjobUser']['postcode'].' '.$WORKER['DreamjobListCity']['name'];?><br/>
+			<br/>
+			<br/>
+			<?=$opening['DreamjobCompany']['owner'];?><br/>
+			<?=$opening['AppUser']['nickname'];?><br/>
+			<?=$opening['DreamjobUser']['street'];?><br/>
+			<?=$opening['DreamjobUser']['postcode'].' '.$opening['DreamjobListCity']['name'];?><br/>
+			<br/>
 			<?php
 			 //echo $this->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']))).'<br/>';
+			 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));
 			?>
 			
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'));
 				}
 			?>
         </span>