Commit e189425a authored by luciash's avatar luciash

Help with Bootstrapification

parent 87783813
{* $Id$ *}
{if empty($user) || $user eq 'anonymous' || (isset($showantibot) and $showantibot)}
{if $antibot_table ne 'y'}
{*if $antibot_table ne 'y'}
<tr{if !empty($tr_style)} class="{$tr_style}"{/if}>
<td{if !empty($td_style)} class="{$td_style}"{/if}>
{else}
......@@ -11,7 +12,9 @@
{else}
</div>
<div class="antibot2">
{/if}
{/if*}
<div class="form-group">
<div class="col-md-4 col-md-offset-4">
{if $captchalib->type eq 'recaptcha'}
{$captchalib->render()}
{else}
......@@ -23,36 +26,44 @@
{$captchalib->render()}
{/if}
{/if}
{if $antibot_table ne 'y'}
</div>
</div>
{*if $antibot_table ne 'y'}
</td>
</tr>
{else}
</div>
{/if}
{/if*}
{if $captchalib->type ne 'recaptcha'}
{if $antibot_table ne 'y'}
{*if $antibot_table ne 'y'}
<tr{if !empty($tr_style)} class="{$tr_style}"{/if}>
<td{if !empty($td_style)} class="{$td_style}"{/if}>
{else}
<div class="antibot3">
{/if}
<label for="antibotcode">{tr}Enter the code you see above{/tr}{if $showmandatory eq 'y'}<span class="attention"> *</span>{/if}</label>
{if $antibot_table ne 'y'}
{/if*}
<div class="form-group">
<label class="col-md-4 control-label" for="antibotcode">{tr}Enter the code you see above:{/tr}{if $showmandatory eq 'y'}<span class="attention"> *</span>{/if}</label>
{*if $antibot_table ne 'y'}
</td>
<td{if !empty($td_style)} class="{$td_style}"{/if}>
{else}
</div>
<div class="antibot4">
{/if}
<input type="text" maxlength="8" size="22" name="captcha[input]" id="antibotcode">
{/if*}
<div class="col-md-4">
<input class="form-control" type="text" maxlength="8" size="22" name="captcha[input]" id="antibotcode">
</div>
<div class="col-md-2">
{if $captchalib->type eq 'default'}
{button _id='captchaRegenerate' href='#antibot' _text="{tr}Try another code{/tr}" _onclick="generateCaptcha()"}
{/if}
{if $antibot_table ne 'y'}
</div>
</div>
{*if $antibot_table ne 'y'}
</td>
</tr>
{else}
</div>
{/if}
{/if*}
{/if}
{/if}
......@@ -47,7 +47,7 @@ if (jqueryTiki.no_cookie) {
<legend>{tr}Return to Main User{/tr}</legend>
<input type="hidden" name="su" value="revert" />
<input type="hidden" name="username" value="auto" />
<div class="text-center"><button type="submit" class="btn btn-default btn-sm" name="actsu">{tr}Switch{/tr}</button></div>
<div class="text-center"><button type="submit" class="btn btn-primary" name="actsu">{tr}Switch{/tr}</button></div>
</fieldset>
</form>
{elseif $tiki_p_admin eq 'y'}
......@@ -62,7 +62,7 @@ if (jqueryTiki.no_cookie) {
{/if}
<input type="text" name="username" class="form-control" id="login-switchuser_{$module_logo_instance}" {* size="{if empty($module_params.input_size)}15{else}{$module_params.input_size}{/if}" *} />
</div>
<div class="text-center"><button type="submit" class="btn btn-default" name="actsu">{tr}Switch{/tr}</button></div>
<div class="text-center"><button type="submit" class="btn btn-primary" name="actsu">{tr}Switch{/tr}</button></div>
{autocomplete element="#login-switchuser_"|cat:$module_logo_instance type="username"}
</fieldset>
</form>
......@@ -94,7 +94,7 @@ if (jqueryTiki.no_cookie) {
{/foreach}
</select>
<input type="hidden" name="action" value="select"/>
<input type="submit" class="btn btn-default btn-sm" value="{tr}Go{/tr}"/>
<input type="submit" class="btn btn-primary" value="{tr}Go{/tr}"/>
</fieldset>
</form>
{/if}
......@@ -210,8 +210,8 @@ function doChallengeResponse() {
{capture assign="close_tags"}</div>{$close_tags}{/capture}
{/if}
{/if}
<div class="text-center">
<input class="btn btn-default btn-sm button submit" type="submit" name="login" value="{tr}Log in{/tr}" />
<div class="form-group text-center">
<button class="btn btn-primary button submit" type="submit" name="login">{tr}Log in{/tr} <!--span class="glyphicon glyphicon-circle-arrow-right"></span--></button>
</div>
{if $module_params.show_forgot eq 'y' or $module_params.show_register eq 'y'}
<div {if $mode eq 'header'}class="text-right" style="display:inline;"{/if}>
......@@ -265,7 +265,7 @@ function doChallengeResponse() {
<fieldset>
<legend>{tr}OpenID Log in{/tr}</legend>
<input class="openid_url" type="text" name="openid_url"/>
<input type="submit" class="btn btn-default btn-sm" value="{tr}Go{/tr}"/>
<input type="submit" class="btn btn-default" value="{tr}Go{/tr}"/>
<a class="linkmodule tikihelp" target="_blank" href="http://doc.tiki.org/OpenID">{tr}What is OpenID?{/tr}</a>
</fieldset>
</form>
......
{* $Id$ *}
{if $prefs.user_register_prettytracker eq 'y' and $prefs.user_register_prettytracker_tpl and $prefs.socialnetworks_user_firstlogin != 'y'}
<input type="text" id="email" name="email">
&nbsp;<strong class='mandatory_star'>*</strong>
{else}
{if $prefs.login_is_email ne 'y'}
<tr>
<td>
<label for="email">{tr}Email:{/tr}</label>
{if $trackerEditFormId}&nbsp;<strong class='mandatory_star'>*</strong>&nbsp;{/if}
</td>
<td>
<input type="text" id="email" name="email" value="{if !empty($smarty.post.email)}{$smarty.post.email}{/if}">
<div class="form-group">
<label class="col-md-4 control-label" for="email">{tr}Email:{/tr}</label>
{if $trackerEditFormId}&nbsp;<strong class='mandatory_star'>*</strong>&nbsp;{/if}
<div class="col-md-4">
<input class="form-control" type="text" id="email" name="email" value="{if !empty($smarty.post.email)}{$smarty.post.email}{/if}">
{if $prefs.validateUsers eq 'y' and $prefs.validateEmail ne 'y'}
<p class="highlight">
<p class="help-block highlight">
<em class='mandatory_note'>{tr}A valid email is mandatory to register{/tr}</em>
</p>
{/if}
</td>
</tr>
</div>
</div>
{/if}
{/if}
{* $Id$ *}
{include file="register-login.tpl"}
{include file="register-passcode.tpl"}
{include file="register-pass.tpl"}
......@@ -6,10 +7,12 @@
{* Custom fields *}
{section name=ir loop=$customfields}
{if $customfields[ir].show}
<tr>
<td><label for="{$customfields[ir].prefName}">{tr}{$customfields[ir].label}:{/tr}</label></td>
<td><input type="{$customfields[ir].type}" name="{$customfields[ir].prefName}" value="{$customfields[ir].value}" size="{$customfields[ir].size}" id="{$customfields[ir].prefName}"></td>
</tr>
<div class="form-group">
<label class="col-md-4 control-label" for="{$customfields[ir].prefName}">{tr}{$customfields[ir].label}:{/tr}</label>
<div class="col-md-4">
<input type="{$customfields[ir].type}" name="{$customfields[ir].prefName}" value="{$customfields[ir].value}" size="{$customfields[ir].size}" id="{$customfields[ir].prefName}">
</div>
</div>
{/if}
{/section}
{include file="register-groupchoice.tpl"}
{* $Id$ *}
{if $prefs.user_register_prettytracker eq 'y' and $prefs.user_register_prettytracker_tpl and $prefs.socialnetworks_user_firstlogin != 'y'}
<input type="text" name="name" id="name">
&nbsp;<strong class='mandatory_star'>*</strong>
{else}
<tr>
<td>
<label for="name">{if $prefs.login_is_email eq 'y'}{tr}Email:{/tr}{else}{tr}Username:{/tr}{/if}</label>
<div class="form-group">
<label class="col-md-4 control-label" for="name">{if $prefs.login_is_email eq 'y'}{tr}Email:{/tr}{else}{tr}Username:{/tr}{/if}</label>
{if $trackerEditFormId}&nbsp;<strong class='mandatory_star'>*</strong>&nbsp;{/if}
</td>
<td>
<input type="text" name="name" id="name" value="{if !empty($smarty.post.name)}{$smarty.post.name}{/if}">
<div class="col-md-4">
<input class="form-control" type="text" name="name" id="name" value="{if !empty($smarty.post.name)}{$smarty.post.name}{/if}">
{if $prefs.login_is_email eq 'y'}
<br><em>{tr}Use your email as login{/tr}</em>.
{else}
......@@ -21,6 +20,6 @@
<div class="highlight"><em>{tr}Lowercase only{/tr}</em></div>
{/if}
{/if}
</td>
</tr>
</div>
</div>
{/if}
{* $Id$ *}
{if $prefs.user_register_prettytracker eq 'y' and $prefs.user_register_prettytracker_tpl}
<input id='pass1' type="password" name="pass" onkeypress="regCapsLock(event)">
&nbsp;<strong class='mandatory_star'>*</strong>
{else}
{if $openid_associate neq 'y'}
<tr>
<td><label for="pass1">{tr}Password:{/tr}</label>{if $trackerEditFormId}&nbsp;<strong class='mandatory_star'>*</strong>&nbsp;{/if}</td>
<td>
<input id='pass1' type="password" name="pass" onkeypress="regCapsLock(event)" value="{if !empty($smarty.post.pass)}{$smarty.post.pass}{/if}"
<div class="form-group">
<label class="col-md-4 control-label" for="pass1">{tr}Password:{/tr}</label>
{if $trackerEditFormId}&nbsp;<strong class='mandatory_star'>*</strong>&nbsp;{/if}
<div class="col-md-4">
<input class="form-control" id='pass1' type="password" name="pass" onkeypress="regCapsLock(event)" value="{if !empty($smarty.post.pass)}{$smarty.post.pass}{/if}"
onkeyup="runPassword(this.value, 'mypassword');{if $prefs.feature_jquery_validation neq 'y' && !$userTrackerData}checkPasswordsMatch('#pass2', '#pass1', '#mypassword2_text');{/if}">
<div style="margin-left:5px;">
<div id="mypassword_text"></div>
......@@ -15,7 +17,7 @@
{if $prefs.feature_jquery_validation neq 'y'}
{include file='password_help.tpl'}
{/if}
</td>
</tr>
</div>
</div>
{/if}
{/if}
{* $Id$ *}
{if $prefs.user_register_prettytracker eq 'y' and $prefs.user_register_prettytracker_tpl}
<input id='pass2' type="password" name="passAgain" onkeypress="regCapsLock(event)">
&nbsp;<strong class='mandatory_star'>*</strong>
{else}
{if $openid_associate neq 'y'}
<tr>
<td style="vertical-align:top">
<label for="pass2">{tr}Repeat password:{/tr}</label>
{if $trackerEditFormId}&nbsp;<strong class='mandatory_star'>*</strong>&nbsp;{/if}
</td>
<td>
<input id='pass2' type="password" name="passAgain" onkeypress="regCapsLock(event)" value="{if !empty($smarty.post.passAgain)}{$smarty.post.passAgain}{/if}"
<div class="form-group">
<label class="col-md-4 control-label" for="pass2">{tr}Repeat password:{/tr}</label>
{if $trackerEditFormId}&nbsp;<strong class='mandatory_star'>*</strong>&nbsp;{/if}
<div class="col-md-4">
<input class="form-control" id='pass2' type="password" name="passAgain" onkeypress="regCapsLock(event)" value="{if !empty($smarty.post.passAgain)}{$smarty.post.passAgain}{/if}"
onkeyup="{if $prefs.feature_jquery_validation neq 'y' && !$userTrackerData}checkPasswordsMatch('#pass2', '#pass1', '#mypassword2_text');{/if}">
<div style="float:right;margin-left:5px;">
<div id="mypassword2_text"></div>
</div>
{if $prefs.feature_jquery_validation neq 'y' && !$userTrackerData}<span id="checkpass"></span>{/if}
</td>
</tr>
</div>
</div>
{if $prefs.generate_password eq 'y'}
<tr>
{if !$reg_in_module}<td>&nbsp;</td>{/if}
......
<div align="center">
{module module=login_box
{* $Id$ *}
{title adminpage='login'}{tr}Login Screen{/tr}{/title}
<fieldset>
<legend>{tr}Log in as a registered user{/tr}</legend>
<div class="col-md-4 col-md-push-4">
{module module=login_box
mode="module"
show_register="y"
show_forgot="y"
......@@ -8,4 +12,5 @@
decorations=""
nobox=""
notitle=""}
</div>
</div>
</fieldset>
{* $Id:$ *}
{if empty($user)}
{jq notonready=true} {* test for caps lock*}
......@@ -60,16 +61,13 @@
{if $userTrackerData}
{$userTrackerData}
{else}
<form action="tiki-register.php" method="post" name="RegForm">
<form action="tiki-register.php" class="form-horizontal" method="post" name="RegForm">
{if $smarty.request.invite}<input type='hidden' name='invite' value='{$smarty.request.invite|escape}'>{/if}
<table class="formcolor">
{include file="register-form.tpl"}
{if $merged_prefs.feature_antibot eq 'y'}{include file='antibot.tpl' td_style='formcolor'}{/if}
<tr class="registerSubmitTr">
<td>&nbsp;</td>
<td><input class="registerSubmit" type="submit" class="btn btn-default" name="register" value="{tr}Register{/tr}"></td>
</tr>
</table>
<div class="form-group text-center">
<button class="btn btn-primary registerSubmit submit" name="register" type="submit">{tr}Register{/tr} <!--span class="glyphicon glyphicon-ok"></span--></button>
</div>
</form>
{/if}
......
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