Commit 5d94365a authored by lindonb's avatar lindonb

[FIX] register fields: conform bootstrap grid classes and place mandatory star better

parent 8d625cb6
......@@ -5,8 +5,8 @@
{else}
{if $prefs.login_is_email ne 'y'}
<div class="form-group">
<label class="col-md-4 col-sm-3 control-label" for="email">{tr}Email{/tr}</label>
<div class="col-md-4 col-sm-6">
<label class="col-sm-4 control-label" for="email">{tr}Email{/tr} {if $trackerEditFormId}<span class='text-danger tips' title=":{tr}This field is manadatory{/tr}">*</span>{/if}</label>
<div class="col-sm-8">
<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="help-block">
......@@ -14,9 +14,6 @@
</p>
{/if}
</div>
<div class="col-sm-1">
{if $trackerEditFormId}<span class='text-danger tips' title=":{tr}This field is manadatory{/tr}">*</span>{/if}
</div>
</div>
{/if}
{/if}
......@@ -9,8 +9,8 @@
{section name=ir loop=$customfields}
{if $customfields[ir].show}
<div class="form-group">
<label class="col-md-4 col-sm-3 control-label" for="{$customfields[ir].prefName}">{tr}{$customfields[ir].label}:{/tr}</label>
<div class="col-md-4 col-sm-6">
<label class="col-sm-4 control-label" for="{$customfields[ir].prefName}">{tr}{$customfields[ir].label}:{/tr}</label>
<div class="col-sm-8">
<input type="{$customfields[ir].type}" name="{$customfields[ir].prefName}" value="{$customfields[ir].value}" size="{$customfields[ir].size}" id="{$customfields[ir].prefName}">
</div>
</div>
......
......@@ -29,7 +29,7 @@ $.getJSON('group_tracker_ajax.php', {chosenGroup:'{{$theChoiceGroup}}'}, functio
<tr><td colspan="2"><div id="registerTracker"></div></td></tr>
{elseif isset($listgroups)}
<tr>
<td>{tr}Group{/tr}{if $prefs.user_must_choose_group eq 'y'}{if $trackerEditFormId}&nbsp;<strong class='mandatory_star'>*</strong>&nbsp;{/if}{/if}</td>
<td>{tr}Group{/tr}{if $prefs.user_must_choose_group eq 'y'} {if $trackerEditFormId}<strong class='mandatory_star'>*</strong>{/if}{/if}</td>
<td>
{foreach item=gr from=$listgroups}
{if $gr.registrationChoice eq 'y'}
......
......@@ -4,8 +4,8 @@
<span class='text-danger'>*</span>
{else}
<div class="form-group">
<label class="col-md-4 col-sm-3 control-label" for="name">{if $prefs.login_is_email eq 'y'}{tr}Email{/tr}{else}{tr}Username{/tr}{/if}</label>
<div class="col-md-4 col-sm-6">
<label class="col-sm-4 control-label" for="name">{if $prefs.login_is_email eq 'y'}{tr}Email{/tr}{else}{tr}Username{/tr}{/if} {if $trackerEditFormId}<span class='text-danger tips' title=":{tr}This field is manadatory{/tr}">*</span>{/if}</label>
<div class="col-sm-8">
<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'}
<div class="help-block">{tr}Use your email as login{/tr}</div>
......@@ -20,8 +20,5 @@
{/if}
{/if}
</div>
<div class="col-md-4 col-sm-3">
{if $trackerEditFormId}<span class='text-danger tips' title=":{tr}This field is manadatory{/tr}">*</span>{/if}
</div>
</div>
{/if}
......@@ -5,8 +5,8 @@
{else}
{if !isset($openid_associate) || $openid_associate neq 'y'}
<div class="form-group">
<label class="col-md-4 col-sm-3 control-label" for="pass1">{tr}Password{/tr}</label>
<div class="col-md-4 col-sm-6">
<label class="col-sm-4 control-label" for="pass1">{tr}Password{/tr} {if $trackerEditFormId}<span class='text-danger tips' title=":{tr}This field is manadatory{/tr}">*</span>{/if}</label>
<div class="col-sm-8">
<input
class="form-control"
id='pass1'
......@@ -24,9 +24,6 @@
</div>
{/if}
</div>
<div class="col-sm-1">
{if $trackerEditFormId}<span class='text-danger tips' title=":{tr}This field is manadatory{/tr}">*</span>{/if}
</div>
</div>
{/if}
{/if}
......@@ -5,8 +5,8 @@
{else}
{if !isset($openid_associate) || $openid_associate neq 'y'}
<div class="form-group">
<label class="col-md-4 col-sm-3 control-label" for="pass2">{tr}Repeat password{/tr}</label>
<div class="col-md-4 col-sm-6">
<label class="col-sm-4 control-label" for="pass2">{tr}Repeat password{/tr} {if $trackerEditFormId}<span class='text-danger tips' title=":{tr}This field is manadatory{/tr}">*</span>{/if}</label>
<div class="col-sm-8">
<input
class="form-control"
id='pass2'
......@@ -24,17 +24,14 @@
</div>
{if $prefs.feature_jquery_validation neq 'y' && !$userTrackerData}<span id="checkpass"></span>{/if}
</div>
<div class="col-md-1 col-sm-1">
{if $trackerEditFormId}<span class='text-danger tips' title=":{tr}This field is manadatory{/tr}">*</span>{/if}
</div>
</div>
{if $prefs.generate_password eq 'y'}
{*if !$reg_in_module}<td>&nbsp;</td>{/if*}
<div class="form-group">
<div class="col-sm-3 col-sm-offset-3 col-md-2 col-md-offset-4">
<div class="col-sm-3 col-sm-offset-4">
<span id="genPass">{button href="#" _text="{tr}Generate a password{/tr}"}</span>
</div>
<div class="col-sm-3 col-md-2">
<div class="col-sm-3">
<input id='genepass' class="form-control" name="genepass" type="text" tabindex="0" style="display:none">
</div>
</div>
......
......@@ -5,15 +5,12 @@
{else}
{if $prefs.useRegisterPasscode eq 'y'}
<div class="form-group">
<label class="col-md-4 col-sm-3 control-label" for="passcode">{tr}Passcode to register{/tr}
<label class="col-sm-4 control-label" for="passcode">{tr}Passcode to register{/tr} <span class='text-danger tips' title=":{tr}This field is manadatory{/tr}">*</span>
</label>
<div class="col-md-4 col-sm-6">
<div class="col-sm-8">
<input class="form-control" required="" type="password" name="passcode" id="passcode" onkeypress="regCapsLock(event)" value="{if !empty($smarty.post.passcode)}{$smarty.post.passcode}{/if}"> <em class="help-block">{tr}Not your password.{/tr} <span id="passcode-help" style="display:none">{tr}To request a passcode, {if $prefs.feature_contact eq 'y'}<a href="tiki-contact.php">{/if}
contact the system administrator{if $prefs.feature_contact eq 'y'}</a>{/if}{/tr}.</span></em>
</div>
<div class="col-md-1 col-sm-1">
<span class='text-danger tips' title=":{tr}This field is manadatory{/tr}">*</span>
</div>
</div>
{/if}
{/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