mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00
Code Issues Releases Wiki Activity
15,353 Commits 17 Branches 190 Tags
Commit Graph

46 Commits

Author SHA1 Message Date
David King
2212294ba3 Merge remote-tracking branch 'p/feature/template-events' into develop 
* p/feature/template-events:
  [feature/template-events] Pass arguments in correct order.

Conflicts:
	phpBB/includes/style/style.php
 2012-12-10 14:27:18 -05:00
David King
a9db155c28 Merge remote-tracking branch 'p/feature/template-events' into develop 
# By Oleg Pudeyev (36) and others
# Via Oleg Pudeyev
* p/feature/template-events: (47 commits)
  [feature/template-events] Pass arguments in correct order.
  [feature/template-events] Order extensions in mock extension manager.
  [feature/template-events] Changes per imkingdavid's review.
  [feature/template-events] Make style names private on template.
  [feature/template-events] Test for event that is defined in parent style only.
  [feature/template-events] Specify style names, add inheritance tests.
  [feature/template-events] Normalize expected directory trees.
  [feature/template-events] Allow dataset to be correctly selectable.
  [feature/template-events] Dataset for template event testing with inheritance.
  [feature/template-events] Use style names array in template filter.
  [feature/template-events] Generate style names array in set_style.
  [feature/template-events] Convert a single style name to array of them.
  [feature/template-events] Chase dependency injection for template context.
  [feature/template-events] Adjust template events test to use the dataset.
  [feature/template-events] Create a dataset for template event tests.
  [feature/template-events] Indentation fix.
  [feature/template-events] Cosmetic changes.
  [feature/template-events] Wording: wrongly -> improperly.
  [feature/template-events] Indentation fix.
  [feature/template-events] Rename template_name to style_name.
  ...
 2012-12-10 14:09:10 -05:00
Oleg Pudeyev
a0211ff2eb [feature/template-events] Pass arguments in correct order. 
Thank you imkingdavid.

PHPBB3-9550
 2012-12-10 14:02:57 -05:00
Oleg Pudeyev
0446886f91 [feature/template-events] Pass arguments in correct order. 
Thank you imkingdavid.

PHPBB3-9550
 2012-12-10 13:35:15 -05:00
Oleg Pudeyev
ec4343c744 [ticket/11227] @return void -> @return null, per coding guidelines. 
PHPBB3-11227
 2012-11-30 23:03:06 -05:00
Oleg Pudeyev
47a90f815d [feature/template-events] Changes per imkingdavid's review. 
PHPBB3-9550
 2012-11-17 16:43:40 -05:00
Oleg Pudeyev
da7d888448 [feature/template-events] Make style names private on template. 
PHPBB3-9550
 2012-11-17 16:43:38 -05:00
Oleg Pudeyev
729eeef2bf [feature/template-events] Generate style names array in set_style. 
PHPBB3-9550
 2012-11-17 16:42:43 -05:00
Oleg Pudeyev
44d6dc4c4c [feature/template-events] Convert a single style name to array of them. 
This allows template code to know the entire style hierarchy for
templates being rendered.

PHPBB3-9550
 2012-11-17 16:42:40 -05:00
Oleg Pudeyev
7fdab9c5d7 [ticket/10933] Prose for get_first_file_location. 
Also rewrite get_first_template_location prose a little to be
less repetitive with get_first_file_location.

PHPBB3-10933
 2012-11-02 19:45:02 -04:00
Oleg Pudeyev
bf66c47650 [ticket/10933] Remaining documentation for added functions in resource locator 
PHPBB3-10933
 2012-11-02 19:39:07 -04:00
Oleg Pudeyev
0dd981071b [ticket/10933] Dispose of locate function in template class. 
It had no callers other than the test suite.

PHPBB3-10933
 2012-11-02 19:39:07 -04:00
Oleg Pudeyev
09794c6821 [ticket/10933] Add mutators for template_path to style resource locator. 
template_path is now private.

Change semantics of passing false for template path - now this resets
template path to default which I think makes sense.

PHPBB3-10933
 2012-11-02 19:39:05 -04:00
Oleg Pudeyev
6295b014d3 [ticket/10933] Delete template_path assignment. 
template_path is now only present in style resource locator and
should not be assigned to.

PHPBB3-10933
 2012-11-02 19:37:53 -04:00
Oleg Pudeyev
615d5ef628 [ticket/10933] Add get_first_template_location. 
This localizes template_path to style resource locator.

locate function on template will be removed in a subsequent commit.

PHPBB3-10933
 2012-11-02 19:37:52 -04:00
Oleg Pudeyev
c063e3a52c [ticket/10933] Use inheritDoc, eliminate copy pasted docblocks. 
PHPBB3-10933
 2012-11-02 19:28:32 -04:00
Oleg Pudeyev
0c18f92c0a [ticket/10933] Typo fixes 
PHPBB3-10933
 2012-11-02 18:03:52 -04:00
Oleg Pudeyev
8528d8ff34 [ticket/10933] Initialize template context when template is constructed. 
There is no apparent reason for either initializing or clearing
the context in set_style/set_custom_style.

Initially the initialization there was added in
0501640d5db158a010741e27803191ab469834c4, for reasons that
presently I do not see.

This permits making context property back private.

PHPBB3-10933
 2012-11-02 18:03:52 -04:00
Igor Wiedler
85bcdbad46 [ticket/11012] Normalize $phpEx member vars to $php_ext 
PHPBB3-11012
 2012-07-21 16:19:01 +02:00
Oleg Pudeyev
699aab8e8e [ticket/10829] $style_name -> $style_path in style class. 
Here the style path is taken and the variable name should be $style_path.

PHPBB3-10829
 2012-06-11 21:00:22 -04:00
Vjacheslav Trushkin
71ca9b4fe6 [ticket/10743] Renaming user->theme 
Renaming user->theme to user->style

PHPBB3-10743
 2012-06-11 19:56:50 -04:00
Vjacheslav Trushkin
ed9a58a6cc [ticket/10756] Fixing variable declarations in style and template classes 
Fixing variable declaration, removing function from template locator that does not belong there

PHPBB3-10756
 2012-04-19 04:25:25 +02:00
Vjacheslav Trushkin
d91abbb146 [ticket/10756] Renaming phpbb_style_template to phpbb_template 
Renaming phpbb_style_template to phpbb_template

PHPBB3-10756
 2012-04-19 04:25:25 +02:00
Vjacheslav Trushkin
6cecc91326 [ticket/10756] Removing path provider from template class 
Removing path provider from template class because it is not used by template class

PHPBB3-10756
 2012-04-19 04:21:56 +02:00
Vjacheslav Trushkin
ea3a2ef223 [ticket/10756] Creating locator interface 
Creating locator interface to be used in template class

PHPBB3-10756
 2012-04-19 04:15:11 +02:00
Vjacheslav Trushkin
ef295a2860 [ticket/10756] Renaming template classes 
Renaming template classes from phpbb_style_template_ to phpbb_template_

PHPBB3-10756
 2012-04-19 04:15:11 +02:00
Vjacheslav Trushkin
733018f99a [ticket/10756] Moving template classes 
Moving template class files from includes/style/ to includes/template/ and removing template_ file prefix

PHPBB3-10756
 2012-04-19 04:15:11 +02:00
Nils Adermann
8a1d084d6d [ticket/10783] Correctly add assets_version config var to includejs urls 
PHPBB3-10783
 2012-04-13 04:08:21 +02:00
Callum Macrae
5665e82616 [ticket/10783] Added ?assets_version to assets. 
PHPBB3-10783
 2012-04-11 14:30:11 +01:00
Vjacheslav Trushkin
1ffc7c1fab [ticket/10665] Changing template->_js_include to public 
Changing template->_js_include to public function

PHPBB3-10665
 2012-04-01 20:29:03 +03:00
Vjacheslav Trushkin
fb0df8d2e3 [ticket/10665] Moving filter parameters to one array 
Moving filter parameters to one array in template compiler class

PHPBB3-10665
 2012-04-01 20:19:07 +03:00
Vjacheslav Trushkin
a7d0ef90ea [ticket/10665] INCLUDEJS template tag 
Implementing INLCUDEJS template tag in style classes

PHPBB3-10665
 2012-04-01 10:58:24 +03:00
Vjacheslav Trushkin
f80512f106 [ticket/10733] Adding functions to locate resources 
Adding $style->locate() and $template->locate() functions

PHPBB3-10733
 2012-04-01 09:52:55 +03:00
Vjacheslav Trushkin
2ce73baeab [ticket/10733] Extending get_source_file_for_handle 
Extending resource locator's function get_source_file_for_handle to find all files. This modified function should be used by template events to locate all templates before compiling them.

PHPBB3-10733
 2012-03-31 22:07:04 +03:00
Vjacheslav Trushkin
b3f46b9565 [ticket/10735] Changing locator paths structure 
Changing locator paths to 2 dimensional array

PHPBB3-10735
 2012-03-31 21:20:18 +03:00
Vjacheslav Trushkin
17989c17a0 [feature/merging-style-components] Moving template initialization out of style 
Moving template initialization out of style constructor

PHPBB3-10632
 2012-03-31 18:10:00 +03:00
Vjacheslav Trushkin
360312f599 [feature/merging-style-components] Initializing locator and provider separately 
Moving locator and path provider initialization out of style class

PHPBB3-10632
 2012-03-31 17:38:30 +03:00
Vjacheslav Trushkin
1ce4d4c4fc [feature/merging-style-components] Changing style class 
Moving functions that deal with styles from template to style class, updating docblocks

PHPBB3-10632
 2012-03-15 21:09:49 +02:00
Vjacheslav Trushkin
5b149e93b9 [feature/merging-style-components] Changing template class 
Removing functions that are now handled by phpbb_style class, allowing to write $context, updating docblocks

PHPBB3-10632
 2012-03-15 21:08:41 +02:00
Vjacheslav Trushkin
0b2abe5250 [feature/merging-style-components] Changing resource locator 
Changing "template" to "style" in all functions that deal with styles, changing error messages, updating docblocks

PHPBB3-10632
 2012-03-15 21:06:24 +02:00
Vjacheslav Trushkin
c692e0d92d [feature/merging-style-components] Changing path provider 
Changing set_templates() to set_style() and removing second parameter, changing get_main_template_path() to get_main_style_path(), removing template_root_for_style(), updating docblocks

PHPBB3-10632
 2012-03-15 21:04:27 +02:00
Vjacheslav Trushkin
8b7c2c3c65 [feature/merging-style-components] Renaming style locator 
Renaming style locator to style resource locator

PHPBB3-10632
 2012-03-15 16:33:13 +02:00
Vjacheslav Trushkin
3997ffac2a [feature/merging-style-components] Creating style class 
Creating phpbb_style class, changing template initialization to style initialization

PHPBB3-10632
 2012-03-15 13:13:21 +02:00
Vjacheslav Trushkin
234e5d6402 [feature/merging-style-components] Implementing unlimited parent templates 
Implementing possibility of unlimited levels of parent templates. Paths are stored in style_parent_tree, entries are separated by /

PHPBB3-10632
 2012-03-14 23:22:02 +02:00
Vjacheslav Trushkin
b7d84a586c [feature/merging-style-components] Renaming template classes 
Changing template classes prefixes from phpbb_template to phpbb_style (for classes that will work with styles) or phpbb_style_template (for classes that are specific to templates)

PHPBB3-10632
 2012-03-14 23:12:11 +02:00
Vjacheslav Trushkin
7d414d04ca [feature/merging-style-components] Moving template classes to style 
Moving includes/template/ to includes/style/, adding template_ prefix to classes that deal only with templates

PHPBB3-10632
 2012-03-14 22:57:58 +02:00