RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bootstrap' of https://github.com/MPOS/php-mpos into bootstrap

Browse Source
This commit is contained in:
root 2014-03-01 11:01:21 -07:00
commit fe30dbd24d
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/templates/bootstrap/master.tpl
View File

@ -11,10 +11,6 @@
<![endif]--> <![endif]-->
<!--[if IE]><script type="text/javascript" src="{$PATH}/js/excanvas.js"></script><![endif]--> <!--[if IE]><script type="text/javascript" src="{$PATH}/js/excanvas.js"></script><![endif]-->
{literal}<script>
var zxcvbnPath = "{/literal}{$PATH}{literal}/js/zxcvbn/zxcvbn.js";
</script>{/literal}
<script type="text/javascript" src="{$PATH}/js/pwcheck.js"></script>
{if $GLOBAL.statistics.analytics.enabled} {if $GLOBAL.statistics.analytics.enabled}
{$GLOBAL.statistics.analytics.code nofilter} {$GLOBAL.statistics.analytics.code nofilter}
{/if} {/if}

9
public/templates/bootstrap/register/default.tpl
View File

@ -1,3 +1,8 @@
<script>
var zxcvbnPath = "{$PATH}/js/zxcvbn/zxcvbn.js";
</script>
<script type="text/javascript" src="{$PATH}/js/pwcheck.js"></script>
<div class="row"> <div class="row">
<div class="col-lg-6"> <div class="col-lg-6">
<div class="panel panel-info"> <div class="panel panel-info">
@ -18,10 +23,10 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Password</label> <label>Password</label>
<p style="padding-right:10px;display:block;margin-top:0px;float:right;color:#999;" id="pw_strength">Strength</p> <span style="padding-right:10px;display:block;margin-top:1px;float:right;color:#999;" id="pw_strength">Strength</span>
<input type="password" class="form-control" name="password1" value="" size="15" maxlength="100" id="pw_field" required> <input type="password" class="form-control" name="password1" value="" size="15" maxlength="100" id="pw_field" required>
<label>Repeat Password</label> <label>Repeat Password</label>
<p style="padding-right:10px;display:block;margin-top:0px;float:right;" id="pw_match"></p> <span style="padding-right:10px;display:block;margin-top:1px;float:right;" id="pw_match"></span>
<input type="password" class="form-control" name="password2" value="" size="15" maxlength="100" id="pw_field2" required> <input type="password" class="form-control" name="password2" value="" size="15" maxlength="100" id="pw_field2" required>
</div> </div>
<div class="form-group"> <div class="form-group">