Commit 237aef76 authored by jonnybradley's avatar jonnybradley

[MRG] Automatic merge, branches/15.x 57431 to 57461

Conflict on tiki-change_password.tpl fixed using 15.x version
parent 64db215c
......@@ -116,7 +116,7 @@
{/remarksbox*}
<div class="form-group">
<input type="hidden" name="filters">
<input type="text" name="lm_criteria" value="{$lm_criteria|escape}" class="form-control" placeholder="{tr}Search preferences{/tr}...">
<input type="text" name="lm_criteria" value="{$lm_criteria|escape}" class="form-control" placeholder="{tr}Search preferences{/tr}..." autofocus>
</div>
<button type="submit" class="btn btn-default" {if $indexNeedsRebuilding} class="tips" title="{tr}Configuration search{/tr}|{tr}Note: The search index needs rebuilding, this will take a few minutes.{/tr}"{/if}>{icon name="search"}</button>
</form>
......
......@@ -33,7 +33,7 @@ The below assumes:
*}
{jq}
{* Give warning if caps lock is on when user starts typing in characters for a password *}
$('#pass1, #pass2').on('keypress', function () {
$('#oldpass, #pass1, #pass2').on('keypress', function () {
regCapsLock(event);
});
{* Show strength of the password as it is being typed *}
......
......@@ -46,7 +46,7 @@
<option value="Anonymous">{tr}Anonymous{/tr}</option>
{foreach key=ix item=auser from=$users}
<option value="{$auser|escape}"
{if $selectedUsers[$ix] eq 'y'}selected="selected"{/if}>{$auser|escape}</option>
{if $selectedUsers[$ix] eq 'y'}selected="selected"{/if}>{$auser|username}</option>
{/foreach}
</select>
</div>
......@@ -188,7 +188,7 @@
&nbsp;&mdash;&nbsp;
{tr}User:{/tr}
{foreach key=ix item=auser from=$users}
{if $selectedUsers[$ix] eq 'y'} {$auser|escape}{/if}
{if $selectedUsers[$ix] eq 'y'} {$auser|username}{/if}
{/foreach}
{/if}
......@@ -408,7 +408,7 @@
{tr}User:{/tr}
{foreach key=ix item=auser from=$users}
{if $selectedUsers[$ix] eq 'y'}
{$auser|escape}
{$auser|username}
{/if}
{/foreach}
{/if}
......@@ -442,7 +442,7 @@
{foreach key=auser item=time from=$logTimes}
<tr>
{if $selectedUsers|@count gt 0}
<td>{$auser}</td>
<td>{$auser|username}</td>
{/if}
<td>
{$time.days} {tr}days{/tr} {$time.hours} {tr}hours{/tr} {$time.mins} {tr}mns{/tr}
......@@ -523,7 +523,7 @@
{foreach item=stat from=$userActions name=userActions}
<tr>
<td class="username">{$stat.user|escape}</td>
<td class="username">{$stat.user|username}</td>
{foreach key=a item=nb from=$stat}
{if $a ne 'user'}
<td class="integer">{$nb}</td>{/if}
......@@ -641,7 +641,7 @@
{foreach key=categUser item=stat from=$statUserCateg}
<tr>
<td class="text">{$stat.category|escape}</td>
<td class="username">{$stat.user|escape}</td>
<td class="username">{$stat.user|username}</td>
{foreach key=a item=nb from=$stat}
{if $a ne 'category' and $a ne 'user'}
<td class="integer">{$nb}</td>
......@@ -696,7 +696,7 @@
{foreach from=$userContributions key=user item=contributions}
{foreach from=$contributions key=contribution item=stat}
<tr>
<td class="username">{$user|escape}</td>
<td class="username">{$user|username}</td>
<td class="text">{$stat.name|escape}</td>
<td class="integer">{$stat.stat.add}</td>
<td class="integer">{$stat.stat.del}</td>
......
{* $Id$ *}
{if isset($new_user_validation) && $new_user_validation eq 'y'}
{title}{tr}Your account has been validated.{/tr} {tr}You have to choose a password to use this account.{/tr}{/title}
{title}{tr}Your account has been validated.{/tr}{/title}
{remarksbox type="warning" title="{tr}Warning{/tr}" close="n"}{tr}You have to choose a password to use this account.{/tr}{/remarksbox}
{else}
{assign var='new_user_validation' value='n'}
{title}{tr}Change password enforced{/tr}{/title}
{/if}
<form class="form-horizontal col-md-12" method="post" action="tiki-change_password.php">
{if !empty($oldpass) and $new_user_validation eq 'y'}
<input type="hidden" name="oldpass" value="{$oldpass|escape}">
{elseif !empty($smarty.request.actpass)}
<input type="hidden" name="actpass" value="{$smarty.request.actpass|escape}">
{/if}
{if $new_user_validation eq 'y'}
<input type="hidden" name="new_user_validation" value="y">
{/if}
<fieldset>{if $new_user_validation neq 'y'}<legend>{tr}Change your password{/tr}</legend>{/if}
<div class="alert alert-warning" id="divRegCapson" style="visibility:hidden">{icon name='error' style="vertical-align:middle"} {tr}CapsLock is on.{/tr}</div>
</fieldset>
<div class="form-group">
<label class="col-sm-3 col-md-2 control-label" for="user">{tr}Username{/tr}</label>
<div class="col-sm-7 col-md-6">
{if empty($userlogin)}
<input type="text" class="form-control" id="user" name="user">
{else}
<input type="hidden" id="user" name="user" value="{$userlogin|escape}">
<div class="form-control-static"><strong>{$userlogin|escape}</strong></div>
<div class="col-md-10 col-md-push-1 clearfix">
<form role="form" class="form-horizontal" method="post" action="tiki-change_password.php">
<div class="panel panel-default">
{if !empty($oldpass) and $new_user_validation eq 'y'}
<input type="hidden" name="oldpass" value="{$oldpass|escape}">
{elseif !empty($smarty.request.actpass)}
<input type="hidden" name="actpass" value="{$smarty.request.actpass|escape}">
{/if}
</div>
</div>
{if empty($smarty.request.actpass) and ($new_user_validation neq 'y' or empty($oldpass))}
<div class="form-group">
<label class="col-sm-3 col-md-2 control-label" for="oldpass">{tr}Old Password{/tr}</label>
<div class="col-sm-7 col-md-6">
<input type="password" class="form-control" name="oldpass" id="oldpass" placeholder="Old Password">
</div>
</div>
{/if}
{include file='password_jq.tpl'}
<div class="form-group">
<label class="col-sm-3 col-md-2 control-label" for="pass1">{tr}New Password{/tr}</label>
<div class="col-sm-7 col-md-6">
<input type="password" class="form-control" placeholder="New Password" name="pass" id="pass1">
<div style="margin-left:5px;">
<div id="mypassword_text">{icon name='ok' istyle='display:none'}{icon name='error' istyle='display:none' } <span id="mypassword_text_inner"></span></div>
<div id="mypassword_bar" style="font-size: 5px; height: 2px; width: 0px;"></div>
</div>
<div style="margin-top:5px">
{include file='password_help.tpl'}
{if $new_user_validation eq 'y'}
<input type="hidden" name="new_user_validation" value="y">
{/if}
<div class="panel-heading text-center">
{if $new_user_validation neq 'y'}
<h3 class="panel-title">{tr}Change password{/tr}</h3>
{else}
<h3 class="panel-title">{tr}Set password{/tr}</h3>
{/if}
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 col-md-2 control-label" for="pass2">{tr}Repeat Password{/tr}</label>
<div class="col-sm-7 col-md-6">
<input type="password" class="form-control" name="passAgain" id="pass2" placeholder="Repeat Password">
<div id="mypassword2_text">
<div id="match" style="display:none">
{icon name='ok' istyle='color:#0ca908'} {tr}Passwords match{/tr}
<div class="panel-body">
<div class="clearfix">
{include file='password_jq.tpl'}
<div class="text-center" id="divRegCapson" style="display:none;">
{remarksbox type="warning" title="{tr}Warning{/tr}" close="n"}{tr}CapsLock is on.{/tr}{/remarksbox}
</div>
</div>
<div class="form-group">
<label class="col-md-4 control-label" for="user">{tr}Username{/tr}</label>
<div class="col-md-8">
{if empty($userlogin)}
<input type="text" class="form-control" id="user" name="user">
{else}
<input type="hidden" id="user" name="user" value="{$userlogin|escape}">
<div class="form-control-static"><strong>{$userlogin|escape}</strong></div>
{/if}
</div>
</div>
<div id="nomatch" style="display:none">
{icon name='error' istyle='color:#ff0000'} {tr}Passwords do not match{/tr}
{if empty($smarty.request.actpass) and ($new_user_validation neq 'y' or empty($oldpass))}
<div class="form-group">
<label class="col-md-4 control-label" for="oldpass">{tr}Old Password{/tr}</label>
<div class="col-md-8">
<input type="password" class="form-control" name="oldpass" id="oldpass" placeholder="Old Password">
</div>
</div>
{/if}
<div class="form-group">
<label class="col-md-4 control-label" for="pass1">{tr}New Password{/tr}</label>
<div class="col-md-8">
<input type="password" class="form-control" placeholder="New Password" name="pass" id="pass1">
<div style="margin-left:5px;">
<div id="mypassword_text">{icon name='ok' istyle='display:none'}{icon name='error' istyle='display:none' } <span id="mypassword_text_inner"></span></div>
<div id="mypassword_bar" style="font-size: 5px; height: 2px; width: 0px;"></div>
</div>
<div style="margin-top:5px">
{include file='password_help.tpl'}
</div>
</div>
</div>
<div class="form-group">
<label class="col-md-4 control-label" for="pass2">{tr}Repeat Password{/tr}</label>
<div class="col-md-8">
<input type="password" class="form-control" name="passAgain" id="pass2" placeholder="Repeat Password">
<div id="mypassword2_text">
<div id="match" style="display:none">
{icon name='ok' istyle='color:#0ca908'} {tr}Passwords match{/tr}
</div>
<div id="nomatch" style="display:none">
{icon name='error' istyle='color:#ff0000'} {tr}Passwords do not match{/tr}
</div>
</div>
</div>
</div>
{if $prefs.generate_password eq 'y'}
<div class="form-group">
<div class="col-md-4 col-md-offset-4">
<span id="genPass">{button href="#" _text="{tr}Generate a password{/tr}"}</span>
</div>
<div class="col-md-4">
<input id='genepass' class="form-control" name="genepass" type="text" tabindex="0" style="display:none">
</div>
</div>
{/if}
{if empty($email)}
<div class="form-group">
<label class="col-md-4 control-label" for="email">{tr}Email{/tr}</label>
<div class="col-md-8">
<input type="email" class="form-control" name="email" id="email" placeholder="Email" value="{if not empty($email)}{$email|escape}{/if}">
</div>
</div>
{/if}
</div>
</div>
</div>
<div class="form-group">
<div class="col-sm-3 col-sm-offset-3 col-md-2 col-md-offset-2">
<span id="genPass">{button href="#" _text="{tr}Generate a password{/tr}"}</span>
</div>
<div class="col-sm-3 col-md-2">
<input id='genepass' class="form-control" name="genepass" type="text" tabindex="0" style="display:none">
</div>
</div>
{if empty($email)}
<div class="form-group">
<label class="col-sm-3 col-md-2 control-label" for="email">{tr}Email{/tr}</label>
<div class="col-sm-7 col-md-6">
<input type="email" class="form-control" name="email" id="email" placeholder="Email" value="{if not empty($email)}{$email|escape}{/if}">
<div class="panel-footer text-center">
<input type="submit" class="btn btn-primary" name="change" onclick="return match_pass();" value="{tr}Apply{/tr}"><span id="validate"></span>
</div>
</div>
{/if}
<div class="form-group">
<div class="col-sm-offset-3 col-md-offset-2 col-sm-10">
<input type="submit" class="btn btn-default" name="change" onclick="return match_pass();" value="{tr}Change{/tr}"><span id="validate"></span>
</div>
</div>
</form>
</form>
</div>
......@@ -1035,6 +1035,7 @@ li.archivedate {
}
.sitelogo img {
margin-top: 10px;
margin-left: 20px;
}
.pass a,
.pass a:visited,
......@@ -4075,6 +4076,7 @@ h6:hover a.tiki_anchor {
h1.pagetitle > a {
padding-left: 0;
padding-right: 0;
margin-top: 0px;
}
#cachedpage {
float: right;
......
......@@ -1222,6 +1222,12 @@ h3,
margin-top: 20px;
margin-bottom: 10px;
}
h1.pagetitle {
margin-top: 0px;
}
#error_report+.clearfix {
float: right;
}
h1 small,
.h1 small,
h2 small,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment