Many small changes, mostly the Clipboard Editor display …

diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css
index f67f79ba8375dcbbbd5054010d5f20215c52ad3c..baf9be1fe013190695b2ae27a1672fe102a74d90 100644 (file)
--- a/wcfsetup/install/files/acp/style/testing.css
+++ b/wcfsetup/install/files/acp/style/testing.css
@@ -619,14 +619,6 @@ fieldset p.description {
        color: #999;
 }
 
-fieldset > ul {
-       margin: 7px 0 21px 21px;
-}
-
-fieldset > ul li {
-       list-style-type: circle;
-}
-
 
 
 /* -- -- -- -- -- Tabbed Content -- -- -- -- -- */
@@ -909,7 +901,7 @@ input[type='button'],
        background-image: -o-linear-gradient(rgba(255, 255, 255, 1), rgba(245, 245, 245, 1) 2px, rgba(235, 235, 235, 1));
        background-image: linear-gradient(rgba(255, 255, 255, 1), rgba(245, 245, 245, 1) 2px, rgba(235, 235, 235, 1));
        
-       margin: 0 3px;
+       margin: 3px 2px;
        padding: 5px 13px;
        display: inline-block;
        
@@ -1259,7 +1251,7 @@ input[type='button'][disabled='disabled'],
 .border {
        border: 1px solid #ccc;
        border-radius: 5px;
-       margin: 15px 0 0;
+       margin-top: 15px;
 }
 
 .border.overlay {
@@ -1328,6 +1320,7 @@ input[type='button'][disabled='disabled'],
        text-align: center;
        white-space: nowrap;
        background-color: none;
+       margin-top: 15px;
        padding: 0 5px;
        display: block;
        position: relative;
@@ -1783,7 +1776,7 @@ table input[type='checkbox'] {
 
 /* -- -- -- -- -- ToDo: Page Navigation -- -- -- -- -- */
 
-/* This is only experimental for the moment */
+/* Page-Navigation Popups are still missing */
 
 .pageNavigation ul li:not(.children) {
        color: #999;
@@ -2171,10 +2164,8 @@ div.ui-widget-overlay {
 
 /* Buttons */
 
-.badgeButton {
-       text-decoration: none !important;
-       text-shadow: 0 1px 0 #fff;
-       color: #999;
+.badgeButton,
+.clipboardEditor {
        cursor: pointer;
        
        border-width: 1px;
@@ -2192,6 +2183,7 @@ div.ui-widget-overlay {
        margin-right: 0;
        margin-left: 0;
        padding: 3px 10px 5px;
+       display: inline-block;
        
        -webkit-transition: all .2s linear;
        -moz-transition: all .2s linear;
@@ -2200,35 +2192,42 @@ div.ui-widget-overlay {
        transition: all .2s linear;
 }
 
-.badgeButton:hover {
-       color: #666;
-       
+li.badgeButton,
+li > .badgeButton {
+       margin-top: 7px;
+       margin-right: 3px;
+       margin-left: 3px;
+       float: left;
+}
+
+.badgeButton:hover,
+.clipboardEditor:hover {
        border-width: 1px;
        border-style: solid;
        border-color: #ffc053 #fa2 #fc9e07;
        
        background-color: #fff9f4;
-       background-image: -webkit-linear-gradient(rgba(255, 255, 255, 1), rgba(255, 237, 217, 1) 2px, rgba(255, 229, 200, 1));
-       background-image: -moz-linear-gradient(rgba(255, 255, 255, 1), rgba(255, 237, 217, 1) 2px, rgba(255, 229, 200, 1));
-       background-image: -ms-linear-gradient(rgba(255, 255, 255, 1), rgba(255, 237, 217, 1) 2px, rgba(255, 229, 200, 1));
-       background-image: -o-linear-gradient(rgba(255, 255, 255, 1), rgba(255, 237, 217, 1) 2px, rgba(255, 229, 200, 1));
-       background-image: linear-gradient(rgba(255, 255, 255, 1), rgba(255, 237, 217, 1) 2px, rgba(255, 229, 200, 1));
+       background-image: -webkit-linear-gradient(rgb(255, 255, 255), rgb(255, 237, 217) 2px, rgb(255, 229, 200));
+       background-image: -moz-linear-gradient(rgb(255, 255, 255), rgb(255, 237, 217) 2px, rgb(255, 229, 200));
+       background-image: -ms-linear-gradient(rgb(255, 255, 255), rgb(255, 237, 217) 2px, rgb(255, 229, 200));
+       background-image: -o-linear-gradient(rgb(255, 255, 255), rgb(255, 237, 217) 2px, rgb(255, 229, 200));
+       background-image: linear-gradient(rgb(255, 255, 255), rgb(255, 237, 217) 2px, rgb(255, 229, 200));
 }
 
 .badgeButton:active,
-.badgeButton:focus {
-       color: #333;
-       
+.badgeButton:focus,
+.clipboardEditor:active,
+.clipboardEditor:focus {       
        border-width: 1px;
        border-style: solid;
        border-color: #fc9e07 #fa2 #ffc053;
        
        background-color: #fff9f4;
-       background-image: -webkit-linear-gradient(bottom, rgba(255, 255, 255, 1), rgba(255, 237, 217, 1) 2px, rgba(255, 229, 200, 1));
-       background-image: -moz-linear-gradient(bottom, rgba(255, 255, 255, 1), rgba(255, 237, 217, 1) 2px, rgba(255, 229, 200, 1));
-       background-image: -ms-linear-gradient(bottom, rgba(255, 255, 255, 1), rgba(255, 237, 217, 1) 2px, rgba(255, 229, 200, 1));
-       background-image: -o-linear-gradient(bottom, rgba(255, 255, 255, 1), rgba(255, 237, 217, 1) 2px, rgba(255, 229, 200, 1));
-       background-image: linear-gradient(bottom, rgba(255, 255, 255, 1), rgba(255, 237, 217, 1) 2px, rgba(255, 229, 200, 1));
+       background-image: -webkit-linear-gradient(bottom, rgb(255, 255, 255), rgb(255, 237, 217) 2px, rgb(255, 229, 200));
+       background-image: -moz-linear-gradient(bottom, rgb(255, 255, 255), rgb(255, 237, 217) 2px, rgb(255, 229, 200));
+       background-image: -ms-linear-gradient(bottom, rgb(255, 255, 255), rgb(255, 237, 217) 2px, rgb(255, 229, 200));
+       background-image: -o-linear-gradient(bottom, rgb(255, 255, 255), rgb(255, 237, 217) 2px, rgb(255, 229, 200));
+       background-image: linear-gradient(bottom, rgb(255, 255, 255), rgb(255, 237, 217) 2px, rgb(255, 229, 200));
        
        -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .1);
        -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .1);
@@ -2237,6 +2236,28 @@ div.ui-widget-overlay {
        box-shadow: inset 0 1px 3px rgba(0, 0, 0, .1);
 }
 
+.badgeButton,
+.badgeButton a,
+.clipboardEditor {
+       text-decoration: none !important;
+       text-shadow: 0 1px 0 #fff;
+       color: #999;
+}
+
+.badgeButton:hover,
+.badgeButton a:hover,
+.clipboardEditor:hover {
+       text-decoration: none !important;
+       color: #666;
+}
+
+.badgeButton:active,
+.badgeButton:focus,
+.badgeButton a:active,
+.badgeButton a:focus {
+       color: #333;
+}
+
 
 
 /* -- -- -- -- -- GUI Widgets -- -- -- -- -- */
@@ -2257,7 +2278,7 @@ div.ui-widget-overlay {
 }
 
 .balloonTooltip {
-       /* That could be wrong */
+       /* Not reliable, sometimes not wanted! */
        cursor: pointer;
 }
 
@@ -2280,41 +2301,76 @@ div.ui-widget-overlay {
 /* Clipboard API - TESTING ONLY / TODO */
 
 .clipboardEditor {
+       padding-top: 5px !important;
        position: relative;
 }
 
-.clipboardEditor span {
-       background-color: rgb(224, 224, 224);
-       border: 1px solid rgb(192, 192, 192);
-       border-radius: 3px;
-       cursor: pointer;
-       padding: 3px;
+.clipboardEditor p {
+       background-image: url('../../icon/dropdown1.svg');
+       background-position: right center;
+       background-repeat: no-repeat;
+       padding-right: 12px;
+       display: inline-block;
 }
 
 .clipboardEditor ol {
-       border: 1px solid rgba(192, 192, 192, 0.9);
-       border-radius: 3px;
-       display: inline-block;
-       left: 0px;
-       margin-top: 19px;
+       border: 1px solid rgba(0, 0, 0, .2);
+       border-radius: 5px;
+       background-color: rgba(0, 0, 0, .7);
+       margin-top: 25px;
        position: absolute;
-       top: 0px;
+       top: 0;
+       left: 0;
+       
+       -webkit-box-shadow: 0 1px 7px rgba(0, 0, 0, .5);
+       -moz-box-shadow: 0 1px 7px rgba(0, 0, 0, .5);
+       -ms-box-shadow: 0 1px 7px rgba(0, 0, 0, .5);
+       -o-box-shadow: 0 1px 7px rgba(0, 0, 0, .5);
+       box-shadow: 0 1px 7px rgba(0, 0, 0, .5);
+       
+       
 }
 
 .clipboardEditor li {
-       background-color: rgba(224, 224, 224, 0.9);
-       border-top: 1px solid rgba(192, 192, 192, 0.9);
-       cursor: pointer;
-       padding: 3px;
+       font-size: .85em;
+       text-shadow: none;
+       color: #ccc;
+       cursor: pointer; 
+       padding: 5px 7px;
+       
+       -webkit-transition: all .2s linear;
+       -moz-transition: all .2s linear;
+       -ms-transition: all .2s linear;
+       -o-transition: all .2s linear;
+       transition: all .2s linear;
+}
+
+.clipboardEditor li:first-child {
+       border-top-left-radius: 3px;
+       border-top-right-radius: 3px;
+}
+
+.clipboardEditor li:last-child {
+       border-bottom-left-radius: 3px;
+       border-bottom-right-radius: 3px;
 }
 
 .clipboardEditor li:hover {
-       background-color: rgb(207, 207, 207);
-       text-shadow: 0 0 3px #999;
+       color: #fff;
+       background-color: rgba(0, 0, 0, .1);
 }
 
 .clipboardEditor li:first-child {
        border-top-width: 0;
 }
 
+
+
+
+
+.actionProxyLoading {
+       
+}
+
+
 /* -- -- -- -- -- EOF -- -- -- -- -- */

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 957de57765ef22bd3d1ed94c57be01b6440d148e..a2406345a05512605612109f0a7872c597a7e038 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -169,4 +169,4 @@
                        
                        <!-- CONTENT -->
                        <section id="content" class="content">
-                               
+                               
\ No newline at end of file

diff --git a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
index 9c0cb2b23da1524ccb0c62ab9361ced39ac8a3e9..faad0c419cd8ac94d908c34bbdd3aa57c6fedcf8 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
+++ b/wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
@@ -1,7 +1,7 @@
 {include file='header'}
 
 <header class="mainHeading">
-       <img src="{@RELATIVE_WCF_DIR}icon/usersL.png" alt="" />
+       <img src="{@RELATIVE_WCF_DIR}icon/users1.svg" alt="" />
        <hgroup>
                <h1>{lang}wcf.acp.user.assignToGroup{/lang}</h1>
        </hgroup>
@@ -18,24 +18,26 @@
                <fieldset>
                        <legend>{lang}wcf.acp.user.assignToGroup.markedUsers{/lang}</legend>
                        
-                       <div>
-                               {implode from=$users item=$user}<a href="index.php?form=UserEdit&amp;userID={@$user->userID}{@SID_ARG_2ND}">{$user}</a>{/implode}
-                       </div>
+                       <ul>
+                               {implode from=$users item=$user}<li class="badge badgeButton"><a href="index.php?form=UserEdit&amp;userID={@$user->userID}{@SID_ARG_2ND}">{$user}</a></li>{/implode}
+                       </ul>
                </fieldset>     
                
                <fieldset>
                        <legend>{lang}wcf.acp.user.groups{/lang}</legend>
                        
-                       <div><!-- ToDo: Definition List -->
-                               <div{if $errorField == 'groupIDs'} class="formError"{/if}>
-                                       {htmlCheckboxes options=$groups name=groupIDs selected=$groupIDs}
+                       <!-- ToDo: Definition List -->
+                       <dl{if $errorField == 'groupIDs'} class="formError"{/if}>
+                               <dt></dt>
+                               <dd>{htmlCheckboxes options=$groups name=groupIDs selected=$groupIDs}
                                        {if $errorField == 'groupIDs'}
                                                <small class="innerError">
                                                        {if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}
                                                </small>
                                        {/if}
-                               </div>
-                       </div>
+                               <dd>
+                       </dl>
+                       
                </fieldset>
                
        </div>

diff --git a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
index 796813fdaaeae5891e78054be36b8e76836d0030..7212e24105757a2dde1ebecf263cf1404bf8fa5f 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
+++ b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
@@ -20,9 +20,9 @@
                <fieldset>
                        <legend>{lang}wcf.acp.user.exportEmailAddress.markedUsers{/lang}</legend>
                        
-                       <div>
-                               {implode from=$users item=$user}<a href="index.php?form=UserEdit&amp;userID={@$user->userID}{@SID_ARG_2ND}">{$user}</a>{/implode}
-                       </div>
+                       <ul>
+                               {implode from=$users item=$user}<li class="badge badgeButton"><a href="index.php?form=UserEdit&amp;userID={@$user->userID}{@SID_ARG_2ND}">{$user}</a></li>{/implode}
+                       </ul>
                </fieldset>     
                
                <fieldset>

diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index e82897aac197a4f6cc4891c825339f1bcc6e1225..5631f5c05dac0ebf46b339cb8cb9432aa75abfa0 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -95,7 +95,7 @@
        <div class="contentFooter">
                {@$pagesLinks}
                
-               <div class="clipboardEditor" data-type="com.woltlab.wcf.user"></div>
+               <div data-type="com.woltlab.wcf.user" class="clipboardEditor"></div>
                
                <nav class="largeButtons">
                        <ul>

diff --git a/wcfsetup/install/files/acp/templates/worker.tpl b/wcfsetup/install/files/acp/templates/worker.tpl
index 8f01ac292ef43de2eba8df4898cdbd34c6a3d137..244c4fbd433ef19576c06437d3672217dc628182 100644 (file)
--- a/wcfsetup/install/files/acp/templates/worker.tpl
+++ b/wcfsetup/install/files/acp/templates/worker.tpl
@@ -1,6 +1,6 @@
 <div id="workerContainer">
        <header class="mainHeading">
-               <img src="{@RELATIVE_WCF_DIR}icon/workerL.png" alt="" />
+               <img src="{@RELATIVE_WCF_DIR}icon/installation.svg" alt="" />
                <hgroup>
                        <h1>Aufgaben werden ausgeführt &hellip;</h1>
                        <h2>Aktueller Schritt: <span id="workerAction">{lang}wcf.package.installation.step.prepare{/lang}</span></h2>