From 14ee1f553e162fd593fdf019615757243d15887b Mon Sep 17 00:00:00 2001
From: mkonecny <martin.konecny@sourcefabric.org>
Date: Fri, 11 Feb 2011 11:56:14 -0500
Subject: [PATCH] -fixed up about tool-tip -ui tweaks to manage users screen

---
 application/forms/AddUser.php                 |  2 +-
 application/views/scripts/user/add-user.phtml | 10 +++++-----
 public/js/airtime/library/library.js          |  5 ++++-
 public/js/airtime/user/user.js                | 20 +++++++++++++++++--
 public/js/playlist/playlist.js                |  9 ++++++++-
 5 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/application/forms/AddUser.php b/application/forms/AddUser.php
index f6bd24980..db366c04d 100644
--- a/application/forms/AddUser.php
+++ b/application/forms/AddUser.php
@@ -12,7 +12,7 @@ class Application_Form_AddUser extends Zend_Form
                                     * */
                         
         $hidden = new Zend_Form_Element_Hidden('user_id');
-        $hidden->setAttrib('style', 'display: none;');
+        $hidden->setDecorators(array('ViewHelper'));
         $this->addElement($hidden);
               
         $login = new Zend_Form_Element_Text('login');
diff --git a/application/views/scripts/user/add-user.phtml b/application/views/scripts/user/add-user.phtml
index 5760e28ae..308c21e36 100644
--- a/application/views/scripts/user/add-user.phtml
+++ b/application/views/scripts/user/add-user.phtml
@@ -7,18 +7,18 @@
         <div id="users_wrapper" class="dataTables_wrapper">
           
         <div class="button-holder">
-         <button type="button" id="add_user_button" name=
-          "search_add_group" class="ui-button ui-widget ui-state-default ui-button-text-icon-primary">
-          <span class="ui-button-text">Add user</span></button>
+         <button type="button" id="add_user_button" name="search_add_group" class="ui-button ui-widget ui-state-default ui-button-text-icon-primary"><span class="ui-button-text">New user</span></button>
         </div>
           
           <table cellspacing="0" cellpadding="0" style="" id="users_datatable" class="datatable">
             <thead>
               <tr>
                 <th>id</th>
-                <th>Name</th>
+                <th>Username</th>
+                <th>Firstname</th>
+                <th>Lastname</th>
                 <th>Role</th>
-                <th>Delete</th>
+                <th>&nbsp;</th>
               </tr>
             </thead>
             <tbody></tbody>
diff --git a/public/js/airtime/library/library.js b/public/js/airtime/library/library.js
index b58db6241..e35cd2b1c 100644
--- a/public/js/airtime/library/library.js
+++ b/public/js/airtime/library/library.js
@@ -147,6 +147,9 @@ $(document).ready(function() {
 		"aaSorting": [[2,'asc']],
 		"sPaginationType": "full_numbers",
 		"bJQueryUI": true,
-		"bAutoWidth": false
+		"bAutoWidth": false,
+        "oLanguage": {
+            "sSearch": ""
+        }
 	});
 });
diff --git a/public/js/airtime/user/user.js b/public/js/airtime/user/user.js
index 03edafc8a..969f9f9aa 100644
--- a/public/js/airtime/user/user.js
+++ b/public/js/airtime/user/user.js
@@ -32,7 +32,18 @@ function removeUserCallback(row_id, nRow){
 
 function rowCallback( nRow, aData, iDisplayIndex ){
     $(nRow).click(function(){rowClickCallback(aData[0])});
-    $('td:eq(2)', nRow).append( '<span class="ui-icon ui-icon-closethick"></span>').children('span').click(function(e){e.stopPropagation(); removeUserCallback(aData[0], nRow)});
+    $('td:eq(4)', nRow).append( '<span class="ui-icon ui-icon-closethick"></span>').children('span').click(function(e){e.stopPropagation(); removeUserCallback(aData[0], nRow)});
+
+    if ( aData[4] == "A" )
+    {
+	    $('td:eq(3)', nRow).html( 'Admin' );
+    } else if ( aData[4] == "H" )
+    {
+	    $('td:eq(3)', nRow).html( 'Host' );
+    } else if ( aData[4] == "G" )
+    {
+	    $('td:eq(3)', nRow).html( 'Guest' );
+    }
     
     return nRow;
 }
@@ -55,12 +66,17 @@ $(document).ready(function() {
         "aoColumns": [
             /* Id */         { "sName": "id", "bSearchable": false, "bVisible": false },
             /* user name */  { "sName": "login" },
+            /* first name */ { "sName": "first_name" },
+            /* last name */  { "sName": "last_name" },
             /* user type */  { "sName": "type", "bSearchable": false },
             /* del button */ { "sName": "null as delete", "bSearchable": false, "bSortable": false}
         ],
         "bJQueryUI": true,
         "bAutoWidth": false,
-        "bLengthChange": false
+        "bLengthChange": false,
+        "oLanguage": {
+            "sSearch": ""
+        }
     });
     
     //$('#user_details').hide();
diff --git a/public/js/playlist/playlist.js b/public/js/playlist/playlist.js
index 0116cc5d0..fae37b183 100644
--- a/public/js/playlist/playlist.js
+++ b/public/js/playlist/playlist.js
@@ -251,7 +251,14 @@ function init() {
                 target: 'center',
                 tooltip: 'topRight'
             }
-        }
+        },
+         style: {
+            border: {
+               width: 0,
+               radius: 4
+            },
+            name: 'light', // Use the default light style
+         }
     });
 }