More adaptions (mostly badges & languages)

diff --git a/wcfsetup/install/files/acp/style/testing-reset.css b/wcfsetup/install/files/acp/style/testing-reset.css
index 5205311afb0ee9794342c60d27fd3547ba34eb16..ad62437ec2a563df9992c318baf0615708df594c 100644 (file)
--- a/wcfsetup/install/files/acp/style/testing-reset.css
+++ b/wcfsetup/install/files/acp/style/testing-reset.css
@@ -20,8 +20,8 @@ time, mark, audio, video {
        padding: 0;
        border: 0;
        font-size: 100%;
-       font: inherit;
-       /* vertical-align: baseline; disabled by WoltLab, does not fit our needs */
+       /* font: inherit;
+       vertical-align: baseline; disabled by WoltLab, does not fit our needs */
 }
 /* HTML5 display-role reset for older browsers */
 article, aside, details, figcaption, figure, 

diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css
index 598e0dc39eaffd3c20301c29582308ead74efcc5..55d210236f97738a91c986a4d670ff98cad43132 100644 (file)
--- a/wcfsetup/install/files/acp/style/testing.css
+++ b/wcfsetup/install/files/acp/style/testing.css
@@ -356,16 +356,16 @@ footer > div:after {
        clear: both;
 }
 
-footer p.copyright {
+footer .copyright {
        padding-top: 20px;
        min-height: 40px;
 }
 
-footer p.copyright a {
+footer .copyright a {
        text-shadow: 0 -1px 0 #000;
 }
 
-footer p.copyright a:hover {
+footer .copyright a:hover {
        color: #69c;
        text-decoration: none;
 }
@@ -428,11 +428,12 @@ footer nav.footerNavigation ul li {
 /* Sub Heading */
 
 .subHeading {
+       color: #999;
        border-bottom: 1px solid #ccc;
        font-size: 120%;
        text-shadow: 0 1px 0 #fff;
-       margin: 14px 0 14px;
-       padding: 15px;
+       margin: 10px 0;
+       padding: 10px 0;
 }
 
 
@@ -493,11 +494,14 @@ div.formField {
 }
 
 div.formFieldDesc {
-       color: #777;
-       font-size: 90%;
        margin: 3px 0 7px 250px;
 }
 
+div.formFieldDesc p {
+       color: #999 !important;
+       font-size: 85%;
+}
+
 div.formGroupLabel label {
        display: none;
 }
@@ -725,13 +729,10 @@ input[type='submit']:hover,
        margin: 15px 0 15px;
 }
 
-.tabMenuContent, .content {
-       border-width: 0 !important;
-}
-
 /* -- -- -- -- -- Box Title -- -- -- -- -- */
 
 .boxTitle {
+       background-color: #29374a;
        /* Disabled, because the WoltLab header image is not LGPL 
        Activate it if you want to test your header image */
        /* background-image: url("../images/header.png"); */
@@ -771,14 +772,23 @@ input[type='submit']:hover,
 }
 
 .tabMenu li a {
+       color: #999;
        text-shadow: 0 1px 0 #fff;
 }
 
+.tabMenu li a:hover {
+       color: #666;
+}
+
 .tabMenu li.ui-state-active a {
        color: #333 !important;
        font-weight: bold;
 }
 
+.tabMenuContent, .content {
+       border-width: 0 !important;
+}
+
 
 
 /* -- -- -- -- -- Menu -- -- -- -- -- */
@@ -793,10 +803,16 @@ input[type='submit']:hover,
        font-size: 85%;
        text-decoration: none;
        text-shadow: 0 -1px 0 #000;
-       border: 1px solid transparent;
+       border: 1px solid rgba(0, 0, 0, .3);
        background-color: transparent;
        padding: 2px 10px;
        border-radius: 13px;
+       
+       -webkit-transition: color .1s linear;
+       -moz-transition: color .1s linear;
+       -ms-transition: color .1s linear;
+       -o-transition: color .1s linear;
+       transition: color .1s linear;
 }
 
 .menu a:hover {
@@ -891,7 +907,7 @@ thead th.active a {
 /* Table Body */
 
 tbody tr {
-       border-bottom: 1px solid #fff;
+       border-bottom: 1px solid rgba(255, 255, 255, .3);
 }
 
 tbody tr:last-child {
@@ -911,7 +927,7 @@ tbody tr:last-child td:last-child {
 
 tbody td {
        background-color: #fcfdfe;
-       border-right-width: 0;
+       border-right: 1px solid rgba(255, 255, 255, .3);
        padding: 5px;
 }
 
@@ -1042,6 +1058,10 @@ p.warning {
        top: 0;
 }
 
+fieldset {
+       background-color: rgba(230, 230, 230, .1);
+}
+
 fieldset legend ~ p {
        margin-bottom: 14px;
 }
@@ -1055,7 +1075,7 @@ dl {
        margin-bottom: 7px;
 }
 
-dt { /* is op */
+dt {
        float: left;
        text-align: right;
        width: 230px;
@@ -1065,10 +1085,11 @@ dd {
        margin-left: 250px;
 }
 
-dl dd ~ p {
-       color: #777;
-       font-size: 90%;
+dl small {
+       color: #999;
+       font-size: 85%;
        margin: 3px 0 7px 250px;
+       display: inline-block;
 }
 
 dl.disabled dt {
@@ -1269,7 +1290,7 @@ div.ui-widget-overlay {
        border: 1px solid #ccc !important;
        z-index: 89; /* Prevents border overlay during transition */
        display: block;
-       padding: 14px 21px;
+       padding: 15px 23px;
 }
 
 .ui-tabs .ui-tabs-hide {
@@ -1328,4 +1349,38 @@ div.ui-widget-overlay {
        filter: Alpha(opacity=0);
 }
 
+
+
+/* Badges */
+
+.badge {
+       color: #369;
+       font-size: 85%;
+       text-shadow: none;
+       border-radius: 10px;
+       background-color: #fff;
+       margin-right: -3px;
+       margin-left: 3px;
+       padding: 1px 5px 2px;
+       display: inline-block;
+       position: relative;
+       top: -1px;
+}
+
+
+
+/* Collapsible */
+
+.collapsible {
+       float: left;
+       margin: 5px 5px 0 5px;
+}
+
+.collapsible img {
+       width: 16px;
+       height: 16px;
+}
+
+
+
 /* -- -- -- -- -- EOF -- -- -- -- -- */

diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl
index 7df5ddcbb58fc453727404e1fe2dc4b3bd701beb..3957fd56ae227ce97197d24218f6efe1db24988e 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cacheList.tpl
+++ b/wcfsetup/install/files/acp/templates/cacheList.tpl
@@ -48,9 +48,9 @@
 {foreach from=$caches key=cache item=files}
        {if $files|count}
                <div class="border boxTitle">
-                       <a onclick="openList('{$cache}')"><img src="{@RELATIVE_WCF_DIR}icon/minusS.png" id="{$cache}Image" alt="" /></a>
+                       <a onclick="openList('{$cache}')" class="collapsible"><img src="{@RELATIVE_WCF_DIR}icon/minusS.png" id="{$cache}Image" alt="" /></a>
                        <hgroup>
-                               <h1>{$cache} ({#$files|count})</h1>
+                               <h1>{$cache} <span class="badge" title="{$cache}">{#$files|count}</span></h1>
                        </hgroup>
                        <table id="{$cache}">
                                <thead>
@@ -70,7 +70,7 @@
                                                <td class="columnNumbers"><p>{@$file.filesize|filesize}</td>
                                                <td class="columnDate">{if $file.mtime > 1}<p>{@$file.mtime|time}</p>{/if}</td>
                                                {if $file.perm|isset}
-                                                       <td class="columnNumbers"{if !$file.writable} style="color: #c00"{/if}><p>{@$file.perm}</p></td>
+                                                       <td class="columnNumbers"><p{if !$file.writable} style="color: #c00"{/if}>{@$file.perm}</p></td>
                                                {/if}
                                        </tr>
                                {/foreach}

diff --git a/wcfsetup/install/files/acp/templates/optionFieldList.tpl b/wcfsetup/install/files/acp/templates/optionFieldList.tpl
index af0c56239ae2612fd4f350e6ab6c8c29420edc4a..3a415e88f108c68fb70b3e324af0a352ce59bab2 100644 (file)
--- a/wcfsetup/install/files/acp/templates/optionFieldList.tpl
+++ b/wcfsetup/install/files/acp/templates/optionFieldList.tpl
@@ -17,6 +17,6 @@
                                {/if}
                        </p>
                {/if}
-               <p>{lang}{@$langPrefix}{$option->optionName}.description{/lang}</p>
+               <small>{lang}{@$langPrefix}{$option->optionName}.description{/lang}</small>
        </dl>   
 {/foreach}
\ No newline at end of file

diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl
index bc58c618808332b567e00058346f7a67c081133a..4894490bbb7b4c5fd71f5bf5bd025812aaffb337 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl
@@ -40,7 +40,7 @@
 {if $groups|count}
        <div class="border boxTitle">
                <hgroup>
-                       <h1>{lang}wcf.acp.group.list.data{/lang}</h1>
+                       <h1>{lang}wcf.acp.group.list.count{/lang} <span class="badge" title="{lang}wcf.acp.group.list.count{/lang}">{#$items}</span></h1>
                </hgroup>
                <table>
                        <thead>

diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index a24f12d59039fbc5a88ce4a4fdd4bc61f26e7cac..30c77a48763bfb4568b51074161075de51f75d31 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -66,7 +66,7 @@
 <div class="border boxTitle">
        <nav class="menu">
                <ul>
-                       <li{if $action == ''} class="active"{/if}><a href="index.php?page=UserList{@SID_ARG_2ND}"><span>{lang}wcf.acp.user.list.all{/lang}</span></a></li>
+                       <li{if $action == ''} class="active"{/if}><a href="index.php?page=UserList{@SID_ARG_2ND}"><span>{lang}wcf.acp.user.list.all{/lang}</span> <span class="badge" title="{lang}wcf.acp.user.list.count{/lang}">{#$items}</span></a></li>
                        {if $additionalUserListOptions|isset}{@$additionalUserListOptions}{/if}
                </ul>
        </nav>

diff --git a/wcfsetup/install/lang/de-informal.xml b/wcfsetup/install/lang/de-informal.xml
index 6185ee9ba416ee3794f81b467557af034dbaa1a3..a31ebca8dfd2581b762c299e62f0ae7cbcf6457d 100644 (file)
--- a/wcfsetup/install/lang/de-informal.xml
+++ b/wcfsetup/install/lang/de-informal.xml
@@ -59,7 +59,7 @@
                <item name="wcf.acp.cronjob.intro"><![CDATA[Das Anlegen von zeitgesteuerten Aufgaben erfordert eine genaue Kenntnis der Crontab-Syntax auf unixähnlichen Systemen. Weiterführende Informationen dazu erhältst du auf dieser Website: <a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={"http://www.unixgeeks.org/security/newbie/unix/cron-1.html"|rawurlencode}" class="externalURL">Newbie: Intro to cron</a>]]></item>
                <item name="wcf.acp.cronjob.lastExec"><![CDATA[Letzte Ausführung]]></item>
                <item name="wcf.acp.cronjob.list"><![CDATA[Zeitgesteuerte Aufgaben]]></item>
-               <item name="wcf.acp.cronjob.list.count"><![CDATA[Insgesamt {#$items} zeitgesteuerte Aufgabe{if $items != 1}n{/if}]]></item>
+               <item name="wcf.acp.cronjob.list.count"><![CDATA[{#$items} zeitgesteuerte Aufgabe{if $items != 1}n{/if}]]></item>
                <item name="wcf.acp.cronjob.log"><![CDATA[Protokoll der ausgeführten zeitgesteuerten Aufgaben]]></item>
                <item name="wcf.acp.cronjob.log.clear"><![CDATA[Alle löschen]]></item>
                <item name="wcf.acp.cronjob.log.clear.confirm"><![CDATA[Bist du sicher, dass du alle Protokoll-Einträge löschen möchtest?]]></item>
@@ -108,7 +108,7 @@
                <item name="wcf.acp.group.groupName.description"><![CDATA[Gib den Namen der Gruppe an.]]></item>
                <item name="wcf.acp.group.guests"><![CDATA[Gäste]]></item>
                <item name="wcf.acp.group.list"><![CDATA[Benutzergruppen]]></item>
-               <item name="wcf.acp.group.list.data"><![CDATA[Insgesamt {#$items} Benutzergruppen]]></item>
+               <item name="wcf.acp.group.list.count"><![CDATA[{#$items} Benutzergruppe{if $items != 1}n{/if}]]></item>
                <item name="wcf.acp.group.members"><![CDATA[Anzahl Mitglieder]]></item>
                <item name="wcf.acp.group.moderators"><![CDATA[Moderatoren]]></item>
                <item name="wcf.acp.group.option.admin.general.canUseAcp"><![CDATA[Kann Administrationsoberfläche betreten]]></item>
@@ -675,7 +675,7 @@
                <item name="wcf.acp.user.groups.invertSearch"><![CDATA[Finde Benutzer, die keine Mitglieder der ausgewählten Benutzergruppen sind.]]></item>
                <item name="wcf.acp.user.list"><![CDATA[Benutzer]]></item>
                <item name="wcf.acp.user.list.all"><![CDATA[Alle Benutzer]]></item>
-               <item name="wcf.acp.user.list.count"><![CDATA[Insgesamt {#$items} Benutzer]]></item>
+               <item name="wcf.acp.user.list.count"><![CDATA[{#$items} Benutzer]]></item>
                <item name="wcf.acp.user.markedUsers"><![CDATA[this.count == 1 ? "Einen Benutzer markiert" : this.count+" Benutzer markiert"]]></item>
                <item name="wcf.acp.user.massProcessing"><![CDATA[Massenverarbeitung von Benutzern]]></item>
                <item name="wcf.acp.user.massProcessing.action"><![CDATA[Aktion]]></item>

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 9db735dc5824db3e9170f444a9944342edeba79e..0ebadbebd87fe8cb887de006bf5b81dc4a995eb3 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -59,7 +59,7 @@
                <item name="wcf.acp.cronjob.intro"><![CDATA[Das Anlegen von zeitgesteuerten Aufgaben erfordert eine genaue Kenntnis der Crontab-Syntax auf unixähnlichen Systemen. Weiterführende Informationen dazu erhalten Sie auf dieser Website: <a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={"http://www.unixgeeks.org/security/newbie/unix/cron-1.html"|rawurlencode}" class="externalURL">Newbie: Intro to cron</a>]]></item>
                <item name="wcf.acp.cronjob.lastExec"><![CDATA[Letzte Ausführung]]></item>
                <item name="wcf.acp.cronjob.list"><![CDATA[Zeitgesteuerte Aufgaben]]></item>
-               <item name="wcf.acp.cronjob.list.count"><![CDATA[Insgesamt {#$items} zeitgesteuerte Aufgabe{if $items != 1}n{/if}]]></item>
+               <item name="wcf.acp.cronjob.list.count"><![CDATA[{#$items} zeitgesteuerte Aufgabe{if $items != 1}n{/if}]]></item>
                <item name="wcf.acp.cronjob.log"><![CDATA[Protokoll der ausgeführten zeitgesteuerten Aufgaben]]></item>
                <item name="wcf.acp.cronjob.log.clear"><![CDATA[Alle löschen]]></item>
                <item name="wcf.acp.cronjob.log.clear.confirm"><![CDATA[Sind Sie sicher, dass Sie alle Protokoll-Einträge löschen möchten?]]></item>
@@ -108,7 +108,7 @@
                <item name="wcf.acp.group.groupName.description"><![CDATA[Geben Sie einen Namen für die Gruppe an.]]></item>
                <item name="wcf.acp.group.guests"><![CDATA[Gäste]]></item>
                <item name="wcf.acp.group.list"><![CDATA[Benutzergruppen]]></item>
-               <item name="wcf.acp.group.list.data"><![CDATA[Insgesamt {#$items} Benutzergruppen]]></item>
+               <item name="wcf.acp.group.list.count"><![CDATA[{#$items} Benutzergruppe{if $items != 1}n{/if}]]></item>
                <item name="wcf.acp.group.members"><![CDATA[Anzahl Mitglieder]]></item>
                <item name="wcf.acp.group.moderators"><![CDATA[Moderatoren]]></item>
                <item name="wcf.acp.group.option.admin.general.canUseAcp"><![CDATA[Kann Administrationsoberfläche betreten]]></item>
@@ -666,7 +666,7 @@
                <item name="wcf.acp.user.groups.invertSearch"><![CDATA[Finde Benutzer, die keine Mitglieder der ausgewählten Benutzergruppen sind.]]></item>
                <item name="wcf.acp.user.list"><![CDATA[Benutzer]]></item>
                <item name="wcf.acp.user.list.all"><![CDATA[Alle Benutzer]]></item>
-               <item name="wcf.acp.user.list.count"><![CDATA[Insgesamt {#$items} Benutzer]]></item>
+               <item name="wcf.acp.user.list.count"><![CDATA[{#$items} Benutzer]]></item>
                <item name="wcf.acp.user.markedUsers"><![CDATA[this.count == 1 ? "Einen Benutzer markiert" : this.count+" Benutzer markiert"]]></item>
                <item name="wcf.acp.user.massProcessing"><![CDATA[Massenverarbeitung von Benutzern]]></item>
                <item name="wcf.acp.user.massProcessing.action"><![CDATA[Aktion]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index ebe633e25a4168217cf5969e7b8b5dee294c3097..f8cddfccf752fa4bdf1e1d6ea34fe977e9fcb9f0 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -59,7 +59,7 @@
                <item name="wcf.acp.cronjob.intro"><![CDATA[Configuring cronjobs (automatized scheduled tasks) requires distinct knowledge of the crontab syntax on Unix based systems. More information about this topic can be obtained on the following Webpage: <a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={"http://www.unixgeeks.org/security/newbie/unix/cron-1.html"|rawurlencode}" class="externalURL">Newbie: Intro to cron</a>.]]></item>
                <item name="wcf.acp.cronjob.lastExec"><![CDATA[Last scheduled execution]]></item>
                <item name="wcf.acp.cronjob.list"><![CDATA[Cron jobs]]></item>
-               <item name="wcf.acp.cronjob.list.count"><![CDATA[There is a total of {#$items} cronjob{if $items != 1}s{/if}]]></item>
+               <item name="wcf.acp.cronjob.list.count"><![CDATA[{#$items} cronjob{if $items != 1}s{/if}]]></item>
                <item name="wcf.acp.cronjob.log"><![CDATA[Log of executed cronjobs]]></item>
                <item name="wcf.acp.cronjob.log.clear"><![CDATA[Delete all]]></item>
                <item name="wcf.acp.cronjob.log.clear.confirm"><![CDATA[Are you sure that you want to remove all log entries?]]></item>
@@ -108,7 +108,7 @@
                <item name="wcf.acp.group.groupName.description"><![CDATA[Enter here a name for this group.]]></item>
                <item name="wcf.acp.group.guests"><![CDATA[Guests]]></item>
                <item name="wcf.acp.group.list"><![CDATA[User groups]]></item>
-               <item name="wcf.acp.group.list.data"><![CDATA[A total of {#$items} user groups]]></item>
+               <item name="wcf.acp.group.list.count"><![CDATA[{#$items} user group{if $items != 1}s{/if}]]></item>
                <item name="wcf.acp.group.members"><![CDATA[Number of members]]></item>
                <item name="wcf.acp.group.moderators"><![CDATA[Moderators]]></item>
                <item name="wcf.acp.group.option.admin.general.canUseAcp"><![CDATA[Can enter Administration Control Panel?]]></item>
@@ -676,7 +676,7 @@
                <item name="wcf.acp.user.groups.invertSearch"><![CDATA[Find users that are not members of the chosen user groups.]]></item>
                <item name="wcf.acp.user.list"><![CDATA[Users]]></item>
                <item name="wcf.acp.user.list.all"><![CDATA[All users]]></item>
-               <item name="wcf.acp.user.list.count"><![CDATA[A total of {#$items} user{if $items > 1}s{/if}]]></item>
+               <item name="wcf.acp.user.list.count"><![CDATA[{#$items} user{if $items != 1}s{/if}]]></item>
                <item name="wcf.acp.user.markedUsers"><![CDATA[this.count == 1 ? "1 user selected" : this.count+" users selected"]]></item>
                <item name="wcf.acp.user.massProcessing"><![CDATA[Bulk processing of users]]></item>
                <item name="wcf.acp.user.massProcessing.action"><![CDATA[Action]]></item>