From 1663c790f77421e3ab6977239a47527ebed3295d Mon Sep 17 00:00:00 2001
From: nuxsmin <nuxsmin@syspass.org>
Date: Wed, 29 Jul 2015 12:45:23 +0200
Subject: [PATCH] Fix line separators

---
 inc/themes/material-blue/css/styles.css  |  6 +++-
 inc/themes/material-blue/js/functions.js | 22 ++++----------
 inc/themes/material-blue/search.inc      | 37 ++++++++++++++++++------
 3 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/inc/themes/material-blue/css/styles.css b/inc/themes/material-blue/css/styles.css
index beff1ba9..2813b0e5 100644
--- a/inc/themes/material-blue/css/styles.css
+++ b/inc/themes/material-blue/css/styles.css
@@ -1485,13 +1485,17 @@ footer img {
     margin-top: 1em;
 }
 
-.tooltip{
+.tooltip {
     max-width: 300px;
     background-color: #777;
     color: #fff;
     z-index: 101;
 }
 
+.cursor-pointer {
+    cursor: pointer;
+}
+
 /*Login Page*/
 #boxLogin {
     width: 500px;
diff --git a/inc/themes/material-blue/js/functions.js b/inc/themes/material-blue/js/functions.js
index 79716631..311bd094 100644
--- a/inc/themes/material-blue/js/functions.js
+++ b/inc/themes/material-blue/js/functions.js
@@ -205,26 +205,13 @@ function accSearch(continous, event) {
 }
 
 // Función para la búsqueda de cuentas mediante ordenación
-function searchSort(skey, start, nav) {
+function searchSort(skey, start, dir) {
     "use strict";
 
     if (typeof(skey) === "undefined" || typeof(start) === "undefined") return false;
 
-    if (order.key > 0 && order.key != skey) {
-        order.key = skey;
-        order.dir = 0;
-    } else if (nav != 1) {
-        order.key = skey;
-
-        if (order.dir === 1) {
-            order.dir = 0;
-        } else {
-            order.dir = 1;
-        }
-    }
-
-    $('#frmSearch').find('input[name="skey"]').val(order.key);
-    $('#frmSearch').find('input[name="sorder"]').val(order.dir);
+    $('#frmSearch').find('input[name="skey"]').val(skey);
+    $('#frmSearch').find('input[name="sorder"]').val(dir);
     $('#frmSearch').find('input[name="start"]').val(start);
 
     doSearch();
@@ -251,8 +238,9 @@ function doSearch() {
             $('#resBuscar').html(resMsg("nofancyerror"));
         },
         complete: function () {
-            scrollUp();
             $.fancybox.hideLoading();
+            scrollUp();
+            setContentSize();
         }
     });
 }
diff --git a/inc/themes/material-blue/search.inc b/inc/themes/material-blue/search.inc
index c64c99d5..06ccfaf0 100644
--- a/inc/themes/material-blue/search.inc
+++ b/inc/themes/material-blue/search.inc
@@ -1,16 +1,18 @@
 <div id="resBuscar">
-    <?php use SP\Acl;
-
-    if (!$accounts): ?>
+    <?php if (!$accounts): ?>
         <div class="noRes round"><?php echo _('No se encontraron registros'); ?></div>
     <?php else: ?>
         <div id="data-search-header" class="data-header data-header-minimal">
             <ul>
                 <?php foreach ($sortFields as $field): ?>
-                    <li>
-                        <a id="search-sort-<?php echo $field['key']; ?>" class="round"
-                           onClick="<?php echo $field['function']; ?>"
-                           title="<?php echo $field['title']; ?>"><?php echo $field['name']; ?></a>
+                    <li data-key="<?php echo $field['key']; ?>">
+                        <a class="round <?php echo ($searchKey == $field['key']) ? 'filterOn' : ''; ?>"
+                           title="<?php echo $field['title']; ?>">
+                            <?php echo $field['name']; ?>
+                        </a>
+
+                        <div class="icon material-icons sort-down cursor-pointer <?php echo ($searchKey ==  $field['key'] && $searchOrder === 0) ? 'fg-orange80' : 'md-dark md-inactive'; ?>">arrow_drop_down</div>
+                        <div class="icon material-icons sort-up cursor-pointer <?php echo ($searchKey ==  $field['key'] && $searchOrder === 1) ? 'fg-orange80' : 'md-dark md-inactive'; ?>">arrow_drop_up</div>
                     </li>
                 <?php endforeach; ?>
             </ul>
@@ -92,7 +94,8 @@
                                 <?php foreach ($wikiFilter as $filter): ?>
                                     <?php if (preg_match("/^" . preg_quote($filter) . ".*/i", $account['name'])): ?>
                                         <a href="<?php echo $wikiPageUrl, $account['name']; ?>" target="_blank">
-                                            <i id="viewpass" class="material-icons" title="<?php echo _('Enlace a Wiki'); ?>">library_books</i>
+                                            <i id="viewpass" class="material-icons"
+                                               title="<?php echo _('Enlace a Wiki'); ?>">library_books</i>
                                         </a>
                                     <?php endif; ?>
                                 <?php endforeach; ?>
@@ -184,7 +187,7 @@
         <script>
             passToClip = 0;
 
-            $(function(){
+            $(function () {
                 function clipboard() {
                     var client = new ZeroClipboard($('.clip-pass-button'), {
                         swfPath: "<?php echo \SP\Init::$WEBURI; ?>/js/ZeroClipboard.swf",
@@ -211,5 +214,21 @@
     <script>
         // Actualizar el token de seguridad
         $("#frmSearch :input[name='sk']").val('<?php echo $sk; ?>');
+
+        $('#data-search-header').find('.sort-down').each(function () {
+            $(this).click(function () {
+                var key = $(this).parent().data('key');
+                $(this).parent().find('a').addClass('filterOn');
+                searchSort(key, <?php echo $limitStart; ?>, 0);
+            });
+        });
+
+        $('#data-search-header').find('.sort-up').each(function () {
+            $(this).click(function () {
+                var key = $(this).parent().data('key');
+                $(this).parent().find('a').addClass('filterOn');
+                searchSort(key, <?php echo $limitStart; ?>, 1);
+            });
+        });
     </script>
 </div>
\ No newline at end of file