[Mrbs-commits] SF.net SVN: mrbs:[2399]

[cimorrison]

Commit r2399: https://sourceforge.net/p/mrbs/code/2399/

------------------------------------------------------------------------
r2399 | cimorrison | 2012-09-08 18:16:36 +0100 (Sat, 08 Sep 2012) | 1 line
Changed paths:
   M /mrbs/trunk/web/css/mrbs.css.php
   M /mrbs/trunk/web/edit_users.php

Fixed sorting and styling of integer custom fields in edit_users.php
------------------------------------------------------------------------

Index: mrbs/trunk/web/css/mrbs.css.php
===================================================================
--- mrbs/trunk/web/css/mrbs.css.php     (revision 2398)
+++ mrbs/trunk/web/css/mrbs.css.php     (revision 2399)
@@ -686,6 +686,8 @@
 form.edit_users_error {width: 10em; margin-top: 2.0em}
 div#user_list {padding: 2em 0}
 form#add_new_user {margin-left: 1em}
+#users_table td {text-align: right}
+#users_table td div.string {text-align: left}
 
 
 
Index: mrbs/trunk/web/edit_users.php
===================================================================
--- mrbs/trunk/web/edit_users.php       (revision 2398)
+++ mrbs/trunk/web/edit_users.php       (revision 2399)
@@ -162,11 +162,11 @@
           // the level field contains a code and we want to display a string
           // (but we put the code in a span for sorting)
           $values[] = "<span title=\"$col_value\"></span>" .
-                      "<div>" . get_vocab("level_$col_value") . "</div>";
+                      "<div class=\"string\">" . get_vocab("level_$col_value") 
. "</div>";
           break;
         case 'email':
           // we don't want to truncate the email address
-          $values[] = "<div>" . htmlspecialchars($col_value) . "</div>";
+          $values[] = "<div class=\"string\">" . htmlspecialchars($col_value) 
. "</div>";
           break;
         default:
           // Where there's an associative array of options, display
@@ -182,25 +182,23 @@
             {
               $col_value = '';
             }
-            $values[] = "<div>" . htmlspecialchars($col_value) . "</div>";
+            $values[] = "<div class=\"string\">" . 
htmlspecialchars($col_value) . "</div>";
           }
           elseif (($field['nature'] == 'boolean') || 
               (($field['nature'] == 'integer') && isset($field['length']) && 
($field['length'] <= 2)) )
           {
             // booleans: represent by a checkmark
-            $values[] = "<div class=\"int\">" .
-                        ((!empty($col_value)) ? "<img src=\"images/check.png\" 
alt=\"check mark\" width=\"16\" height=\"16\">" : "&nbsp;") .
-                         "</div>";
+            $values[] = (!empty($col_value)) ? "<img src=\"images/check.png\" 
alt=\"check mark\" width=\"16\" height=\"16\">" : "&nbsp;";
           }
           elseif (($field['nature'] == 'integer') && isset($field['length']) 
&& ($field['length'] > 2))
           {
             // integer values
-            $values[] = "<div class=\"int\">" . $col_value . "</div>";
+            $values[] = $col_value;
           }
           else
           {
              // strings
-            $values[] = "<div title=\"" . htmlspecialchars($col_value) . "\">" 
.
+            $values[] = "<div class=\"string\" title=\"" . 
htmlspecialchars($col_value) . "\">" .
                         htmlspecialchars($col_value) . "</div>";
           }
           break;

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Mrbs-commits mailing list
Mrbs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mrbs-commits