Changeset 1079

Timestamp:

Mar 14, 2006, 10:31:31 PM (18 years ago)

Author:

rub

Message:

Step 2 improvement issue 0000127:

o Allow to chage high property on user list
o Set initial value for the 2 default users

+ Correction of permissions.png in user list

Location:

trunk

Files:

• admin/user_list.php (modified) (5 diffs)
• include/functions_user.inc.php (modified) (1 diff)
• install.php (modified) (3 diffs)
• language/en_UK.iso-8859-1/admin.lang.php (modified) (1 diff)
• language/en_UK.iso-8859-1/help/user_list.html (modified) (1 diff)
• language/fr_FR.iso-8859-1/admin.lang.php (modified) (1 diff)
• language/fr_FR.iso-8859-1/help/user_list.html (modified) (1 diff)
• template/yoga/admin/user_list.tpl (modified) (3 diffs)

trunk/admin/user_list.php

@@ -97 +97 @@
                 u.'.$conf['user_fields']['username'].' AS username,
                 u.'.$conf['user_fields']['email'].' AS email,
-                ui.status
+                ui.status,
+                ui.enabled_high
   FROM '.USERS_TABLE.' AS u
     INNER JOIN '.USER_INFOS_TABLE.' AS ui
@@ -273 +274 @@
       foreach ($page['filtered_users'] as $filter_key => $filter_user)
       {
-        if (in_array($filter_user['id'], $collection))
-        {
-          unset($page['filtered_users'][$filter_key]);
-        }
+        if (in_array($filter_user['id'], $collection))
+        {
+          unset($page['filtered_users'][$filter_key]);
+        }
       }
     }
@@ -337 +338 @@
     array('nb_image_line', 'nb_line_page', 'template', 'language',
           'recent_period', 'maxwidth', 'expand', 'show_nb_comments',
-          'maxheight', 'status');
-  
-  $true_false_fields = array('expand', 'show_nb_comments');
+          'maxheight', 'status', 'enabled_high');
+  
+  $true_false_fields = array('expand', 'show_nb_comments', 'enabled_high');
   
   foreach ($formfields as $formfield)
@@ -452 +453 @@
     'L_ORDER_BY' => $lang['order_by'],
     'L_ACTIONS' => $lang['actions'],
+    'L_PROPERTIES' => $lang['properties'],
     'L_PERMISSIONS' => $lang['permissions'],
     'L_USERS_LIST' => $lang['title_liste_users'],
@@ -802 +804 @@
       'STATUS' => $lang['user_status_'.$local_user['status']],
       'EMAIL' => isset($local_user['email']) ? $local_user['email'] : '',
-      'GROUPS' => $groups_string
+      'GROUPS' => $groups_string,
+      'PROPERTIES' => (isset($local_user['enabled_high']) and ($local_user['enabled_high'] == 'true')) ? $lang['is_high_enabled'] : $lang['is_high_disabled']
       )
     );

trunk/include/functions_user.inc.php

@@ -452 +452 @@
       'maxwidth' => $conf['default_maxwidth'],
       'maxheight' => $conf['default_maxheight'],
-      'registration_date' => $dbnow
+      'registration_date' => $dbnow,
+      'enabled_high' => $conf['newuser_default_enabled_high']
       );
 

trunk/install.php

@@ -186 +186 @@
 $prefixeTable = $table_prefix;
 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
+@include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
 include(PHPWG_ROOT_PATH . 'include/constants.php');
 include(PHPWG_ROOT_PATH . 'include/functions.inc.php');
@@ -310 +311 @@
     $query = '
 INSERT INTO '.USER_INFOS_TABLE.'
-  (user_id,status,language)
+  (user_id,status,language,enabled_high)
   VALUES
-  (1, \'webmaster\', \''.$language.'\')
+  (1, \'webmaster\', \''.$language.'\',\''.$conf['newuser_default_enabled_high'].'\')
 ;';
     mysql_query($query);
@@ -334 +335 @@
     $query = '
 INSERT INTO '.USER_INFOS_TABLE.'
-  (user_id,status,language)
+  (user_id,status,language,enabled_high)
   VALUES
-  (2, \'guest\', \''.$language.'\')
+  (2, \'guest\', \''.$language.'\',\'false\')
 ;';
     mysql_query($query);

trunk/language/en_UK.iso-8859-1/admin.lang.php

@@ -162 +162 @@
 $lang['You cannot move a category in its own sub category'] = 'You cannot move a category in its own sub category';
 $lang['You need to confirm deletion'] = 'You need to confirm deletion';
-$lang['actions'] = 'actions';
+$lang['actions'] = 'Actions';
+$lang['properties'] = 'Properties';
+$lang['is_high_enabled'] = 'High definition';
+$lang['is_high_disabled'] = '';
+$lang['enabled_high'] = 'High definition enabled';
 $lang['add keywords'] = 'add keywords';
 $lang['associate to category'] = 'associate to category';

trunk/language/en_UK.iso-8859-1/help/user_list.html

@@ -26 +26 @@
 
   <li>modify display properties</li>
+  
+  <li>modify additional properties</li>
 
 </ul>

trunk/language/fr_FR.iso-8859-1/admin.lang.php

@@ -162 +162 @@
 $lang['You cannot move a category in its own sub category'] = 'Vous ne pouvez pas déplacer une catégorie dans sa propre sous-catégorie';
 $lang['You need to confirm deletion'] = 'Vous devez confirmer la suppression';
-$lang['actions'] = 'actions';
+$lang['actions'] = 'Actions';
+$lang['properties'] = 'Propriétés';
+$lang['is_high_enabled'] = 'Haute définition';
+$lang['is_high_disabled'] = '';
+$lang['enabled_high'] = 'Haute définition actif';
 $lang['add keywords'] = 'ajouter des mots-clef';
 $lang['associate to category'] = 'associer à la catégorie';

trunk/language/fr_FR.iso-8859-1/help/user_list.html

@@ -28 +28 @@
   <li>modifier les propriétés d'affichage</li>
 
+  <li>modifier les propriétés annexes</li>
+
 </ul>
 

trunk/template/yoga/admin/user_list.tpl

@@ -81 +81 @@
     <th>{L_EMAIL}</th>
     <th>{lang:Groups}</th>
+    <th>{L_PROPERTIES}</th>
     <th>{L_ACTIONS}</th>
   </tr>
@@ -90 +91 @@
     <td>{user.EMAIL}</td>
     <td>{user.GROUPS}</td>
+    <td>{user.PROPERTIES}</td>
     <td style="text-align:center;">
-      <a href="{user.U_PERM}"><img src="./template/yoga/theme/permissions.png" class="button" style="border:none" alt="{L_PERMISSIONS}" title="{L_PERMISSIONS}" /></a>
+      <a href="{user.U_PERM}"><img src="{themeconf:icon_dir}/permissions.png" class="button" style="border:none" alt="{L_PERMISSIONS}" title="{L_PERMISSIONS}" /></a>
     </td>
   </tr>
@@ -158 +160 @@
 </fieldset>
 
+<!-- Properties -->
+<fieldset>
+  <legend>{L_PROPERTIES}</legend>
+
+  <table>
+
+    <tr>
+      <td>{lang:enabled_high}</td>
+      <td>
+        <label><input type="radio" name="enabled_high" value="leave" checked="checked" /> {lang:leave}</label>
+        / {lang:set to}
+        <label><input type="radio" name="enabled_high" value="true"  {ENABLED_HIGH_YES} />{L_YES}</label>
+        <label><input type="radio" name="enabled_high" value="false" {ENABLED_HIGH_NO}  />{L_NO}</label>
+      </td>
+    </tr>
+
+  </table>
+
+</fieldset>
+
+<!-- preference -->
 <fieldset>
   <legend>{lang:Preferences}</legend>