TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into template

Browse Source 
Conflicts:
	templates/admin/default/customers.html
	templates/default/register.html
This commit is contained in:
Manuel Raynaud
2013-09-10 17:09:22 +02:00
parent 3c67903bd7 66d6f86b9a
commit 672b489418
46 changed files with 1500 additions and 739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
templates/default/register.html
View File

@@ -27,7 +27,7 @@
<div class="panel-body">
{form_field form=$form field="firstname"}
<div class="form-group group-firstname {if $error}has-error{else if $value != "" && !$error}has_success{/if}">
<div class="form-group group-firstname {if $error}has-error{elseif $value != "" && !$error}has_success{/if}">
<label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
<div class="control-input">
<input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" autofocus required>
@@ -40,7 +40,7 @@
</div><!--/.form-group-->
{/form_field}
{form_field form=$form field="lastname"}
<div class="form-group group-lastname {if $error}has-error{else if $value != "" && !$error}has_success{/if}">
<div class="form-group group-lastname {if $error}has-error{elseif $value != "" && !$error}has_success{/if}">
<label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
<div class="control-input">
<input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" autofocus required>
@@ -53,8 +53,9 @@
</div><!--/.form-group-->
{/form_field}
{form_field form=$form field="email"}
<div class="form-group group-email {if $error}has-error{else if $value != "" && !$error}has_success{/if}">
<div class="form-group group-email {if $error}has-error{elseif $value != "" && !$error}has_success{/if}">
<label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
<div class="control-input">
<input type="email" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="johndoe@domain.com" required value="{$smarty.get.email|default:$value}">
{if $error }
@@ -66,7 +67,7 @@
</div><!--/.form-group-->
{/form_field}
{form_field form=$form field="phone"}
<div class="form-group group-phone {if $error}has-error{else if $value != "" && !$error}has_success{/if}">
<div class="form-group group-phone {if $error}has-error{elseif $value != "" && !$error}has_success{/if}">
<label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
<div class="control-input">
<input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" autofocus>
@@ -79,7 +80,7 @@
</div><!--/.form-group-->
{/form_field}
{form_field form=$form field="cellphone"}
<div class="form-group group-cellphone {if $error}has-error{else if $value != "" && !$error}has_success{/if}">
<div class="form-group group-cellphone {if $error}has-error{elseif $value != "" && !$error}has_success{/if}">
<label class="control-label" for="{$label_attr.for}">{$label} <span class="required">*</span></label>
<div class="control-input">
<input type="text" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="John" value="{$value}" autofocus>