Templates moved from core to add directory

diff --git a/.gitattributes b/.gitattributes
index a294cfefa643b06724692f69edee678e362e9210..798f8c8a6b63c83152806f43eef8666756245b1b 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -30,7 +30,10 @@ application/install/main/filter/install/.htaccess -text
 application/install/starter.php -text
 application/install/templates/.htaccess -text
 application/install/templates/de/.htaccess -text
+application/install/templates/de/code/emergency_exit.ctp -text
 application/install/templates/de/code/footer.ctp -text
+application/install/templates/de/code/footer_msg.ctp -text
+application/install/templates/de/code/footer_nav.ctp -text
 application/install/templates/de/code/header.ctp -text
 application/install/templates/de/code/home.ctp -text
 application/install/templates/de/code/install_main.ctp -text

diff --git a/application/install/templates/de/code/emergency_exit.ctp b/application/install/templates/de/code/emergency_exit.ctp
new file mode 100644 (file)
index 0000000..e974daf
--- /dev/null
+++ b/application/install/templates/de/code/emergency_exit.ctp
@@ -0,0 +1,29 @@
+{?header:title="Problem in application framework detected!"?}
+
+<div id="emergency_message">
+       $content[message]
+</div>
+
+<div id="emergency_backtrace">
+       <div id="backtrace_header">
+               File inclusion backtrace:
+       </div>
+       <div id="backtrace_content">
+               $content[backtrace]
+       </div>
+</div>
+
+<div id="stats_box">
+       <div id="stats_header">
+               Statistics
+       </div>
+       <div id="stats_objects">
+               Total objects: $content[total_objects]
+       </div>
+       <div id="stats_includes">
+               Loaded class files: $content[total_includes]
+               <span class="hint">(Including exception and interfaces.)</span>
+       </div>
+</div>
+
+{?footer_msg:footer_msg="Please contact the support and supply the full above message, if you think you are not qualified to fix this problem."?}

diff --git a/application/install/templates/de/code/footer_msg.ctp b/application/install/templates/de/code/footer_msg.ctp
new file mode 100644 (file)
index 0000000..fb1de36
--- /dev/null
+++ b/application/install/templates/de/code/footer_msg.ctp
@@ -0,0 +1,8 @@
+       <div id="footer_message">
+               $content[footer_msg]
+       </div>
+
+</div> <!-- masterbox //-->
+
+</body>
+</html>

diff --git a/application/install/templates/de/code/footer_nav.ctp b/application/install/templates/de/code/footer_nav.ctp
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/application/install/templates/de/code/home.ctp b/application/install/templates/de/code/home.ctp
index 259d49f1a5f70895d23f96cee162a58c0052f3a7..4f88892ca25faddd254d8558c095eb2a340fa363 100644 (file)
--- a/application/install/templates/de/code/home.ctp
+++ b/application/install/templates/de/code/home.ctp
@@ -1,3 +1,19 @@
 <div id="content_header">
        Willkommen zum Installationsassistenten Version {?app_version?}
 </div>
+
+<div id="content_text">
+       <div class="para teaser">
+               Herzlichen Dank, dass Sie sich f&uuml;r unsere frei erh&auml;ltliche
+               Software entschieden haben. Das Entwicklerteam m&ouml;chte sich bei Ihnen
+               f&uuml;r Ihre Wahl an dieser Stelle bedanken und hofft, dass Sie mit
+               unserer Software zufrieden sind und es bleiben.
+       </div>
+
+       <div class="para">
+               Dieser Installationsassistent wird Sie schrittweise durch die
+               Installation des Frameworks f&uuml;hren und Ihnen dabei alle Schritte
+               ausf&uuml;hrlich erleutern. Programmierkenntnisse sind hierzu nicht
+               n&ouml;tig!
+       </div>
+</div>

diff --git a/application/install/templates/de/code/install_main.ctp b/application/install/templates/de/code/install_main.ctp
index 82635dec613a49bcb0fe303885e0bbfebf4fa20e..ddf640851d1e8948b8b0827cbe25bfb32df4cb79 100644 (file)
--- a/application/install/templates/de/code/install_main.ctp
+++ b/application/install/templates/de/code/install_main.ctp
@@ -12,12 +12,16 @@
        {?nav_advert?}
 </div>
 
+<div id="language">
+       {?language_selector?}
+</div>
+
 <div id="main_content">
        {?content?}
 </div>
 
-<div id="nav_footer">
-       {?nav_footer?}
+<div id="footer_nav">
+       {?footer_nav?}
 </div>
 
 <div id="main_footer">

diff --git a/package.sh b/package.sh
index ef5f11b25fa5694d13a678bb2aa07f9bc5e5bb1d..106f2a3d57c2882439def1b3d86ee9c47a86ac9a 100755 (executable)
--- a/package.sh
+++ b/package.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Prefix of archive
-PREFIX="xxx"
+PREFIX="install"
 
 sh ./clear-cache.sh