Some minor improvements/fixes

diff --git a/com.woltlab.wcf/templates/headInclude.tpl b/com.woltlab.wcf/templates/headInclude.tpl
index 6cd5bb052d0677c8b408e33bd6625b435677d83a..ee5e4ba692fd6daa1e88de958f193d530612e074 100644 (file)
--- a/com.woltlab.wcf/templates/headInclude.tpl
+++ b/com.woltlab.wcf/templates/headInclude.tpl
@@ -58,7 +58,7 @@
 <script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Tagging.js?v={@$__wcfVersion}"></script>
 <script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.User.js?v={@$__wcfVersion}"></script>
 {else}
-<script data-relocate="true" src="{@$__wcf->getPath()js/WCF.Combined.min.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Combined.min.js?v={@$__wcfVersion}"></script>
 {/if}
 
 <script data-relocate="true">
@@ -164,7 +164,6 @@
                });
                
                WCF.Dropdown.init();
-
                WCF.System.Mobile.UX.init();
                
                new WCF.Date.Time();

diff --git a/com.woltlab.wcf/templates/imageViewer.tpl b/com.woltlab.wcf/templates/imageViewer.tpl
index a56bf3e63a4589946ae1c05b3258945569585269..3ee12343b1cfe14080b87c765fd174ffc01aff76 100644 (file)
--- a/com.woltlab.wcf/templates/imageViewer.tpl
+++ b/com.woltlab.wcf/templates/imageViewer.tpl
@@ -1,6 +1,6 @@
 {if !$__imageViewerLoaded|isset}
        <script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/slimbox2{if !ENABLE_DEBUG_MODE}.min{/if}.js"></script>
-       <script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.ImageViewer{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+       {*<script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.ImageViewer{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>*}
        <script data-relocate="true">
                //<![CDATA[
                var $imageViewer = null;

diff --git a/com.woltlab.wcf/templates/searchArea.tpl b/com.woltlab.wcf/templates/searchArea.tpl
index e16ff8ce5c942b150e335fea27c966ba31d4e9dc..5a8a0eab22a5ee5e0cd635956ec7b1a2c43da3a0 100644 (file)
--- a/com.woltlab.wcf/templates/searchArea.tpl
+++ b/com.woltlab.wcf/templates/searchArea.tpl
@@ -27,7 +27,7 @@
 </aside>
 
 {if !OFFLINE || $__wcf->session->getPermission('admin.general.canViewPageDuringOfflineMode')}
-       <script data-relocate="true" src="{@$__wcf->getPath('wcf')}js/WCF.Search.Message{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+       {*<script data-relocate="true" src="{@$__wcf->getPath('wcf')}js/WCF.Search.Message{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>*}
        <script data-relocate="true">
                //<![CDATA[
                $(function() {

diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js
index 39a87f8567f77c380251b7cd38cfcc25d9556190..c603d7c5770681e181e3c19d3d1bb820df8f8775 100644 (file)
--- a/wcfsetup/install/files/acp/js/WCF.ACP.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.js
@@ -1594,7 +1594,7 @@ WCF.ACP.PluginStore.PurchasedItems.Search = Class.extend({
                        success: $.proxy(this._success, this)
                });
                
-               var $button = $('<li><a class="button"><span class="icon icon16 fa-shopping-cart" /> <span>' + WCF.Language.get('wcf.acp.pluginstore.purchasedItems.button.search') + '</span></a></li>');
+               var $button = $('<li><a class="button"><span class="icon icon16 fa-shopping-cart" /> <span>' + WCF.Language.get('wcf.acp.pluginStore.purchasedItems.button.search') + '</span></a></li>');
                $button.prependTo($('.contentNavigation:eq(0) > nav > ul')).click($.proxy(this._click, this));
        },
        
@@ -1611,7 +1611,7 @@ WCF.ACP.PluginStore.PurchasedItems.Search = Class.extend({
                        if (this._dialog === null) {
                                this._dialog = $('<div />').hide().appendTo(document.body);
                                this._dialog.html(data.returnValues.template).wcfDialog({
-                                       title: WCF.Language.get('wcf.acp.pluginstore.authorization')
+                                       title: WCF.Language.get('wcf.acp.pluginStore.authorization')
                                });
                        }
                        else {
@@ -1628,7 +1628,7 @@ WCF.ACP.PluginStore.PurchasedItems.Search = Class.extend({
                        });
                }
                else if (data.returnValues.noResults) {
-                       this._dialog.wcfDialog('option', 'title', WCF.Language.get('wcf.acp.pluginstore.purchasedItems'));
+                       this._dialog.wcfDialog('option', 'title', WCF.Language.get('wcf.acp.pluginStore.purchasedItems'));
                        this._dialog.html(data.returnValues.noResults);
                        this._dialog.wcfDialog('open');
                }

diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index 17bef9a4690558f5cb4a629c2b534c84034729fb..a9ea2c0b2b0dab8b2dfaae4a68ef619c25e04ea5 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -7,10 +7,10 @@
                        'wcf.acp.package.searchForUpdates': '{lang}wcf.acp.package.searchForUpdates{/lang}',
                        'wcf.acp.package.searchForUpdates.noResults': '{lang}wcf.acp.package.searchForUpdates.noResults{/lang}',
                        'wcf.acp.package.uninstallation.title': '{lang}wcf.acp.package.uninstallation.title{/lang}',
-                       'wcf.acp.pluginstore.authorization': '{lang}wcf.acp.pluginstore.authorization{/lang}',
-                       'wcf.acp.pluginstore.purchasedItems': '{lang}wcf.acp.pluginstore.purchasedItems{/lang}',
-                       'wcf.acp.pluginstore.purchasedItems.button.search': '{lang}wcf.acp.pluginstore.purchasedItems.button.search{/lang}',
-                       'wcf.acp.pluginstore.purchasedItems.noResults': '{lang}wcf.acp.pluginstore.purchasedItems.noResults{/lang}'
+                       'wcf.acp.pluginStore.authorization': '{lang}wcf.acp.pluginStore.authorization{/lang}',
+                       'wcf.acp.pluginStore.purchasedItems': '{lang}wcf.acp.pluginStore.purchasedItems{/lang}',
+                       'wcf.acp.pluginStore.purchasedItems.button.search': '{lang}wcf.acp.pluginStore.purchasedItems.button.search{/lang}',
+                       'wcf.acp.pluginStore.purchasedItems.noResults': '{lang}wcf.acp.pluginStore.purchasedItems.noResults{/lang}'
                });
                
                {if $__wcf->session->getPermission('admin.system.package.canUninstallPackage')}

diff --git a/wcfsetup/install/files/acp/templates/pluginStoreAuthorization.tpl b/wcfsetup/install/files/acp/templates/pluginStoreAuthorization.tpl
index 7c951745f88e1225f3abbf5d08c691d85cd783c2..c6e4886d278ec8cb83a7b82eb4a8633027071500 100644 (file)
--- a/wcfsetup/install/files/acp/templates/pluginStoreAuthorization.tpl
+++ b/wcfsetup/install/files/acp/templates/pluginStoreAuthorization.tpl
@@ -1,18 +1,18 @@
 {if $rejected}
-       <p class="error">{lang}wcf.acp.pluginstore.authorization.credentails.rejected{/lang}</p>
+       <p class="error">{lang}wcf.acp.pluginStore.authorization.credentails.rejected{/lang}</p>
 {/if}
 
 <fieldset{if $rejected} class="marginTop"{/if}>
-       <legend>{lang}wcf.acp.pluginstore.authorization.credentials{/lang}</legend>
-       <small>{lang}wcf.acp.pluginstore.authorization.credentails.description{/lang}</small>
+       <legend>{lang}wcf.acp.pluginStore.authorization.credentials{/lang}</legend>
+       <small>{lang}wcf.acp.pluginStore.authorization.credentials.description{/lang}</small>
        
        <dl>
-               <dt><label for="pluginStoreUsername">{lang}wcf.acp.pluginstore.authorization.username{/lang}</label></dt>
+               <dt><label for="pluginStoreUsername">{lang}wcf.acp.pluginStore.authorization.username{/lang}</label></dt>
                <dd><input type="text" id="pluginStoreUsername" value="" class="long" /></dd>
        </dl>
        
        <dl>
-               <dt><label for="pluginStorePassword">{lang}wcf.acp.pluginstore.authorization.password{/lang}</label></dt>
+               <dt><label for="pluginStorePassword">{lang}wcf.acp.pluginStore.authorization.password{/lang}</label></dt>
                <dd><input type="password" id="pluginStorePassword" value="" class="long" /></dd>
        </dl>
 </fieldset>