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

Password vergessen in NavBar

This commit is contained in:
Martin Müller 2014-06-16 00:38:44 +02:00
parent 1ac23045da
commit b760ac41d0
10 changed files with 64 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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-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" "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-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" "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-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" "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"
@ -65,7 +65,7 @@ msgid "dreamjob.advertise"
msgstr "" msgstr ""
#: Controller/HomeController.php:41;69;86 #: Controller/HomeController.php:41;69;86
#: View/Elements/barleft.ctp:84 #: View/Elements/barleft.ctp:93
#: View/Elements/navbar.ctp:3;6 #: View/Elements/navbar.ctp:3;6
msgid "dreamjob.startpage" msgid "dreamjob.startpage"
msgstr "" msgstr ""
@ -302,28 +302,28 @@ msgstr ""
msgid "dreamjob.settings.avatar.error" msgid "dreamjob.settings.avatar.error"
msgstr "" msgstr ""
#: View/Elements/barleft.ctp:27 #: View/Elements/barleft.ctp:30
msgid "dreamjob.my.profil" msgid "dreamjob.my.profil"
msgstr "" msgstr ""
#: View/Elements/barleft.ctp:29 #: View/Elements/barleft.ctp:32
#: View/Job/opening_list.ctp:7 #: View/Job/opening_list.ctp:7
msgid "dreamjob.my.opening" msgid "dreamjob.my.opening"
msgstr "" msgstr ""
#: View/Elements/barleft.ctp:31 #: View/Elements/barleft.ctp:34
#: View/Job/application.ctp:10 #: View/Job/application.ctp:10
#: View/Job/applicationWorker_list.ctp:7 #: View/Job/applicationWorker_list.ctp:7
#: View/Job/opening.ctp:28 #: View/Job/opening.ctp:28
msgid "dreamjob.my.application" msgid "dreamjob.my.application"
msgstr "" msgstr ""
#: View/Elements/barleft.ctp:32 #: View/Elements/barleft.ctp:35
#: View/Job/favorite.ctp:7 #: View/Job/favorite.ctp:7
msgid "dreamjob.my.favority" msgid "dreamjob.my.favority"
msgstr "" msgstr ""
#: View/Elements/barleft.ctp:34 #: View/Elements/barleft.ctp:37
#: View/User/settings_account.ctp:17;32 #: View/User/settings_account.ctp:17;32
#: View/User/settings_account_delete.ctp:9 #: View/User/settings_account_delete.ctp:9
#: View/User/settings_isearch.ctp:17 #: View/User/settings_isearch.ctp:17
@ -331,7 +331,7 @@ msgstr ""
msgid "dreamjob.settings" msgid "dreamjob.settings"
msgstr "" msgstr ""
#: View/Elements/barleft.ctp:60 #: View/Elements/barleft.ctp:66
msgid "dreamjob.company.startpage" msgid "dreamjob.company.startpage"
msgstr "" msgstr ""
@ -487,10 +487,14 @@ msgstr ""
msgid "dreamjob.password" msgid "dreamjob.password"
msgstr "" msgstr ""
#: View/Elements/navbar.ctp:28 #: View/Elements/navbar.ctp:29
msgid "dreamjob.login" msgid "dreamjob.login"
msgstr "" msgstr ""
#: View/Elements/navbar.ctp:33
msgid "dreamjob.password.forget"
msgstr ""
#: View/Elements/search_navbar.ctp:3 #: View/Elements/search_navbar.ctp:3
#: View/Search/opening.ctp:15 #: View/Search/opening.ctp:15
msgid "dreamjob.search.opening" msgid "dreamjob.search.opening"
@ -925,7 +929,7 @@ msgid "dreamjob.password.reset"
msgstr "" msgstr ""
#: View/Registration/password_reset.ctp:11 #: View/Registration/password_reset.ctp:11
msgid "dreamjob.password.send" msgid "dreamjob.password.reset.send"
msgstr "" msgstr ""
#: View/Registration/worker.ctp:19 #: View/Registration/worker.ctp:19

BIN
app/Locale/deu/LC_MESSAGES/default.mo
View File

Binary file not shown.

31
app/Locale/deu/LC_MESSAGES/default.po
View File

@ -1,7 +1,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "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" "PO-Revision-Date: \n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
@ -9,7 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\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 #: Controller/ExtraController.php:19;61;79 Controller/HomeController.php:116
msgid "dreamjob.contactSend.success" msgid "dreamjob.contactSend.success"
@ -52,7 +52,7 @@ msgstr "Premium Account"
msgid "dreamjob.advertise" msgid "dreamjob.advertise"
msgstr "Werbung schalten" 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 #: View/Elements/navbar.ctp:3;6
msgid "dreamjob.startpage" msgid "dreamjob.startpage"
msgstr "Startseite" msgstr "Startseite"
@ -290,30 +290,30 @@ msgstr "Bilddatei wurde erfolgreich geändert"
msgid "dreamjob.settings.avatar.error" msgid "dreamjob.settings.avatar.error"
msgstr "Bilddatei konnte nicht gespeichert werden" msgstr "Bilddatei konnte nicht gespeichert werden"
#: View/Elements/barleft.ctp:27 #: View/Elements/barleft.ctp:30
msgid "dreamjob.my.profil" msgid "dreamjob.my.profil"
msgstr "Mein 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" msgid "dreamjob.my.opening"
msgstr "Meine Stellenausschreibungen" 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 #: View/Job/applicationWorker_list.ctp:7 View/Job/opening.ctp:28
msgid "dreamjob.my.application" msgid "dreamjob.my.application"
msgstr "Meine Bewerbungen" 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" msgid "dreamjob.my.favority"
msgstr "Meine Favoriten" 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_account_delete.ctp:9 View/User/settings_isearch.ctp:17
#: View/User/settings_pages.ctp:35 #: View/User/settings_pages.ctp:35
msgid "dreamjob.settings" msgid "dreamjob.settings"
msgstr "Einstellungen" msgstr "Einstellungen"
#: View/Elements/barleft.ctp:60 #: View/Elements/barleft.ctp:66
msgid "dreamjob.company.startpage" msgid "dreamjob.company.startpage"
msgstr "für Arbeitgeber" msgstr "für Arbeitgeber"
@ -439,10 +439,14 @@ msgstr "E-Mail"
msgid "dreamjob.password" msgid "dreamjob.password"
msgstr "Passwort" msgstr "Passwort"
#: View/Elements/navbar.ctp:28 #: View/Elements/navbar.ctp:29
msgid "dreamjob.login" msgid "dreamjob.login"
msgstr "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 #: View/Elements/search_navbar.ctp:3 View/Search/opening.ctp:15
msgid "dreamjob.search.opening" msgid "dreamjob.search.opening"
msgstr "Stellensuche" msgstr "Stellensuche"
@ -833,8 +837,8 @@ msgid "dreamjob.password.reset"
msgstr "Passwort zurücksetzen" msgstr "Passwort zurücksetzen"
#: View/Registration/password_reset.ctp:11 #: View/Registration/password_reset.ctp:11
msgid "dreamjob.password.send" msgid "dreamjob.password.reset.send"
msgstr "Passwort übernehmen" msgstr "Passwort zurücksetzen"
#: View/Registration/worker.ctp:19 View/User/settings_account.ctp:46 #: View/Registration/worker.ctp:19 View/User/settings_account.ctp:46
msgid "dreamjob.worker" msgid "dreamjob.worker"
@ -1150,6 +1154,9 @@ msgstr ""
msgid "Debug setting does not allow access to this url." msgid "Debug setting does not allow access to this url."
msgstr "" msgstr ""
#~ msgid "dreamjob.password.send"
#~ msgstr "Passwort übernehmen"
#~ msgid "dreamjob.opening.save.add" #~ msgid "dreamjob.opening.save.add"
#~ msgstr "Stellenausschreibung wurde angelegt" #~ msgstr "Stellenausschreibung wurde angelegt"

9
app/View/Elements/barleft.ctp
View File

@ -20,6 +20,9 @@ if($isLoggedin){
padding-left:50px; padding-left:50px;
width:1192px; width:1192px;
} }
.content-size{
min-width:1192px;
}
--> -->
</style> </style>
@ -54,6 +57,9 @@ if($isLoggedin){
padding-left:130px; padding-left:130px;
width:1252px; width:1252px;
} }
.content-size{
min-width:1252px;
}
--> -->
</style> </style>
<?php <?php
@ -78,6 +84,9 @@ if($isLoggedin){
padding-left:130px; padding-left:130px;
width:1252px; width:1252px;
} }
.content-size{
min-width:1252px;
}
--> -->
</style> </style>
<?php <?php

4
app/View/Elements/navbar.ctp
View File

@ -25,8 +25,12 @@
echo "\n"; echo "\n";
echo $this->Form->input('User.password',array('placeholder'=>__('dreamjob.password'))); echo $this->Form->input('User.password',array('placeholder'=>__('dreamjob.password')));
echo "\n"; echo "\n";
echo $this->Form->button(__('dreamjob.login'),array('div' => false,'class'=>"btn btn-default",'type' => 'submit')); echo $this->Form->button(__('dreamjob.login'),array('div' => false,'class'=>"btn btn-default",'type' => 'submit'));
echo $this->Form->end(); echo $this->Form->end();
?> ?>
<div style="font-size:10px;padding-left:165px;">
<?=$this->Html->link(__('dreamjob.password.forget'),array('controller'=>'registration','action'=>'password_reset'),array('style'=>'color:white;'));?>
</div>
</div> </div>
<?php } ?> <?php } ?>

8
app/View/Layouts/default.ctp
View File

@ -28,7 +28,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="bg" id="logo_bar"> <div class="bg content-size" id="logo_bar">
<div id="logo"> <div id="logo">
<?=$this->Html->image('logo.png',array('url'=>array('controller'=>'home','action'=>'home'))); ?> <?=$this->Html->image('logo.png',array('url'=>array('controller'=>'home','action'=>'home'))); ?>
</div> </div>
@ -36,7 +36,7 @@
<div id="logo_right"><?=$this->Html->image('mobil.png',array("url"=>array('controller'=>'home','action'=>'home')));?></div> <div id="logo_right"><?=$this->Html->image('mobil.png',array("url"=>array('controller'=>'home','action'=>'home')));?></div>
*/ ?> */ ?>
</div> </div>
<div id="navbar"> <div id="navbar" class="content-size">
<!-- navbar --> <!-- navbar -->
<?php <?php
$this->startIfEmpty('navbar'); $this->startIfEmpty('navbar');
@ -61,7 +61,7 @@
<!-- /barleft --> <!-- /barleft -->
</div> </div>
</div> </div>
<div class="column-center"> <div class="column-center content-size">
<div id="alert"> <div id="alert">
<!-- alert --> <!-- alert -->
<?=$this->Session->flash(); ?> <?=$this->Session->flash(); ?>
@ -90,7 +90,7 @@
</div> </div>
<div id="navdown" class="columns"> <div id="navdown" class="columns">
<div class="bar"></div> <div class="bar"></div>
<div class="column-center"> <div class="column-center content-size">
<table> <table>
<tr> <tr>
<td> <td>

2
app/View/Registration/password_reset.ctp
View File

@ -8,7 +8,7 @@
echo $this->Form->input('User.mail',array('label'=>array('text'=>__("dreamjob.mail"),"class"=>$default_Form['inputDefaults']['label']['class']))); echo $this->Form->input('User.mail',array('label'=>array('text'=>__("dreamjob.mail"),"class"=>$default_Form['inputDefaults']['label']['class'])));
?> ?>
<div class="buttonrow"> <div class="buttonrow">
<?=$this->Form->button(__('dreamjob.password.send'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?> <?=$this->Form->button(__('dreamjob.password.reset.send'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?>
</div> </div>
<?php echo $this->Form->end(); ?> <?php echo $this->Form->end(); ?>
</div> </div>

12
app/webroot/css/dreamjob.css
View File

@ -66,7 +66,6 @@ legend{
#logo_bar{ #logo_bar{
position:relative; position:relative;
padding:15px 0px 15px 15px; padding:15px 0px 15px 15px;
min-width: 960px;
} }
#logo_right{ #logo_right{
position:absolute; position:absolute;
@ -103,7 +102,6 @@ body.loading #container{
border-radius: 0px; border-radius: 0px;
margin: 0px; margin: 0px;
height:100px; height:100px;
min-width: 1110px;
} }
#navbar:after, #navbar:before, #navbar:after, #navbar:before,
.bar:after,.bar:before, .bar:after,.bar:before,
@ -114,6 +112,7 @@ body.loading #container{
#navbar:after,.bar:after,.box:after{ #navbar:after,.bar:after,.box:after{
clear: both; clear: both;
} }
#navbar > div{ #navbar > div{
margin: 30px 15px; margin: 30px 15px;
float:right; float:right;
@ -149,7 +148,9 @@ body.loading #container{
text-shadow: none; text-shadow: none;
border-radius: 4px 4px 0px 0px; border-radius: 4px 4px 0px 0px;
} }
#navbar form{
margin-bottom:8px;
}
/* /*
* Bottom * Bottom
*/ */
@ -219,6 +220,10 @@ body.loading #container{
#barright img{ #barright img{
max-width:100%; max-width:100%;
} }
.content-size{
min-width:1142px;
}
.column-center{ .column-center{
width:1142px; width:1142px;
display: table-cell; display: table-cell;
@ -226,7 +231,6 @@ body.loading #container{
margin: 0px; margin: 0px;
padding-top: 20px; padding-top: 20px;
padding-right:162px; padding-right:162px;
//width:960px;
} }
#container{ #container{
min-height: 400px; min-height: 400px;