diff --git a/app/Locale/cake.pot b/app/Locale/cake.pot index 7b04879..1440243 100644 --- a/app/Locale/cake.pot +++ b/app/Locale/cake.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2014-06-10 18:37+0200\n" +"POT-Creation-Date: 2014-06-16 00:35+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" diff --git a/app/Locale/cake_dev.pot b/app/Locale/cake_dev.pot index 9e19b36..63ca261 100644 --- a/app/Locale/cake_dev.pot +++ b/app/Locale/cake_dev.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2014-06-10 18:37+0200\n" +"POT-Creation-Date: 2014-06-16 00:35+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" diff --git a/app/Locale/default.pot b/app/Locale/default.pot index 1da6b31..247908e 100644 --- a/app/Locale/default.pot +++ b/app/Locale/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2014-06-10 18:37+0200\n" +"POT-Creation-Date: 2014-06-16 00:35+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -65,7 +65,7 @@ msgid "dreamjob.advertise" msgstr "" #: Controller/HomeController.php:41;69;86 -#: View/Elements/barleft.ctp:84 +#: View/Elements/barleft.ctp:93 #: View/Elements/navbar.ctp:3;6 msgid "dreamjob.startpage" msgstr "" @@ -302,28 +302,28 @@ msgstr "" msgid "dreamjob.settings.avatar.error" msgstr "" -#: View/Elements/barleft.ctp:27 +#: View/Elements/barleft.ctp:30 msgid "dreamjob.my.profil" msgstr "" -#: View/Elements/barleft.ctp:29 +#: View/Elements/barleft.ctp:32 #: View/Job/opening_list.ctp:7 msgid "dreamjob.my.opening" msgstr "" -#: View/Elements/barleft.ctp:31 +#: View/Elements/barleft.ctp:34 #: View/Job/application.ctp:10 #: View/Job/applicationWorker_list.ctp:7 #: View/Job/opening.ctp:28 msgid "dreamjob.my.application" msgstr "" -#: View/Elements/barleft.ctp:32 +#: View/Elements/barleft.ctp:35 #: View/Job/favorite.ctp:7 msgid "dreamjob.my.favority" msgstr "" -#: View/Elements/barleft.ctp:34 +#: View/Elements/barleft.ctp:37 #: View/User/settings_account.ctp:17;32 #: View/User/settings_account_delete.ctp:9 #: View/User/settings_isearch.ctp:17 @@ -331,7 +331,7 @@ msgstr "" msgid "dreamjob.settings" msgstr "" -#: View/Elements/barleft.ctp:60 +#: View/Elements/barleft.ctp:66 msgid "dreamjob.company.startpage" msgstr "" @@ -487,10 +487,14 @@ msgstr "" msgid "dreamjob.password" msgstr "" -#: View/Elements/navbar.ctp:28 +#: View/Elements/navbar.ctp:29 msgid "dreamjob.login" msgstr "" +#: View/Elements/navbar.ctp:33 +msgid "dreamjob.password.forget" +msgstr "" + #: View/Elements/search_navbar.ctp:3 #: View/Search/opening.ctp:15 msgid "dreamjob.search.opening" @@ -925,7 +929,7 @@ msgid "dreamjob.password.reset" msgstr "" #: View/Registration/password_reset.ctp:11 -msgid "dreamjob.password.send" +msgid "dreamjob.password.reset.send" msgstr "" #: View/Registration/worker.ctp:19 diff --git a/app/Locale/deu/LC_MESSAGES/default.mo b/app/Locale/deu/LC_MESSAGES/default.mo index 86eefd8..ba3578d 100644 Binary files a/app/Locale/deu/LC_MESSAGES/default.mo and b/app/Locale/deu/LC_MESSAGES/default.mo differ diff --git a/app/Locale/deu/LC_MESSAGES/default.po b/app/Locale/deu/LC_MESSAGES/default.po index c5a6787..6f06514 100644 --- a/app/Locale/deu/LC_MESSAGES/default.po +++ b/app/Locale/deu/LC_MESSAGES/default.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2014-06-10 18:37+0200\n" +"POT-Creation-Date: 2014-06-16 00:35+0200\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -9,7 +9,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.6.4\n" +"X-Generator: Poedit 1.6.5\n" #: Controller/ExtraController.php:19;61;79 Controller/HomeController.php:116 msgid "dreamjob.contactSend.success" @@ -52,7 +52,7 @@ msgstr "Premium Account" msgid "dreamjob.advertise" msgstr "Werbung schalten" -#: Controller/HomeController.php:41;69;86 View/Elements/barleft.ctp:84 +#: Controller/HomeController.php:41;69;86 View/Elements/barleft.ctp:93 #: View/Elements/navbar.ctp:3;6 msgid "dreamjob.startpage" msgstr "Startseite" @@ -290,30 +290,30 @@ msgstr "Bilddatei wurde erfolgreich geändert" msgid "dreamjob.settings.avatar.error" msgstr "Bilddatei konnte nicht gespeichert werden" -#: View/Elements/barleft.ctp:27 +#: View/Elements/barleft.ctp:30 msgid "dreamjob.my.profil" msgstr "Mein Profil" -#: View/Elements/barleft.ctp:29 View/Job/opening_list.ctp:7 +#: View/Elements/barleft.ctp:32 View/Job/opening_list.ctp:7 msgid "dreamjob.my.opening" msgstr "Meine Stellenausschreibungen" -#: View/Elements/barleft.ctp:31 View/Job/application.ctp:10 +#: View/Elements/barleft.ctp:34 View/Job/application.ctp:10 #: View/Job/applicationWorker_list.ctp:7 View/Job/opening.ctp:28 msgid "dreamjob.my.application" msgstr "Meine Bewerbungen" -#: View/Elements/barleft.ctp:32 View/Job/favorite.ctp:7 +#: View/Elements/barleft.ctp:35 View/Job/favorite.ctp:7 msgid "dreamjob.my.favority" msgstr "Meine Favoriten" -#: View/Elements/barleft.ctp:34 View/User/settings_account.ctp:17;32 +#: View/Elements/barleft.ctp:37 View/User/settings_account.ctp:17;32 #: View/User/settings_account_delete.ctp:9 View/User/settings_isearch.ctp:17 #: View/User/settings_pages.ctp:35 msgid "dreamjob.settings" msgstr "Einstellungen" -#: View/Elements/barleft.ctp:60 +#: View/Elements/barleft.ctp:66 msgid "dreamjob.company.startpage" msgstr "für Arbeitgeber" @@ -439,10 +439,14 @@ msgstr "E-Mail" msgid "dreamjob.password" msgstr "Passwort" -#: View/Elements/navbar.ctp:28 +#: View/Elements/navbar.ctp:29 msgid "dreamjob.login" msgstr "Login" +#: View/Elements/navbar.ctp:33 +msgid "dreamjob.password.forget" +msgstr "Passwort vergessen?" + #: View/Elements/search_navbar.ctp:3 View/Search/opening.ctp:15 msgid "dreamjob.search.opening" msgstr "Stellensuche" @@ -833,8 +837,8 @@ msgid "dreamjob.password.reset" msgstr "Passwort zurücksetzen" #: View/Registration/password_reset.ctp:11 -msgid "dreamjob.password.send" -msgstr "Passwort übernehmen" +msgid "dreamjob.password.reset.send" +msgstr "Passwort zurücksetzen" #: View/Registration/worker.ctp:19 View/User/settings_account.ctp:46 msgid "dreamjob.worker" @@ -1150,6 +1154,9 @@ msgstr "" msgid "Debug setting does not allow access to this url." msgstr "" +#~ msgid "dreamjob.password.send" +#~ msgstr "Passwort übernehmen" + #~ msgid "dreamjob.opening.save.add" #~ msgstr "Stellenausschreibung wurde angelegt" diff --git a/app/View/Elements/barleft.ctp b/app/View/Elements/barleft.ctp index f31b9e0..c689bd7 100755 --- a/app/View/Elements/barleft.ctp +++ b/app/View/Elements/barleft.ctp @@ -20,6 +20,9 @@ if($isLoggedin){ padding-left:50px; width:1192px; } +.content-size{ + min-width:1192px; +} --> @@ -54,6 +57,9 @@ if($isLoggedin){ padding-left:130px; width:1252px; } +.content-size{ + min-width:1252px; +} --> Form->input('User.password',array('placeholder'=>__('dreamjob.password'))); echo "\n"; + echo $this->Form->button(__('dreamjob.login'),array('div' => false,'class'=>"btn btn-default",'type' => 'submit')); echo $this->Form->end(); ?> +
+ Html->link(__('dreamjob.password.forget'),array('controller'=>'registration','action'=>'password_reset'),array('style'=>'color:white;'));?>
- \ No newline at end of file + + diff --git a/app/View/Layouts/default.ctp b/app/View/Layouts/default.ctp index 07dc679..b0361c1 100755 --- a/app/View/Layouts/default.ctp +++ b/app/View/Layouts/default.ctp @@ -28,7 +28,7 @@ -
+
@@ -36,7 +36,7 @@
Html->image('mobil.png',array("url"=>array('controller'=>'home','action'=>'home')));?>
*/ ?>
- -
+
Session->flash(); ?> @@ -90,7 +90,7 @@