-Corrected navbar formatting issues

-Fixed search result page indicators not showing at certain screen sizes
-Added enhanced image uploader for customers
-Added enhanced color picker for customers

webui/view/theme/default/templates/customer/list.tpl

@@ -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>

webui/view/theme/default/templates/search/helper.tpl

@@ -4,7 +4,7 @@
     <table id="results" class="table table-striped table-condensed">
       <thead>
         <tr>
-          <th id="restore-header"><input type="checkbox" id="bulkcheck" name="bulkcheck" value="1" <?php if(SEARCH_RESULT_CHECKBOX_CHECKED == 1) { ?>checked="checked"<?php } ?> class="restorebox" onclick="Piler.toggle_bulk_check('');" /></th>
+          <th id="restore-header"><input type="checkbox" id="bulkcheck" name="bulkcheck" value="1" <?php if(SEARCH_RESULT_CHECKBOX_CHECKED == 1) { ?>checked="checked"<?php } ?> class="restorebox" onclick="Piler.toggle_bulk_check();" /></th>
           <th id="id-header">&nbsp;</th>
           <th id="date-header">
              <?php print $text_date; ?>
@@ -44,12 +44,12 @@
     <?php $i=0; foreach ($messages as $message) { ?>
             
          <tr onmouseover="Piler.current_message_id = <?php print $message['id']; ?>; return false;" id="e_<?php print $message['id']; ?>" class="resultrow new" onclick="Piler.view_message_by_pos(<?php print $i; ?>);">
-            <td id="c1_r<?php print $i; ?>" class="resultcell restore" onclick="Piler.stop_propagation(event);"><input type="checkbox" id="r_<?php print $message['id']; ?>" name="r_<?php print $message['id']; ?>" value="iiii" <?php if(SEARCH_RESULT_CHECKBOX_CHECKED == 1) { ?>checked="checked"<?php } ?> class="restorebox" /></td>
+            <td id="c1_r<?php print $i; ?>" class="resultcell restore"><input type="checkbox" id="r_<?php print $message['id']; ?>" name="r_<?php print $message['id']; ?>" value="iiii" <?php if(SEARCH_RESULT_CHECKBOX_CHECKED == 1) { ?>checked="checked"<?php } ?> class="restorebox" /></td>
             <td id="c2_r<?php print $i; ?>" class="resultcell id"><?php print ($page*$page_len) + $i + 1; ?></td>
             <td id="c3_r<?php print $i; ?>" class="resultcell date"><?php print $message['date']; ?></td>
             <td id="c4_r<?php print $i; ?>" class="resultcell from"><?php if($message['from'] != $message['shortfrom']) { ?><span title="<?php print $message['from']; ?>"><?php print $message['shortfrom']; ?></span><?php } else { print $message['from']; } ?></td>
             <td id="c5_r<?php print $i; ?>" class="resultcell to"><?php if($message['to'] != $message['shortto']) { ?><span title="<?php print $message['to']; ?>"><?php print $message['shortto']; ?>&nbsp;<i class=" muted icon-group"></i></span><?php } else { print $message['to']; } ?></td>
-            <td id="c6_r<?php print $i; ?>" class="resultcell subject"><?php if($message['subject'] != $message['shortsubject']) { print $message['subject']; } else { print $message['subject']; } ?> <?php if($message['reference']) { ?> <a href="#" title="<?php print $text_conversation_available; ?>" onclick="$('#ref').val('<?php print $message['reference']; ?>'); Piler.expert(this);">[+]</span></a><?php } ?></td>
+            <td id="c6_r<?php print $i; ?>" class="resultcell subject"><a href="#" <?php if($message['subject'] != $message['shortsubject']) { ?>title="<?php $message['subject']; ?>"<?php } ?> onclick="Piler.view_message_by_pos(<?php print $i; ?>);"><?php if($message['subject'] != $message['shortsubject']) { print $message['shortsubject']; } else { print $message['subject']; } ?></a><?php if($message['reference']) { ?> <a href="#" title="<?php print $text_conversation_available; ?>" onclick="$('#ref').val('<?php print $message['reference']; ?>'); Piler.expert(this);">[+]</span></a><?php } ?></td>
             <td id="c7_r<?php print $i; ?>" class="resultcell size"><?php print $message['size']; ?></td>
             <td id="c8_r<?php print $i; ?>" class="resultcell end"><?php if($message['spam'] == 1) { ?><i class="spam icon-warning-sign icon-large" title="<?php print $text_spam_flag; ?>"></i><?php } else { ?>&nbsp;<?php } ?></td>
             <td id="c9_r<?php print $i; ?>" class="resultcell end"><?php if($message['attachments'] > 0) { ?><i class="attachment icon-paper-clip icon-large" title="<?php print $text_attachment_flag; ?>"></i><?php } else { ?>&nbsp;<?php } ?></td>
@@ -67,7 +67,7 @@
       
       <tfoot>
         <tr>
-          <th id="restore-header"><input type="checkbox" id="bulkcheck2" name="bulkcheck2" value="1" <?php if(SEARCH_RESULT_CHECKBOX_CHECKED == 1) { ?>checked="checked"<?php } ?> class="restorebox" onclick="Piler.toggle_bulk_check('2');" /></th>
+          <th id="restore-header"><input type="checkbox" id="bulkcheck" name="bulkcheck" value="1" <?php if(SEARCH_RESULT_CHECKBOX_CHECKED == 1) { ?>checked="checked"<?php } ?> class="restorebox" onclick="Piler.toggle_bulk_check();" /></th>
           <th id="id-header">&nbsp;</th>
           <th id="date-header">
              <?php print $text_date; ?>
@@ -114,7 +114,8 @@
 
 <div id="messagelistfooter" class="boxfooter">
     <div class="row-fluid">
-       <div id="pagingrow" class="span3">
+       <div id="pagingrow" class="span4">
+            <div id="pagingbox">
     <?php if($n > 0){ ?>
             &nbsp;
             <?php if($page > 0) { ?><a href="#" class="navlink" onclick="Piler.navigation(0);"><i class="icon-double-angle-left icon-large"></i></a><?php } else { ?><span class="navlink"><i class="icon-double-angle-left icon-large muted"></i></span><?php } ?>
@@ -128,16 +129,17 @@
             <?php if($page < $total_pages) { ?><a href="#" class="navlink" onclick="Piler.navigation(<?php print $total_pages; ?>);"><i class="icon-double-angle-right icon-large"></i></a><?php } else { ?> <span class="navlink"><i class="icon-double-angle-right icon-large muted"></i></span><?php } ?>
             &nbsp;
     <?php } else { print $text_none_found; } ?>
+            </div>
         </div>
-<div id="functionrow" class="span9">
+        <div id="functionrow" class="span8">
             <input type="hidden" id="tag_keys" name="tag_keys" value="<?php print $all_ids; ?>" />
             <input type="hidden" id="_ref" name="_ref" value="<?php if(isset($_ref)) { print $_ref; } ?>" />
-            <div id="tagbox" class="input-prepend input-append pull-right">
-                <span class="add-on"><?php print $text_with_selected; ?>:&nbsp;</span>
+            <div id="functionbox" class="input-prepend input-append pull-right">
+                <span class="add-on">With Selected:&nbsp;</span>
                 <a href="#" class="btn btn-custom btn-inverse" onclick="Piler.bulk_restore_messages('<?php print $text_restored; ?>'); " title="<?php print $text_bulk_restore_selected_emails; ?>"><i class="icon-share-alt"></i></a>
                 <a href="#" class="btn btn-custom btn-inverse" onclick="Piler.download_messages();"  title="<?php print $text_bulk_download; ?>"><i class="icon-download-alt"></i></a>
                 <input type="text" id="tag_value" name="tag_value" class="tagtext" />
-                <a href="#" class="btn btn-custom btn-inverse" onclick="Piler.tag_search_results('<?php print $text_tagged; ?>');" title="<?php print $text_tag_selected_messages; ?>"><i class="icon-tags" title="Tag"></i></a>
+                <a href="#" class="btn btn-custom btn-inverse" onclick="Piler.tag_search_results('Tagged');" title="<?php print $text_tag_selected_messages; ?>"><i class="icon-tags" title="Tag"></i></a>
             </div>
         </div>
     </div>