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-28 22:14:59 +02:00
parent 0b6f51df6e b9255be77a
commit 3ad33ba5d1
8 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,7 +121,7 @@ class MiconwareSessionComponent extends Component {
} }
public static function generateKey($length=8){ public static function generateKey($length=8){
return base64_encode(mcrypt_create_iv($length, MCRYPT_DEV_URANDOM)); return md5(mcrypt_create_iv($length, MCRYPT_DEV_URANDOM));
} }
/** /**

2
app/Locale/cake.pot
View File

@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"POT-Creation-Date: 2014-04-28 12:52+0200\n" "POT-Creation-Date: 2014-04-28 22:17+0200\n"
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
"Last-Translator: NAME <EMAIL@ADDRESS>\n" "Last-Translator: NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"

2
app/Locale/cake_dev.pot
View File

@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"POT-Creation-Date: 2014-04-28 12:52+0200\n" "POT-Creation-Date: 2014-04-28 22:17+0200\n"
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
"Last-Translator: NAME <EMAIL@ADDRESS>\n" "Last-Translator: NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"

24
app/Locale/default.pot
View File

@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"POT-Creation-Date: 2014-04-28 12:52+0200\n" "POT-Creation-Date: 2014-04-28 22:17+0200\n"
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
"Last-Translator: NAME <EMAIL@ADDRESS>\n" "Last-Translator: NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
@ -361,11 +361,7 @@ msgid "dreamjob.message.send"
msgstr "" msgstr ""
#: View/Home/home.ctp:13 #: View/Home/home.ctp:13
#: View/Search/academy.ctp:20 msgid "dreamjob.search.opening.startpage.placeholder"
#: View/Search/education.ctp:20
#: View/Search/internship.ctp:20
#: View/Search/opening.ctp:20
msgid "dreamjob.search.opening.placeholder"
msgstr "" msgstr ""
#: View/Home/home.ctp:22 #: View/Home/home.ctp:22
@ -735,6 +731,10 @@ msgstr ""
msgid "dreamjob.country" msgid "dreamjob.country"
msgstr "" msgstr ""
#: View/Search/academy.ctp:20
msgid "dreamjob.search.opening.academy.placeholder"
msgstr ""
#: View/Search/academy.ctp:24;25 #: View/Search/academy.ctp:24;25
#: View/Search/company.ctp:25;26 #: View/Search/company.ctp:25;26
#: View/Search/education.ctp:24;25 #: View/Search/education.ctp:24;25
@ -751,6 +751,10 @@ msgstr ""
msgid "dreamjob.search.company.placeholder" msgid "dreamjob.search.company.placeholder"
msgstr "" msgstr ""
#: View/Search/education.ctp:20
msgid "dreamjob.search.opening.education.placeholder"
msgstr ""
#: View/Search/education.ctp:24 #: View/Search/education.ctp:24
msgid "dreamjob.branch.placeholder" msgid "dreamjob.branch.placeholder"
msgstr "" msgstr ""
@ -759,6 +763,14 @@ msgstr ""
msgid "dreamjob.city.placeholder" msgid "dreamjob.city.placeholder"
msgstr "" msgstr ""
#: View/Search/internship.ctp:20
msgid "dreamjob.search.opening.internship.placeholder"
msgstr ""
#: View/Search/opening.ctp:20
msgid "dreamjob.search.opening.placeholder"
msgstr ""
#: View/Search/worker.ctp:14 #: View/Search/worker.ctp:14
msgid "dreamjob.search.worker" msgid "dreamjob.search.worker"
msgstr "" msgstr ""

2
app/View/Home/home.ctp
View File

@ -10,7 +10,7 @@
<div class="searchform"> <div class="searchform">
<?php echo $this->Form->create(null,array('inputDefaults'=> array('div' => false,'label'=>false,'class' => 'form-control'),'url'=>array('controller'=>'search', 'action'=>'opening'),'type'=>'get')); ?> <?php echo $this->Form->create(null,array('inputDefaults'=> array('div' => false,'label'=>false,'class' => 'form-control'),'url'=>array('controller'=>'search', 'action'=>'opening'),'type'=>'get')); ?>
<div class="input-group"> <div class="input-group">
<?php echo $this->Form->input('DreamjobJobOpening.title',array('placeholder'=>__('dreamjob.search.opening.placeholder')));?> <?php echo $this->Form->input('DreamjobJobOpening.title',array('placeholder'=>__('dreamjob.search.opening.startpage.placeholder')));?>
<span class="input-group-btn"> <span class="input-group-btn">
<?php echo $this->Form->button('<span class="glyphicon glyphicon-search"></span>',array('div' => false,'class'=>"btn btn-default",'type' => 'submit')); ?> <?php echo $this->Form->button('<span class="glyphicon glyphicon-search"></span>',array('div' => false,'class'=>"btn btn-default",'type' => 'submit')); ?>
</span> </span>

2
app/View/Search/academy.ctp
View File

@ -17,7 +17,7 @@
$a = $default_hForm['inputDefaults']; $a = $default_hForm['inputDefaults'];
$a['inputDefaults']['between'] = false; $a['inputDefaults']['between'] = false;
$a['inputDefaults']['after'] = false; $a['inputDefaults']['after'] = false;
$a['placeholder'] = __('dreamjob.search.opening.placeholder'); $a['placeholder'] = __('dreamjob.search.opening.academy.placeholder');
echo $this->Form->input('DreamjobJobOpening.title',$a); echo $this->Form->input('DreamjobJobOpening.title',$a);
?> ?>
<fieldset class="search"> <fieldset class="search">

2
app/View/Search/education.ctp
View File

@ -17,7 +17,7 @@
$a = $default_hForm['inputDefaults']; $a = $default_hForm['inputDefaults'];
$a['inputDefaults']['between'] = false; $a['inputDefaults']['between'] = false;
$a['inputDefaults']['after'] = false; $a['inputDefaults']['after'] = false;
$a['placeholder'] = __('dreamjob.search.opening.placeholder'); $a['placeholder'] = __('dreamjob.search.opening.education.placeholder');
echo $this->Form->input('DreamjobJobOpening.title',$a); echo $this->Form->input('DreamjobJobOpening.title',$a);
?> ?>
<fieldset class="search"> <fieldset class="search">

2
app/View/Search/internship.ctp
View File

@ -17,7 +17,7 @@
$a = $default_hForm['inputDefaults']; $a = $default_hForm['inputDefaults'];
$a['inputDefaults']['between'] = false; $a['inputDefaults']['between'] = false;
$a['inputDefaults']['after'] = false; $a['inputDefaults']['after'] = false;
$a['placeholder']=__('dreamjob.search.opening.placeholder'); $a['placeholder']=__('dreamjob.search.opening.internship.placeholder');
echo $this->Form->input('DreamjobJobOpening.title',$a); echo $this->Form->input('DreamjobJobOpening.title',$a);
?> ?>
<fieldset class="search"> <fieldset class="search">