Merge branch 'master' of http://git.dev.miconware.de/dreamjob
This commit is contained in:
commit
8e9df391bc
|
@ -1107,6 +1107,14 @@ msgstr ""
|
|||
msgid "dreamjob.avatar"
|
||||
msgstr ""
|
||||
|
||||
#
|
||||
msgid "dreamjob.favority.adding"
|
||||
msgstr ""
|
||||
|
||||
#
|
||||
msgid "dreamjob.favority.removeing"
|
||||
msgstr ""
|
||||
|
||||
#
|
||||
# Generierte Fehlermeldungen eigenarbeit!
|
||||
#
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
|
||||
<?php
|
||||
echo $this->Html->link(__('dreamjob.regisration.active.link'),array('controller' => 'registration', 'action' => 'active','code'=>$key,
|
||||
$url = $this->Html->url(array('controller' => 'registration', 'action' => 'active','code'=>$key,
|
||||
'?'=>array('mail'=>$data['User']['mail']),'full_base' => true) );
|
||||
echo $this->Html->link($url, $url);
|
||||
?>
|
||||
|
|
|
@ -11,11 +11,20 @@
|
|||
<?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['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));
|
||||
?>
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
||||
<h4 class="modal-title"></h4>
|
||||
<h3 class="modal-title"></h3>
|
||||
</div>
|
||||
<div class="modal-body"></div>
|
||||
<div class="modal-footer">
|
||||
|
|
|
@ -28,7 +28,15 @@ $tcpdf->AddPage();
|
|||
$tcpdf->SetY(35);
|
||||
$tcpdf->SetTextColor(0, 0, 0);
|
||||
$tcpdf->SetFont($tcpdf->font);
|
||||
$tcpdf->Image(WWW_ROOT.DS.'uploads'.DS.$WORKER['AppUser']['avatar'],0,40,0,140,'','','','',300,'L');
|
||||
|
||||
$url=WWW_ROOT.DS.'img'.DS'icon_user.png';
|
||||
if($WORKER['AppUser']['take_systemwide']){
|
||||
if($WORKER['User']['avatar'])
|
||||
$url = WWW_ROOT.DS.'uploads'.DS.$WORKER['User']['avatar'];
|
||||
}else
|
||||
if($profil['AppUser']['avatar'])
|
||||
$url = WWW_ROOT.DS.'uploads'.DS.$WORKER['AppUser']['avatar'];
|
||||
$tcpdf->Image($url,0,40,0,140,'','','','',300,'L');
|
||||
$tcpdf->SetY(185);
|
||||
$tcpdf->SetFont($tcpdf->font,'B',$tcpdf->fontsize+4);
|
||||
$tcpdf->Cell(0,0, __('dreamjob.application.mappe'), 0,1,'L');
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
<?php
|
||||
$default_Form['type']='file';
|
||||
echo $this->Form->create('AppUser',$default_Form);
|
||||
echo $this->Form->input('AppUser.avatar',array('type'=>'file','label'=>array('text'=>__("dreamjob.avatar"),"class"=>$default_Form['inputDefaults']['label']['class']));
|
||||
echo $this->Form->input('AppUser.avatar',array('type'=>'file','label'=>array('text'=>__("dreamjob.avatar"),"class"=>$default_Form['inputDefaults']['label']['class'])));
|
||||
?>
|
||||
<div class="buttonrow">
|
||||
<?=$this->Form->button('<span class="glyphicon glyphicon-floppy-disk"></span> '.__('dreamjob.settings.save'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?>
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 20 KiB |
Loading…
Reference in New Issue