From 8a0a5198d0616981053f070374513d9ff5c13701 Mon Sep 17 00:00:00 2001
From: SJ <sj@acts.hu>
Date: Fri, 10 Jan 2014 12:27:26 +0100
Subject: [PATCH] added a beacon to the chevrons to visually represent the used
 sort method and order

---
 webui/controller/search/helper.php               |  2 ++
 .../theme/default/assets/css/metro-bootstrap.css |  1 +
 .../theme/default/templates/search/helper.tpl    | 16 ++++++++--------
 .../theme/mobile/stylesheet/style-mobile.css     |  1 +
 .../theme/mobile/templates/search/helper.tpl     | 16 ++++++++--------
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/webui/controller/search/helper.php b/webui/controller/search/helper.php
index 86ffb8b5..a8f28373 100644
--- a/webui/controller/search/helper.php
+++ b/webui/controller/search/helper.php
@@ -78,6 +78,8 @@ class ControllerSearchHelper extends Controller {
 
       if($this->data['hits_to'] > $this->data['n']) { $this->data['hits_to'] = $this->data['n']; }
 
+      $this->data['sort'] = $this->request->post['sort'];
+      $this->data['order'] = $this->request->post['order'];
 
       $this->render();
    }
diff --git a/webui/view/theme/default/assets/css/metro-bootstrap.css b/webui/view/theme/default/assets/css/metro-bootstrap.css
index 7e6b50a6..5154d384 100644
--- a/webui/view/theme/default/assets/css/metro-bootstrap.css
+++ b/webui/view/theme/default/assets/css/metro-bootstrap.css
@@ -1726,4 +1726,5 @@ body#loginpage{background-color:#fcfcfc;padding-top:40px;padding-bottom:40px;}
 .control-group.success .fileupload .uneditable-input{color:#468847;border-color:#468847;}
 .control-group.success .fileupload .fileupload-preview{color:#468847;}
 .control-group.success .fileupload .thumbnail{border-color:#468847;}
+.bottomborder { border-bottom: 1px solid black; }
 @media (min-width:980px){body{padding-top:65px;}}@media (max-width:980px){.navbar-fixed-top{margin-bottom:10px;} .nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{font-weight:normal;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} .nav-collapse .nav>li>a:hover,.nav-collapse ul.nav li.dropdown ul.dropdown-menu li a:hover{color:#fff;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#555555;} .navbar .nav li.dropdown>a:hover .caret{border-top-color:#fff;border-bottom-color:#fff;} .dropdown-menu li>a:hover{background-color:#00f;}}@media (max-width:767px){#mainscreen{top:162px;} #pagingrow{border-bottom:1px solid #ccc;} #pagingbox{border-right:none;} #functionbox{border-left:none;} .boxlistcontent{bottom:68px;overflow:scroll;} .boxfooter{height:67px;}}
diff --git a/webui/view/theme/default/templates/search/helper.tpl b/webui/view/theme/default/templates/search/helper.tpl
index 3bc2d1ce..281907c5 100644
--- a/webui/view/theme/default/templates/search/helper.tpl
+++ b/webui/view/theme/default/templates/search/helper.tpl
@@ -9,13 +9,13 @@
           <th id="id-header">&nbsp;</th>
           <th id="date-header">
              <?php print $text_date; ?>
-             <a xid="date" xorder="1" onclick="Piler.changeOrder(this);"><i class="icon-chevron-up"></i></a>
-             <a xid="date" xorder="0" onclick="Piler.changeOrder(this);"><i class="icon-chevron-down"></i></a>
+             <a xid="date" xorder="1" onclick="Piler.changeOrder(this);"><i class="icon-chevron-up<?php if($sort == 'date' && $order == 1) { ?> bottomborder<?php } ?>"></i></a>
+             <a xid="date" xorder="0" onclick="Piler.changeOrder(this);"><i class="icon-chevron-down<?php if($sort == 'date' && $order == 0) { ?> bottomborder<?php } ?>"></i></a>
           </th>
           <th id="from-header">
              <?php print $text_from; ?>
-             <a xid="from" xorder="1" onclick="Piler.changeOrder(this);"><i class="icon-chevron-up"></i></a>
-             <a xid="from" xorder="0" onclick="Piler.changeOrder(this);"><i class="icon-chevron-down"></i></a>
+             <a xid="from" xorder="1" onclick="Piler.changeOrder(this);"><i class="icon-chevron-up<?php if($sort == 'from' && $order == 1) { ?> bottomborder<?php } ?>"></i></a>
+             <a xid="from" xorder="0" onclick="Piler.changeOrder(this);"><i class="icon-chevron-down<?php if($sort == 'from' && $order == 0) { ?> bottomborder<?php } ?>"></i></a>
           </th>
           <th id="to-header">
              <?php print $text_to; ?>
@@ -24,13 +24,13 @@
           </th>
           <th id="subject-header">
              <?php print $text_subject; ?>
-             <a xid="subj" xorder="1" onclick="Piler.changeOrder(this);"><i class="icon-chevron-up"></i></a>
-             <a xid="subj" xorder="0" onclick="Piler.changeOrder(this);"><i class="icon-chevron-down"></i></a>
+             <a xid="subj" xorder="1" onclick="Piler.changeOrder(this);"><i class="icon-chevron-up<?php if($sort == 'subject' && $order == 1) { ?> bottomborder<?php } ?>"></i></a>
+             <a xid="subj" xorder="0" onclick="Piler.changeOrder(this);"><i class="icon-chevron-down<?php if($sort == 'subject' && $order == 0) { ?> bottomborder<?php } ?>"></i></a>
           </th>
           <th id="size-header">
              <?php print $text_size; ?>
-             <a xid="size" xorder="1" onclick="Piler.changeOrder(this);"><i class="icon-chevron-up"></i></a>
-             <a xid="size" xorder="0" onclick="Piler.changeOrder(this);"><i class="icon-chevron-down"></i></a>
+             <a xid="size" xorder="1" onclick="Piler.changeOrder(this);"><i class="icon-chevron-up<?php if($sort == 'size' && $order == 1) { ?> bottomborder<?php } ?>"></i></a>
+             <a xid="size" xorder="0" onclick="Piler.changeOrder(this);"><i class="icon-chevron-down<?php if($sort == 'size' && $order == 0) { ?> bottomborder<?php } ?>"></i></a>
           </th>
           <th id="spam-header"><i class="spam icon-warning-sign icon-large" title="<?php print $text_spam_flag; ?>"></i></th>
           <th id="attachment-header"><i class="attachment icon-paper-clip icon-large" title="<?php print $text_attachment_flag; ?>"></i></th>
diff --git a/webui/view/theme/mobile/stylesheet/style-mobile.css b/webui/view/theme/mobile/stylesheet/style-mobile.css
index 1b25857a..3f1ea5d9 100644
--- a/webui/view/theme/mobile/stylesheet/style-mobile.css
+++ b/webui/view/theme/mobile/stylesheet/style-mobile.css
@@ -143,6 +143,7 @@
 	.center { text-align: center; }
 	.sleek { margin:0; padding:0; }
 	.with20margin{ margin-left:20%; margin-right:20%; }
+	.bottomborder { border-bottom: 1px solid black; }
 
 	#notesbox { position:absolute; top: 3px; right: 3px; }
 	.messageheader { margin-left: 5px; }
diff --git a/webui/view/theme/mobile/templates/search/helper.tpl b/webui/view/theme/mobile/templates/search/helper.tpl
index e47c0eb8..1ef54ec9 100644
--- a/webui/view/theme/mobile/templates/search/helper.tpl
+++ b/webui/view/theme/mobile/templates/search/helper.tpl
@@ -20,26 +20,26 @@
       </th>
       <th data-resizable-column-id="date" id="date" class="sleek">
          <strong><?php print $text_date; ?></strong>
-         <a xid="date" xorder="1" onclick="Piler.changeOrder(this);"><i class="icon-chevron-up sleek"></i></a>
-         <a xid="date" xorder="0" onclick="Piler.changeOrder(this);"><i class="icon-chevron-down sleek"></i></a>
+         <a xid="date" xorder="1" onclick="Piler.changeOrder(this);"><i class="icon-chevron-up sleek<?php if($sort == 'date' && $order == 1) { ?> bottomborder<?php } ?>"></i></a>
+         <a xid="date" xorder="0" onclick="Piler.changeOrder(this);"><i class="icon-chevron-down sleek<?php if($sort == 'date' && $order == 0) { ?> bottomborder<?php } ?>"></i></a>
       </th>
       <th data-resizable-column-id="from">
          <strong><?php print $text_from; ?></strong>
-         <a xid="from" xorder="1" onclick="Piler.changeOrder(this);"><i class="icon-chevron-up sleek"></i></a>
-         <a xid="from" xorder="0" onclick="Piler.changeOrder(this);"><i class="icon-chevron-down sleek"></i></a>
+         <a xid="from" xorder="1" onclick="Piler.changeOrder(this);"><i class="icon-chevron-up sleek<?php if($sort == 'from' && $order == 1) { ?> bottomborder<?php } ?>"></i></a>
+         <a xid="from" xorder="0" onclick="Piler.changeOrder(this);"><i class="icon-chevron-down sleek<?php if($sort == 'from' && $order == 0) { ?> bottomborder<?php } ?>"></i></a>
       </th>
       <th data-resizable-column-id="to">
          <strong><?php print $text_to; ?></strong>
       </th>
       <th data-resizable-column-id="subject">
          <strong><?php print $text_subject; ?><strong>
-         <a xid="subj" xorder="1" onclick="Piler.changeOrder(this);"><i class="icon-chevron-up sleek"></i></a>
-         <a xid="subj" xorder="0" onclick="Piler.changeOrder(this);"><i class="icon-chevron-down sleek"></i></a>
+         <a xid="subj" xorder="1" onclick="Piler.changeOrder(this);"><i class="icon-chevron-up sleek<?php if($sort == 'subject' && $order == 1) { ?> bottomborder<?php } ?>"></i></a>
+         <a xid="subj" xorder="0" onclick="Piler.changeOrder(this);"><i class="icon-chevron-down sleek<?php if($sort == 'subject' && $order == 0) { ?> bottomborder<?php } ?>"></i></a>
       </th>
       <th data-resizable-column-id="size">
          <strong><?php print $text_size; ?></strong>
-         <a xid="size" xorder="1" onclick="Piler.changeOrder(this);"><i class="icon-chevron-up sleek"></i></a>
-         <a xid="size" xorder="0" onclick="Piler.changeOrder(this);"><i class="icon-chevron-down sleek"></i></a>
+         <a xid="size" xorder="1" onclick="Piler.changeOrder(this);"><i class="icon-chevron-up sleek<?php if($sort == 'size' && $order == 1) { ?> bottomborder<?php } ?>"></i></a>
+         <a xid="size" xorder="0" onclick="Piler.changeOrder(this);"><i class="icon-chevron-down sleek<?php if($sort == 'size' && $order == 0) { ?> bottomborder<?php } ?>"></i></a>
       </th>
       <th data-resizable-column-id="attachment" id="attachment" data-noresize><i class="icon-file sleek"></i></th>
       <th data-resizable-column-id="bookmark" id="bookmark" data-noresize><i class="icon-bookmark sleek"></i></th>