From 07e0df9203bbeae4b289add2c8b80de20a725637 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Mon, 29 Apr 2013 13:40:53 +0200
Subject: sortable helper method added

---
 app/helpers/application_helper.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app/helpers/application_helper.rb')

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index de4d677..9334f7d 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -19,4 +19,9 @@ module ApplicationHelper
     end
 	end
 
+  def sortable(column, title)
+    link_class = (column.to_s == sort_column.to_s) ? "sort_descending #{sort_descending}" : nil
+    link_to title, {:sort => column, :desc => !!(!sort_descending && column), :type => @type}, {:class => link_class}
+  end
+
 end
-- 
cgit v1.2.3


From d181daa525a730cc46c942845e5e2168858b7ef3 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Mon, 29 Apr 2013 15:11:47 +0200
Subject: sort_descending fixed

---
 app/helpers/application_helper.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/helpers/application_helper.rb')

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 9334f7d..b74fa27 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -21,7 +21,8 @@ module ApplicationHelper
 
   def sortable(column, title)
     link_class = (column.to_s == sort_column.to_s) ? "sort_descending #{sort_descending}" : nil
-    link_to title, {:sort => column, :desc => !!(!sort_descending && column), :type => @type}, {:class => link_class}
+    desc = (column.to_s == sort_column.to_s) ? !!(!sort_descending && column) : nil
+    link_to title, {:sort => column, :desc => desc, :type => @type}, {:class => link_class}
   end
 
 end
-- 
cgit v1.2.3


From 0317faf79380e706b72290939c6a0d46644b0ffe Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Mon, 29 Apr 2013 15:24:17 +0200
Subject: return title if sort_descending is not defined

---
 app/helpers/application_helper.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'app/helpers/application_helper.rb')

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b74fa27..7171fbb 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -20,6 +20,9 @@ module ApplicationHelper
 	end
 
   def sortable(column, title)
+    if !defined?(sort_descending)
+      return title
+    end
     link_class = (column.to_s == sort_column.to_s) ? "sort_descending #{sort_descending}" : nil
     desc = (column.to_s == sort_column.to_s) ? !!(!sort_descending && column) : nil
     link_to title, {:sort => column, :desc => desc, :type => @type}, {:class => link_class}
-- 
cgit v1.2.3


From 91a4c93f7e89c44059283b2395d7c7419c6a4c7d Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Tue, 30 Apr 2013 08:32:08 +0200
Subject: chevrons added

---
 app/helpers/application_helper.rb | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'app/helpers/application_helper.rb')

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7171fbb..2c420c4 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -23,9 +23,18 @@ module ApplicationHelper
     if !defined?(sort_descending)
       return title
     end
-    link_class = (column.to_s == sort_column.to_s) ? "sort_descending #{sort_descending}" : nil
-    desc = (column.to_s == sort_column.to_s) ? !!(!sort_descending && column) : nil
-    link_to title, {:sort => column, :desc => desc, :type => @type}, {:class => link_class}
+
+    if column.to_s == sort_column.to_s
+      link_class = "sort_descending #{sort_descending}"
+      desc = !!(!sort_descending && column)
+      icon = sort_descending ? ' <i class = "icon-chevron-up"></i> ' : ' <i class = "icon-chevron-down"></i> '
+    else
+      link_class = nil
+      desc = nil
+      icon = ''
+    end
+
+    link_to raw('') + title + raw(icon), {:sort => column, :desc => desc, :type => @type}, {:class => link_class}
   end
 
 end
-- 
cgit v1.2.3