Going back to "dropdown"!

diff --git a/wcfsetup/install/files/acp/style/wcf.css b/wcfsetup/install/files/acp/style/wcf.css
index 16896d74a166ce6ac94cc34cedc78069cb29fa4c..e15be3fd89a1b5a753fe5d4bb5868ea27a11d064 100644 (file)
--- a/wcfsetup/install/files/acp/style/wcf.css
+++ b/wcfsetup/install/files/acp/style/wcf.css
@@ -101,10 +101,6 @@ hr {
        top: -9000px;
 }
 
-.separated {
-       margin-top: 13px;
-}
-
 ::selection {
        text-shadow: 0 1px 0 rgba(255, 255, 255, .5) !important;
        color: #300;
@@ -361,27 +357,27 @@ nav.topMenu > div > ul > li:hover a {
        border-color: rgba(255, 255, 255, .5);
 }
 
-nav.topMenu > div > ul > li .dropDownCaption,
-nav.topMenu > div > ul > li .dropDownCaption a {
+nav.topMenu > div > ul > li .dropdownCaption,
+nav.topMenu > div > ul > li .dropdownCaption a {
        padding-right: 5px;
 }
 
-nav.topMenu > div > ul > li:hover .dropDownCaption,
-nav.topMenu > div > ul > li:hover .dropDownCaption a {
+nav.topMenu > div > ul > li:hover .dropdownCaption,
+nav.topMenu > div > ul > li:hover .dropdownCaption a {
        text-shadow: 0 -1px 0 rgba(0, 0, 0, .7);
        color: #fff;
        background-color: rgba(0, 0, 0, .7);
 }
 
-nav.topMenu > div > ul > li > .dropDownCaption > .badge,
-nav.topMenu > div > ul > li:hover > .dropDownCaption > .badge {
+nav.topMenu > div > ul > li > .dropdownCaption > .badge,
+nav.topMenu > div > ul > li:hover > .dropdownCaption > .badge {
        font-size: 75%;
        color: #369 !important;
        margin: -3px 3px;
        padding: 1px 3px;
 }
 
-nav.topMenu > div > ul > li > .dropDownCaption > img {
+nav.topMenu > div > ul > li > .dropdownCaption > img {
        margin: -7px 0 -5px 0;
 }
 
@@ -389,9 +385,9 @@ nav.topMenu > div > ul > li > span:not(.badge) {
        padding: 6px;
 }
 
-nav.topMenu > div > ul > li > .dropDownCaption {
+nav.topMenu > div > ul > li > .dropdownCaption {
        cursor: pointer;
-       background-image: url('../../icon/dropDown2.svg');
+       background-image: url('../../icon/dropdown2.svg');
        background-position: 97% center;
        background-repeat: no-repeat;
        padding-right: 15px !important;
@@ -403,7 +399,7 @@ nav.topMenu > div > ul > li > .dropDownCaption {
 /* ToDo: Top-Menu Dropdown Tweaks */
 
 /* Auto-Opening Dropdowns */
-nav.topMenu ul li:hover .dropDownCaption ~ .dropDown {
+nav.topMenu ul li:hover .dropdownCaption ~ .dropdown {
        border-color: rgba(255, 255, 255, .5);
        background-color: rgba(0, 0, 0, .7);
        display: block !important;
@@ -414,12 +410,12 @@ nav.topMenu ul li {
        white-space: nowrap;
 }
 
-nav.topMenu ul li .dropDown {
+nav.topMenu ul li .dropdown {
        border-width: 0 1px 1px 1px !important;
        border-radius: 0 0 5px 5px;
 }
 
-nav.topMenu ul li .dropDown > :first-child {
+nav.topMenu ul li .dropdown > :first-child {
        border-top-width: 0;
 }
 
@@ -1172,7 +1168,7 @@ li > .badgeButton {
 
 /* ############## ToDo: Dropdown Global ############## */
 
-.dropDown {
+.dropdown {
        color: #fff;
        border-width: 1px;
        border-style: solid;
@@ -1200,14 +1196,14 @@ li > .badgeButton {
        transition: color background height .1s ease;
 }
 
-.dropDown.open {
+.dropdown.open {
        display: block;
 }
 
 /* Dropdown Items */
 
-.dropDown > li,
-.dropDown > div {
+.dropdown > li,
+.dropdown > div {
        text-shadow: none;
        color: #ccc;
        cursor: pointer; 
@@ -1219,45 +1215,45 @@ li > .badgeButton {
        transition: color background .2s linear;
 }
 
-.dropDown > div {
+.dropdown > div {
        padding: 5px 7px;
 }
 
-.dropDown > :first-child {
+.dropdown > :first-child {
        border-top-left-radius: 5px;
        border-top-right-radius: 5px;
 }
 
-.dropDown > :last-child {
+.dropdown > :last-child {
        border-bottom-left-radius: 5px;
        border-bottom-right-radius: 5px;
 }
 
-.dropDown > :hover:not(ul):not(.pointer),
-.dropDown > .active {
+.dropdown > :hover:not(ul):not(.pointer),
+.dropdown > .active {
        color: #fff;
        cursor: pointer;
        background-color: rgba(0, 0, 0, .5);
 }
 
-.dropDown > li.divider:not(:first-child) {
+.dropdown > li.divider:not(:first-child) {
        border-top: 1px solid rgba(255, 255, 255, .7);
 }
 
-.dropDown > li {
+.dropdown > li {
        text-decoration: none;
        padding: 5px 7px;
        display: block;
 }
 
-.dropDown > li a {
+.dropdown > li a {
        text-decoration: none;
        color: #ccc;
        padding: -5px -7px;
        display: block;
 }
 
-.dropDown > li a:hover {
+.dropdown > li a:hover {
        color: #fff;
        background-color: rgba(0, 0, 0, .5);
 }
@@ -1810,7 +1806,7 @@ textarea[disabled='disabled'] {
 
 /* Dropdown Caption */
 
-.preInput .dropDownCaption {
+.preInput .dropdownCaption {
        letter-spacing: -1px;
        cursor: pointer;
        border-radius: 3px 0 0 3px;
@@ -1820,20 +1816,20 @@ textarea[disabled='disabled'] {
        vertical-align: middle;
 }
 
-.preInput .dropDownCaption span {
+.preInput .dropdownCaption span {
        margin-right: -1px;
        padding-left: 5px;
        white-space: nowrap;
 }
 
-.preInput .dropDownCaption span.active {
-       background-image: url('../../icon/dropDown1.svg');
+.preInput .dropdownCaption span.active {
+       background-image: url('../../icon/dropdown1.svg');
        background-position: right center;
        background-repeat: no-repeat;
        padding-right: 10px;
 }
 
-.preInput .dropDown > li.missingValue { /* ToDo */
+.preInput .dropdown > li.missingValue { /* ToDo */
        /* color: #990; */
        background-image: url('../../icon/systemWarning.svg');
        background-size: 16px;
@@ -2766,7 +2762,7 @@ tr .columnURL {
        width: 7px;
 }
 
-.pageNavigation ul li.children .dropDown {
+.pageNavigation ul li.children .dropdown {
        text-align: left;
        border-color: transparent;
        border-radius: 3px;
@@ -2788,19 +2784,19 @@ tr .columnURL {
        transition: opacity .2s linear;
 }
 
-.pageNavigation ul li.children:hover .dropDown {
+.pageNavigation ul li.children:hover .dropdown {
        border-color: rgba(255, 255, 255, .7);
        height: auto;
        overflow: visible;
        opacity: 1;
 }
 
-.pageNavigation ul li.children .dropDown ul {
+.pageNavigation ul li.children .dropdown ul {
        padding: 0 5px 5px 2px;
        display: block;
 }
 
-.pageNavigation ul li.children .dropDown ul li {
+.pageNavigation ul li.children .dropdown ul li {
        margin-top: 5px;
        margin-left: 3px;
 }
@@ -3198,7 +3194,7 @@ img[src*='enable'] {
 }
 
 .clipboardEditor > ul > li > span {
-       background-image: url('../../icon/dropDown1.svg');
+       background-image: url('../../icon/dropdown1.svg');
        background-position: right center;
        background-repeat: no-repeat;
        padding-right: 12px;
@@ -3218,7 +3214,7 @@ input[type='button'],
 .badgeButton,
 .pageNavigation ul li:not(.children),
 .clipboardEditor > ul > li,
-.preInput .dropDownCaption {
+.preInput .dropdownCaption {
        text-decoration: none;
        text-shadow: 0 1px 0 #fff;
        color: #999;
@@ -3269,7 +3265,7 @@ input[type='button'].default:hover,
 .badgeButton:hover,
 .pageNavigation ul li:not(.disabled):not(.children):hover,
 .clipboardEditor > ul > li:hover,
-.preInput:hover .dropDownCaption {
+.preInput:hover .dropdownCaption {
        color: #666;
        border-width: 1px;
        border-style: solid;
@@ -3298,7 +3294,7 @@ input[type='button'].default:focus,
 .badgeButton:focus,
 .pageNavigation ul li:not(.disabled):not(.children):active,
 .clipboardEditor > ul > li:focus,
-.preInput .dropDownCaption:focus,
+.preInput .dropdownCaption:focus,
 button:active,
 input[type='reset']:active,
 input[type='submit']:active,
@@ -3311,7 +3307,7 @@ input[type='button'].default:active,
 .badgeButton:active,
 .pageNavigation ul li:not(.disabled):not(.children):focus,
 .clipboardEditor > ul > li:active,
-.preInput .dropDownCaption:active {
+.preInput .dropdownCaption:active {
        color: #333;
        border-width: 1px;
        border-style: solid;

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index c8286a3faa61408f46d3801f751a56e25382d734..fa2e11c87f63c79ebc898ba784718d9f985f3f5e 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -89,8 +89,8 @@
                                        <div>
                                                <ul>
                                                        <li id="userMenu" class="userMenu"><!-- ToDo: We need an ID and/or class for each list here, this ID may also change! -->
-                                                               <span class="dropDownCaption">{lang}wcf.user.userNote{/lang}</span>
-                                                               <ul class="dropDown">
+                                                               <span class="dropdownCaption">{lang}wcf.user.userNote{/lang}</span>
+                                                               <ul class="dropdown">
                                                                        <li><a href="{link controller='Logout'}t={@SECURITY_TOKEN}{/link}" onclick="return confirm('{lang}wcf.user.logout.sure{/lang}')">{lang}wcf.user.logout{/lang}</a></li>
                                                                </ul>
                                                        </li>
@@ -182,4 +182,4 @@
                        
                        <!-- CONTENT -->
                        <section id="content" class="content">
-                               
+                               
\ No newline at end of file

diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index 4923e88e3ebc6b8929c1c015f69a1de5da231ee1..87002962cbefa3234c06d18e8488aa5a9f27bf63 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -10,7 +10,7 @@
 
                {if $pluginsCount > 1}
                        WCF.Icon.addObject({
-                               'wcf.icon.arrow.down': '{@RELATIVE_WCF_DIR}icon/dropDown1.svg',
+                               'wcf.icon.arrow.down': '{@RELATIVE_WCF_DIR}icon/dropdown1.svg',
                                'wcf.icon.next': '{@RELATIVE_WCF_DIR}icon/next1.svg',
                                'wcf.icon.next.disabled': '{@RELATIVE_WCF_DIR}icon/next1D.svg',
                                'wcf.icon.previous': '{@RELATIVE_WCF_DIR}icon/previous1.svg',

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index a9e9ea9b02216db8001a5ad4d9528b27981887d0..34eab02806bb48cce009506bebeb51bcb5613aef 100644 (file)
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -811,7 +811,7 @@ WCF.Clipboard = {
                        
                        var $editor = data.items[$typeName];
                        var $label = $('<li><span>' + $editor.label + '</span></li>').appendTo($list)
-                       var $itemList = $('<ol class="dropDown"></ol>').appendTo($label);
+                       var $itemList = $('<ol class="dropdown"></ol>').appendTo($label);
 
                        $label.click(function() { $itemList.toggleClass('open'); });
                        
@@ -1735,7 +1735,7 @@ WCF.MultipleLanguageInput.prototype = {
        _prepareElement: function(enableOnInit) {
                this._element.wrap('<div class="preInput" />');
                var $wrapper = this._element.parent();
-               var $button = $('<p class="dropDownCaption"><span>enable i18n</span></p>').prependTo($wrapper);
+               var $button = $('<p class="dropdownCaption"><span>enable i18n</span></p>').prependTo($wrapper);
 
                $button.click($.proxy(this._enable, this));
                WCF.CloseOverlayHandler.addCallback(this._element.wcfIdentify(), $.proxy(this._closeSelection, this));
@@ -1769,7 +1769,7 @@ WCF.MultipleLanguageInput.prototype = {
 
                        // insert list
                        if (this._list === null) {
-                               this._list = $('<ul class="dropDown"></ul>').insertAfter($button.parent());
+                               this._list = $('<ul class="dropdown"></ul>').insertAfter($button.parent());
                                this._list.click(function(event) {
                                        // discard click event
                                        event.stopPropagation();
@@ -1858,7 +1858,7 @@ WCF.MultipleLanguageInput.prototype = {
                $button.addClass('active');
 
                // update label
-               this._list.prev('.dropDownCaption').children('span').text(this._availableLanguages[this._languageID]);
+               this._list.prev('.dropdownCaption').children('span').text(this._availableLanguages[this._languageID]);
 
                // close selection and set focus on input element
                this._closeSelection();
@@ -1870,7 +1870,7 @@ WCF.MultipleLanguageInput.prototype = {
         */
        _disable: function() {
                // remove active marking
-               this._list.prev('.dropDownCaption').children('span').removeClass('active').text('enable i18n');
+               this._list.prev('.dropdownCaption').children('span').removeClass('active').text('enable i18n');
                this._closeSelection();
 
                // update element value
@@ -3082,7 +3082,7 @@ WCF.Search.User = Class.extend({
                this._includeUserGroups = includeUserGroups;
                this._searchInput = $(searchInput).keyup($.proxy(this._keyUp, this));
                this._searchInput.wrap('<div class="preInput" />');
-               this._list = $('<ul class="dropDown" />').insertAfter(this._searchInput);
+               this._list = $('<ul class="dropdown" />').insertAfter(this._searchInput);
                
                this._proxy = new WCF.Action.Proxy({
                        success: $.proxy(this._success, this)
@@ -3952,7 +3952,7 @@ $.widget('ui.wcfPages', {
                                        $leftChildrenInput.keyup($.proxy(this._handleInput, this));
                                        $leftChildrenInput.blur($.proxy(this._stopInput, this));
                                        
-                                       var $leftChildrenContainer = $('<div class="dropDown"></div>');
+                                       var $leftChildrenContainer = $('<div class="dropdown"></div>');
                                        $leftChildren.append($leftChildrenContainer);
                                        
                                        var $leftChildrenList = $('<ul></u>');
@@ -3995,7 +3995,7 @@ $.widget('ui.wcfPages', {
                                        $rightChildrenInput.keyup($.proxy(this._handleInput, this));
                                        $rightChildrenInput.blur($.proxy(this._stopInput, this));
                                        
-                                       var $rightChildrenContainer = $('<div class="dropDown"></div>');
+                                       var $rightChildrenContainer = $('<div class="dropdown"></div>');
                                        $rightChildren.append($rightChildrenContainer);
                                        
                                        var $rightChildrenList = $('<ul></ul>');

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 bdd34602c15ccffd303bce5661f142c27b7d05df..c0d20bf2ad5bab5be7ae1b0f78b9f0ef1bb636a5 100644 (file)
--- a/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php
+++ b/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php
@@ -153,7 +153,7 @@ class PagesFunctionTemplatePlugin implements IFunctionTemplatePlugin {
                                        $html .= $this->makeLink($link, 2, $tagArgs['page']);
                                }
                                else {
-                                       $html .= '<li class="children"><a onclick="multiPagesLinks.startPageNumberInput(this)" class="dropDownCaption">&hellip;<img src="'.self::getIconPath('dropDown1').'" alt="" /></a><input type="text" name="pageNo" class="tiny" /><div class="dropDown"><span class="pointer"><span></span></span><ul>'."\n";
+                                       $html .= '<li class="children"><a onclick="multiPagesLinks.startPageNumberInput(this)" class="dropdownCaption">&hellip;<img src="'.self::getIconPath('dropdown1').'" alt="" /></a><input type="text" name="pageNo" class="tiny" /><div class="dropdown"><span class="pointer"><span></span></span><ul>'."\n";
                                        
                                        $k = 0;
                                        $step = intval(ceil(($left - 2) / self::SHOW_SUB_LINKS));
@@ -177,7 +177,7 @@ class PagesFunctionTemplatePlugin implements IFunctionTemplatePlugin {
                                        $html .= $this->makeLink($link, $tagArgs['pages'] - 1, $tagArgs['page']);
                                }
                                else {
-                                       $html .= '<li class="children"><a onclick="multiPagesLinks.startPageNumberInput(this)" class="dropDownCaption">&hellip;<img src="'.self::getIconPath('dropDown1').'" alt="" /></a><input type="text" name="page" class="tiny" /><div class="dropDown"><span class="pointer"><span></span></span><ul>'."\n";
+                                       $html .= '<li class="children"><a onclick="multiPagesLinks.startPageNumberInput(this)" class="dropdownCaption">&hellip;<img src="'.self::getIconPath('dropdown1').'" alt="" /></a><input type="text" name="page" class="tiny" /><div class="dropdown"><span class="pointer"><span></span></span><ul>'."\n";
                                        
                                        $k = 0;
                                        $step = intval(ceil(($tagArgs['pages'] - $right) / self::SHOW_SUB_LINKS));