From: Luzifr Date: Mon, 29 Aug 2011 18:23:11 +0000 (+0200) Subject: Experimental page navigation, some text corrections, some new and improved SVG images X-Git-Tag: 2.0.0_Beta_1~1804 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e5f3f0bfbc583563a871c2e844466051fdc44cec;p=GitHub%2FWoltLab%2FWCF.git Experimental page navigation, some text corrections, some new and improved SVG images --- diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css index d522390c11..665cef403c 100644 --- a/wcfsetup/install/files/acp/style/testing.css +++ b/wcfsetup/install/files/acp/style/testing.css @@ -1361,36 +1361,108 @@ tbody tr .columnIcon img { /* -- -- -- -- -- ToDo: Page Navigation -- -- -- -- -- */ -.pageNavigation ul li { - display: inline-block; +/* This is only experimental for the moment */ + +.pageNavigation ul li:not(.children) { + background-image: -webkit-linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, .1)); + background-image: -moz-linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, .1)); + background-image: -o-linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, .1)); + background-image: -ms-linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, .1)); + background-image: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, .1)); + + border: 1px solid rgba(0, 0, 0, .2); border-radius: 3px; + display: inline-block; + position: relative; } -.pageNavigation ul li:not(.skip) { - background-color: #eee; - border: 1px solid #ccc; - padding: 3px; +.pageNavigation ul li.disabled { + background-image: none; + border: 1px solid rgba(0, 0, 0, .1); } -.pageNavigation ul li.active, -.pageNavigation ul li:not(.skip):hover { - background-color: #faebd7; - border-color: #f80; - color: #f80; +.pageNavigation ul li:after { + content: ""; + display: block; + clear: both; +} + +.pageNavigation ul li img { + width: 16px; + height: 16px; +} + +.pageNavigation ul li:not(.disabled):hover { + color: #333; + border: 1px solid rgba(0, 0, 0, .3); + background-color: rgba(255, 255, 255, 1); + background-image: none; +} + +.pageNavigation ul li.skip { + top: -1px; + padding: 2px 2px 1px 3px; } .pageNavigation ul li a { + color: #999; + text-shadow: 0 1px 0 #fff; text-decoration: none; + display: inline-block; } -.pageNavigation ul li:not(.skip):hover a { - color: #f80; +.pageNavigation ul li:not(.skip) a { + padding: 3px 5px; } -.pageNavigation ul li.skip { - vertical-align: middle; +.pageNavigation ul li:active, +.pageNavigation ul li:focus { + border: 1px solid rgba(0, 0, 0, .3); + background-color: rgba(0, 0, 0, .5) !important; +} + +.pageNavigation ul li.active, +.pageNavigation ul li.active:hover { + color: #fff; + text-shadow: 0 1px 0 #000; + border: 1px solid rgba(0, 0, 0, .3); + background-color: rgba(0, 0, 0, .5); + + background-image: -webkit-linear-gradient(rgba(0, 0, 0, .3), rgba(0, 0, 0, 0) 3px); + background-image: -moz-linear-gradient(rgba(0, 0, 0, .3), rgba(0, 0, 0, 0) 3px); + background-image: -o-linear-gradient(rgba(0, 0, 0, .3), rgba(0, 0, 0, 0) 3px); + background-image: -ms-linear-gradient(rgba(0, 0, 0, .3), rgba(0, 0, 0, 0) 3px); + background-image: linear-gradient(rgba(0, 0, 0, .3), rgba(0, 0, 0, 0) 3px); + + padding: 3px 5px; } +.pageNavigation ul li:active a, +.pageNavigation ul li:focus a { + color: #fff; + text-shadow: 0 1px 0 #000; +} + +.pageNavigation ul li.children, +.pageNavigation ul li.children:hover, +.pageNavigation ul li.children:active, +.pageNavigation ul li.children:focus { + display: inline-block; +} + +.pageNavigation ul li.children img { + width: 7px; + height: 9px; +} + + + + + + + + + /* -- -- -- -- -- System Notifications -- -- -- -- -- */ diff --git a/wcfsetup/install/files/icon/cache1.svg b/wcfsetup/install/files/icon/cache1.svg index 367c6d4da1..4cacf2deb1 100644 --- a/wcfsetup/install/files/icon/cache1.svg +++ b/wcfsetup/install/files/icon/cache1.svg @@ -18,7 +18,7 @@ - - + + + + + Dropdown + Dropdown Icon + + + + + + + + diff --git a/wcfsetup/install/files/icon/next1.svg b/wcfsetup/install/files/icon/next1.svg new file mode 100644 index 0000000000..0e2261b443 --- /dev/null +++ b/wcfsetup/install/files/icon/next1.svg @@ -0,0 +1,27 @@ + + + + + + To Right + To The Right Icon + + + + + + + + + + + + diff --git a/wcfsetup/install/files/icon/next1D.svg b/wcfsetup/install/files/icon/next1D.svg new file mode 100644 index 0000000000..62717d1163 --- /dev/null +++ b/wcfsetup/install/files/icon/next1D.svg @@ -0,0 +1,27 @@ + + + + + + To Right + To The Right Icon + + + + + + + + + + + + diff --git a/wcfsetup/install/files/icon/previous1.svg b/wcfsetup/install/files/icon/previous1.svg new file mode 100644 index 0000000000..4c1cf63641 --- /dev/null +++ b/wcfsetup/install/files/icon/previous1.svg @@ -0,0 +1,27 @@ + + + + + + To Left + To The Left Icon + + + + + + + + + + + + diff --git a/wcfsetup/install/files/icon/previous1D.svg b/wcfsetup/install/files/icon/previous1D.svg new file mode 100644 index 0000000000..45261ed0d1 --- /dev/null +++ b/wcfsetup/install/files/icon/previous1D.svg @@ -0,0 +1,27 @@ + + + + + + To Left + To The Left Icon + + + + + + + + + + + + diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js index 53af932bd1..05b196fd9e 100644 --- a/wcfsetup/install/files/js/WCF.js +++ b/wcfsetup/install/files/js/WCF.js @@ -1949,11 +1949,11 @@ $.widget('ui.wcfPages', { maxPage: 1, // icons - previousIcon: RELATIVE_WCF_DIR + 'icon/previousS.png', - previousDisabledIcon: RELATIVE_WCF_DIR + 'icon/previousDisabledS.png', - arrowDownIcon: RELATIVE_WCF_DIR + 'icon/arrowDown.png', - nextIcon: RELATIVE_WCF_DIR + 'icon/nextS.png', - nextDisabledIcon: RELATIVE_WCF_DIR + 'icon/nextDisabledS.png', + previousIcon: RELATIVE_WCF_DIR + 'icon/previous1.svg', + previousDisabledIcon: RELATIVE_WCF_DIR + 'icon/previous1D.svg', + arrowDownIcon: RELATIVE_WCF_DIR + 'icon/dropDown1.svg', + nextIcon: RELATIVE_WCF_DIR + 'icon/next1.svg', + nextDisabledIcon: RELATIVE_WCF_DIR + 'icon/next1D.svg', // language // we use options here instead of language variables, because the paginator is not only usable with pages diff --git a/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php index 4963bc16d9..e7d35f8182 100644 --- a/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php +++ b/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php @@ -94,10 +94,10 @@ class PagesFunctionTemplatePlugin implements IFunctionTemplatePlugin { // previous page $previousTitle = WCF::getLanguage()->getDynamicVariable('wcf.global.page.previous'); if ($tagArgs['page'] > 1) { - $html .= ''."\n"; + $html .= ''."\n"; } else { - $html .= ''."\n"; + $html .= ''."\n"; } // first page @@ -146,7 +146,7 @@ class PagesFunctionTemplatePlugin implements IFunctionTemplatePlugin { $html .= $this->makeLink($tagArgs['link'], 2, $tagArgs['page']); } else { - $html .= '
  • …
      '."\n"; + $html .= '
    • …
        '."\n"; $k = 0; $step = intval(ceil(($left - 2) / self::SHOW_SUB_LINKS)); @@ -170,7 +170,7 @@ class PagesFunctionTemplatePlugin implements IFunctionTemplatePlugin { $html .= $this->makeLink($tagArgs['link'], $tagArgs['pages'] - 1, $tagArgs['page']); } else { - $html .= '
      • …
          '."\n"; + $html .= '
        • …
            '."\n"; $k = 0; $step = intval(ceil(($tagArgs['pages'] - $right) / self::SHOW_SUB_LINKS)); @@ -189,10 +189,10 @@ class PagesFunctionTemplatePlugin implements IFunctionTemplatePlugin { // next page $nextTitle = WCF::getLanguage()->getDynamicVariable('wcf.global.page.next'); if ($tagArgs['page'] && $tagArgs['page'] < $tagArgs['pages']) { - $html .= ''."\n"; + $html .= ''."\n"; } else { - $html .= ''."\n"; + $html .= ''."\n"; } // close div and ul diff --git a/wcfsetup/install/lang/de-informal.xml b/wcfsetup/install/lang/de-informal.xml index 4cdccd7b7b..98aa71b51b 100644 --- a/wcfsetup/install/lang/de-informal.xml +++ b/wcfsetup/install/lang/de-informal.xml @@ -214,12 +214,12 @@ - + - + @@ -230,8 +230,8 @@ - - + + @@ -254,7 +254,7 @@ - + @@ -433,7 +433,7 @@ - + @@ -441,8 +441,8 @@ - - + + @@ -481,7 +481,7 @@ - {$packageName|encodeJS}: ]]> + {$packageName|encodeJS}: ]]> @@ -524,24 +524,24 @@ - + - + - - - - + + + + - + diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index b99cf97683..2bef952e78 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -219,7 +219,7 @@ - + @@ -230,8 +230,8 @@ - - + + @@ -254,7 +254,7 @@ - + @@ -481,7 +481,7 @@ - {$packageName|encodeJS}: ]]> + {$packageName|encodeJS}: ]]> @@ -524,25 +524,25 @@ - + - + - - - - + + + + - - + + diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 5736bf154b..0ea30bbd21 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -10,7 +10,7 @@ - + @@ -214,12 +214,12 @@ - + - + @@ -230,8 +230,8 @@ - - + + @@ -484,7 +484,7 @@ - {$packageName|encodeJS}: ]]> + {$packageName|encodeJS}: ]]> @@ -534,25 +534,25 @@ - + - + - - - - + + + + - - + +