From b760ac41d07ce9a1ea65e58516574757007f0ee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCller?= Date: Mon, 16 Jun 2014 00:38:44 +0200 Subject: [PATCH] Password vergessen in NavBar --- app/Locale/cake.pot | 2 +- app/Locale/cake_dev.pot | 2 +- app/Locale/default.pot | 24 ++++++++++-------- app/Locale/deu/LC_MESSAGES/default.mo | Bin 16284 -> 16353 bytes app/Locale/deu/LC_MESSAGES/default.po | 31 ++++++++++++++--------- app/View/Elements/barleft.ctp | 9 +++++++ app/View/Elements/navbar.ctp | 6 ++++- app/View/Layouts/default.ctp | 8 +++--- app/View/Registration/password_reset.ctp | 4 +-- app/webroot/css/dreamjob.css | 14 ++++++---- 10 files changed, 64 insertions(+), 36 deletions(-) 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 86eefd8246f33993ef0108076446c7c800d98e0f..ba3578de5a365585d07356bdcc193187a9be8f71 100644 GIT binary patch delta 4497 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 delta 4463 zcmYM$2~bs49LMoPg$Rfbp34&?&Gn6w>aR=8);Qq?zWDWztyQsfl#TrMzin zF==X2lA5Hc0YyP>E#g9IA(Bp7jg_gDP22bP?rFNi|9#H6%US;C+^a3ltB!Nrf5mdc zaf(PJ`b8L%7iP>oZFSa|?(K|ejcFK*x#+_}Y>#(h2b^NB&&N3GOVN+3u?@b9{Fz#Q z)X!n$x?_H^7s6?+BNyUP4QKOnB^F@{UmnA2u72Nsn`jNFdoOE zu9u+Nbuo$l%{vr=oY;@L@f@myXhx$B(@_l#LN1xfs0=)YF}MhonU(hX27A30HSh*h zCeC62^`qxHVLbhtt0^ek1*nFGAb(~YKN?U8@~l~gO5K~NnS5exL8bOj)bp{7R@YN7 zw4_LKOfjmR8K?}EqN4}ODd@%>NE@aRqwz=7^*>M}j%GAk+j!)ZNk40nf&X4o(#7O4#%!I7j;7!YQ#HHsc%4ad>WNn{b=Tis1CAG z6Bvq`@f1`$k0XC(B|ln_ZLcB z461>!6mRB}XaG?RTNe^hOVJ;d!coZb znVG1~xCqtI8f0>28}erw`JpLu$<`A{mohQ{)&4}(K<1z_;$kQIH)|;bu^N^7c*fR zEWvbq4l}R{Gx2-WgYj2;=li2FF%6ZO`KU}RM@?iqYNnr~GSG}#(sLNZ*ly%sGs)@Z zUAWD9KWe56ZT$_@K19VUsT!zZfMq97xPX3j; zW1Ns@Q19ulsF8=Kc@1|&J(!0YKp`peFq-;a)b&PG>YGs+xQJ>u>KZRo38vgDxK0$TVfEs8MYNls#82*hx9Lmns`3EsH zLDc=LFhcMDW(u0YcGM<2f%>5QfyzwVEN@^zR7z8AJ>S;*q6Rb=HIZV}jK^c>?Z7!E3P&_3w}Qhr)H3knMdyMxi##qo@WpVNd+X)_=3tqjLCf8RrX7OEeW@u@qx) z1?ufui`ul+r~w{EWx5F+6`Co;VGAk)=WRVE*E^q#>L3So{~f4?24g?G3zZocHS=;* zdt0y-)}i*wKGgGv@K$WhCI1>(ko=6mKA3`wQER>l_25=iLp9h2>ro9Iu;&k<_QF@z z)2IQQM<0fhKD|X9Q1|7co*&SY{I{o2zzGIrMxs6-3sIR^j~YO&y}lRuikiPr8AxTF zwDvvFkG)WD$t|c4(@fM`@igiKRDtbrH)?=Q4ut{=KcODX?(KCr3N`X^sFBXH&bH?t zMy2{Gyb+fmt7aNdd*bqZuj33Wfx^T7vzk8U2DCF}#nr z)`_T$6r(;M6HqfLMcwzJbt7t~_1FQAp(gmVHPAPdNyiMJpbHbd6XqGz2VxUy=9Q>S zY(=HA9<|GVK<)BBF&?9Mr|Pf^D%Ia1p8ylitEBdtnx~??BCT7itCvP`ms))KZ*7{o`~Vlks=F5<6Y*J>MI3-$2yb--KGa(WnVdLv6kl zsQVaH=g{t*PNkkWL=+J^-f$PUO?N6Om4)g&hHGqDG!g1vQ@EQrK)gddN6aH;652`c z5jt)nln-sk8sb4>2cgB&F^%|)7)ZQG%;1Zb?~6&>L|M}wLi8tebRpIgZxRiJj@RAk zzVz^qD81{J`2uNMLuXl6tg_`ge1LeC(Cc%YIOR6^0ylh0NylPh1aXX5K!n4o+j=iCKJWP zMncC};)uH^HZSa?`&VpoWCiu3#2&Y6Tz=ngDCt$uv6iR~mH4+AZy*j5_Y$j#6NHZI zh`sLexNc!P-Rii6oYz8U|NnWP;?2ZLqTHSiV6H7UyOI8c$gikvBi?c|{DGJjdu=@K zc8B@9MSf0cK5^K6!XN0mpVBg7G@+vv@ilR~DjZ9RU2e7is<6#&i$5#n3+k(gyNC?p zzvCfW_^>jkU8c`1NgY!8S!zl|M0PNz&$W5^?!~kNVLdB%_qZ72HuNco{J3huq}ekj MO_^Sq*tfpbzu{ly#sB~S 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 @@