From 4fbee37752f8b854a98f60f4f7befc09f33e604c Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 12 Jun 2012 19:50:55 +0200 Subject: [feature/new-tz-handling] Move timezone option into its own template file This should make it much easier for extensions to change the handling of the timezone selection PHPBB3-9558 --- .../styles/prosilver/template/timezone_option.html | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 phpBB/styles/prosilver/template/timezone_option.html (limited to 'phpBB/styles/prosilver/template/timezone_option.html') diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html new file mode 100644 index 0000000000..6a6a937977 --- /dev/null +++ b/phpBB/styles/prosilver/template/timezone_option.html @@ -0,0 +1,22 @@ +
+
+ + + +
+ + + + + +
+
-- cgit v1.2.1 From 5441ee1ee489ef9ad1727f110c440dde5417cc1f Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sun, 17 Jun 2012 16:54:12 +0200 Subject: [feature/new-tz-handling] Use jQuery and INCLUDEJS for javascript PHPBB3-9558 --- phpBB/styles/prosilver/template/timezone_option.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'phpBB/styles/prosilver/template/timezone_option.html') diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html index 6a6a937977..3a08de1a46 100644 --- a/phpBB/styles/prosilver/template/timezone_option.html +++ b/phpBB/styles/prosilver/template/timezone_option.html @@ -15,8 +15,10 @@ {S_TZ_OPTIONS} - - - + + -- cgit v1.2.1 From c21275fa951bd4d8608cc335a5c39d9a05bc4904 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 18 Jun 2012 10:53:47 +0200 Subject: [feature/new-tz-handling] Use js and data attributes to create the events PHPBB3-9558 --- phpBB/styles/prosilver/template/timezone_option.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'phpBB/styles/prosilver/template/timezone_option.html') diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html index 3a08de1a46..8840e9e5e8 100644 --- a/phpBB/styles/prosilver/template/timezone_option.html +++ b/phpBB/styles/prosilver/template/timezone_option.html @@ -6,7 +6,7 @@ {S_TZ_DATE_OPTIONS} - +
@@ -15,10 +15,6 @@ {S_TZ_OPTIONS} -
-- cgit v1.2.1 From 79a03909706d78efe6d49e88a0ac089186a65368 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 19 Jun 2012 15:41:18 +0200 Subject: [feature/new-tz-handling] Fix javascript in prosilver Use new coding guidelines, wrap code with (function($)) and use phpbb. prefix PHPBB3-9558 --- phpBB/styles/prosilver/template/timezone_option.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/styles/prosilver/template/timezone_option.html') diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html index 8840e9e5e8..3881c2553c 100644 --- a/phpBB/styles/prosilver/template/timezone_option.html +++ b/phpBB/styles/prosilver/template/timezone_option.html @@ -2,7 +2,7 @@
-- cgit v1.2.1 From 22951e43674d023f43edc8da7ade33f01b5428c8 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 23 Jul 2012 17:02:40 +0200 Subject: [ticket/11004] Make suggestion button a real button and fix it's value PHPBB3-11004 --- phpBB/styles/prosilver/template/timezone_option.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/styles/prosilver/template/timezone_option.html') diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html index 94e2bbdfbd..24d6aa677f 100644 --- a/phpBB/styles/prosilver/template/timezone_option.html +++ b/phpBB/styles/prosilver/template/timezone_option.html @@ -6,7 +6,7 @@ {S_TZ_DATE_OPTIONS} - +
-- cgit v1.2.1 From 6e7e70a18abc4368bc0728db420d1f7f61ad8686 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Fri, 3 Aug 2012 11:43:23 -0500 Subject: [ticket/10780] Replace colon usage in template output with {L_COLON} Replace all the instances (I could find) where the colon is displayed to the user with {L_COLON} so it can be localised. PHPBB3-10780 --- phpBB/styles/prosilver/template/timezone_option.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/styles/prosilver/template/timezone_option.html') diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html index 24d6aa677f..320b9b7121 100644 --- a/phpBB/styles/prosilver/template/timezone_option.html +++ b/phpBB/styles/prosilver/template/timezone_option.html @@ -1,5 +1,5 @@
-
+
-- cgit v1.2.1 From f60540d31f89bfd1ee8aabb2ce85fe3cd7dfe829 Mon Sep 17 00:00:00 2001 From: Dhruv Date: Sun, 17 Feb 2013 12:53:14 +0530 Subject: [ticket/11303] rename attribute to timezone-preselect PHPBB3-11303 --- phpBB/styles/prosilver/template/timezone_option.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/styles/prosilver/template/timezone_option.html') diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html index 6f09f276ff..a77e82f9a1 100644 --- a/phpBB/styles/prosilver/template/timezone_option.html +++ b/phpBB/styles/prosilver/template/timezone_option.html @@ -6,7 +6,7 @@ {S_TZ_DATE_OPTIONS} - +
-- cgit v1.2.1 From 1a0819bdc40fd6b40b556ba1739ae71214719b43 Mon Sep 17 00:00:00 2001 From: Nathan Guse Date: Mon, 24 Jun 2013 13:32:31 -0500 Subject: [feature/twig] Changing INCLUDEJS behavior Was: Now: Reasons for this: 1. INCLUDEJS is 3.1-dev only 2. INCLUDEJS has odd behavior to begin with (arbitrary setting root path to styles/name/ directory) 3. INCLUDEJS could not include files from outside directories or anywhere else 4. It was easier to change INCLUDEJS behavior to something more flexible and useful than hack around it to make it work as it was with Twig. PHPBB3-11598 --- phpBB/styles/prosilver/template/timezone_option.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/styles/prosilver/template/timezone_option.html') diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html index a77e82f9a1..95b30dbcd1 100644 --- a/phpBB/styles/prosilver/template/timezone_option.html +++ b/phpBB/styles/prosilver/template/timezone_option.html @@ -15,6 +15,6 @@ {S_TZ_OPTIONS} - +
-- cgit v1.2.1 From 6c30441ad4a20fe4f154d5a859b9df0f28cbc8e0 Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Mon, 1 Jul 2013 12:26:01 -0500 Subject: [feature/twig] Changing INCLUDEJS behavior slightly Automatically parsing inline variables the same way it is done for INCLUDE, INCLUDEPHP PHPBB3-11598 --- phpBB/styles/prosilver/template/timezone_option.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/styles/prosilver/template/timezone_option.html') diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html index 95b30dbcd1..ebcf51a906 100644 --- a/phpBB/styles/prosilver/template/timezone_option.html +++ b/phpBB/styles/prosilver/template/timezone_option.html @@ -15,6 +15,6 @@ {S_TZ_OPTIONS} - +
-- cgit v1.2.1 From 59d13d0535ab3687725d36f2dbe2ee64de294df8 Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Tue, 2 Jul 2013 11:02:55 -0500 Subject: [feature/twig] INCLUDEJS behavior now supports local relative paths This was done because T_TEMPLATE_PATH is not always correct for js files (e.g. the inheriting style does not include these). Now we use the Twig Loader to find the correct file to link to (most specific file first, then parent styles). Also allows using @namespace convention PHPBB3-11598 --- phpBB/styles/prosilver/template/timezone_option.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/styles/prosilver/template/timezone_option.html') diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html index ebcf51a906..fc0579bffd 100644 --- a/phpBB/styles/prosilver/template/timezone_option.html +++ b/phpBB/styles/prosilver/template/timezone_option.html @@ -15,6 +15,6 @@ {S_TZ_OPTIONS} - + -- cgit v1.2.1 From 9ebee7de323eae3ac86f025f44429d2d4bc995b1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 17 Sep 2014 14:15:16 +0200 Subject: [ticket/12858] Generate timezone selects with template loop PHPBB3-12858 --- phpBB/styles/prosilver/template/timezone_option.html | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'phpBB/styles/prosilver/template/timezone_option.html') diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html index fc0579bffd..291283c7ca 100644 --- a/phpBB/styles/prosilver/template/timezone_option.html +++ b/phpBB/styles/prosilver/template/timezone_option.html @@ -1,10 +1,12 @@
- + @@ -12,7 +14,13 @@
-- cgit v1.2.1 From 9a3aeb8a99e7edeb38b5791adf71cfd13059957b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 17 Sep 2014 15:54:00 +0200 Subject: [ticket/12858] Remove hardcoded language entries from timezone selects PHPBB3-12858 --- phpBB/styles/prosilver/template/timezone_option.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/styles/prosilver/template/timezone_option.html') diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html index 291283c7ca..8f9017b2ef 100644 --- a/phpBB/styles/prosilver/template/timezone_option.html +++ b/phpBB/styles/prosilver/template/timezone_option.html @@ -15,7 +15,7 @@ - - - + + +
@@ -14,13 +14,13 @@
-- cgit v1.2.1