From: <var...@us...> - 2014-09-19 16:54:48
|
Revision: 9101 http://sourceforge.net/p/phpwiki/code/9101 Author: vargenau Date: 2014-09-19 16:54:44 +0000 (Fri, 19 Sep 2014) Log Message: ----------- Harmonize sort buttons Modified Paths: -------------- trunk/lib/PageList.php trunk/themes/Crao/crao.css trunk/themes/Hawaiian/Hawaiian.css trunk/themes/MacOSX/MacOSX.css trunk/themes/MonoBook/monobook.css trunk/themes/Portland/portland.css trunk/themes/Sidebar/sidebar.css trunk/themes/SpaceWiki/SpaceWiki.css trunk/themes/Wordpress/Wordpress.css trunk/themes/blog/Kubrick.css trunk/themes/default/phpwiki.css trunk/themes/fusionforge/fusionforge.css trunk/themes/shamino_com/shamino_com.css trunk/themes/wikilens/wikilens.css Added Paths: ----------- trunk/themes/default/buttons/sort_down.gif trunk/themes/default/buttons/sort_none.gif trunk/themes/default/buttons/sort_up.gif Removed Paths: ------------- trunk/themes/default/buttons/asc_order.png trunk/themes/default/buttons/desc_order.png trunk/themes/default/buttons/no_order.png trunk/themes/default/images/sort_down.gif trunk/themes/default/images/sort_none.gif trunk/themes/default/images/sort_up.gif trunk/themes/fusionforge/buttons/asc_order.png trunk/themes/fusionforge/buttons/desc_order.png trunk/themes/fusionforge/buttons/no_order.png Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/lib/PageList.php 2014-09-19 16:54:44 UTC (rev 9101) @@ -108,7 +108,7 @@ 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 @@ 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 Modified: trunk/themes/Crao/crao.css =================================================================== --- trunk/themes/Crao/crao.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/Crao/crao.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -1305,7 +1305,7 @@ } 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.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.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; Modified: trunk/themes/Hawaiian/Hawaiian.css =================================================================== --- trunk/themes/Hawaiian/Hawaiian.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/Hawaiian/Hawaiian.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -677,7 +677,7 @@ } 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.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.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; Modified: trunk/themes/MacOSX/MacOSX.css =================================================================== --- trunk/themes/MacOSX/MacOSX.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/MacOSX/MacOSX.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -1201,7 +1201,7 @@ } 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.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.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; Modified: trunk/themes/MonoBook/monobook.css =================================================================== --- trunk/themes/MonoBook/monobook.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/MonoBook/monobook.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -2252,7 +2252,7 @@ } 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.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.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; Modified: trunk/themes/Portland/portland.css =================================================================== --- trunk/themes/Portland/portland.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/Portland/portland.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -186,7 +186,7 @@ } 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.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.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; Modified: trunk/themes/Sidebar/sidebar.css =================================================================== --- trunk/themes/Sidebar/sidebar.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/Sidebar/sidebar.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -2306,7 +2306,7 @@ } 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.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.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; Modified: trunk/themes/SpaceWiki/SpaceWiki.css =================================================================== --- trunk/themes/SpaceWiki/SpaceWiki.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/SpaceWiki/SpaceWiki.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -1037,7 +1037,7 @@ } 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.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.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; Modified: trunk/themes/Wordpress/Wordpress.css =================================================================== --- trunk/themes/Wordpress/Wordpress.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/Wordpress/Wordpress.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -1118,7 +1118,7 @@ } 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.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.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; Modified: trunk/themes/blog/Kubrick.css =================================================================== --- trunk/themes/blog/Kubrick.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/blog/Kubrick.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -1024,7 +1024,7 @@ } 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.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.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; Deleted: trunk/themes/default/buttons/asc_order.png =================================================================== (Binary files differ) Deleted: trunk/themes/default/buttons/desc_order.png =================================================================== (Binary files differ) Deleted: trunk/themes/default/buttons/no_order.png =================================================================== (Binary files differ) Copied: trunk/themes/default/buttons/sort_down.gif (from rev 9100, trunk/themes/default/images/sort_down.gif) =================================================================== (Binary files differ) Copied: trunk/themes/default/buttons/sort_none.gif (from rev 9100, trunk/themes/default/images/sort_none.gif) =================================================================== (Binary files differ) Copied: trunk/themes/default/buttons/sort_up.gif (from rev 9100, trunk/themes/default/images/sort_up.gif) =================================================================== (Binary files differ) Deleted: trunk/themes/default/images/sort_down.gif =================================================================== (Binary files differ) Deleted: trunk/themes/default/images/sort_none.gif =================================================================== (Binary files differ) Deleted: trunk/themes/default/images/sort_up.gif =================================================================== (Binary files differ) Modified: trunk/themes/default/phpwiki.css =================================================================== --- trunk/themes/default/phpwiki.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/default/phpwiki.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -1291,7 +1291,7 @@ } 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; @@ -1299,7 +1299,7 @@ } 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; @@ -1307,7 +1307,7 @@ } 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; Deleted: trunk/themes/fusionforge/buttons/asc_order.png =================================================================== (Binary files differ) Deleted: trunk/themes/fusionforge/buttons/desc_order.png =================================================================== (Binary files differ) Deleted: trunk/themes/fusionforge/buttons/no_order.png =================================================================== (Binary files differ) Modified: trunk/themes/fusionforge/fusionforge.css =================================================================== --- trunk/themes/fusionforge/fusionforge.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/fusionforge/fusionforge.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -154,7 +154,7 @@ } 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; @@ -162,7 +162,7 @@ } 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; @@ -170,7 +170,7 @@ } 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; Modified: trunk/themes/shamino_com/shamino_com.css =================================================================== --- trunk/themes/shamino_com/shamino_com.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/shamino_com/shamino_com.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -395,7 +395,7 @@ } 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; @@ -403,7 +403,7 @@ } 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; @@ -411,7 +411,7 @@ } 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; Modified: trunk/themes/wikilens/wikilens.css =================================================================== --- trunk/themes/wikilens/wikilens.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/wikilens/wikilens.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -43,7 +43,7 @@ } 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; @@ -51,7 +51,7 @@ } 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; @@ -59,7 +59,7 @@ } 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; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |