merge r10098,r10100,r10101,r10113,r10128,r10129 from trunk to branch 2.2

feature:2250
Incompatible plugins and obsolete plugins may not be activated.
Deactivate and uninstall obsolete plugins.
Add warning icon and tiptip
Add languages keys.
Add expire parameter.
Clean code.
Remove useless query for delete.

git-svn-id: http://piwigo.org/svn/branches/2.2@10131 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 33 insertions, 2 deletions

diff --git a/admin/themes/clear/icon/warning.png b/admin/themes/clear/icon/warning.png
new file mode 100644
index 000000000..060b57707
--- /dev/null
+++ b/admin/themes/clear/icon/warning.png
diff --git a/admin/themes/default/icon/warning.png b/admin/themes/default/icon/warning.png
new file mode 100644
index 000000000..060b57707
--- /dev/null
+++ b/admin/themes/default/icon/warning.png
diff --git a/admin/themes/default/template/plugins_list.tpl b/admin/themes/default/template/plugins_list.tpl
index d6a8364ee..618104ca5 100644
--- a/admin/themes/default/template/plugins_list.tpl
+++ b/admin/themes/default/template/plugins_list.tpl
@@ -1,3 +1,21 @@
+{footer_script}
+var incompatible_msg = '{'WARNING! This plugin does not seem to be compatible with this version of Piwigo.'|@translate|@escape:'javascript'}';
+incompatible_msg += '\n';
+incompatible_msg += '{'Do you want to activate anyway?'|@translate|@escape:'javascript'}';
+
+{literal}
+jQuery(document).ready(function() {
+  jQuery('.incompatible').click(function() {
+    return confirm(incompatible_msg);
+  });
+  jQuery('.warning').tipTip({
+    'delay' : 0,
+    'fadeIn' : 200,
+    'fadeOut' : 200
+  });
+});
+{/literal}{/footer_script}
+
 <div class="titrePage">
   <h2>{'Plugins'|@translate}</h2>
 </div>
@@ -19,6 +37,9 @@
   {elseif $plugin_state == 'missing'}
   {'Missing Plugins'|@translate}
 
+  {elseif $plugin_state == 'merged'}
+  {'Obsolete Plugins'|@translate}
+
   {/if}
   </legend>
   {foreach from=$plugins item=plugin name=plugins_loop}
@@ -26,7 +47,9 @@
   <div class="pluginBox">
     <table>
       <tr>
-        <td class="pluginBoxNameCell">{$plugin.NAME}</td>
+        <td class="pluginBoxNameCell{if $plugin.INCOMPATIBLE} warning" title="{'WARNING! This plugin does not seem to be compatible with this version of Piwigo.'|@translate|@escape:'html'}{/if}">
+          {$plugin.NAME}
+        </td>
         <td>{$plugin.DESC}</td>
       </tr>
       <tr>
@@ -35,7 +58,7 @@
           <a href="{$plugin.U_ACTION}&amp;action=deactivate">{'Deactivate'|@translate}</a>
 
     {elseif $plugin_state == 'inactive'}
-          <a href="{$plugin.U_ACTION}&amp;action=activate">{'Activate'|@translate}</a>
+          <a href="{$plugin.U_ACTION}&amp;action=activate" {if $plugin.INCOMPATIBLE}class="incompatible"{/if}>{'Activate'|@translate}</a>
           | <a href="{$plugin.U_ACTION}&amp;action=uninstall" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');">{'Uninstall'|@translate}</a>
 
     {elseif $plugin_state == 'uninstalled'}
@@ -45,6 +68,8 @@
     {elseif $plugin_state == 'missing'}
           <a href="{$plugin.U_ACTION}&amp;action=uninstall" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');">{'Uninstall'|@translate}</a>
 
+    {elseif $plugin_state == 'merged'}
+          <a href="{$plugin.U_ACTION}&amp;action=delete">{'Delete'|@translate}</a>
     {/if}
         </td>
         <td>
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index 13c499411..bb645c256 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -1043,3 +1043,9 @@ LEGEND {
 #batchManagerGlobal .removeFilter span {display:none}
 #batchManagerGlobal #applyFilterBlock {margin-top:20px;}
 #batchManagerGlobal .useFilterCheckbox {display:none}
+
+.warning {
+  background:url(icon/warning.png) no-repeat top left;
+  width: 130px;
+  padding-left: 20px;
+}