From 9fee2e7266a269a8795b96b972cdc62bbcb3329b Mon Sep 17 00:00:00 2001
From: nicosomb <nicolas@loeuillet.org>
Date: Tue, 16 Apr 2013 12:58:03 +0200
Subject: [PATCH] Fixed #13 - tri par date / tri par titre

---
 css/style.css     |  15 +++++++++++++++
 img/down.png      | Bin 0 -> 216 bytes
 img/up.png        | Bin 0 -> 212 bytes
 inc/config.php    |   2 +-
 inc/functions.php |   4 ++--
 index.php         |   4 ++--
 js/poche.js       |   4 ++--
 process.php       |  16 ++++++++++++++++
 tpl/home.html     |  10 ++++------
 9 files changed, 42 insertions(+), 13 deletions(-)
 create mode 100755 img/down.png
 create mode 100755 img/up.png
 create mode 100644 process.php

diff --git a/css/style.css b/css/style.css
index ee99dbc..e0041a2 100644
--- a/css/style.css
+++ b/css/style.css
@@ -32,6 +32,21 @@ header {
     color: #F1F1F1;
 }
 
+#main ul#sort {
+    padding: 0;
+    list-style-type: none;
+    text-align: center;
+}
+
+#main ul#sort li {
+    display: inline;
+    font-size: 0.9em;
+}
+
+#main ul#sort img:hover {
+    cursor: pointer;
+}
+
 #main, #article {
     margin: 0 auto;
 }
diff --git a/img/down.png b/img/down.png
new file mode 100755
index 0000000000000000000000000000000000000000..b9d536a7cabbd3e404dc187a2e2844562e07fbb0
GIT binary patch
literal 216
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`^F3W0LoEE?PEO==FyLvmWb|ti
ze(+=mqxwU(J?goe&RPl9>t?28-`_sH?9-dar{uqIe_~&>_0>EEk>Z)9_6iqeGViTc
z^Aiy5VB9F(AoP6klgQ`2?G1bfZ)zVYUGRwQr{u+U1~Gvk>j}PdLW+!!uI|vE{?M93
zQKaDFRbLtA4`*6C{{5;j&puSusi>m0O-3U|@y_N%E6M9q|4yz5?L5mlagv(gyMmSN
QK&LWzy85}Sb4q9e0C^WwoB#j-

literal 0
HcmV?d00001

diff --git a/img/up.png b/img/up.png
new file mode 100755
index 0000000000000000000000000000000000000000..954a8c0acbb221eb20d04d6184d3317c9604adf6
GIT binary patch
literal 212
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`vproLLoEE?PJYPi;K0-R-Yh}L
z?7)+r11dQV@t4$c*ZUobpMJvm{%@_)>6edB)&AL*Wqe)zlJci}j4F4EGgNsM1rM|@
zE#&yfAbU^aW?|Gj?hdveA3Pq;Wz>Cn$btDHg9O{I3%rRuZ&Mg*G86<f(k9t3sBtb{
z$5<i8@!*3bgSqh|#@6NA_!sH_U_3Zuep`ocvugUIuL6tXv+u<&HBuFn=G}P#=u8Gr
LS3j3^P6<r_9)(Y+

literal 0
HcmV?d00001

diff --git a/inc/config.php b/inc/config.php
index 4c1978b..d468228 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -35,8 +35,8 @@ if (!isset($_SESSION['token_poche'])) {
 }
 
 # Traitement des paramètres et déclenchement des actions
+$view               = (isset ($_REQUEST['view'])) ? htmlentities($_REQUEST['view']) : 'index';
 $action             = (isset ($_REQUEST['action'])) ? htmlentities($_REQUEST['action']) : '';
-$_SESSION['view']   = (isset ($_GET['view'])) ? htmlentities($_GET['view']) : 'index';
 $_SESSION['sort']   = (isset ($_REQUEST['sort'])) ? htmlentities($_REQUEST['sort']) : 'id';
 $id                 = (isset ($_REQUEST['id'])) ? htmlspecialchars($_REQUEST['id']) : '';
 $url                = (isset ($_GET['url'])) ? $_GET['url'] : '';
diff --git a/inc/functions.php b/inc/functions.php
index a743058..464410c 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -182,7 +182,7 @@ function action_to_do($action, $id, $url, $token)
 /**
  * Détermine quels liens afficher : home, fav ou archives
  */
-function display_view()
+function display_view($view)
 {
     global $db;
 
@@ -205,7 +205,7 @@ function display_view()
             break;
     }
 
-    switch ($_SESSION['view'])
+    switch ($view)
     {
         case 'archive':
             $sql    = "SELECT * FROM entries WHERE is_read=? " . $order;
diff --git a/index.php b/index.php
index f62cf13..c303f8e 100755
--- a/index.php
+++ b/index.php
@@ -10,10 +10,10 @@
 
 include dirname(__FILE__).'/inc/config.php';
 
-$entries = display_view();
+$entries = display_view($view);
 
 $tpl->assign('title', 'poche, a read it later open source system');
-$tpl->assign('view', $_SESSION['view']);
+$tpl->assign('view', $view);
 $tpl->assign('poche_url', get_poche_url());
 $tpl->assign('entries', $entries);
 $tpl->assign('load_all_js', 1);
diff --git a/js/poche.js b/js/poche.js
index f0e39b3..98fc48e 100644
--- a/js/poche.js
+++ b/js/poche.js
@@ -22,6 +22,6 @@ function toggle_archive(element, id, token, view_article) {
     }
 }
 
-function sort_links(sort, token) {
-    $('#content').load('process.php', { sort: sort, token: token } );
+function sort_links(view, sort, token) {
+    $('#content').load('process.php', { view: view, sort: sort, token: token } );
 }
\ No newline at end of file
diff --git a/process.php b/process.php
new file mode 100644
index 0000000..1468688
--- /dev/null
+++ b/process.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * poche, a read it later open source system
+ *
+ * @category   poche
+ * @author     Nicolas Lœuillet <support@inthepoche.com>
+ * @copyright  2013
+ * @license    http://www.wtfpl.net/ see COPYING file
+ */
+
+include dirname(__FILE__).'/inc/config.php';
+
+$entries = display_view($view);
+$tpl->assign('token', $_SESSION['token_poche']);
+$tpl->assign('entries', $entries);
+$tpl->draw('entries');
\ No newline at end of file
diff --git a/tpl/home.html b/tpl/home.html
index d961253..568b927 100644
--- a/tpl/home.html
+++ b/tpl/home.html
@@ -9,10 +9,8 @@
                 <li><a href="?view=archive" {if="$view == 'archive'"}class="current"{/if}>archive</a></li>
                 <li><a style="cursor: move" title="i am a bookmarklet, use me !" href="javascript:(function(){var%20url%20=%20location.href%20||%20url;window.open('{$poche_url}?action=add&url='%20+%20encodeURIComponent(url),'_self');})();">poche it !</a></li>
             </ul>
-<!--             <ul>
-                <li onclick="sort_links('ia', '{$token}');">tri par id asc</li>
-                <li onclick="sort_links('id', '{$token}');">tri par id desc</li>
-                <li onclick="sort_links('ta', '{$token}');">tri par title asc</li>
-                <li onclick="sort_links('td', '{$token}');">tri par title desc</li>
-            </ul> -->
+            <ul id="sort">
+                <li><img src="img/up.png" onclick="sort_links('{$view}', 'ia', '{$token}');" title="by date asc" /> by date <img src="img/down.png" onclick="sort_links('{$view}', 'id', '{$token}');" title="by date desc" /></li>
+                <li><img src="img/up.png" onclick="sort_links('{$view}', 'ta', '{$token}');" title="by title asc" /> by title <img src="img/down.png" onclick="sort_links('{$view}', 'td', '{$token}');" title="by title desc" /></li>
+            </ul>
             <div id="content">
\ No newline at end of file