Tables, Installation dialogues, Buttons, many small changes

Some more tables adapted to have the new look and some small
bug-fixing; Again fixed some button-problems; More styling for the
several installation dialogues (not yet ready); Made the collapsible
table at package view function; Some smaller bug-fixes.

diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js
index 09e256cb51d65fb895f59fdd6b1345daa573fdbd..c66b32d8863fa90de76a3cbc1109f3e383296432 100644 (file)
--- a/wcfsetup/install/files/acp/js/WCF.ACP.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.js
@@ -206,7 +206,7 @@ WCF.ACP.PackageInstallation.prototype = {
                // handle success
                if ($data.step == 'success') {
                        var $id = WCF.getRandomID();
-                       $('#packageInstallationInnerContent').append('<div class="formSubmit"><input type="button" id="' + $id + '" value="' + WCF.Language.get('wcf.global.button.next') + '" /></div>');
+                       $('#packageInstallationInnerContent').append('<div class="formSubmit"><input type="button" id="' + $id + '" value="' + WCF.Language.get('wcf.global.button.next') + '" class="default" /></div>');
                        
                        $('#' + $id).click($.proxy(function() {
                                window.location.href = "index.php?page=PackageList" + SID_ARG_2ND;
@@ -234,7 +234,7 @@ WCF.ACP.PackageInstallation.prototype = {
                        // create button to handle next step
                        if ($data.step && $data.node) {
                                var $id = WCF.getRandomID();
-                               $('#packageInstallationInnerContent').append('<div class="formSubmit"><input type="button" id="' + $id + '" value="' + WCF.Language.get('wcf.global.button.next') + '" /></div>');
+                               $('#packageInstallationInnerContent').append('<div class="formSubmit"><input type="button" id="' + $id + '" value="' + WCF.Language.get('wcf.global.button.next') + '" class="default" /></div>');
                                
                                $('#' + $id).click($.proxy(function() {
                                        // collect form values

diff --git a/wcfsetup/install/files/acp/style/testing.css b/wcfsetup/install/files/acp/style/testing.css
index 8ecc5fe24d20674e6da9354b2128be13aae72f8d..f67f79ba8375dcbbbd5054010d5f20215c52ad3c 100644 (file)
--- a/wcfsetup/install/files/acp/style/testing.css
+++ b/wcfsetup/install/files/acp/style/testing.css
@@ -256,10 +256,6 @@ nav.mainMenu ul li {
        transition-timing-function: ease;
 }
 
-nav.mainMenu ul li:only-child {
-       cursor: default !important;
-}
-
 nav.mainMenu ul li:hover {
        color: #fff;
 }
@@ -288,6 +284,12 @@ nav.mainMenu ul li.activeMenuItem:last-child {
        margin: 5px 0 -5px -5px;
 }
 
+nav.mainMenu ul li:only-child,
+nav.mainMenu ul li.activeMenuItem:only-child {
+       cursor: default !important;
+       margin: 5px 0 -5px;
+}
+
 /* Header Navigation  */
 
 nav.headerNavigation {
@@ -743,6 +745,7 @@ input[type='radio'] ~ small {
 
 input[type='reset'],
 input[type='submit'],
+input[type='button'],
 input[type='checkbox'],
 input[type='radio'],
 select {
@@ -921,6 +924,7 @@ input[type='button'],
 input[type='reset']:hover,
 input[type='submit']:hover,
 input[type='button']:hover,
+input[type='button'].default:hover,
 .largeButtons ul li a:hover {
        color: #666;
        border-width: 1px;
@@ -939,10 +943,12 @@ input[type='button']:hover,
 input[type='reset']:focus,
 input[type='submit']:focus,
 input[type='button']:focus,
+input[type='button'].default:focus,
 .largeButtons ul li a:focus,
 input[type='reset']:active,
 input[type='submit']:active,
 input[type='button']:active,
+input[type='button'].default:active,
 .largeButtons ul li a:active{
        color: #333;
        border-width: 1px;
@@ -1103,9 +1109,7 @@ input[type='button'].default,
 /* default buttons hover */
 input[type='submit']:hover,
 input[type='button'].default:hover,
-.largeButtons ul li.default a:hover {
-       color: #666;
-       
+.largeButtons ul li.default a:hover {  
        -webkit-box-shadow: 0 0 10px #fa2;
        -moz-box-shadow: 0 0 10px #fa2;
        -ms-box-shadow: 0 0 10px #fa2;
@@ -1187,13 +1191,11 @@ input[type='button'].default:hover,
 
 /* default buttons active */
 input[type='submit']:focus,
-input[type='button'].default:hover,
+input[type='button'].default:focus,
 .largeButtons ul li.default a:focus,
 input[type='submit']:active,
-input[type='button'].default:hover,
+input[type='button'].default:active,
 .largeButtons ul li.default a:active {
-       color: #333;
-       
        -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .1);
        -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .1);
        -ms-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .1);
@@ -1260,6 +1262,10 @@ input[type='button'][disabled='disabled'],
        margin: 15px 0 0;
 }
 
+.border.overlay {
+       margin-top: 0 !important;
+}
+
 /* -- -- -- -- -- Box Title -- -- -- -- -- */
 
 .boxTitle {
@@ -1282,6 +1288,7 @@ input[type='button'][disabled='disabled'],
        text-shadow: 0 -1px 0 #000;
        color: #fff;
        padding: 7px;
+       display: inline-block;
 }
 
 .boxTitle > hgroup a, .boxTitle > a {
@@ -1293,6 +1300,12 @@ input[type='button'][disabled='disabled'],
        display: inline-block;
 }
 
+.boxTitle > hgroup h2 {
+       font-size: 85%;
+       color: rgba(255, 255, 255, .9);
+       margin-top: 5px;
+}
+
 .boxTitle img.handle {
        cursor: pointer;
        margin-top: -1px;
@@ -2103,6 +2116,9 @@ div.ui-widget-overlay {
        left: 0;
 }
 
+.ui-dialog {
+       background-color: rgba(255, 255, 255, .9);
+}
 
 
 /* -- -- -- -- -- Badges -- -- -- -- -- */
@@ -2248,7 +2264,7 @@ div.ui-widget-overlay {
 /* Collapsible */
 
 .collapsible {
-       margin: 5px 5px 0 5px;
+       margin: 5px 0 0 10px;
        float: left;
 }
 

diff --git a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
index 4501188c8148ed9a59abb4031a12890584c3dfc6..dcda5808dd05ca445674ea6c141df9dd18d1a4c0 100644 (file)
--- a/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
+++ b/wcfsetup/install/files/acp/templates/acpSessionLog.tpl
@@ -22,13 +22,13 @@
                <table>
                        <thead>
                                <tr>
-                                       <th class="columnSessionAccessLogID{if $sortField == 'sessionAccessLogID'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=sessionAccessLogID&amp;sortOrder={if $sortField == 'sessionAccessLogID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.sessionAccessLogID{/lang}{if $sortField == 'sessionAccessLogID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnIpAddress{if $sortField == 'ipAddress'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=ipAddress&amp;sortOrder={if $sortField == 'ipAddress' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.ipAddress{/lang}{if $sortField == 'ipAddress'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnTime{if $sortField == 'time'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=time&amp;sortOrder={if $sortField == 'time' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.time{/lang}{if $sortField == 'time'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnPackageName{if $sortField == 'packageName'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=packageName&amp;sortOrder={if $sortField == 'packageName' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.packageName{/lang}{if $sortField == 'packageName'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnClassName{if $sortField == 'className'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=className&amp;sortOrder={if $sortField == 'className' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.className{/lang}{if $sortField == 'className'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
-                                       <th class="columnRequestURI{if $sortField == 'requestURI'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=requestURI&amp;sortOrder={if $sortField == 'requestURI' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.requestURI{/lang}{if $sortField == 'requestURI'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnRequestMethod{if $sortField == 'requestMethod'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=requestMethod&amp;sortOrder={if $sortField == 'requestMethod' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.requestMethod{/lang}{if $sortField == 'requestMethod'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnID columnSessionAccessLogID{if $sortField == 'sessionAccessLogID'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=sessionAccessLogID&amp;sortOrder={if $sortField == 'sessionAccessLogID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.sessionAccessLogID{/lang}{if $sortField == 'sessionAccessLogID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnURL columnIpAddress{if $sortField == 'ipAddress'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=ipAddress&amp;sortOrder={if $sortField == 'ipAddress' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.ipAddress{/lang}{if $sortField == 'ipAddress'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnDate{if $sortField == 'time'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=time&amp;sortOrder={if $sortField == 'time' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.time{/lang}{if $sortField == 'time'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnTitle columnPackageName{if $sortField == 'packageName'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=packageName&amp;sortOrder={if $sortField == 'packageName' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.packageName{/lang}{if $sortField == 'packageName'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnText columnClassName{if $sortField == 'className'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=className&amp;sortOrder={if $sortField == 'className' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.className{/lang}{if $sortField == 'className'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></p></th>
+                                       <th class="columnURL columnRequestURI{if $sortField == 'requestURI'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=requestURI&amp;sortOrder={if $sortField == 'requestURI' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.requestURI{/lang}{if $sortField == 'requestURI'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnText columnRequestMethod{if $sortField == 'requestMethod'} active{/if}"><a href="index.php?page=ACPSessionLog&amp;sessionLogID={@$sessionLogID}&amp;pageNo={@$pageNo}&amp;sortField=requestMethod&amp;sortOrder={if $sortField == 'requestMethod' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.sessionLog.requestMethod{/lang}{if $sortField == 'requestMethod'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        
                                        {if $additionalColumnHeads|isset}{@$additionalColumnHeads}{/if}
                                </tr>
@@ -37,13 +37,13 @@
                        <tbody>
                        {foreach from=$sessionAccessLogs item=sessionAccessLog}
                                <tr>
-                                       <td class="columnSessionAccessLogID columnID"><p>{@$sessionAccessLog->sessionAccessLogID}</p></td>
-                                       <td class="columnIpAddress columnText"{if $sessionAccessLog->ipAddress != $sessionLog->ipAddress} style="color: red"{/if}><p>{$sessionAccessLog->ipAddress}</p></td>
-                                       <td class="columnTime columnText"><p>{@$sessionAccessLog->time|time}</p></td>
-                                       <td class="columnPackageName columnText"><p>{$sessionAccessLog->packageName}</p></td>
-                                       <td class="columnClassName columnText"><p>{$sessionAccessLog->className}</p></td>
-                                       <td class="columnRequestURI columnText" title="{$sessionAccessLog->requestURI}"><p>{if !$sessionAccessLog->hasProtectedURI()}<a href="{$sessionAccessLog->requestURI}{@SID_ARG_2ND}">{$sessionAccessLog->requestURI|truncate:50}</a>{else}{$sessionAccessLog->requestURI|truncate:50}{/if}</p></td>
-                                       <td class="columnRequestMethod columnText"><p>{$sessionAccessLog->requestMethod}</p></td>
+                                       <td class="columnID columnSessionAccessLogID"><p>{@$sessionAccessLog->sessionAccessLogID}</p></td>
+                                       <td class="columnURL columnIpAddress"{if $sessionAccessLog->ipAddress != $sessionLog->ipAddress} style="color: red"{/if}><p>{$sessionAccessLog->ipAddress}</p></td>
+                                       <td class="columnDate columnTime"><p>{@$sessionAccessLog->time|time}</p></td>
+                                       <td class="columnTitle columnPackageName"><p>{$sessionAccessLog->packageName}</p></td>
+                                       <td class="columnText columnClassName"><p>{$sessionAccessLog->className}</p></td>
+                                       <td class="columnURL columnRequestURI" title="{$sessionAccessLog->requestURI}"><p>{if !$sessionAccessLog->hasProtectedURI()}<a href="{$sessionAccessLog->requestURI}{@SID_ARG_2ND}">{$sessionAccessLog->requestURI|truncate:50}</a>{else}{$sessionAccessLog->requestURI|truncate:50}{/if}</p></td>
+                                       <td class="columnTextolumnRequestMethod"><p>{$sessionAccessLog->requestMethod}</p></td>
                                        
                                        {if $additionalColumns.$sessionAccessLog->sessionAccessLogID|isset}{@$additionalColumns.$sessionAccessLog->sessionAccessLogID}{/if}
                                </tr>

diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl
index 69b107926f72d57eeac77249bcceb1f88c3ab8a0..7a5f1fb82678c00e32f192c68ac25a8172fe5538 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cronjobList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl
@@ -61,14 +61,14 @@
                <table>
                        <thead>
                                <tr>
-                                       <th class="columnCronjobID{if $sortField == 'cronjobID'} active{/if}" colspan="2"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=cronjobID&amp;sortOrder={if $sortField == 'cronjobID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.cronjobID{/lang}{if $sortField == 'cronjobID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnStartMinute{if $sortField == 'startMinute'} active{/if}" title="{lang}wcf.acp.cronjob.startMinute{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startMinute&amp;sortOrder={if $sortField == 'startMinute' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startMinuteShort{/lang}{if $sortField == 'startMinute'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnStartHour{if $sortField == 'startHour'} active{/if}" title="{lang}wcf.acp.cronjob.startHour{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startHour&amp;sortOrder={if $sortField == 'startHour' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startHourShort{/lang}{if $sortField == 'startHour'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnStartDom{if $sortField == 'startDom'} active{/if}" title="{lang}wcf.acp.cronjob.startDom{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startDom&amp;sortOrder={if $sortField == 'startDom' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startDomShort{/lang}{if $sortField == 'startDom'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnStartMonth{if $sortField == 'startMonth'} active{/if}" title="{lang}wcf.acp.cronjob.startMonth{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startMonth&amp;sortOrder={if $sortField == 'startMonth' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startMonthShort{/lang}{if $sortField == 'startMonth'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnStartDow{if $sortField == 'startDow'} active{/if}" title="{lang}wcf.acp.cronjob.startDow{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startDow&amp;sortOrder={if $sortField == 'startDow' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startDowShort{/lang}{if $sortField == 'startDow'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnDescription{if $sortField == 'description'} active{/if}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=description&amp;sortOrder={if $sortField == 'description' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.description{/lang}{if $sortField == 'description'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
-                                       <th class="columnNextExec{if $sortField == 'nextExec'} active{/if}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=nextExec&amp;sortOrder={if $sortField == 'nextExec' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.nextExec{/lang}{if $sortField == 'nextExec'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnID columnCronjobID{if $sortField == 'cronjobID'} active{/if}" colspan="2"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=cronjobID&amp;sortOrder={if $sortField == 'cronjobID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.cronjobID{/lang}{if $sortField == 'cronjobID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnDate columnStartMinute{if $sortField == 'startMinute'} active{/if}" title="{lang}wcf.acp.cronjob.startMinute{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startMinute&amp;sortOrder={if $sortField == 'startMinute' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startMinuteShort{/lang}{if $sortField == 'startMinute'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnDate columnStartHour{if $sortField == 'startHour'} active{/if}" title="{lang}wcf.acp.cronjob.startHour{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startHour&amp;sortOrder={if $sortField == 'startHour' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startHourShort{/lang}{if $sortField == 'startHour'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnText columnStartDom{if $sortField == 'startDom'} active{/if}" title="{lang}wcf.acp.cronjob.startDom{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startDom&amp;sortOrder={if $sortField == 'startDom' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startDomShort{/lang}{if $sortField == 'startDom'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnDate columnStartMonth{if $sortField == 'startMonth'} active{/if}" title="{lang}wcf.acp.cronjob.startMonth{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startMonth&amp;sortOrder={if $sortField == 'startMonth' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startMonthShort{/lang}{if $sortField == 'startMonth'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnDate columnStartDow{if $sortField == 'startDow'} active{/if}" title="{lang}wcf.acp.cronjob.startDow{/lang}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=startDow&amp;sortOrder={if $sortField == 'startDow' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.startDowShort{/lang}{if $sortField == 'startDow'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnText columnDescription{if $sortField == 'description'} active{/if}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=description&amp;sortOrder={if $sortField == 'description' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.description{/lang}{if $sortField == 'description'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
+                                       <th class="columnDate columnNextExec{if $sortField == 'nextExec'} active{/if}"><a href="index.php?page=CronjobList&amp;pageNo={@$pageNo}&amp;sortField=nextExec&amp;sortOrder={if $sortField == 'nextExec' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.nextExec{/lang}{if $sortField == 'nextExec'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}.svg" alt="" />{/if}</a></th>
                                        
                                        {if $additionalHeadColumns|isset}{@$additionalHeadColumns}{/if}
                                </tr>
@@ -107,19 +107,19 @@
                                                {if $additionalButtons[$cronjob->cronjobID]|isset}{@$additionalButtons[$cronjob->cronjobID]}{/if}
                                        </td>
                                        <td class="columnID"><p>{@$cronjob->cronjobID}</p></td>
-                                       <td class="columnStartMinute"><p>{$cronjob->startMinute|truncate:30:' ...'}</p></td>
-                                       <td class="columnStartHour"><p>{$cronjob->startHour|truncate:30:' ...'}</p></td>
-                                       <td class="columnStartDom"><p>{$cronjob->startDom|truncate:30:' ...'}</p></td>
-                                       <td class="columnStartMonth"><p>{$cronjob->startMonth|truncate:30:' ...'}</p></td>
-                                       <td class="columnStartDow"><p>{$cronjob->startDow|truncate:30:' ...'}</p></td>
-                                       <td class="columnDescription columnText" title="{$cronjob->description}">
+                                       <td class="columnDate columnStartMinute"><p>{$cronjob->startMinute|truncate:30:' ...'}</p></td>
+                                       <td class="columnDate columnStartHour"><p>{$cronjob->startHour|truncate:30:' ...'}</p></td>
+                                       <td class="columnDate columnStartDom"><p>{$cronjob->startDom|truncate:30:' ...'}</p></td>
+                                       <td class="columnDate columnStartMonth"><p>{$cronjob->startMonth|truncate:30:' ...'}</p></td>
+                                       <td class="columnDate columnStartDow"><p>{$cronjob->startDow|truncate:30:' ...'}</p></td>
+                                       <td class="columnText columnDescription" title="{$cronjob->description}">
                                                {if $cronjob->editable}
                                                        <p><a title="{lang}wcf.acp.cronjob.edit{/lang}" href="index.php?form=CronjobEdit&amp;cronjobID={@$cronjob->cronjobID}{@SID_ARG_2ND}">{$cronjob->description|truncate:50:" ..."}</a></p>
                                                {else}
                                                        <p>{$cronjob->description|truncate:50:' ...'}</p>
                                                {/if}
                                        </td>
-                                       <td class="columnNextExec columnDate">
+                                       <td class="columnDate columnNextExec">
                                                {if $cronjob->active && $cronjob->nextExec != 1}
                                                        <p>{@$cronjob->nextExec|plainTime}</p>
                                                {/if}

diff --git a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
index 26bf74c60c92f1ee1c51a5365bce425290cc45cb..d81c0c4d69cc4a149ca2632d614b914ed20eb2b0 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
@@ -9,7 +9,7 @@
 </script>
 
 <header class="mainHeading">
-       <img src="{@RELATIVE_WCF_DIR}icon/package{@$action|ucfirst}L.png" alt="" />
+       <img src="{@RELATIVE_WCF_DIR}icon/installation1.svg" alt="" />
        <hgroup>
                <h1>{$archive->getPackageInfo('packageName')}</h1>
                <h2>{$archive->getPackageInfo('packageDescription')}</h2>
@@ -84,17 +84,17 @@
                
                <table>
                        <thead>
-                               <tr class="tableHead">
-                                       <th><p class="emptyHead">{lang}wcf.acp.package.list.name{/lang}</p></th>
-                                       <th><p class="emptyHead">{lang}wcf.acp.package.list.version{/lang}</p></th>
+                               <tr>
+                                       <th class="columnTitle">{lang}wcf.acp.package.list.name{/lang}</th>
+                                       <th class="columnDigits">{lang}wcf.acp.package.list.version{/lang}</th>
                                </tr>
                        </thead>
                        
                        <tbody>
                        {foreach from=$updatableInstances item=$package}
                                <tr>
-                                       <td class="columnText"><p><a href="index.php?page=Package&amp;action=install&amp;queueID={@$queueID}&amp;step=changeToUpdate&amp;packageID={@$package.packageID}{@SID_ARG_2ND}">{$package.packageName}{if $package.instanceNo > 1 && $package.instanceName == ''} (#{#$package.instanceNo}){/if}</a></p></td>
-                                       <td class="columnText"><p>{$package.packageVersion}</p></td>
+                                       <td class="columnTitle"><p><a href="index.php?page=Package&amp;action=install&amp;queueID={@$queueID}&amp;step=changeToUpdate&amp;packageID={@$package.packageID}{@SID_ARG_2ND}">{$package.packageName}{if $package.instanceNo > 1 && $package.instanceName == ''} (#{#$package.instanceNo}){/if}</a></p></td>
+                                       <td class="columnDigits"><p>{$package.packageVersion}</p></td>
                                </tr>
                        {/foreach}
                        </tbody>
@@ -105,34 +105,33 @@
 {if $requiredPackages|count > 0}
        <div class="border boxTitle">
                <hgroup>
-                       <h1>{lang}wcf.acp.package.view.requiredPackages{/lang}</h1>
-                       <h2>{lang}wcf.acp.package.view.requiredPackages.description{/lang}</h2>
+                       <h1>{lang}wcf.acp.package.view.requiredPackages{/lang} <span class="badge" title="{lang}wcf.acp.package.view.requiredPackages.description{/lang}">{#$requiredPackages|count}</span></h1>
                </hgroup>
-       </div>
-       
-       <table>
-               <thead>
-                       <tr>
-                               <th>{lang}wcf.acp.package.list.name{/lang}</th>
-                               <th>{lang}wcf.acp.package.list.version{/lang}</th>
-                       </tr>
-               </thead>
                
-               <tbody>
-               {foreach from=$requiredPackages item=$package}
-                       <tr>
-                               <td class="columnText"><p>{lang}wcf.acp.package.install.packageName{/lang}</p></td>
-                               <td class="columnText"><p>{if $package.minversion|isset}{$package.minversion}{/if}</p></td>
-                       </tr>
-               {/foreach}
-               </tbody>
-       </table>
+               <table>
+                       <thead>
+                               <tr>
+                                       <th class="columnTitle">{lang}wcf.acp.package.list.name{/lang}</th>
+                                       <th class="columnDigits">{lang}wcf.acp.package.list.version{/lang}</th>
+                               </tr>
+                       </thead>
+                       
+                       <tbody>
+                       {foreach from=$requiredPackages item=$package}
+                               <tr>
+                                       <td class="columnTitle"><p>{lang}wcf.acp.package.install.packageName{/lang}</p></td>
+                                       <td class="columnDigits"><p>{if $package.minversion|isset}{$package.minversion}{/if}</p></td>
+                               </tr>
+                       {/foreach}
+                       </tbody>
+               </table>
+       </div>
 {/if}
 
 <div class="formSubmit">
        <input type="button" onclick="document.location.href=fixURL('index.php?page=Package&amp;action={@$action}&amp;queueID={@$queueID}&amp;step=cancel{@SID_ARG_2ND}')" value="{lang}wcf.global.button.back{/lang}" accesskey="c" />
        {if $missingPackages == 0 && $excludingPackages|count == 0 && $excludedPackages|count == 0}
-               <input type="button" id="submitButton" value="{lang}wcf.global.button.next{/lang}" accesskey="s" />
+               <input type="button" id="submitButton" value="{lang}wcf.global.button.next{/lang}" class="default" accesskey="s" />
        {/if}
 </div>
 

diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index 7754a9d60b9b87956f25aace67bfd2c48202fe14..6db5cdcfaf06afa270b55f78c269b96273d038ed 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -72,9 +72,9 @@
                                                        {if $package->standalone}
                                                                <img src="{@RELATIVE_WCF_DIR}icon/packageStandalone1.svg" alt="" title="{lang}wcf.acp.package.list.standalone{/lang}" class="balloonTooltip" />
                                                        {elseif $package->isPlugin()}
-                                                               <img src="{@RELATIVE_WCF_DIR}icon/packagePlugin1.svg" alt="" title="{lang}wcf.acp.package.list.plugin{/lang}" />
+                                                               <img src="{@RELATIVE_WCF_DIR}icon/packagePlugin1.svg" alt="" title="{lang}wcf.acp.package.list.plugin{/lang}" class="balloonTooltip" />
                                                        {else}
-                                                               <img src="{@RELATIVE_WCF_DIR}icon/package1.svg" alt="" title="{lang}wcf.acp.package.list.other{/lang}" />
+                                                               <img src="{@RELATIVE_WCF_DIR}icon/package1.svg" alt="" title="{lang}wcf.acp.package.list.other{/lang}" class="balloonTooltip" />
                                                        {/if}
                                                </td>
                                                <td id="packageName{@$package->packageID}" class="columnTitle" title="{$package->packageDescription}">

diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
index 2e18b67e1691fa2539190e04dd116adef8207963..45becc92e694e5958384dd4d0a118168b3919187 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
+++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
@@ -3,12 +3,12 @@
 <header class="mainHeading">
        {if $packageID == 0}
                <img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" />
-               <hgroup class="headlineContainer">
+               <hgroup>
                        <h1>{lang}wcf.acp.package.startInstall{/lang}</h1>
                </hgroup>
        {else}
                <img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" />
-               <hgroup class="headlineContainer">
+               <hgroup>
                        <h1>{lang}wcf.acp.package.startUpdate{/lang}</h1>
                </hgroup>
        {/if}

diff --git a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
index d4a87c9a701adf314938df3b9738b9b9acd250cb..1473140fe98c87fb88d72b6dd8fa41ea6ebdab8a 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
@@ -78,11 +78,11 @@
                <table>
                        <thead>
                                <tr>
-                                       <th colspan="2">{lang}wcf.acp.package.list.id{/lang}</th>
-                                       <th colspan="2">{lang}wcf.acp.package.list.name{/lang}</th>
-                                       <th>{lang}wcf.acp.package.list.author{/lang}</th>
-                                       <th>{lang}wcf.acp.package.list.version{/lang}</th>
-                                       <th>{lang}wcf.acp.package.list.date{/lang}</th>
+                                       <th colspan="2" class="columnID">{lang}wcf.acp.package.list.id{/lang}</th>
+                                       <th colspan="2" class="columnTitle">{lang}wcf.acp.package.list.name{/lang}</th>
+                                       <th class="columnText">{lang}wcf.acp.package.list.author{/lang}</th>
+                                       <th class="columnText">{lang}wcf.acp.package.list.version{/lang}</th>
+                                       <th class="columnDate">{lang}wcf.acp.package.list.date{/lang}</th>
                                        
                                        {if $additionalColumns|isset}{@$additionalColumns}{/if}
                                </tr>
@@ -115,7 +115,7 @@
                                                        <img src="{@RELATIVE_WCF_DIR}icon/packageS.png" alt="" title="{lang}wcf.acp.package.list.other{/lang}" class="balloonTooltip" />
                                                {/if}
                                        </td>
-                                       <td class="columnText" title="{$package.packageDescription}"><p><a href="index.php?page=PackageView&amp;packageID={@$package.packageID}{@SID_ARG_2ND}">{$package.packageName}{if $package.instanceNo > 1 && $package.instanceName == ''} (#{#$package.instanceNo}){/if}</a></p></td>
+                                       <td class="columnTitle" title="{$package.packageDescription}"><p><a href="index.php?page=PackageView&amp;packageID={@$package.packageID}{@SID_ARG_2ND}">{$package.packageName}{if $package.instanceNo > 1 && $package.instanceName == ''} (#{#$package.instanceNo}){/if}</a></p></td>
                                        <td class="columnText"><p>{if $package.authorURL}<a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$package.authorURL|rawurlencode}" class="externalURL">{$package.author}</a>{else}{$package.author}{/if}</p></td>
                                        <td class="columnText"><p>{$package.packageVersion}</p></td>
                                        <td class="columnDate"><p>{@$package.packageDate|date}</p></td>
@@ -135,7 +135,7 @@
        <input type="hidden" name="packageID" value="{@$packageObj->packageID}" />
        <input type="hidden" name="send" value="1" />
        <input type="button" value="{lang}wcf.global.button.back{/lang}" onclick="document.location.href=fixURL('index.php?page=PackageView&amp;packageID={@$packageID}{@SID_ARG_2ND}')" accesskey="c" />
-       <input type="button" id="uninstallPackage" value="{lang}wcf.global.button.next{/lang}" accesskey="s" />
+       <input type="button" id="uninstallPackage" value="{lang}wcf.global.button.next{/lang}" class="default" accesskey="s" />
 </div>
 
 {include file='footer'}

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
index 10eebdba68011476bfea9010086c2a85178bf540..eea50fd1c1f32d65554896fd5f1c91a5cd5c57fb 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
@@ -3,7 +3,7 @@
 <script type="text/javascript" src="{@RELATIVE_WCF_DIR}js/MultiPagesLinks.class.js"></script>
 
 <header class="mainHeading">
-       <img src="{@RELATIVE_WCF_DIR}icon/packageSearchL.png" alt="" />
+       <img src="{@RELATIVE_WCF_DIR}icon/search1.svg" alt="" />
        <hgroup>
                <h1>{lang}wcf.acp.packageUpdate.search{/lang}</h1>
        </hgroup>

diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl
index 75886aa84ef4fb1b391e253cd2d05a1d7a533612..8a8ec218bf77bf7f76225f737a3054e6d1166d25 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageView.tpl
+++ b/wcfsetup/install/files/acp/templates/packageView.tpl
@@ -1,5 +1,17 @@
 {include file='header'}
 
+<script type="text/javascript">
+       //<![CDATA[
+       $(function() {
+               WCF.Icon.addObject({
+                       'wcf.global.opened': '{@RELATIVE_WCF_DIR}icon/opened2.svg',
+                       'wcf.global.closed': '{@RELATIVE_WCF_DIR}icon/closed2.svg'
+               });
+               WCF.Collapsible.Simple.init();
+       });
+       //]]>
+</script>
+
 <header class="mainHeading">
        <img src="{@RELATIVE_WCF_DIR}icon/packageStandalone1.svg" alt="" /><!-- ToDo: Add possibility to show a custom app icon if given! -->
        <hgroup>
@@ -96,7 +108,7 @@
 
 {if $requiredPackages|count > 0}
        <div class="border boxTitle">
-               <a onclick="openList('requiredPackages')"><img id="requiredPackagesImage" src="{@RELATIVE_WCF_DIR}icon/close.svg" alt="" /></a>
+               <a data-isOpen="1" data-collapsibleContainer="requiredPackages" class="collapsible"><img src="{@RELATIVE_WCF_DIR}icon/opened2.svg" alt="" title="{lang}wcf.global.button.collapsible{/lang}" class="balloonTooltip" /></a>
                <hgroup>
                        <h1><a onclick="openList('requiredPackages')">{lang}wcf.acp.package.view.requiredPackages{/lang}</a></h1>
                        <h2>{lang}wcf.acp.package.view.requiredPackages.description{/lang}</h2>

diff --git a/wcfsetup/install/files/acp/templates/permissionDenied.tpl b/wcfsetup/install/files/acp/templates/permissionDenied.tpl
index 206fd66077e3bee5769ecf2459b08da661282d23..2bb8c04743450dd9850408603f8bfa4c8bec6b10 100644 (file)
--- a/wcfsetup/install/files/acp/templates/permissionDenied.tpl
+++ b/wcfsetup/install/files/acp/templates/permissionDenied.tpl
@@ -6,7 +6,7 @@
 {else}{capture assign='pageTitle'}{lang}wcf.global.error.permissionDenied.title{/lang}{/capture}
 {include file='setupHeader'}
 
-<img class="icon" src="{@RELATIVE_WCF_DIR}icon/loginXL.png" alt="" />
+<img class="icon" src="{@RELATIVE_WCF_DIR}icon/logIn1.svg" alt="" />
 
 <h1>{@$pageTitle}</h1>
 

diff --git a/wcfsetup/install/files/acp/templates/setupHeader.tpl b/wcfsetup/install/files/acp/templates/setupHeader.tpl
index c0a8988a9e03015530a1a2c8eae17bf4964650be..c3d6f008a6fa97a352488edd6fdcf18d6ffac9d0 100644 (file)
--- a/wcfsetup/install/files/acp/templates/setupHeader.tpl
+++ b/wcfsetup/install/files/acp/templates/setupHeader.tpl
@@ -30,7 +30,6 @@
        *}
        
        <!-- Testing stylesheets -->
-       <link rel="stylesheet" type="text/css" href="{@RELATIVE_WCF_DIR}acp/style/testing-reset.css" />
        <link rel="stylesheet" type="text/css" href="{@RELATIVE_WCF_DIR}acp/style/testing.css" />
        <!-- /Testing stylesheets -->
        
@@ -45,6 +44,28 @@
                </style>
        <![endif]-->
        *}
+       
+       <script type="text/javascript">
+               //<![CDATA[
+               $(function() {
+                       WCF.Language.addObject({
+                               'wcf.global.loading': '{lang}wcf.global.loading{/lang}',
+                               'wcf.global.date.relative.minutes': '{capture assign=relativeMinutes}{lang}wcf.global.date.relative.minutes{/lang}{/capture}{@$relativeMinutes|encodeJS}',
+                               'wcf.global.date.relative.hours': '{capture assign=relativeHours}{lang}wcf.global.date.relative.hours{/lang}{/capture}{@$relativeHours|encodeJS}',
+                               'wcf.global.date.relative.pastDays': '{capture assign=relativePastDays}{lang}wcf.global.date.relative.pastDays{/lang}{/capture}{@$relativePastDays|encodeJS}',
+                               'wcf.global.date.dateTimeFormat': '{lang}wcf.global.date.dateTimeFormat{/lang}',
+                               '__days': [ '{lang}wcf.global.date.day.sunday{/lang}', '{lang}wcf.global.date.day.monday{/lang}', '{lang}wcf.global.date.day.tuesday{/lang}', '{lang}wcf.global.date.day.wednesday{/lang}', '{lang}wcf.global.date.day.thursday{/lang}', '{lang}wcf.global.date.day.friday{/lang}', '{lang}wcf.global.date.day.saturday{/lang}' ],
+                               'wcf.global.thousandsSeparator': '{capture assign=thousandsSeparator}{lang}wcf.global.thousandsSeparator{/lang}{/capture}{@$thousandsSeparator|encodeJS}',
+                               'wcf.global.decimalPoint': '{capture assign=decimalPoint}{lang}wcf.global.decimalPoint{/lang}{/capture}{$decimalPoint|encodeJS}',
+                               'wcf.global.page.next': '{capture assign=pageNext}{lang}wcf.global.page.next{/lang}{/capture}{@$pageNext|encodeJS}',
+                               'wcf.global.page.previous': '{capture assign=pagePrevious}{lang}wcf.global.page.previous{/lang}{/capture}{@$pagePrevious|encodeJS}'
+                       });
+                       new WCF.Date.Time();
+                       new WCF.Effect.SmoothScroll();
+                       new WCF.Effect.BalloonTooltip();
+               });
+               //]]>
+       </script>
 </head>
 
 <body id="tpl{$templateName|ucfirst}">