Changeset 2552

Timestamp:

04/27/11 20:11:20 (13 months ago)

Author:

paparazzia

Message:

fix #387 : basics finished
- default value handling when required (lang_ihm)
- theme enhancements (background color for mselect, centering)
- complet admin interface (permissions handling)
see #154 also

Location:

trunk

Files:

• lib/phpcommon/playersPrefs.class.php (modified) (4 diffs)
• site/admin/players_prefs.TBU.trigger.php (added)
• site/admin/players_prefs.php (modified) (3 diffs)
• site/includes/strings.inc (modified) (3 diffs)
• site/manage_profil.php (modified) (2 diffs)
• site/style/base-style.css (modified) (2 diffs)

trunk/lib/phpcommon/playersPrefs.class.php

@@ -59 +59 @@
     function getPrefValue($key) {
         $value = $this->playerclass->getPref($key);
-        if (is_null($value)) return null;
+        if (is_null($value)) {
+            switch($key) {
+                case 'lang_ihm' :
+                    return getCurrentLang();
+                default :
+                    return null;
+            }
+        }
         return $value['pref_value'];
     }
@@ -108 +115 @@
 
     function baseDropDown($key, $list) {
-        $value = $this->playerclass->getPref($key);
+        $value = $this->getPrefValue($key);
         $str = "<select name=\"pref_$key\" class=\"selectpref\" id=\"".$this->getId($key)."\">";
         foreach ($list as $k =>$v) {
             $str .= "<option value=\"$k\"";
-            if ($k == $value['pref_value']) $str .= " selected";
+            if ($k == $value) $str .= " selected";
             $str .= ">$v</option>";
         }
@@ -120 +127 @@
 
     function baseDropDownMultiple($key, $list) {
-        $value = $this->playerclass->getPref($key);
-        $values = explode(',', $value['pref_value']);
+        $value = $this->getPrefValue($key);
+        $values = explode(',', $value);
         $str = "<select title=\"".getLocalizedString("pref_helper_$key")."\" name=\"pref_$key"."[]\" multiple class=\"selectpref\" id=\"".$this->getId($key)."\">";
         foreach ($list as $k =>$v) {
@@ -137 +144 @@
         $str = "<select size=\"2\" name=\"perm_$key"."[]\" multiple class=\"selectperm\" id=\"perm-".$this->getId($key)."\">";
         foreach ($plist as $k =>$v) {
-            $str .= "<option value=\"$k\"";
+            $str .= "<option class=\"selectperm\" value=\"$k\"";
             if ($value['permissions'] & $k) $str .= " selected";
             $str .= ">$v</option>";

trunk/site/admin/players_prefs.php

@@ -5 +5 @@
 
 include('adminheader.php');
-
+require('playersPrefs.class.php');
 /* RACE TABLE */
 
@@ -61 +61 @@
 );
 
+$opts['fdd']['permissions'] = array(
+  'name'     => 'Permissions',
+  'help'     => nl2br("Permissions"),
+  'select|FLDV'   => 'M',
+  'select|ACP'   => 'C',
+  'values2' => Array(
+      VLM_ACL_BOATSIT => "Boatsitter",
+      VLM_ACL_AUTH => "VLM Players",
+      ),
+  'sql' => 'MAKE_SET(`PMEtable0`.`permissions`, 1, 2)',
+//  'maxlen'   => 11,
+//  'default'  => '0',
+  'sort'     => true
+);
+
+
 $opts['fdd']['updated'] = array(
   'name'     => 'Last change',
@@ -68 +84 @@
 );
 
+$opts['triggers']['update']['before'][0] = 'players_prefs.TBU.trigger.php';
+
+//force basic pme class.
+require_once('../externals/phpMyEdit/phpMyEdit.class.php');
+$pmeinstance = new phpMyEdit($opts);
+
 include('adminfooter.php');
 

trunk/site/includes/strings.inc

@@ -17 +17 @@
 
     "This is not your boat, only boat owner may abandon !" => "This is not your boat, only boat owner may abandon !",
-    "Please connect to create your first boat" => "Please connect to create your first boat",
-    
+    "Please connect to create your first boat" => "Please connect to create your first boat",    
     "You seem to try to use an old account with boat" => "You seem to try to use an old account with boat",
     "You should do following steps" => "You should do following steps",
@@ -454 +453 @@
   'fr' => 
   array (
+    'Visible for' => 'Visible pour',
     'pref_helper_contact_taverne' => 'Copiez l\'url de votre profil ou entrez votre identifiant numérique',
     'pref_helper_contact_revatua' => 'Copiez l\'url de votre profil ou entrez votre identifiant numérique',
@@ -481 +481 @@
     'prefsgroup_lang' => 'Préférences de langue',
     'pref_lang_ihm' => 'Langue de l\'interface',
-    'pref_lang_communication' => 'Langue(s) que vous parlez suffisament pour communiquer',
+    'pref_lang_communication' => 'Langue(s) connue(s)',
     'prefsgroup_contact' => 'Infos pour vous contacter',
     'pref_contact_email' => 'Courriel',

trunk/site/manage_profil.php

@@ -34 +34 @@
     echo "<div>";
     echo "<form name=\"prefs\" method=\"post\">";
-    echo "<table>";
+    echo "<table class=\"prefsetter\">";
 
     echoSaveCancel();
@@ -48 +48 @@
         foreach ($pg as $pkey) {
             echo "<tr class=\"prefsetter\">";
-            echo "<td>".getLocalizedString("pref_$pkey")."</td>";
-            echo "<td>".$pp->getform($pkey)."</td>";
-            echo "<td>".$pp->permissions($pkey)."</td>";
+            echo "<td class=\"prefsetter\">".getLocalizedString("pref_$pkey")."</td>";
+            echo "<td class=\"prefsetter\">".$pp->getform($pkey)."</td>";
+            echo "<td class=\"prefsetter\">".$pp->permissions($pkey)."</td>";
             echo "</tr>";
         }

trunk/site/style/base-style.css

@@ -483 +483 @@
 }
 
-
 .racesummary-type1 {
   font-style: italic;
@@ -492 +491 @@
           background-color: #eeeeee;
 }
+
+td.prefsetter {
+  vertical-align: top;
+}
+
+select.selectperm {
+        background-color: #eeeeee;
+        overflow: auto;
+        empty-cells: hide;      
+}
+
+option {
+        background-color: #eeeeee;
+}