From c945fc9355fca866bfb095a2e79c51408a709387 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Mon, 11 Jul 2011 09:55:18 +0200
Subject: [ticket/10155] Add jQuery, introduce global assets path

Add the jQuery JavaScript library to all pages, giving modifications
instant access and allowing for any future core JavaScript to take
advantage of it.

Also introduce a global /assets directory for assets that are shared
between styles.

PHPBB3-10155
---
 phpBB/adm/index.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/index.php')

diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 726cb1644c..2444a1b597 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -53,6 +53,7 @@ $mode			= request_var('mode', '');
 
 // Set custom template for admin area
 $template->set_custom_template($phpbb_admin_path . 'style', 'admin');
+$template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets');
 $template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
 
 // the acp template is never stored in the database
-- 
cgit v1.2.1


From 9e4349e7faac65403de02fd090a837fee92b764a Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Thu, 4 Sep 2008 11:39:25 +0000
Subject: [feature/remove-db-styles] Removed database storage of style
 components.

The bulk of database storage of templates is removed, rendering template
stored in the database as useless.

Theme database storage is reduced to a skeleton for full removal soon.

This commit was cherry picked from the old feature/ascraeus-experiment branch
the old commit hash is 0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e.

PHPBB3-9741
---
 phpBB/adm/index.php | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'phpBB/adm/index.php')

diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 2444a1b597..4f4d9ccedd 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -56,9 +56,6 @@ $template->set_custom_template($phpbb_admin_path . 'style', 'admin');
 $template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets');
 $template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
 
-// the acp template is never stored in the database
-$user->theme['template_storedb'] = false;
-
 // Instantiate new module
 $module = new p_master();
 
-- 
cgit v1.2.1


From ea46feb11542a9cf54ce083ee0ad03f4c5e02a1e Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Tue, 30 Aug 2011 01:32:11 -0400
Subject: [feature/extension-manager] Add support for templates in extensions.

This commit adds a template path provider to separate the process of locating
(cached) paths in extensions from the template engine. The locator is supplied
with a list of paths from the path provider.

Admin templates can now be created in ext/<ext>/adm/style/ and regular
templates go into ext/<ext>/styles/<style>/template/. Extension templates
override regular templates. So if an extension supplies a file with a name
used in phpBB, the extension's file will be used.

A side-effect of this commit: Locator and Provider are now able to deal with
arbitrary levels of template inheritance. So we can expose this through
phpbb_template if we choose to, and allow styles to inherit from inherited
styles.

PHPBB3-10323
---
 phpBB/adm/index.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/adm/index.php')

diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 4f4d9ccedd..cb9e07bd70 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -52,6 +52,7 @@ $module_id		= request_var('i', '');
 $mode			= request_var('mode', '');
 
 // Set custom template for admin area
+$template->set_ext_dir_prefix('adm/');
 $template->set_custom_template($phpbb_admin_path . 'style', 'admin');
 $template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets');
 $template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
-- 
cgit v1.2.1


From 7a04c9048c110f0bd21ea3e9e869e17b408d640e Mon Sep 17 00:00:00 2001
From: Unknown <unknownbliss@phpbbdevelopers.net>
Date: Sat, 31 Dec 2011 13:32:52 +0000
Subject: [ticket/9916] Updating header license and removing Version $Id$

PHPBB3-9916
---
 phpBB/adm/index.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'phpBB/adm/index.php')

diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index cb9e07bd70..e7168b210b 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -2,9 +2,8 @@
 /**
 *
 * @package acp
-* @version $Id$
 * @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
 
-- 
cgit v1.2.1


From fd96f97dc3c659e1d2e9b58420d652ad79387fbf Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Thu, 15 Mar 2012 21:11:34 +0200
Subject: [feature/merging-style-components] Updating style initialization

Changing template initialization to style initialization.

PHPBB3-10632
---
 phpBB/adm/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/index.php')

diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index e7168b210b..91894e5aec 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -50,9 +50,9 @@ $file_uploads	= (@ini_get('file_uploads') == '1' || strtolower(@ini_get('file_up
 $module_id		= request_var('i', '');
 $mode			= request_var('mode', '');
 
-// Set custom template for admin area
-$template->set_ext_dir_prefix('adm/');
-$template->set_custom_template($phpbb_admin_path . 'style', 'admin');
+// Set custom style for admin area
+$style->set_ext_dir_prefix('adm/');
+$style->set_custom_style('admin', $phpbb_admin_path . 'style', '');
 $template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets');
 $template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
 
-- 
cgit v1.2.1


From 57065095d570f0ff5976470ce81a4b216fe5f98e Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <arty@phpbb.com>
Date: Tue, 3 Apr 2012 00:41:56 +0300
Subject: [ticket/10754] Changing $style to $phpbb_style

Renaming global variable $style to $phpbb_style

PHPBB3-10754
---
 phpBB/adm/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/index.php')

diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 91894e5aec..e20bbe4bec 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -51,8 +51,8 @@ $module_id		= request_var('i', '');
 $mode			= request_var('mode', '');
 
 // Set custom style for admin area
-$style->set_ext_dir_prefix('adm/');
-$style->set_custom_style('admin', $phpbb_admin_path . 'style', '');
+$phpbb_style->set_ext_dir_prefix('adm/');
+$phpbb_style->set_custom_style('admin', $phpbb_admin_path . 'style', '');
 $template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets');
 $template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
 
-- 
cgit v1.2.1