Merge branch '3.1.x'

* 3.1.x:
  [ticket/14154] Add extension composer name as tooltip
This commit is contained in:
Tristan Darricau 2015-09-16 11:58:53 +02:00
commit 087e219a09
2 changed files with 5 additions and 2 deletions

View file

@ -48,7 +48,7 @@
</tr> </tr>
<!-- BEGIN enabled --> <!-- BEGIN enabled -->
<tr class="ext_enabled"> <tr class="ext_enabled">
<td><strong>{enabled.META_DISPLAY_NAME}</strong></td> <td><strong title="{enabled.NAME}">{enabled.META_DISPLAY_NAME}</strong></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"> <tr class="ext_disabled">
<td><strong>{disabled.META_DISPLAY_NAME}</strong></td> <td><strong title="{disabled.NAME}">{disabled.META_DISPLAY_NAME}</strong></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

@ -371,6 +371,7 @@ class acp_extensions
foreach ($enabled_extension_meta_data as $name => $block_vars) foreach ($enabled_extension_meta_data as $name => $block_vars)
{ {
$block_vars['NAME'] = $name;
$block_vars['U_DETAILS'] = $this->u_action . '&amp;action=details&amp;ext_name=' . urlencode($name); $block_vars['U_DETAILS'] = $this->u_action . '&amp;action=details&amp;ext_name=' . urlencode($name);
$this->template->assign_block_vars('enabled', $block_vars); $this->template->assign_block_vars('enabled', $block_vars);
@ -428,6 +429,7 @@ class acp_extensions
foreach ($disabled_extension_meta_data as $name => $block_vars) foreach ($disabled_extension_meta_data as $name => $block_vars)
{ {
$block_vars['NAME'] = $name;
$block_vars['U_DETAILS'] = $this->u_action . '&amp;action=details&amp;ext_name=' . urlencode($name); $block_vars['U_DETAILS'] = $this->u_action . '&amp;action=details&amp;ext_name=' . urlencode($name);
$this->template->assign_block_vars('disabled', $block_vars); $this->template->assign_block_vars('disabled', $block_vars);
@ -488,6 +490,7 @@ class acp_extensions
foreach ($available_extension_meta_data as $name => $block_vars) foreach ($available_extension_meta_data as $name => $block_vars)
{ {
$block_vars['NAME'] = $name;
$block_vars['U_DETAILS'] = $this->u_action . '&amp;action=details&amp;ext_name=' . urlencode($name); $block_vars['U_DETAILS'] = $this->u_action . '&amp;action=details&amp;ext_name=' . urlencode($name);
$this->template->assign_block_vars('disabled', $block_vars); $this->template->assign_block_vars('disabled', $block_vars);