Skip to content

Commit 5fabfe0

Browse files
marc1706marc1706
committed
Merge branch '3.3.x'
2 parents 22f3b01 + 2a88638 commit 5fabfe0

File tree

3 files changed

+26
-12
lines changed

3 files changed

+26
-12
lines changed

‎development/extensions/events_list.rst‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1661,10 +1661,14 @@ Template Events
16611661
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
16621662
| ucp_agreement_terms_before | ucp_agreement.html | 3.1.0-b3 | Add content before the terms of agreement text at user registration |
16631663
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
1664+
| ucp_footer_content_after | ucp_footer.html | 3.3.12-RC1 | Add optional elements after tab panels content in UCP |
1665+
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
16641666
| ucp_friend_list_after | ucp_zebra_friends.html | 3.1.0-a4 | Add optional elements after list of friends in UCP |
16651667
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
16661668
| ucp_friend_list_before | ucp_zebra_friends.html | 3.1.0-a4 | Add optional elements before list of friends in UCP |
16671669
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
1670+
| ucp_header_content_before | ucp_header.html | 3.3.12-RC1 | Add optional elements before tab panels content in UCP |
1671+
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
16681672
| ucp_header_friends_offline_username_full_append | ucp_header.html | 3.2.10-RC1 | Append information to offline friends username in UCP |
16691673
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
16701674
| ucp_header_friends_offline_username_full_prepend | ucp_header.html | 3.2.10-RC1 | Prepend information to offline friends username in UCP |
@@ -1685,6 +1689,14 @@ Template Events
16851689
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
16861690
| ucp_main_subscribed_topic_title_after | ucp_main_subscribed.html | 3.3.8-RC1 | Add content right after the topic title viewing UCP subscribed topics |
16871691
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
1692+
| ucp_notifications_content_after | ucp_notifications.html | 3.3.12-RC1 | Add optional elements after UCP notification options tab content |
1693+
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
1694+
| ucp_notifications_content_before | ucp_notifications.html | 3.3.12-RC1 | Add optional elements before UCP notification options tab content |
1695+
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
1696+
| ucp_notifications_form_after | ucp_notifications.html | 3.3.12-RC1 | Add optional elements after HTMP form in UCP notification options tab |
1697+
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
1698+
| ucp_notifications_form_before | ucp_notifications.html | 3.3.12-RC1 | Add optional elements before HTMP form in UCP notificationoptions tab |
1699+
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
16881700
| ucp_pm_history_post_buttons_after | ucp_pm_history.html | 3.1.6-RC1 | Add post button to private messages in history review (next to quote etc), at |
16891701
| | | | the end of the list. |
16901702
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
@@ -1864,6 +1876,8 @@ Template Events
18641876
| viewtopic_body_footer_before | viewtopic_body.html | 3.1.0-a1 | Add content to the bottom of the View topic screen below the posts |
18651877
| | | | and quick reply, directly before the jumpbox in Prosilver. |
18661878
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
1879+
| viewtopic_body_online_list_after | viewtopic_body.html | 3.3.12-RC1 | Add content after the online users list |
1880+
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
18671881
| viewtopic_body_online_list_before | viewtopic_body.html | 3.2.10-RC1 | Add content before the online users list |
18681882
+-------------------------------------------------------+----------------------------------------------------------+------------------+----------------------------------------------------------------------------------------------------------------------------------+
18691883
| viewtopic_body_pagination_top_after | viewtopic_body.html | 3.1.4-RC1 | Add content after the pagination at top |

‎development/extensions/skeleton_extension.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,13 @@ In order to create an extension via the CLI, you need to open a console
108108
on your server and ``cd`` to the root directory of the phpBB board where
109109
you installed this extension:
110110

111-
.. code:: bash
111+
.. code:: console
112112
113113
$ cd ./path/to/phpBB
114114
115115
To create an extension, run:
116116

117-
.. code:: bash
117+
.. code:: console
118118
119119
$ ./bin/phpbbcli.php extension:create
120120
@@ -814,7 +814,7 @@ distribution such as unit tests and hidden Git files.
814814

815815
To run the build script, use the following console commands:
816816

817-
.. code:: bash
817+
.. code:: console
818818
819819
# Navigate to the root of your extension
820820
$ cd ./path/to/phpBB/vendor/package

‎development/extensions/tutorial_key_concepts.rst‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -297,21 +297,21 @@ is already defined, and if not, then include your script and define the script.
297297

298298
.. code-block:: twig
299299
300-
{% if not $INCLUDED_JQUERYUIJS %}
300+
{% if not definition.INCLUDED_JQUERYUIJS %}
301301
{% INCLUDEJS '@vendor_extname/jquery-ui.js' %}
302-
{% DEFINE $INCLUDED_JQUERYUIJS = true %}
302+
{% DEFINE INCLUDED_JQUERYUIJS = true %}
303303
{% endif %}
304304
305305
Some example template variable definitions to use with common libraries (the common practice should be to name
306306
the variable definition after the library filename, e.g. highslide.js becomes HIGHSLIDEJS):
307307

308-
* HighSlide JS: ``$INCLUDED_HIGHSLIDEJS``
309-
* Font Awesome CSS: ``$INCLUDED_FONTAWESOMECSS``
310-
* ColorBox JS: ``$INCLUDED_COLORBOXJS``
311-
* ColPick JS: ``$INCLUDED_COLPICKJS``
312-
* MoTools JS: ``$INCLUDED_MOTOOLSJS``
313-
* Dojo JS: ``$INCLUDED_DOJOJS``
314-
* Angular JS: ``$INCLUDED_ANGULARJS``
308+
* HighSlide JS: ``INCLUDED_HIGHSLIDEJS``
309+
* Font Awesome CSS: ``INCLUDED_FONTAWESOMECSS``
310+
* ColorBox JS: ``INCLUDED_COLORBOXJS``
311+
* ColPick JS: ``INCLUDED_COLPICKJS``
312+
* MoTools JS: ``INCLUDED_MOTOOLSJS``
313+
* Dojo JS: ``INCLUDED_DOJOJS``
314+
* Angular JS: ``INCLUDED_ANGULARJS``
315315

316316
.. seealso::
317317

0 commit comments

Comments
 (0)