Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2017-02-21 22:08:21 +01:00
commit cfeea80a8c
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 14 additions and 2 deletions

View file

@ -48,7 +48,7 @@
</tr> </tr>
<!-- BEGIN enabled --> <!-- BEGIN enabled -->
<tr class="ext_enabled row-highlight"> <tr class="ext_enabled row-highlight">
<td><strong title="{enabled.NAME}">{enabled.META_DISPLAY_NAME}</strong></td> <td><strong title="{enabled.NAME}">{enabled.META_DISPLAY_NAME}</strong><!-- EVENT acp_ext_list_enabled_name_after --></td>
<td style="text-align: center;"> <td style="text-align: center;">
<!-- IF enabled.S_VERSIONCHECK --> <!-- IF enabled.S_VERSIONCHECK -->
<strong <!-- IF enabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{enabled.META_VERSION}</strong> <strong <!-- IF enabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{enabled.META_VERSION}</strong>
@ -73,7 +73,7 @@
</tr> </tr>
<!-- BEGIN disabled --> <!-- BEGIN disabled -->
<tr class="ext_disabled row-highlight"> <tr class="ext_disabled row-highlight">
<td><strong title="{disabled.NAME}">{disabled.META_DISPLAY_NAME}</strong></td> <td><strong title="{disabled.NAME}">{disabled.META_DISPLAY_NAME}</strong><!-- EVENT acp_ext_list_disabled_name_after --></td>
<td style="text-align: center;"> <td style="text-align: center;">
<!-- IF disabled.S_VERSIONCHECK --> <!-- IF disabled.S_VERSIONCHECK -->
<strong <!-- IF disabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{disabled.META_VERSION}</strong> <strong <!-- IF disabled.S_UP_TO_DATE -->style="color: #228822;"<!-- ELSE -->style="color: #BC2A4D;"<!-- ENDIF -->>{disabled.META_VERSION}</strong>

View file

@ -64,12 +64,24 @@ acp_ext_details_end
* Since: 3.1.11-RC1 * Since: 3.1.11-RC1
* Purpose: Add more detailed information on extension after the available information. * Purpose: Add more detailed information on extension after the available information.
acp_ext_list_disabled_name_after
===
* Location: adm/style/acp_ext_list.html
* Since: 3.1.11-RC1
* Purpose: Add content after the name of disabled extensions in the list
acp_ext_list_disabled_title_after acp_ext_list_disabled_title_after
=== ===
* Location: adm/style/acp_ext_list.html * Location: adm/style/acp_ext_list.html
* Since: 3.1.11-RC1 * Since: 3.1.11-RC1
* Purpose: Add text after disabled extensions section title. * Purpose: Add text after disabled extensions section title.
acp_ext_list_enabled_name_after
===
* Location: adm/style/acp_ext_list.html
* Since: 3.1.11-RC1
* Purpose: Add content after the name of enabled extensions in the list
acp_ext_list_enabled_title_after acp_ext_list_enabled_title_after
=== ===
* Location: adm/style/acp_ext_list.html * Location: adm/style/acp_ext_list.html