projects / GitHub / WoltLab / WCF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6425426)
Fixing Style in last step of WCFSetup
authorTim Düsterhus <timwolla@arcor.de>
Tue, 20 Sep 2011 13:59:14 +0000 (15:59 +0200)
committerTim Düsterhus <timwolla@arcor.de>
Tue, 20 Sep 2011 13:59:14 +0000 (15:59 +0200)
Closes gh-170
The Style was no loaded because it was still tunneled through install.php which was already deleted at that point

wcfsetup/setup/template/footer.tpl patch | blob | blame | history
wcfsetup/setup/template/header.tpl patch | blob | blame | history
wcfsetup/setup/template/stepInstallPackages.tpl patch | blob | blame | history

diff --git a/wcfsetup/setup/template/footer.tpl b/wcfsetup/setup/template/footer.tpl
index 013811264119cbc53ea3624ea4f8f82e4cc85ffc..54b921d8ba24be0911b9b7f6423658ae3772194a 100644 (file)
--- a/wcfsetup/setup/template/footer.tpl
+++ b/wcfsetup/setup/template/footer.tpl
@@ -9,7 +9,7 @@
                <div>
                        <nav id="footerNavigation" class="footerNavigation">
                                <ul>
-                                       <li id="toTopLink" class="toTopLink"><a href="#top" title="{lang}wcf.global.scrollUp{/lang}" class="balloonTooltip"><img src="install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showIcon=toTop.svg" alt="" /> <span class="invisible">{lang}wcf.global.scrollUp{/lang}</span></a></li>
+                                       <li id="toTopLink" class="toTopLink"><a href="#top" title="{lang}wcf.global.scrollUp{/lang}" class="balloonTooltip"><img src="{if $lastStep|isset}{@RELATIVE_WCF_DIR}icon/{else}install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showIcon={/if}toTop.svg" alt="" /> <span class="invisible">{lang}wcf.global.scrollUp{/lang}</span></a></li>
                                </ul>
                        </nav>
                </div>
diff --git a/wcfsetup/setup/template/header.tpl b/wcfsetup/setup/template/header.tpl
index c68fb5c7c84ba5b353a8dff16dc60f45bcab8411..b7a33eeeba1d070857d19760362ee17b29ab674d 100644 (file)
--- a/wcfsetup/setup/template/header.tpl
+++ b/wcfsetup/setup/template/header.tpl
@@ -5,7 +5,7 @@
        <title>{lang}wcf.global.progressBar{/lang} - {lang}wcf.global.pageTitle{/lang}</title>
        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-       <link rel="stylesheet" type="text/css" href="install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showCSS=testing.css" />
+       <link rel="stylesheet" type="text/css" href="{if $lastStep|isset}{@RELATIVE_WCF_DIR}acp/style/{else}install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showCSS={/if}testing.css" />
 </head>
 
 <body id="tplWCFInstaller">
@@ -19,7 +19,7 @@
                        <div id="logo" class="logo">
                                <div><!-- ToDo: This is just a little trick to compensate the missing link here, find a better solution -->
                                        <h1>Installation</h1><!-- ToDo: Use a proper text and language variable -->
-                                       <img src="install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showImage=wcfLogoWhite.svg" width="300" height="58" alt="Product-logo" title="Installation" />
+                                       <img src="{if $lastStep|isset}{@RELATIVE_WCF_DIR}acp/images/{else}install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showImage={/if}wcfLogoWhite.svg" width="300" height="58" alt="Product-logo" title="Installation" />
                                </div>
                                
                                <!-- no search area -->
@@ -32,7 +32,7 @@
                        <nav class="headerNavigation">
                                <div>
                                        <ul>
-                                               <li id="toBottomLink" class="toBottomLink"><a href="#bottom" title="{lang}wcf.global.scrollDown{/lang}" class="balloonTooltip"><img src="install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showIcon=toBottom.svg" alt="" /> <span class="invisible">{lang}wcf.global.scrollDown{/lang}</span></a></li>
+                                               <li id="toBottomLink" class="toBottomLink"><a href="#bottom" title="{lang}wcf.global.scrollDown{/lang}" class="balloonTooltip"><img src="{if $lastStep|isset}{@RELATIVE_WCF_DIR}icon/{else}install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showIcon={/if}toBottom.svg" alt="" /> <span class="invisible">{lang}wcf.global.scrollDown{/lang}</span></a></li>
                                        </ul>
                                </div>
                        </nav>
@@ -49,7 +49,7 @@
                        <section id="content" class="content">
                                
                                <header class="mainHeading setup">
-                                       <img src="install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showIcon=installation1.svg" alt="" />
+                                       <img src="{if $lastStep|isset}{@RELATIVE_WCF_DIR}icon/{else}install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showIcon={/if}installation1.svg" alt="" />
                                        <hgroup>
                                                <h1>{lang}wcf.global.title{/lang}</h1>
                                                <h2>{lang}wcf.global.title.subtitle{/lang}</h2>
diff --git a/wcfsetup/setup/template/stepInstallPackages.tpl b/wcfsetup/setup/template/stepInstallPackages.tpl
index 872f1cd28be0750a11497745c5b015119135f6f6..85096e11e1bda64036016a06089875be1482e910 100644 (file)
--- a/wcfsetup/setup/template/stepInstallPackages.tpl
+++ b/wcfsetup/setup/template/stepInstallPackages.tpl
@@ -1,3 +1,4 @@
+{assign var=lastStep value=true}
 {include file='header'}
 
 <hgroup class="subHeading">
WoltLab Suite Core (previously WoltLab Community Framework)