From 38033ff72728354f60ef2e49aac6e359986ffd99 Mon Sep 17 00:00:00 2001 From: vargenau Date: Fri, 19 Sep 2014 16:54:44 +0000 Subject: [PATCH] Harmonize sort buttons git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@9101 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- lib/PageList.php | 4 ++-- themes/Crao/crao.css | 6 +++--- themes/Hawaiian/Hawaiian.css | 6 +++--- themes/MacOSX/MacOSX.css | 6 +++--- themes/MonoBook/monobook.css | 6 +++--- themes/Portland/portland.css | 6 +++--- themes/Sidebar/sidebar.css | 6 +++--- themes/SpaceWiki/SpaceWiki.css | 6 +++--- themes/Wordpress/Wordpress.css | 6 +++--- themes/blog/Kubrick.css | 6 +++--- themes/default/buttons/asc_order.png | Bin 137 -> 0 bytes themes/default/buttons/desc_order.png | Bin 137 -> 0 bytes themes/default/buttons/no_order.png | Bin 105 -> 0 bytes themes/default/{images => buttons}/sort_down.gif | Bin themes/default/{images => buttons}/sort_none.gif | Bin themes/default/{images => buttons}/sort_up.gif | Bin themes/default/phpwiki.css | 6 +++--- themes/fusionforge/buttons/asc_order.png | Bin 571 -> 0 bytes themes/fusionforge/buttons/desc_order.png | Bin 567 -> 0 bytes themes/fusionforge/buttons/no_order.png | Bin 576 -> 0 bytes themes/fusionforge/fusionforge.css | 6 +++--- themes/shamino_com/shamino_com.css | 6 +++--- themes/wikilens/wikilens.css | 6 +++--- 23 files changed, 41 insertions(+), 41 deletions(-) delete mode 100644 themes/default/buttons/asc_order.png delete mode 100644 themes/default/buttons/desc_order.png delete mode 100644 themes/default/buttons/no_order.png rename themes/default/{images => buttons}/sort_down.gif (100%) rename themes/default/{images => buttons}/sort_none.gif (100%) rename themes/default/{images => buttons}/sort_up.gif (100%) delete mode 100644 themes/fusionforge/buttons/asc_order.png delete mode 100644 themes/fusionforge/buttons/desc_order.png delete mode 100644 themes/fusionforge/buttons/no_order.png diff --git a/lib/PageList.php b/lib/PageList.php index a7c20ebef..ccd7f83c8 100644 --- a/lib/PageList.php +++ b/lib/PageList.php @@ -108,7 +108,7 @@ class _PageList_Column_base if (!$WikiTheme->DUMP_MODE /* or in_array($this->_field, PageList::sortable_columns()) */) { // TODO: add to multiple comma-delimited sortby args: "+hits,+pagename" $src = false; - $noimg_src = $WikiTheme->getButtonURL('no_order'); + $noimg_src = $WikiTheme->getButtonURL('sort_none'); if ($noimg_src) $noimg = HTML::img(array('src' => $noimg_src, 'alt' => '.')); @@ -117,7 +117,7 @@ class _PageList_Column_base if ($pagelist->sortby($colNum, 'check')) { // show icon? request or plugin arg $sortby = $pagelist->sortby($colNum, 'flip_order'); $desc = (substr($sortby, 0, 1) == '-'); // +pagename or -pagename - $src = $WikiTheme->getButtonURL($desc ? 'asc_order' : 'desc_order'); + $src = $WikiTheme->getButtonURL($desc ? 'sort_up' : 'sort_down'); $reverse = $desc ? _("reverse") . " " : ""; } else { // initially unsorted diff --git a/themes/Crao/crao.css b/themes/Crao/crao.css index 21c087bce..2038a199a 100644 --- a/themes/Crao/crao.css +++ b/themes/Crao/crao.css @@ -1305,7 +1305,7 @@ table.boxed th, table.bordered th { } table.sortable th.header { - background-image: url(../default/images/sort_none.gif); + background-image: url(../default/buttons/sort_none.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -1313,7 +1313,7 @@ table.sortable th.header { } table.sortable th.headerSortUp { - background-image: url(../default/images/sort_up.gif); + background-image: url(../default/buttons/sort_up.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -1321,7 +1321,7 @@ table.sortable th.headerSortUp { } table.sortable th.headerSortDown { - background-image: url(../default/images/sort_down.gif); + background-image: url(../default/buttons/sort_down.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; diff --git a/themes/Hawaiian/Hawaiian.css b/themes/Hawaiian/Hawaiian.css index 9c9636fa2..45bf1399e 100644 --- a/themes/Hawaiian/Hawaiian.css +++ b/themes/Hawaiian/Hawaiian.css @@ -677,7 +677,7 @@ table.boxed th, table.bordered th { } table.sortable th.header { - background-image: url(../default/images/sort_none.gif); + background-image: url(../default/buttons/sort_none.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -685,7 +685,7 @@ table.sortable th.header { } table.sortable th.headerSortUp { - background-image: url(../default/images/sort_up.gif); + background-image: url(../default/buttons/sort_up.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -693,7 +693,7 @@ table.sortable th.headerSortUp { } table.sortable th.headerSortDown { - background-image: url(../default/images/sort_down.gif); + background-image: url(../default/buttons/sort_down.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; diff --git a/themes/MacOSX/MacOSX.css b/themes/MacOSX/MacOSX.css index 8cdc35d5c..3381afe30 100644 --- a/themes/MacOSX/MacOSX.css +++ b/themes/MacOSX/MacOSX.css @@ -1201,7 +1201,7 @@ table.boxed th, table.bordered th { } table.sortable th.header { - background-image: url(../default/images/sort_none.gif); + background-image: url(../default/buttons/sort_none.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -1209,7 +1209,7 @@ table.sortable th.header { } table.sortable th.headerSortUp { - background-image: url(../default/images/sort_up.gif); + background-image: url(../default/buttons/sort_up.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -1217,7 +1217,7 @@ table.sortable th.headerSortUp { } table.sortable th.headerSortDown { - background-image: url(../default/images/sort_down.gif); + background-image: url(../default/buttons/sort_down.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; diff --git a/themes/MonoBook/monobook.css b/themes/MonoBook/monobook.css index 5ef972095..7eada96f7 100644 --- a/themes/MonoBook/monobook.css +++ b/themes/MonoBook/monobook.css @@ -2252,7 +2252,7 @@ td.tdunselected { } table.sortable th.header { - background-image: url(../default/images/sort_none.gif); + background-image: url(../default/buttons/sort_none.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -2260,7 +2260,7 @@ table.sortable th.header { } table.sortable th.headerSortUp { - background-image: url(../default/images/sort_up.gif); + background-image: url(../default/buttons/sort_up.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -2268,7 +2268,7 @@ table.sortable th.headerSortUp { } table.sortable th.headerSortDown { - background-image: url(../default/images/sort_down.gif); + background-image: url(../default/buttons/sort_down.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; diff --git a/themes/Portland/portland.css b/themes/Portland/portland.css index 9ab7c792c..1150422df 100644 --- a/themes/Portland/portland.css +++ b/themes/Portland/portland.css @@ -186,7 +186,7 @@ table.boxed th, table.bordered th { } table.sortable th.header { - background-image: url(../default/images/sort_none.gif); + background-image: url(../default/buttons/sort_none.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -194,7 +194,7 @@ table.sortable th.header { } table.sortable th.headerSortUp { - background-image: url(../default/images/sort_up.gif); + background-image: url(../default/buttons/sort_up.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -202,7 +202,7 @@ table.sortable th.headerSortUp { } table.sortable th.headerSortDown { - background-image: url(../default/images/sort_down.gif); + background-image: url(../default/buttons/sort_down.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; diff --git a/themes/Sidebar/sidebar.css b/themes/Sidebar/sidebar.css index 9993d61de..727e5dc70 100644 --- a/themes/Sidebar/sidebar.css +++ b/themes/Sidebar/sidebar.css @@ -2306,7 +2306,7 @@ td.tdunselected { } table.sortable th.header { - background-image: url(../default/images/sort_none.gif); + background-image: url(../default/buttons/sort_none.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -2314,7 +2314,7 @@ table.sortable th.header { } table.sortable th.headerSortUp { - background-image: url(../default/images/sort_up.gif); + background-image: url(../default/buttons/sort_up.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -2322,7 +2322,7 @@ table.sortable th.headerSortUp { } table.sortable th.headerSortDown { - background-image: url(../default/images/sort_down.gif); + background-image: url(../default/buttons/sort_down.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; diff --git a/themes/SpaceWiki/SpaceWiki.css b/themes/SpaceWiki/SpaceWiki.css index bb8da7830..353df6a04 100644 --- a/themes/SpaceWiki/SpaceWiki.css +++ b/themes/SpaceWiki/SpaceWiki.css @@ -1037,7 +1037,7 @@ table.boxed th, table.bordered th { } table.sortable th.header { - background-image: url(../default/images/sort_none.gif); + background-image: url(../default/buttons/sort_none.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -1045,7 +1045,7 @@ table.sortable th.header { } table.sortable th.headerSortUp { - background-image: url(../default/images/sort_up.gif); + background-image: url(../default/buttons/sort_up.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -1053,7 +1053,7 @@ table.sortable th.headerSortUp { } table.sortable th.headerSortDown { - background-image: url(../default/images/sort_down.gif); + background-image: url(../default/buttons/sort_down.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; diff --git a/themes/Wordpress/Wordpress.css b/themes/Wordpress/Wordpress.css index 0b5652ea8..99ac58cdd 100644 --- a/themes/Wordpress/Wordpress.css +++ b/themes/Wordpress/Wordpress.css @@ -1118,7 +1118,7 @@ table.boxed th, table.bordered th { } table.sortable th.header { - background-image: url(../default/images/sort_none.gif); + background-image: url(../default/buttons/sort_none.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -1126,7 +1126,7 @@ table.sortable th.header { } table.sortable th.headerSortUp { - background-image: url(../default/images/sort_up.gif); + background-image: url(../default/buttons/sort_up.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -1134,7 +1134,7 @@ table.sortable th.headerSortUp { } table.sortable th.headerSortDown { - background-image: url(../default/images/sort_down.gif); + background-image: url(../default/buttons/sort_down.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; diff --git a/themes/blog/Kubrick.css b/themes/blog/Kubrick.css index 3bdefd70b..d5298c316 100644 --- a/themes/blog/Kubrick.css +++ b/themes/blog/Kubrick.css @@ -1024,7 +1024,7 @@ table.boxed th, table.bordered th { } table.sortable th.header { - background-image: url(../default/images/sort_none.gif); + background-image: url(../default/buttons/sort_none.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -1032,7 +1032,7 @@ table.sortable th.header { } table.sortable th.headerSortUp { - background-image: url(../default/images/sort_up.gif); + background-image: url(../default/buttons/sort_up.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -1040,7 +1040,7 @@ table.sortable th.headerSortUp { } table.sortable th.headerSortDown { - background-image: url(../default/images/sort_down.gif); + background-image: url(../default/buttons/sort_down.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; diff --git a/themes/default/buttons/asc_order.png b/themes/default/buttons/asc_order.png deleted file mode 100644 index 85424664e9b10deb33ff1a3f794dc8448386f5cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^>>$j-3?$8JydD54{s5m4*DDuJurRUw`Ss_@wL3Xk zIR&j3!+}zaB|(0{3=Yq3qyae^o-U3d6>+9V9C;ZGI9Lw)1~blKHYpJL@V=A%p|J+#eWH39!wEXnq>$j-3?$8JydD54{s5m4*DDuJurRUw`Ss_@wL3Xk zIR&j3!+}zaB|(0{3=Yq3qyae^o-U3d6>+*p9C;ZGI9Lw)1~blKHYpJL@SaodO!9+` hR_ovIy5*;GltJwm({hJ;hen_t22WQ%mvv4FO#m}tD>$j-3?$8JydD54<^Z1%*DDuJSk~&V267oog8YIR x9G=}s19C(>T^vIy;#vC}R#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(w zAt7O5VG$7#QBhGbF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BL zWfc__RaI3rH8pj0bqx&-O-)TLEiG+rZ5lC}R#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(w zAt7O5VG$7#QBhGbF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BL zWfc__RaI3rH8pj0bqx&-O-)TLEiG+rZ5l!Hm2?+^FNl7UwDQRhG85tQ_Sy?$bIeB?`1qB5~MMWhgC1qu0 z6%`d#RaG@LHFb4$4Gj%VO-(H=Ep2UW9UUEAU0pprJ$-$B0|Ns?Lqj7YBV%J@6B83t zQ&TfDGjnru3kwTNOG_&&D{E_O8yg#2TU$FjJ9~S32L}g7M@J_oCue787Z(>-S64ST zH+Oe;4-XGdPfsr|FK=&eA0HoIUtd2zKYxG!fPjF&z`&rOpy1%(kdTnj(9p23u<-Ek zh=_>D$jGRusOaeEn3$N@*x0zZxcK<^goK2|#Kfeeq~zq}l$4az)YP=JwDk1!jEs!T z%*?E;tnBRUoSdB8+}ympy!`z9f`Wqc(Kl>B!CDgJ7tG-B>_!@hljQC0!qCAg>jC6& z7I;J!Gca%qgD@k*tT_@uLG}_)Usv{<+-!m(dM<}%g#(3TOI#yLobz*YQ}ap~oQqNu zOHxx5$}>wc6hbmm72G|21Ky{o<^dHNc)B=-a9mH;aA4wL