projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2ae0813)
Some more Corrections
authorLuzifr <szekely@woltlab.com>
Sun, 7 Aug 2011 22:04:08 +0000 (00:04 +0200)
committerLuzifr <szekely@woltlab.com>
Mon, 8 Aug 2011 00:32:37 +0000 (02:32 +0200)
wcfsetup/install/files/acp/templates/cronjobAdd.tpl patch | blob | blame | history
wcfsetup/install/files/acp/templates/header.tpl patch | blob | blame | history
wcfsetup/install/files/acp/templates/optionImport.tpl patch | blob | blame | history
wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl patch | blob | blame | history
wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl patch | blob | blame | history
wcfsetup/install/files/acp/templates/packageView.tpl patch | blob | blame | history
wcfsetup/install/files/acp/templates/userMail.tpl patch | blob | blame | history

diff --git a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
index c2c1f48faf139d57d7368a8d6357ad4a8ed90284..cd4d99c94e950b3d42e1145e4b49f712fc3f4e96 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobAdd.tpl
@@ -68,7 +68,7 @@
                                                                {if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if}
                                                        </small>
                                                {/if}
-                                               <small id="startMinuteHelpMessage"><p>{lang}wcf.acp.cronjob.startMinute.description{/lang}</small></small>
+                                               <small id="startMinuteHelpMessage">{lang}wcf.acp.cronjob.startMinute.description{/lang}</small>
                                        </dd>
                                </dl>
                                
@@ -81,7 +81,7 @@
                                                                {if $errorType == 'notValid'}{lang}wcf.acp.cronjob.error.notValid{/lang}{/if}
                                                        </small>
                                                {/if}
-                                               <small id="startHourHelpMessage"><p>{lang}wcf.acp.cronjob.startHour.description{/lang}</small></small>
+                                               <small id="startHourHelpMessage">{lang}wcf.acp.cronjob.startHour.description{/lang}</small>
                                        </dd>
                                </dl>
                                
diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 5c4cd9b6696df24bf7ff23d61e693ab38a85957c..3a0840223380c9710f2eb478612292d95a575b51 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -76,7 +76,7 @@
 <body id="tpl{$templateName|ucfirst}">
        <a id="top"></a>
        <!-- HEADER -->
-       <header class="pageHeader">
+       <header id="pageHeader" class="pageHeader">
                <div>
                        <!-- top menu -->
                        <nav id="topMenu" class="topMenu">
diff --git a/wcfsetup/install/files/acp/templates/optionImport.tpl b/wcfsetup/install/files/acp/templates/optionImport.tpl
index c595de1d41b39c8e9fe672a540d29b8017ad95eb..700a15f3f25e78d95a21b11ea4d2c7bb65586322 100644 (file)
--- a/wcfsetup/install/files/acp/templates/optionImport.tpl
+++ b/wcfsetup/install/files/acp/templates/optionImport.tpl
@@ -32,8 +32,8 @@
                                                                {if $errorType == 'uploadFailed'}{lang}wcf.acp.option.import.error.uploadFailed{/lang}{/if}
                                                        </small>
                                                {/if}
+                                               <small id="optionImportHelpMessage">{lang}wcf.acp.option.import.upload.description{/lang}</small>
                                        </dd>
-                                       <small id="optionImportHelpMessage">{lang}wcf.acp.option.import.upload.description{/lang}</small>
                                </dl>
                        </fieldset>
                        
@@ -53,14 +53,14 @@
                <fieldset>
                        <legend>{lang}wcf.acp.option.export{/lang}</legend>
                
-                       <div id="optionExportDiv" class="formElement">
-                               <div class="formField">
-                                       <a href="index.php?action=OptionExport{@SID_ARG_2ND}" id="optionExport">{lang}wcf.acp.option.export.download{/lang}</a>
-                               </div>
-                               <div id="optionExportHelpMessage">
-                                       <p>{lang}wcf.acp.option.export.download.description{/lang}</p>
-                               </div>
-                       </div>
+                       <dl id="optionExportDiv">
+                               <dt><label><!-- ToDo: Download label --></label></dt>
+                               <dd><p><a href="index.php?action=OptionExport{@SID_ARG_2ND}" id="optionExport" class="largeButton">{lang}wcf.acp.option.export.download{/lang}</a></p></dd>
+                               <small>{lang}wcf.acp.option.export.download.description{/lang}</small>
+                       </dl>
+                       <script type="text/javascript">//<![CDATA[
+                               inlineHelp.register('optionExport');
+                       //]]></script>
                </fieldset>
                
                {if $additionalFields|isset}{@$additionalFields}{/if}
diff --git a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
index e1cf4977e4c7ca08370c7df762db2d878ccb8c28..b96f75650943685afbc36fd5a19ac4387affdf36 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
@@ -130,8 +130,8 @@
        <input type="hidden" name="action" value="startUninstall" />
        <input type="hidden" name="packageID" value="{@$packageObj->packageID}" />
        <input type="hidden" name="send" value="1" />
-       <input type="button" accesskey="c" value="{lang}wcf.global.button.back{/lang}" onclick="document.location.href=fixURL('index.php?page=PackageView&amp;packageID={@$packageID}{@SID_ARG_2ND}')" />
-       <input type="button" accesskey="s" id="uninstallPackage" value="{lang}wcf.global.button.next{/lang}" />
+       <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" />
 </div>
 
 {include file='footer'}
diff --git a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
index 5c156ddb3d71a48407331c825753a665313945b2..9f6b53bfad36c32ef380bc08f86dae02ab195361 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
@@ -81,15 +81,15 @@
                                        <legend>{lang}wcf.acp.packageUpdate.search.conditions{/lang}</legend>
                                        
                                        <div>
-                                               <div class="formElement">
-                                                       <div class="formFieldLabel">
+                                               <dl>
+                                                       <dt>
                                                                <label for="packageName">{lang}wcf.acp.packageUpdate.search.packageName{/lang}</label>
-                                                       </div>
-                                                       <div class="formField">
-                                                               <input type="text" id="packageName" name="packageName" value="{$packageName}" class="inputText" />
+                                                       </dt>
+                                                       <dd>
+                                                               <input type="text" id="packageName" name="packageName" value="{$packageName}" class="large" />
                                                                <label><input type="checkbox" name="searchDescription" value="1" {if $searchDescription == 1}checked="checked" {/if}/> {lang}wcf.acp.packageUpdate.search.searchDescription{/lang}</label>
-                                                       </div>
-                                               </div>
+                                                       </dd>
+                                               </dl>
                                                
                                                <dl>
                                                        <dt><label for="author">{lang}wcf.acp.packageUpdate.search.author{/lang}</label></dt>
diff --git a/wcfsetup/install/files/acp/templates/packageView.tpl b/wcfsetup/install/files/acp/templates/packageView.tpl
index bcdaa72fc69a92e59aa32f0fc289dabe4f9890f5..36b595757ee3cf76802b189ab122a9d9d450b5eb 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageView.tpl
+++ b/wcfsetup/install/files/acp/templates/packageView.tpl
@@ -10,64 +10,65 @@
 
 <fieldset>
        <legend>{lang}wcf.acp.package.view.properties{/lang}</legend>
-       <div class="formElement">
-               <p class="formFieldLabel">{lang}wcf.acp.package.view.identifier{/lang}</p>
-               <p class="formField">{$package->package}</p>
-       </div>
-       <div class="formElement">
-               <p class="formFieldLabel">{lang}wcf.acp.package.view.version{/lang}</p>
-               <p class="formField">{$package->packageVersion}</p>
-       </div>
+       
+       <dl>
+               <dt>{lang}wcf.acp.package.view.identifier{/lang}</dt>
+               <p>{$package->package}</dd>
+       </dl>
+       <dl>
+               <dt>{lang}wcf.acp.package.view.version{/lang}</dt>
+               <dd>{$package->packageVersion}</dd>
+       </dl>
        {if $package->instanceNo > 1}
-               <div class="formElement">
-                       <p class="formFieldLabel">{lang}wcf.acp.package.view.instanceNo{/lang}</p>
-                       <p class="formField">{#$package->instanceNo}</p>
-               </div>
+               <dl>
+                       <dt>{lang}wcf.acp.package.view.instanceNo{/lang}</dt>
+                       <dd>{#$package->instanceNo}</dd>
+               </dl>
        {elseif $package->package == 'com.woltlab.wcf' && WCF_N != 1}
-               <div class="formElement">
-                       <p class="formFieldLabel">{lang}wcf.acp.package.view.instanceNo{/lang}</p>
-                       <p class="formField">{#WCF_N}</p>
-               </div>
+               <dl>
+                       <dt>{lang}wcf.acp.package.view.instanceNo{/lang}</dt>
+                       <dd>{#WCF_N}</dd>
+               </dl>
        {/if}
        {if $package->packageDir != ''}
-               <div class="formElement">
-                       <p class="formFieldLabel">{lang}wcf.acp.package.view.dir{/lang}</p>
-                       <p class="formField"><a href="{@RELATIVE_WCF_DIR}{$package->packageDir}">{$package->packageDir}</a></p>
-               </div>
+               <dl>
+                       <dt>{lang}wcf.acp.package.view.dir{/lang}</dt>
+                       <dd><a href="{@RELATIVE_WCF_DIR}{$package->packageDir}">{$package->packageDir}</a></dd>
+               </dl>
        {elseif $package->package == 'com.woltlab.wcf'}
-               <div class="formElement">
-                       <p class="formFieldLabel">{lang}wcf.acp.package.view.dir{/lang}</p>
-                       <p class="formField">{WCF_DIR}</p>
-               </div>
+               <dl>
+                       <dt>{lang}wcf.acp.package.view.dir{/lang}</dt>
+                       <dd>{WCF_DIR}</dd>
+               </dl>
        {/if}
-       <div class="formElement">
-               <p class="formFieldLabel">{lang}wcf.acp.package.view.date{/lang}</p>
-               <p class="formField">{@$package->packageDate|date}</p>
-       </div>
-       <div class="formElement">
-               <p class="formFieldLabel">{lang}wcf.acp.package.installDate{/lang}</p>
-               <p class="formField">{@$package->installDate|time}</p>
-       </div>
-       <div class="formElement">
-               <p class="formFieldLabel">{lang}wcf.acp.package.updateDate{/lang}</p>
-               <p class="formField">{@$package->updateDate|time}</p>
-       </div>
+       <dl>
+               <dt>{lang}wcf.acp.package.view.date{/lang}</dt>
+               <dd>{@$package->packageDate|date}</dd>
+       </dl>
+       <dl>
+               <dt>{lang}wcf.acp.package.installDate{/lang}</dt>
+               <dd>{@$package->installDate|time}</dd>
+       </dl>
+       <dl>
+               <dt>{lang}wcf.acp.package.updateDate{/lang}</dt>
+               <dd>{@$package->updateDate|time}</dd>
+       </dl>
        {if $package->packageURL != ''}
-               <div class="formElement">
-                       <p class="formFieldLabel">{lang}wcf.acp.package.view.url{/lang}</p>
-                       <p class="formField"><a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$package->packageURL|rawurlencode}" class="externalURL">{$package->packageURL}</a></p>
-               </div>
+               <dl>
+                       <dt>{lang}wcf.acp.package.view.url{/lang}</dt>
+                       <dd><a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$package->packageURL|rawurlencode}" class="externalURL">{$package->packageURL}</a></dd>
+               </dl>
        {/if}
        {if $package->parentPackageID}
-               <div class="formElement">
-                       <p class="formFieldLabel">{lang}wcf.acp.package.view.parent{/lang}</p>
-                       <p class="formField"><a href="index.php?page=PackageView&amp;packageID={@$package->parentPackageID}{@SID_ARG_2ND}">{$package->parentPackage()->getName()}</a></p>
-               </div>
+               <dl>
+                       <dt>{lang}wcf.acp.package.view.parent{/lang}</dt>
+                       <dd><a href="index.php?page=PackageView&amp;packageID={@$package->parentPackageID}{@SID_ARG_2ND}">{$package->parentPackage()->getName()}</a></dd>
+               </dl>
        {/if}
-       <div class="formElement">
-               <p class="formFieldLabel">{lang}wcf.acp.package.view.author{/lang}</p>
-               <p class="formField">{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>
-       </div>
+       <dl>
+               <dt>{lang}wcf.acp.package.view.author{/lang}</dt>
+               <dd>{if $package->authorURL}<a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$package->authorURL|rawurlencode}" class="externalURL">{$package->author}</a>{else}{$package->author}{/if}</dd>
+       </dl>
        
        {if $additionalFields|isset}{@$additionalFields}{/if}
 </fieldset>
@@ -76,7 +77,7 @@
 {foreach from=$dependentPackages item=dependentPackage}
        {if $dependentPackage.package != 'com.woltlab.wcf' && $dependentPackage.packageID == PACKAGE_ID}
                {assign var=noDependentIsActive value=false}
-               {* TODO: maybe show user that this package can't be uninstalled because a dependent package is the active standalone application *}
+               {* TODO: maybe show users that this package can't be uninstalled because a dependent package is the active standalone application *}
        {/if}
 {/foreach}
 
diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl
index d324397fbda924ead33712a10b2bd4da970bf9ca..f95c6072451dbfe1605601964f361e3ed6be495c 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -72,39 +72,36 @@
                                <div>
                                        <dl id="subjectDiv"{if $errorField == 'subject'} class="formError"{/if}>
                                                <dt><label for="subject">{lang}wcf.acp.user.sendMail.subject{/lang}</label></dt>
-                                               <dd><input type="text" id="subject" name="subject" value="{$subject}" class="inputText" /></dd>
-                                               {if $errorField == 'subject'}
-                                                       <small class="innerError">{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}</small>
-                                               {/if}
-                                               <small id="subjectHelpMessage">{lang}wcf.acp.user.sendMail.subject.description{/lang}</small>
+                                               <dd>
+                                                       <input type="text" id="subject" name="subject" value="{$subject}" class="long" />
+                                                       {if $errorField == 'subject'}
+                                                               <small class="innerError">{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}</small>
+                                                       {/if}
+                                                       <small id="subjectHelpMessage">{lang}wcf.acp.user.sendMail.subject.description{/lang}</small>
+                                               </dd>
                                        </dl>
-                                       <script type="text/javascript">//<![CDATA[
-                                               inlineHelp.register('subject');
-                                       //]]></script>
                                        
                                        <dl id="fromDiv"{if $errorField == 'from'} class="formError"{/if}>
                                                <dt><label for="from">{lang}wcf.acp.user.sendMail.from{/lang}</label></dt>
-                                               <dd><input type="text" id="from" name="from" value="{$from}" class="inputText" /></dd>
-                                               {if $errorField == 'from'}
-                                                       <small class="innerError">{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}</small>
-                                               {/if}
-                                               <small id="fromHelpMessage">{lang}wcf.acp.user.sendMail.from.description{/lang}</small><!-- ToDo: Language variable contains paragraphs! -->
+                                               <dd>
+                                                       <input type="text" id="from" name="from" value="{$from}" class="medium" />
+                                                       {if $errorField == 'from'}
+                                                               <small class="innerError">{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}</small>
+                                                       {/if}
+                                                       <small id="fromHelpMessage">{lang}wcf.acp.user.sendMail.from.description{/lang}</small><!-- ToDo: Language variable contains paragraphs! -->
+                                               </dd>
                                        </dl>
-                                       <script type="text/javascript">//<![CDATA[
-                                               inlineHelp.register('from');
-                                       //]]></script>
-                               
+                                       
                                        <dl id="textDiv"{if $errorField == 'text'} class="formError"{/if}>
-                                               <dt class="formFieldLabel"><label for="text">{lang}wcf.acp.user.sendMail.text{/lang}</label></dt>
-                                               <dd class="formField"><textarea id="text" name="text" rows="15" cols="40">{$text}</textarea></dd>
-                                               {if $errorField == 'text'}
-                                                       <small class="innerError">{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}</small>
-                                               {/if}
-                                               <small id="textHelpMessage" class="formFieldDesc hidden">{lang}wcf.acp.user.sendMail.text.description{/lang}</small>
+                                               <dt><label for="text">{lang}wcf.acp.user.sendMail.text{/lang}</label></dt>
+                                               <dd>
+                                                       <textarea id="text" name="text" rows="15" cols="40" class="long">{$text}</textarea>
+                                                       {if $errorField == 'text'}
+                                                               <small class="innerError">{if $errorType == 'empty'}{lang}wcf.global.error.empty{/lang}{/if}</small>
+                                                       {/if}
+                                                       <small id="textHelpMessage">{lang}wcf.acp.user.sendMail.text.description{/lang}</small>
+                                               </dd>
                                        </dl>
-                                       <script type="text/javascript">//<![CDATA[
-                                               inlineHelp.register('text');
-                                       //]]></script>
                                        
                                        <dl>
                                                <dt></dt>
WoltLab Suite Core (previously WoltLab Community Framework)