Changeset 6642

Timestamp:

Jul 1, 2010, 12:00:51 AM (14 years ago)

Author:

datajulien

Message:

theme changer :
Correction du bug sur la suppression du thème présent sur une association active.
Utilisation unique des id des thèmes.
Mise en place jquery et tableSorter pour la gestion des tris.

Location:

extensions/nbc_ThemeChanger

Files:

• Version.txt (modified) (1 diff)
• admin/nbc_ThemeChanger_admin.php (modified) (2 diffs)
• admin/nbc_ThemeChanger_admin.tpl (modified) (4 diffs)
• include/functions_ThemeChanger.inc.php (modified) (2 diffs)
• include/jquery.tablesorter.js (added)
• main.inc.php (modified) (1 diff)
• theme (added)
• theme/asc.gif (added)
• theme/bg.gif (added)
• theme/desc.gif (added)
• theme/style.css (added)

extensions/nbc_ThemeChanger/Version.txt

@@ +1 @@
+Version 2.1.0.c
+
+[lang=fr]
+
+Correction du bug sur la suppression du thème présent sur une association active.
+Utilisation unique des id des thèmes.
+Mise en place jquery et tableSorter pour la gestion des tris.
+
+Fichiers impactés :
+        main.inc.php
+        admin/nbc_ThemeChanger_admin.php
+        admin/nbc_ThemeChanger_admin.tpl
+        include/functions_ThemeChanger.inc.php
+        include/jquery.tablesorter.js
+        theme/*
+[/lang=fr]
+[lang=en]
+
+
+Correction of the bug on the suppression of a theme present into an active association.
+Use of the theme's id instead of name
+Use of jquery and tablesorter plugin in order to manage the sort feature.
+        
+Files modifies:
+        main.inc.php
+        admin/nbc_ThemeChanger_admin.php
+        admin/nbc_ThemeChanger_admin.tpl
+        include/functions_ThemeChanger.inc.php
+        include/jquery.tablesorter.js
+        theme/*
+[/lang=en]
+
+[lang=it]       
+
+Correzione del bug sull'eliminazione di un tema se è ancora associato.
+Utilizzazione dell’id del tema invece del nome.
+Utilizzazione del plugin tablesorter e jquery per gestire l'ordinamento.
+
+File modificati :       
+        main.inc.php
+        admin/nbc_ThemeChanger_admin.php
+        admin/nbc_ThemeChanger_admin.tpl
+        include/functions_ThemeChanger.inc.php
+        include/jquery.tablesorter.js
+        theme/*
+
+        
+[/lang=it]
+--------------------------------------------------
 Version 2.1.0.b
 

extensions/nbc_ThemeChanger/admin/nbc_ThemeChanger_admin.php

@@ -185 +185 @@
 $conf_nbc_ThemeChanger = isset($conf['nbc_ThemeChanger']) ? explode(";" , $conf['nbc_ThemeChanger']) : array();
 
-$num = 0;
+//$num = 0;
 $catsused = array();
 $assoc = array();
@@ -208 +208 @@
 
      array_push($assoc , array(
-        'CLASS' => ($num++ % 2 == 1) ? 'row2' : 'row1',
+        //'CLASS' => ($num++ % 2 == 1) ? 'row2' : 'row1',
         'CATEGORY_NAME' => get_cat_display_name_cache($row['uppercats'], null, false),
         'CATEGORY_ID'   => $element_ThemeChanger[0],
-        'TEMPLATE'              => my_get_pwg_themeName($element_ThemeChanger[1]),
+        'TEMPLATE'              => $element_ThemeChanger[1],
         'U_MODIFY'      => add_url_params($page_ThemeChanger_admin, array(
                         'action'                => 'mod_assoc',

extensions/nbc_ThemeChanger/admin/nbc_ThemeChanger_admin.tpl

@@ +1 @@
+
+<link rel="stylesheet" href="plugins/nbc_ThemeChanger/theme/style.css" type="text/css" id="" />
+<script type="text/javascript" src="plugins/nbc_ThemeChanger/include/jquery.tablesorter.js"></script> 
+{literal}
+
+<script type="text/javascript" id="js">
+$(document).ready(function() { 
+    // extend the default setting to always include the zebra widget. 
+    $.tablesorter.defaults.widgets = ['zebra']; 
+    // extend the default setting to always sort on the first column 
+    $.tablesorter.defaults.sortList = [[1,0]]; 
+        // On choisi ici la colonne 5 (l'index commence à 0) // On désactive le tri sur cette colonne 
+        $.tablesorter.defaults.headers = { 
+            2: {  
+                                sorter: false  
+                                }  
+                };
+    // call the tablesorter plugin 
+    $("table").tablesorter(); 
+}); 
+</script>
+
+  {/literal}
+
 <div class="titrePage">
         <h3>Theme Changer</h3>
@@ -10 +34 @@
 <br>
 
-<table class="table2">
+<table class="table2" id="tablesorter">
+  <thead> 
   <tr class="throw">
     <th>{'categories'|@translate}</th>
@@ -16 +41 @@
     <th>{'action'|@translate}</th>
   </tr>
+  </thead> 
   <!-- BEGIN assoc -->
+  <tbody> 
   {foreach from=$assoc item=assoc key=i}  
-<tr class="{$assoc.CLASS}">
-
+  
+<tr>
     <td>{$assoc.CATEGORY_NAME}</td>
     <td>{$assoc.TEMPLATE}</td>
     <td style="text-align:center;">
       <a href="{$assoc.U_MODIFY}"><img src="{$themeconf.icon_dir}/register.png" class="button" style="border:none" alt="{'modify_assoc'|@translate}" title="{'modify_assoc'|@translate}"></a>
-      <a href="{$assoc.U_DELETE}" onclick="return confirm('{'Are you sure?'|@translate}');" ><img src="{$themeconf.icon_dir}/category_delete.png" class="button" style="border:none" alt="{'delete_assoc'|@translate}" title="{'delete_assoc'|@translate}"></a>
+      <a href="{$assoc.U_DELETE}" onclick="return confirm('{'Are you sure?'|@translate}');" ><img src="{$themeconf.icon_dir}/remove_s.png" class="button" style="border:none" alt="{'delete_assoc'|@translate}" title="{'delete_assoc'|@translate}"></a>
     </td>
         
   </tr>
   {/foreach}
+  
   <!-- END assoc -->
 </table>
@@ -63 +91 @@
                         {foreach from=$params.Themes item=Themes key=i}
                         {if ($formulaire.THEMETOMODIFY==$Themes.id)}
-                                        <option value="{$Themes.id}" selected ="selected">{$Themes.name}</option>
+                                        <option value="{$Themes.id}" selected ="selected">{$Themes.id}</option>
                                         
                                 {else}
-                                        <option value="{$Themes.id}" {$Themes.id}>{$Themes.name}</option>
+                                        <option value="{$Themes.id}" {$Themes.id}>{$Themes.id}</option>
                                 {/if}
                                 

extensions/nbc_ThemeChanger/include/functions_ThemeChanger.inc.php

@@ -71 +71 @@
 }
 
+/*
+function my_existe_theme ($themeId)
+{
+        return -1;
+}
+
 
 function my_get_pwg_themeName ($themeId)
@@ -82 +88 @@
                 return $themes[$i_themeName]['name'];
                 else return  '0';
-}
-
+}*/
 
 

extensions/nbc_ThemeChanger/main.inc.php

@@ -57 +57 @@
   if (isset($page['category']['id']) and isset($category_theme[$page['category']['id']]))
   {
-    $user['theme'] = $category_theme[$page['category']['id']];
+        if (realpath(PHPWG_ROOT_PATH.'themes'.'/'.$category_theme[$page['category']['id']]))
+                $user['theme'] = $category_theme[$page['category']['id']];
+        else 
+                $user['theme'] = 'Sylvia';
         
         $template = new Template(PHPWG_ROOT_PATH.'themes', $user['theme']);