Updated logo

diff --git a/wcfsetup/install.php b/wcfsetup/install.php
index 636b7a333f076146742c17e2b0b53d75fe7d0ffb..b8ba222bc2262107e981cf588420736d79e46ece 100644 (file)
--- a/wcfsetup/install.php
+++ b/wcfsetup/install.php
@@ -21,7 +21,7 @@ set_error_handler('handleError', E_ALL);
 // define list of needed file
 $neededFilesPattern = [
        '!^setup/.*!',
-       '!^install/files/acp/images/wcfLogo.*!',
+       '!^install/files/acp/images/woltlabSuite.*!',
        '!^install/files/acp/style/setup/.*!',
        '!^install/files/lib/data/.*!',
        '!^install/files/icon/.*!',

diff --git a/wcfsetup/install/files/acp/images/wcfLogo-small.png b/wcfsetup/install/files/acp/images/wcfLogo-small.png
deleted file mode 100644 (file)
index f0fec15..0000000
Binary files a/wcfsetup/install/files/acp/images/wcfLogo-small.png and /dev/null differ

diff --git a/wcfsetup/install/files/acp/images/wcfLogo.png b/wcfsetup/install/files/acp/images/wcfLogo.png
deleted file mode 100644 (file)
index aeb620f..0000000
Binary files a/wcfsetup/install/files/acp/images/wcfLogo.png and /dev/null differ

diff --git a/wcfsetup/install/files/acp/images/woltlabSuite-small.png b/wcfsetup/install/files/acp/images/woltlabSuite-small.png
new file mode 100644 (file)
index 0000000..7edb733
Binary files /dev/null and b/wcfsetup/install/files/acp/images/woltlabSuite-small.png differ

diff --git a/wcfsetup/install/files/acp/images/woltlabSuite.png b/wcfsetup/install/files/acp/images/woltlabSuite.png
new file mode 100644 (file)
index 0000000..13475ee
Binary files /dev/null and b/wcfsetup/install/files/acp/images/woltlabSuite.png differ

diff --git a/wcfsetup/install/files/acp/templates/pageHeaderLogo.tpl b/wcfsetup/install/files/acp/templates/pageHeaderLogo.tpl
index a2e0807c3ce8c5afd5e016628421f8d94ad10202..ba2350e52c8a86ec9aac4e8c86a807bbae54d198 100644 (file)
--- a/wcfsetup/install/files/acp/templates/pageHeaderLogo.tpl
+++ b/wcfsetup/install/files/acp/templates/pageHeaderLogo.tpl
@@ -1,6 +1,6 @@
 <div id="pageHeaderLogo" class="pageHeaderLogo">
        <a href="{link}{/link}">
-               <img src="{@$__wcf->getPath()}acp/images/wcfLogo.png" alt="" class="pageHeaderLogoLarge">
-               <img src="{@$__wcf->getPath()}acp/images/wcfLogo-small.png" alt="" class="pageHeaderLogoSmall">
+               <img src="{@$__wcf->getPath()}acp/images/woltlabSuite.png" alt="" class="pageHeaderLogoLarge">
+               <img src="{@$__wcf->getPath()}acp/images/woltlabSuite-small.png" alt="" class="pageHeaderLogoSmall">
        </a>
 </div>
\ No newline at end of file

diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl
index 29320cd5554175e90586917ea4af2b810c44e783..ac7a2c99d7501a35e40afddc12aa189a6b0be4b8 100644 (file)
--- a/wcfsetup/install/files/acp/templates/styleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl
@@ -492,7 +492,7 @@
                                        <div id="spWindow">
                                                <div id="spHeader" data-region="wcfHeader">
                                                        <div class="spBoundary">
-                                                               <div id="spLogo"><img src="{@$__wcf->getPath()}acp/images/wcfLogo.png"></div>
+                                                               <div id="spLogo"><img src="{@$__wcf->getPath()}acp/images/woltlabSuite.png"></div>
                                                                <div id="spSearch"><input type="search" id="spSearchBox" placeholder="{lang}wcf.global.search.enterSearchTerm{/lang}" autocomplete="off" data-region="wcfHeaderSearchBox"></div>
                                                                <div id="spMenu">
                                                                        <ol class="inlineList" data-region="wcfHeaderMenu">

diff --git a/wcfsetup/install/files/images/default-logo-small.png b/wcfsetup/install/files/images/default-logo-small.png
index f0fec150dae7c2e047e73cca575ab6d5356eab24..7edb733aa392ea43df1142e2aaddcbb0ca14bd92 100644 (file)
Binary files a/wcfsetup/install/files/images/default-logo-small.png and b/wcfsetup/install/files/images/default-logo-small.png differ

diff --git a/wcfsetup/install/files/images/default-logo.png b/wcfsetup/install/files/images/default-logo.png
index aeb620fa1a5da8e5ffea66bdbb788df4d272a7e8..13475ee6fb69a9b592a1a342b13505e806950186 100644 (file)
Binary files a/wcfsetup/install/files/images/default-logo.png and b/wcfsetup/install/files/images/default-logo.png differ

diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index 186a6d94084973032ce3a6c5641953c16d4569fb..d2fb5a5488208e5488641d4a5f4b1057410509e4 100644 (file)
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -1996,7 +1996,7 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('individual
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('messageSidebarOrientation', 'left');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('overrideScss', '');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('pageLogo', '');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('pageLogoWidth', '288');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('pageLogoWidth', '281');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('pageLogoHeight', '40');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('pageLogoMobile', '');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('useFluidLayout', '1');

diff --git a/wcfsetup/setup/template/header.tpl b/wcfsetup/setup/template/header.tpl
index f038f4c93279319200983194bb245747a53ee8d2..320bda96a4ff4aaa2a016c10cfb65a93423a0eed 100644 (file)
--- a/wcfsetup/setup/template/header.tpl
+++ b/wcfsetup/setup/template/header.tpl
@@ -32,7 +32,7 @@
                                <div>
                                        <div class="layoutBoundary">
                                                <div id="pageHeaderLogo" class="pageHeaderLogo">
-                                                       <img src="{if $lastStep|isset}{@RELATIVE_WCF_DIR}acp/images/{else}install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showImage={/if}wcfLogo.png" alt="" style="height: 40px; width: 288px;">
+                                                       <img src="{if $lastStep|isset}{@RELATIVE_WCF_DIR}acp/images/{else}install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showImage={/if}woltlabSuite.png" alt="" style="height: 40px; width: 288px;">
                                                </div>
                                        </div>
                                </div>