aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--admin/themes/default/template/plugins_list.tpl19
-rw-r--r--admin/themes/default/theme.css2
-rw-r--r--language/en_UK/admin.lang.php1
-rw-r--r--language/fr_CA/admin.lang.php5
-rw-r--r--language/fr_FR/admin.lang.php1
5 files changed, 17 insertions, 11 deletions
diff --git a/admin/themes/default/template/plugins_list.tpl b/admin/themes/default/template/plugins_list.tpl
index 39b1725bd..ccf6f02f7 100644
--- a/admin/themes/default/template/plugins_list.tpl
+++ b/admin/themes/default/template/plugins_list.tpl
@@ -60,17 +60,19 @@ jQuery(document).ready(function() {
'fadeIn' : 200,
'fadeOut' : 200,
'maxWidth':'250px'
- }).click(function(){
- return false;
+ });
+ jQuery('.plugin-restore').tipTip({
+ 'delay' : 0,
+ 'fadeIn' : 200,
+ 'fadeOut' : 200
});
jQuery('.pluginMiniBoxDesc').tipTip({
'delay' : 0,
'fadeIn' : 200,
'fadeOut' : 200,
'maxWidth':'300px', /* not effective, TipTip bug */
+ 'defaultPosition':'left',
'keepAlive':true
- }).click(function(){
- return false;
});
});
{/literal}
@@ -149,7 +151,7 @@ jQuery(document).ready(function() {
<td>
{if $plugin.STATE == 'active'}
<a href="{$plugin.U_ACTION}&amp;action=deactivate">{'Deactivate'|@translate}</a>
- | <a href="{$plugin.U_ACTION}&amp;action=restore" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');">{'Restore'|@translate}</a>
+ | <a href="{$plugin.U_ACTION}&amp;action=restore" class="plugin-restore" title="{'Restore default configuration. You will lost your plugin settings!'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');">{'Restore'|@translate}</a>
{elseif $plugin.STATE == 'inactive'}
<a href="{$plugin.U_ACTION}&amp;action=activate" {if $plugin.INCOMPATIBLE}class="incompatible"{/if}>{'Activate'|@translate}</a>
@@ -186,15 +188,14 @@ jQuery(document).ready(function() {
<div id="{$plugin.ID}" class="pluginMiniBox {$plugin.STATE}{if $plugin.INCOMPATIBLE} incompatible{/if}">
<div class="pluginMiniBoxNameCell">
- {if $plugin.INCOMPATIBLE}<a class="warning" title="{'WARNING! This plugin does not seem to be compatible with this version of Piwigo.'|@translate|@escape:'html'}"></a>{/if}
- {$plugin.NAME}
- <a class="pluginMiniBoxDesc" title="{if !empty($author)}{'By %s'|@translate|@sprintf:$author} | {/if}{'Version'|@translate} {$version}<br/>{$plugin.DESC|@escape:'html'}"></a>
+ {if $plugin.INCOMPATIBLE}<span class="warning" title="{'WARNING! This plugin does not seem to be compatible with this version of Piwigo.'|@translate|@escape:'html'}"></span>{/if}
+ <span class="pluginMiniBoxDesc" title="{if !empty($author)}{'By %s'|@translate|@sprintf:$author} | {/if}{'Version'|@translate} {$version}<br/>{$plugin.DESC|@escape:'html'}">{$plugin.NAME}</span>
</div>
<div class="pluginActions">
<div>
{if $plugin.STATE == 'active'}
<a href="{$plugin.U_ACTION}&amp;action=deactivate">{'Deactivate'|@translate}</a>
- | <a href="{$plugin.U_ACTION}&amp;action=restore" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');">{'Restore'|@translate}</a>
+ | <a href="{$plugin.U_ACTION}&amp;action=restore" class="plugin-restore" title="{'Restore default configuration. You will lost all your settings !'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');">{'Restore'|@translate}</a>
{elseif $plugin.STATE == 'inactive'}
<a href="{$plugin.U_ACTION}&amp;action=activate" {if $plugin.INCOMPATIBLE}class="incompatible"{/if}>{'Activate'|@translate}</a>
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index fc093c009..49b0870d3 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -945,8 +945,6 @@ h2:lang(en) { text-transform:capitalize; }
.pluginMiniBox.inactive, .pluginMiniBox.uninstalled {opacity:0.65;filter:alpha(opacity=65);}
.pluginsByState .pluginMiniBox.inactive, .pluginsByState .pluginMiniBox.uninstalled {opacity:0.8;filter:alpha(opacity=80);}
-.pluginMiniBoxDesc{float:right;margin:0 4px 0 -20px;}
-.pluginMiniBoxDesc:after{content:url(icon/help-min.png);}
.warning:before {content:url(icon/warning.png);vertical-align:top;}
fieldset.pluginsByName{border:none;}
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 297d40d90..571e4dbb9 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -572,6 +572,7 @@ $lang['Representative'] = "Representative";
$lang['Represents'] = "Represents";
$lang['Resize'] = 'Resize';
$lang['Restore'] = "Restore";
+$lang['Restore default configuration. You will lost your plugin settings!'] = "Restore default configuration. You will lost your plugin settings!";
$lang['Results of miniaturization'] = "Miniaturization process results";
$lang['Save order'] = "Save order";
$lang['Save page visits by administrators'] = "Record pages visited by administrators";
diff --git a/language/fr_CA/admin.lang.php b/language/fr_CA/admin.lang.php
index fe3d1951b..5d452bb06 100644
--- a/language/fr_CA/admin.lang.php
+++ b/language/fr_CA/admin.lang.php
@@ -794,4 +794,9 @@ $lang['WARNING! This plugin does not seem to be compatible with this version of
$lang['Do you want to activate anyway?'] = 'Voulez-vous l\'activer quand même?';
$lang['THIS PLUGIN IS NOW PART OF PIWIGO CORE! DELETE IT NOW.'] = 'CE GREFFON FAIT DÉSORMAIS PARTIE DU CŒUR DE PIWIGO! SUPPRIMEZ-LE.';
$lang['ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW.'] = 'ERREUR: CE GREFFON EST MANQUANT MAIS TOUJOURS INSTALLÉ! DÉSINSTALLEZ-LE.';
+$lang['display'] = 'Afficher';
+$lang['Compact'] = "Compact";
+$lang['Complete'] = "Complet";
+$lang['Restore'] = "Restaurer";
+$lang['Restore default configuration. You will lost your plugin settings!'] = "Restaurer la configuration par défaut? Vous perdrez vos réglages personnels !";
?> \ No newline at end of file
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 72f80371e..279231c15 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -797,4 +797,5 @@ $lang['display'] = 'Afficher';
$lang['Compact'] = "Compact";
$lang['Complete'] = "Complet";
$lang['Restore'] = "Restaurer";
+$lang['Restore default configuration. You will lost your plugin settings!'] = "Restaurer la configuration par défaut? Vous perdrez vos réglages personnels !";
?> \ No newline at end of file