From 3356130ce2adf82248cf64fcaa81a47713ce7987 Mon Sep 17 00:00:00 2001 From: Mate Bartus Date: Wed, 22 Jul 2015 12:43:17 +0200 Subject: [PATCH] [ticket/13740] Separate new installer style templates PHPBB3-13740 --- phpBB/adm/style/install_header.html | 10 +--- phpBB/adm/style/installer_footer.html | 21 +++++++ phpBB/adm/style/installer_header.html | 57 +++++++++++++++++++ phpBB/adm/style/installer_install.html | 4 +- phpBB/adm/style/installer_main.html | 6 ++ .../install/controller/installer_index.php | 2 +- 6 files changed, 90 insertions(+), 10 deletions(-) create mode 100644 phpBB/adm/style/installer_footer.html create mode 100644 phpBB/adm/style/installer_header.html create mode 100644 phpBB/adm/style/installer_main.html diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html index 9d0f9a56de..8debfc69c0 100644 --- a/phpBB/adm/style/install_header.html +++ b/phpBB/adm/style/install_header.html @@ -15,14 +15,10 @@

{L_INSTALL_PANEL}

{L_SKIP}

-
+
- + {S_LANG_SELECT}
@@ -47,7 +43,7 @@ id="activemenu">{l_block1.L_TITLE} - id="activemenu"> class="completed" id="installer-stage-{l_block2.STAGE_NAME}">{l_block2.L_TITLE} + id="activemenu"> class="completed">{l_block2.L_TITLE} diff --git a/phpBB/adm/style/installer_footer.html b/phpBB/adm/style/installer_footer.html new file mode 100644 index 0000000000..2c70d4d5d3 --- /dev/null +++ b/phpBB/adm/style/installer_footer.html @@ -0,0 +1,21 @@ + + + + + + +
+
+ Powered by phpBB® Forum Software © phpBB Limited +
+
+ + + + + + +{$SCRIPTS} + + + diff --git a/phpBB/adm/style/installer_header.html b/phpBB/adm/style/installer_header.html new file mode 100644 index 0000000000..ada6553aec --- /dev/null +++ b/phpBB/adm/style/installer_header.html @@ -0,0 +1,57 @@ + + + + + + {META} + {PAGE_TITLE} + + + + + +
+
+

{L_INSTALL_PANEL}

+

{L_SKIP}

+ +
+
+ + + +
+
+ +
+ +
+
+ +
+ +
+
+ + +
+
diff --git a/phpBB/adm/style/installer_install.html b/phpBB/adm/style/installer_install.html index 7700c79036..175c6eac67 100644 --- a/phpBB/adm/style/installer_install.html +++ b/phpBB/adm/style/installer_install.html @@ -1,4 +1,4 @@ - +

{TITLE}

{CONTENT}

@@ -10,4 +10,4 @@ - + diff --git a/phpBB/adm/style/installer_main.html b/phpBB/adm/style/installer_main.html new file mode 100644 index 0000000000..ed65da8a68 --- /dev/null +++ b/phpBB/adm/style/installer_main.html @@ -0,0 +1,6 @@ + + +

{TITLE}

+

{BODY}

+ + diff --git a/phpBB/phpbb/install/controller/installer_index.php b/phpBB/phpbb/install/controller/installer_index.php index 0a1855f4e5..8e1874984b 100644 --- a/phpBB/phpbb/install/controller/installer_index.php +++ b/phpBB/phpbb/install/controller/installer_index.php @@ -74,6 +74,6 @@ class installer_index 'BODY' => $body, )); - return $this->helper->render('install_main.html', $title, true); + return $this->helper->render('installer_main.html', $title, true); } }