miconware
/
dreamjob
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Sebastian Imberg 2014-04-29 20:09:48 +02:00
parent 3ad33ba5d1 d5ef303363
commit 61ee6fd191
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/Component/MiconwareSessionComponent.php
View File

@ -20,7 +20,7 @@ class MiconwareSessionComponent extends Component {
}
$controller->set("isStaff",$this->isStaff());
$controller->set("MEDIA",'/uploads');
$controller->set("strip_tags",'<p><a><img><span><div>');
$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('default_sForm',array(
'inputDefaults' => array(
'div' => array('class' => 'control-group'),

4
app/Vendor/tcpdf/xtcpdf.php vendored
View File

@ -11,9 +11,9 @@ class XTCPDF extends TCPDF{
function Header(){
$this->SetY(25);
$this->SetTextColor(0,0, 0);
$this->SetFont($this->font,'B',$this->fontsize);
$this->SetFont($this->font,'B',($this->fontsize)+2);
$this->Cell(0,0, $this->title, array('B'=>array('width' => 1,'color'=>array(157,18,22))),1,'L');
$this->SetY(25);
$this->SetY(22);
if($this->title=='')
$this->Image(WWW_ROOT.DS.'img'.DS.'pdf-logo-lang.png',0,10,85,20,'','','','',300,'R');
else

7
app/View/Pdf/application.ctp
View File

@ -7,7 +7,8 @@ $cvinhalt = $this->element('user_worker_cv',array('toPDF'=>true,'profil'=>array(
,'AppUser'=>$application['AppUserWorker'],'DreamjobWorker'=>$application['DreamjobWorker'],'DreamjobListGraducation'=>$application['WorkerGraducation'],'DreamjobListCity'=>$application['DreamjobWorkerListCity'])));
$cvinhalt .= '<style>span{font-style:italic;font-size:10px;}h1,h2,h3,h4,h5{
border-bottom:2px solid grey;
border-bottom:1px solid grey;
margin-bottom:3px;
width:100%;
}</style>';
@ -26,8 +27,8 @@ $tcpdf->AddPage();
$tcpdf->SetY(35);
$tcpdf->SetTextColor(0, 0, 0);
$tcpdf->SetFont($tcpdf->font);
$tcpdf->Image(WWW_ROOT.DS.'uploads'.DS.$application['AppUserWorker']['avatar'],0,35,0,140,'','','','',300,'L');
$tcpdf->SetY(180);
$tcpdf->Image(WWW_ROOT.DS.'uploads'.DS.$application['AppUserWorker']['avatar'],0,40,0,140,'','','','',300,'L');
$tcpdf->SetY(185);
$tcpdf->SetFont($tcpdf->font,'B',$tcpdf->fontsize);
$tcpdf->Cell(0,0, __('dreamjob.application'), 0,1,'L');
$tcpdf->SetFont($tcpdf->font);

8
app/View/Pdf/profil.ctp
View File

@ -7,7 +7,8 @@ header("Content-type: application/pdf");
$cvinhalt = $this->element('user_worker_cv',array('toPDF'=>true,'profil'=>$WORKER));
$cvinhalt .= '<style>span{font-style:italic;font-size:10px;}h1,h2,h3,h4,h5{
border-bottom:2px solid grey;
border-bottom:1px solid grey;
margin-bottom:3px;
width:100%;
}</style>';
@ -25,8 +26,8 @@ $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,35,0,140,'','','','',300,'L');
$tcpdf->SetY(180);
$tcpdf->Image(WWW_ROOT.DS.'uploads'.DS.$WORKER['AppUser']['avatar'],0,40,0,140,'','','','',300,'L');
$tcpdf->SetY(185);
$tcpdf->SetFont($tcpdf->font,'B',$tcpdf->fontsize);
$tcpdf->Cell(0,0, __('dreamjob.application.mappe'), 0,1,'L');
$tcpdf->SetFont($tcpdf->font);
@ -37,6 +38,7 @@ $tcpdf->Cell(0,0, $WORKER['DreamjobUser']['street'], 0,1,'R');
$tcpdf->Cell(0,0, $WORKER['DreamjobUser']['postcode'].' '.$WORKER['DreamjobListCity']['name'], 0,1,'R');
//Lebenslauf
$tcpdf->SetAutoPageBreak( true,50);
$tcpdf->title=__('dreamjob.cv');
$tcpdf->AddPage();
$tcpdf->SetY(35);

2
update.sql
View File

@ -99,7 +99,7 @@ ALTER TABLE `mic_dj_jobs_opening` CHANGE `city` `city_id` INT(11) NOT NULL;
ALTER TABLE `mic_dj_jobs_application` ADD `subject` VARCHAR( 255 ) NOT NULL AFTER `opening_id`
--- update `mic_sys_micacc` `n` left join `mic_sys_micacc` `o` on o.id=n.id SET n.code = md5(SUBSTRING(o.code, 3, CHAR_LENGTH(o.code)-2)) WHERE n.`code` Like "_:%" and o.`code` Like "_:%"