From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 27 Mar 2013 10:00:07 +0000 (+0100)
Subject: restored tick marks in column headers to indicate sort direction
X-Git-Tag: myslice-django-0.1-3~25
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b694f6b7bea92654261353a3e97a267ed8d3f8b3;p=unfold.git

restored tick marks in column headers to indicate sort direction
---

diff --git a/third-party/datatables/css/README b/third-party/datatables/css/README
index 50b0d4a2..c979ef91 100644
--- a/third-party/datatables/css/README
+++ b/third-party/datatables/css/README
@@ -1,2 +1,2 @@
-manually replaced images/ with all-static/img/ in this css after downloading
-sed -i  -e s,images/,all-static/img/, dataTables.bootstrap.css
+manually replaced images/ with ../img/ in this css after downloading
+remember url() gives a location relative to where the css file lies
diff --git a/third-party/datatables/css/dataTables.bootstrap.css b/third-party/datatables/css/dataTables.bootstrap.css
index 16b68648..63fa1eb0 100644
--- a/third-party/datatables/css/dataTables.bootstrap.css
+++ b/third-party/datatables/css/dataTables.bootstrap.css
@@ -36,12 +36,12 @@ table.table thead .sorting_desc_disabled {
 	*cursor: hand;
 }
 
-table.table thead .sorting { background: url('all-static/img/sort_both.png') no-repeat center right; }
-table.table thead .sorting_asc { background: url('all-static/img/sort_asc.png') no-repeat center right; }
-table.table thead .sorting_desc { background: url('all-static/img/sort_desc.png') no-repeat center right; }
+table.table thead .sorting { background: url('../img/sort_both.png') no-repeat center right; }
+table.table thead .sorting_asc { background: url('../img/sort_asc.png') no-repeat center right; }
+table.table thead .sorting_desc { background: url('../img/sort_desc.png') no-repeat center right; }
 
-table.table thead .sorting_asc_disabled { background: url('all-static/img/sort_asc_disabled.png') no-repeat center right; }
-table.table thead .sorting_desc_disabled { background: url('all-static/img/sort_desc_disabled.png') no-repeat center right; }
+table.table thead .sorting_asc_disabled { background: url('../img/sort_asc_disabled.png') no-repeat center right; }
+table.table thead .sorting_desc_disabled { background: url('../img/sort_desc_disabled.png') no-repeat center right; }
 
 table.dataTable th:active {
 	outline: none;
diff --git a/plugins/hazelnut/img/sort_asc.png b/third-party/datatables/img/sort_asc.png
similarity index 100%
rename from plugins/hazelnut/img/sort_asc.png
rename to third-party/datatables/img/sort_asc.png
diff --git a/plugins/hazelnut/img/sort_asc_disabled.png b/third-party/datatables/img/sort_asc_disabled.png
similarity index 100%
rename from plugins/hazelnut/img/sort_asc_disabled.png
rename to third-party/datatables/img/sort_asc_disabled.png
diff --git a/plugins/hazelnut/img/sort_both.png b/third-party/datatables/img/sort_both.png
similarity index 100%
rename from plugins/hazelnut/img/sort_both.png
rename to third-party/datatables/img/sort_both.png
diff --git a/plugins/hazelnut/img/sort_desc.png b/third-party/datatables/img/sort_desc.png
similarity index 100%
rename from plugins/hazelnut/img/sort_desc.png
rename to third-party/datatables/img/sort_desc.png
diff --git a/plugins/hazelnut/img/sort_desc_disabled.png b/third-party/datatables/img/sort_desc_disabled.png
similarity index 100%
rename from plugins/hazelnut/img/sort_desc_disabled.png
rename to third-party/datatables/img/sort_desc_disabled.png
diff --git a/plugins/hazelnut/img/sort_none.png b/third-party/datatables/img/sort_none.png
similarity index 100%
rename from plugins/hazelnut/img/sort_none.png
rename to third-party/datatables/img/sort_none.png
diff --git a/third-party/datatables/js/DT_bootstrap.js.url b/third-party/datatables/js/DT_bootstrap.js.url
deleted file mode 100644
index 4a3b04ae..00000000
--- a/third-party/datatables/js/DT_bootstrap.js.url
+++ /dev/null
@@ -1 +0,0 @@
-http://datatables.net/media/blog/bootstrap_2/DT_bootstrap.js
diff --git a/third-party/datatables/js/dataTables.bootstrap.js.url b/third-party/datatables/js/dataTables.bootstrap.js.url
new file mode 100644
index 00000000..bd20cdbf
--- /dev/null
+++ b/third-party/datatables/js/dataTables.bootstrap.js.url
@@ -0,0 +1 @@
+http://datatables.github.com/Plugins/integration/bootstrap/dataTables.bootstrap.js