webcraftmedia/u-vote.eu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

optics & final login functionality

Browse Source
This commit is contained in:
Nael 2013-06-30 03:43:12 +02:00
parent 12577cac92
commit 81566348df
3 changed files with 18 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
uVote/page/default_page/page.html
View File

@ -67,13 +67,15 @@
<div class="hero-unit" style="height: 200px; background: white;">
<div class="row">
<img src="${PIC_PATH}logo2.png" width="600" style="margin-top: -40px;" />
</div>
<div class="hero-unit" style="margin-left: 600px; margin-right: -60px; padding: 0px; padding-left: 10px; margin-top: -240px;">
<div class="hero-unit" style="margin: 0px; padding: 15px; float: right; margin-top: -40px; background-color: silver;">
<!-- margin-left: 600px; margin-right: -60px; padding: 5px; margin-top: -240px;-->
${registerform}
</div>
</div>
<!-- <div class="hero-unit" style="height: 300px; padding: 5px; padding-top: 50px; width: 400px; margin-left: 700px; margin-top: -260px; background: white;">
<i class="icon-tags" style="margin-left: 20px; margin-top: -30px;" ></i>Informieren
<p></p>
@ -95,7 +97,7 @@
</form>
</div>
<!-- Example row of columns -->
<div class="hero-unit" style="padding: 5px;">
<div class="hero-unit" style="padding: 0px; padding-top: 5px">
${votelist}
</div> <!-- /container -->

63
uVote/page/default_page/register_form.tpl
View File

@ -1,14 +1,12 @@
<div>
<br>
<form class="form-horizontal" id="form_register" align="right">
<form class="form-vertical" id="form_register">
<h2 style="" align="right">Accounterstellung<h2>
<h3 style="" align="left">Accounterstellung</h3>
<div class="control-group">
<div class="control-group" style="margin: 0px; padding: 0px;">
<div class="controls">
<input type="text"
size="30"
style="margin-bottom: 15px;"
id="bt_login_user"
placeholder="${loginUsername}"
data-validation-email-message="${check_mail_format}"
@ -17,77 +15,38 @@
<div class="controls">
<input type="password"
name="login_password"
size="30"
style="margin-bottom: 15px;"
id="bt_login_password"
placeholder="${loginPassword}"
minlength="5" data-validation-minlength-message="${login_password_too_short}"
required data-validation-required-message="${login_password_required}"/>
</div>
</div>
<div class="control-group" style="margin: 0px;">
<div class="controls">
<input type="password"
size="30"
style="margin-bottom: 15px;"
id="bt_login_password2"
placeholder="${loginPassword}"
data-validation-matches-match="user_register_password1"
data-validation-matches-match="login_password"
data-validation-matches-message="${register_password_dont_math}"/>
</div>
<label><input type="checkbox" id="remember_me" style="margin-top: -1px;"> ${login_rememberMe}</label><br />
<label><input type="checkbox" id="remember_me" style="margin-top: -1px;"> ${login_rememberMe}</label>
<div class="help-block"></div>
<div id="help-block-user-password-combi-wrong" style="display: none"><font color="red">${login_not_successfull}</font></div>
<input type="hidden" />
<button class="btn btn-primary" style="clear: left; width: 100%; height: 32px; font-size: 13px;"
type="submit"
id="login_submit">${login}</button>
<input type="hidden" />
</div>
</form>
</div>
<br>
<div id="user-button-wrapper-logged-out" style="display: none;">
<div id="user-button" class="btn-group pull-right">
<a class="btn btn-primary dropdown-toggle disableKeyEvents" data-toggle="dropdown" href="#" id="show_login_form">
<i class="icon-user icon-white"></i> ${login} <span class="caret"></span>
</a>
<div class="dropdown-menu" style="padding: 15px;">
<form class="textbox" id="login_form">
<div class="control-group">
<div class="controls">
<input type="text"
size="30"
style="margin-bottom: 15px;"
id="bt_login_user"
placeholder="${loginUsername}"
minlength="3" data-validation-minlength-message="${login_username_too_short}"
required data-validation-required-message="${login_username_required}"/>
</div>
<div class="controls">
<input type="password"
size="30"
style="margin-bottom: 15px;"
id="bt_login_password"
placeholder="${loginPassword}"
minlength="5" data-validation-minlength-message="${login_password_too_short}"
required data-validation-required-message="${login_password_required}"/>
</div>
<label><input type="checkbox" id="remember_me" style="margin-top: -1px;"> ${login_rememberMe}</label><br />
<div class="help-block"></div>
<div id="help-block-user-password-combi-wrong" style="display: none"><font color="red">${login_not_successfull}</font></div>
<input type="hidden" />
<button class="btn btn-primary" style="clear: left; width: 100%; height: 32px; font-size: 13px;"
type="submit"
id="login_submit">${login}</button>
</div>
<button type="button" class="btn btn-primary filter" style="clear: left; width: 100%; height: 32px; font-size: 13px;"
id="user-register-btn" url="?module=user&action=register" href="#">${register}</button>
</form>
</div>
</div>
</div>'

2
uVote/page/default_page/vote.tpl
View File

@ -1,4 +1,4 @@
<div class="hero-unit" style="padding: 5px; background: white;">
<div class="hero-unit" style="padding: 5px; background: white; margin-bottom: 8px;">
<div class="row" style="width: 100%; margin: auto;">
<div class="span6">
<h2>${vote_title}</h2>