harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2015-03-03 14:39:03 -08:00
commit 52f42e7d81
4 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boot.php
View File

@ -1553,7 +1553,7 @@ function login($register = false, $form_id = 'main-login', $hiddens=false) {
'$form_id' => $form_id, '$form_id' => $form_id,
'$lname' => array('username', t('Email') , '', ''), '$lname' => array('username', t('Email') , '', ''),
'$lpassword' => array('password', t('Password'), '', ''), '$lpassword' => array('password', t('Password'), '', ''),
'$remember' => array('remember', t('Remember me'), '', ''), '$remember' => array('remember', t('Remember me'), '', '',array(t('No'),t('Yes'))),
'$hiddens' => $hiddens, '$hiddens' => $hiddens,
'$register' => $reg, '$register' => $reg,
'$lostpass' => t('Forgot your password?'), '$lostpass' => t('Forgot your password?'),
@ -2339,4 +2339,4 @@ function check_cron_broken() {
. 'Content-transfer-encoding: 8bit' ); . 'Content-transfer-encoding: 8bit' );
set_config('system','lastpollcheck',datetime_convert()); set_config('system','lastpollcheck',datetime_convert());
return; return;
} }

12
view/theme/redbasic/css/style.css
View File

@ -81,7 +81,11 @@ a.btn-default {
color: #333; color: #333;
} }
a.btn-success { a.btn-success,
a.btn-danger,
a.btn-info,
a.btn-warning,
a.btn-primary {
color: #fff; color: #fff;
} }
@ -111,8 +115,8 @@ input[type="submit"] {
padding: 6px 12px; padding: 6px 12px;
} }
button, input, optgroup, select, textarea { input, optgroup, select, textarea {
color: #000; color: #333;
} }
pre code { pre code {
@ -2331,5 +2335,5 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
.field.checkbox > div > input:checked + label .onoffswitch-switch { .field.checkbox > div > input:checked + label .onoffswitch-switch {
right: 0px; right: 0px;
background-color: $link_colour; background-color: #337AB7;
} }

22
view/tpl/login.tpl
View File

@ -1,29 +1,19 @@
<form action="{{$dest_url}}" id="{{$form_id}}" method="post" > <form action="{{$dest_url}}" id="{{$form_id}}" method="post" >
<input type="hidden" name="auth-params" value="login" /> <input type="hidden" name="auth-params" value="login" />
<div id="login-main"> <div id="login-main">
<div id="login_standard"> <div id="login-input" class="form-group">
{{include file="field_input.tpl" field=$lname}} {{include file="field_input.tpl" field=$lname}}
{{include file="field_password.tpl" field=$lpassword}} {{include file="field_password.tpl" field=$lpassword}}
{{include file="field_checkbox.tpl" field=$remember}}
<button type="submit" name="submit" class="btn btn-block btn-primary">{{$login}}</button>
</div> </div>
<div id="login-extra-links"> <div id="login-extra-links">
{{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>&nbsp;|{{/if}} {{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link" class="pull-right">{{$register.desc}}</a>{{/if}}
<a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a> <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
</div> </div>
<div class="clear"></div>
{{include file="field_checkbox.tpl" field=$remember}}
<div class="clear"></div>
<div id="login-submit-wrapper" >
<input type="submit" name="submit" id="login-submit-button" class="btn btn-default" value="{{$login}}" />
</div>
</div> </div>
{{foreach $hiddens as $k=>$v}} {{foreach $hiddens as $k=>$v}}
<input type="hidden" name="{{$k}}" value="{{$v}}" /> <input type="hidden" name="{{$k}}" value="{{$v}}" />
{{/foreach}} {{/foreach}}
</form> </form>
<script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script> <script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>

2
view/tpl/settings.tpl
View File

@ -1,6 +1,6 @@
<div class="generic-content-wrapper"> <div class="generic-content-wrapper">
<div class="section-title-wrapper"> <div class="section-title-wrapper">
<button title="{{$permanent}}" class="btn btn-danger btn-xs pull-right" type="submit" formaction="removeme"><i class="icon-trash"></i>&nbsp;{{$removeme}}</button> <a title="{{$permanent}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a>
<h2>{{$ptitle}}</h2> <h2>{{$ptitle}}</h2>
<div class="clear"></div> <div class="clear"></div>
</div> </div>