Merge
This commit is contained in:
commit
d9dac55a28
1 changed files with 4 additions and 4 deletions
|
@ -73,7 +73,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div><!--/span-->
|
</div><!--/span-->
|
||||||
|
|
||||||
|
{if $permission != '1'}
|
||||||
<div class="box span4">
|
<div class="box span4">
|
||||||
<div class="box-header well" data-original-title="">
|
<div class="box-header well" data-original-title="">
|
||||||
<h2><i class="icon-th"></i> Add User</h2>
|
<h2><i class="icon-th"></i> Add User</h2>
|
||||||
|
@ -88,7 +88,7 @@
|
||||||
<div class="controls">
|
<div class="controls">
|
||||||
<div class="input-prepend">
|
<div class="input-prepend">
|
||||||
<span style="margin-left:5px;" class="add-on"><i class="icon-user"></i></span>
|
<span style="margin-left:5px;" class="add-on"><i class="icon-user"></i></span>
|
||||||
<input type="text" value="Username" placeholder="Username" name="Username" id="Username" class="input-xlarge">
|
<input type="text" placeholder="Username" name="Username" id="Username" class="input-xlarge">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -118,7 +118,7 @@
|
||||||
<div class="controls">
|
<div class="controls">
|
||||||
<div class="input-prepend">
|
<div class="input-prepend">
|
||||||
<span style="margin-left:5px;" class="add-on"><i class="icon-envelope"></i></span>
|
<span style="margin-left:5px;" class="add-on"><i class="icon-envelope"></i></span>
|
||||||
<input type="text" value="Email" placeholder="Email" name="Email" id="Email" class="input-xlarge">
|
<input type="text" placeholder="Email" name="Email" id="Email" class="input-xlarge">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -148,7 +148,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div><!--/span-->
|
</div><!--/span-->
|
||||||
|
{/if}
|
||||||
|
|
||||||
<div class="box span4">
|
<div class="box span4">
|
||||||
<div class="box-header well" data-original-title="">
|
<div class="box-header well" data-original-title="">
|
||||||
|
|
Loading…
Reference in a new issue