bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-08-13 09:18:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

-Corrected navbar formatting issues

Browse Source 
-Fixed search result page indicators not showing at certain screen sizes
-Added enhanced image uploader for customers
-Added enhanced color picker for customers
This commit is contained in:
Remi
2013-08-26 18:46:02 -04:00
parent 98c15c4ff1
commit 9f6d3fd802
5 changed files with 1225 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
webui/view/theme/default/templates/customer/list.tpl
View File

@@ -12,13 +12,6 @@
</div>
</div>
<form method="get" name="search1" action="customer.php" class="form-inline pull-right">
<div class="input-append">
<input type="text" name="search" class="input-medium" value="<?php print $search; ?>" />
<input type="submit" class="btn" value="<?php print $text_search; ?>" />
</div>
</form>
<h4><?php if(isset($id) && ($id > 0)) { print $text_edit_entry; } else { print $text_add_new_entry; } ?></h4>
<?php if(isset($errorstring)){ ?><div class="alert alert-danger"><?php print $text_error; ?>: <?php print $errorstring; ?></div><?php } ?>
@@ -59,7 +52,14 @@
<div class="control-group<?php if(isset($errors['branding_logo'])){ print " error"; } ?>">
<label class="control-label" for="branding_logo"><?php print $text_branding_logo; ?>:</label>
<div class="controls">
<input type="file" class="text" name="branding_logo" id="branding_logo" placeholder="" value="<?php if(isset($a['branding_logo'])) { print $a['branding_logo']; } ?>"/> <?php if(isset($a['branding_logo'])) { ?><img src="/images/<?php print $a['branding_logo']; ?>" /><?php } ?>
<div class="fileupload fileupload-new" data-provides="fileupload">
<div class="fileupload-new thumbnail" style="width: 50px; height: 50px;">
<img src="http://www.placehold.it/50x50/EFEFEF/AAAAAA" />
</div>
<div class="fileupload-preview fileupload-exists thumbnail" style="width: 50px; height: 50px;"></div>
<span class="btn btn-file"><span class="fileupload-new">Select image</span><span class="fileupload-exists">Change</span><input type="file" name="branding_logo" id="branding_logo" /></span>
<a href="#" class="btn fileupload-exists" data-dismiss="fileupload">Remove</a>
</div>
<?php if ( isset($errors['branding_logo']) ) { ?><span class="help-inline"><?php print $errors['branding_logo']; ?></span><?php } ?>
</div>
</div>
@@ -70,18 +70,11 @@
<?php if ( isset($errors['support_link']) ) { ?><span class="help-inline"><?php print $errors['support_link']; ?></span><?php } ?>
</div>
</div>
<div class="control-group<?php if(isset($errors['background_colour'])){ print " error"; } ?>">
<label class="control-label" for="colour"><?php print $text_background_colour; ?>:</label>
<div class="control-group<?php if(isset($errors['colour'])){ print " error"; } ?>">
<label class="control-label" for="colour"><?php print $text_colour; ?>:</label>
<div class="controls">
<input type="text" class="text" name="background_colour" id="background_colour" placeholder="" value="<?php if(isset($a['background_colour'])) { print $a['background_colour']; } ?>" oninput="Piler.change_box_colour('background_colour', 'cp');" /> <span id="cp" class="label" style="<?php if(isset($a['background_colour'])) { ?>background: <?php print $a['background_colour']; ?>;<?php } ?>">&nbsp;</span>
<?php if ( isset($errors['background_colour']) ) { ?><span class="help-inline"><?php print $errors['background_colour']; ?></span><?php } ?>
</div>
</div>
<div class="control-group<?php if(isset($errors['text_colour'])){ print " error"; } ?>">
<label class="control-label" for="colour"><?php print $text_text_colour; ?>:</label>
<div class="controls">
<input type="text" class="text" name="text_colour" id="text_colour" placeholder="" value="<?php if(isset($a['text_colour'])) { print $a['text_colour']; } ?>" oninput="Piler.change_box_colour('text_colour', 'cp2');" /> <span id="cp2" class="label" style="<?php if(isset($a['text_colour'])) { ?>background: <?php print $a['text_colour']; ?>;<?php } ?>">&nbsp;</span>
<?php if ( isset($errors['text_colour']) ) { ?><span class="help-inline"><?php print $errors['text_colour']; ?></span><?php } ?>
<input type="text" class="text color {hash:true}" name="colour" id="colour" placeholder="" value="<?php if(isset($a['colour'])) { print $a['colour']; } ?>" oninput="Piler.change_box_colour();" />
<?php if ( isset($errors['colour']) ) { ?><span class="help-inline"><?php print $errors['colour']; ?></span><?php } ?>
</div>
</div>
@@ -110,8 +103,7 @@
<th><?php print $text_branding_text; ?></th>
<th><?php print $text_branding_url; ?></th>
<th><?php print $text_branding_logo; ?></th>
<th><?php print $text_background_colour; ?></th>
<th><?php print $text_text_colour; ?></th>
<th><?php print $text_colour; ?></th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
@@ -122,8 +114,7 @@
<td><?php print $e['branding_text']; ?></td>
<td><?php print $e['branding_url']; ?></td>
<td><?php if($e['branding_logo']) { ?><img src="/images/<?php print $e['branding_logo']; ?>" /><?php } ?></td>
<td><span class="label" style="background-color:<?php print $e['background_colour']; ?>"><?php print $e['background_colour']; ?></span></td>
<td><span class="label" style="background-color:<?php print $e['text_colour']; ?>"><?php print $e['text_colour']; ?></span></td>
<td><span class="label" style="background-color:<?php print $e['colour']; ?>"><?php print $e['colour']; ?></span></td>
<td><a href="index.php?route=customer/list&amp;id=<?php print $e['id']; ?>"><i class="icon-edit"></i>&nbsp;<?php print $text_edit; ?></a></td>
<td><a href="index.php?route=customer/remove&amp;id=<?php print $e['id']; ?>&amp;name=<?php print urlencode($e['domain']); ?>&amp;confirmed=1" class="confirm-delete" data-id="<?php print $e['id']; ?>" data-name="<?php print $e['domain']; ?>"><i class="icon-remove-sign"></i>&nbsp;<?php print $text_remove; ?></a></td>
</tr>