Changeset 4026

Timestamp:

01/27/10 12:20:28 (2 years ago)

Author:

mszopinski

Message:

user <-> group interaction

Location:

ssme/trunk

Files:

• doc/delete_data.sql (added)
• doc/insert_data.sql (added)
• src/com/kh/ssme/business/GroupService.java (modified) (3 diffs)
• src/com/kh/ssme/business/UserService.java (modified) (2 diffs)
• src/com/kh/ssme/manage/GroupManager.java (modified) (2 diffs)
• src/com/kh/ssme/manage/UserManager.java (modified) (2 diffs)
• src/com/kh/ssme/model/entity/BasicDataEntity.java (modified) (1 diff)
• src/com/kh/ssme/model/entity/GroupEntity.java (modified) (3 diffs)
• src/com/kh/ssme/model/entity/UserEntity.java (modified) (6 diffs)
• src/com/kh/ssme/model/ifc/Group.java (modified) (3 diffs)
• src/com/kh/ssme/model/ifc/User.java (modified) (3 diffs)
• src/com/kh/ssme/rest/parsers/JSONEntityCreator.java (modified) (4 diffs)
• src/com/kh/ssme/rest/parsers/JSONEntityMerger.java (modified) (3 diffs)
• web/css/ssme.css (modified) (2 diffs)
• web/group.jsp (modified) (1 diff)
• web/script/facebox.js (modified) (5 diffs)
• web/script/group.js (modified) (4 diffs)
• web/script/user.js (modified) (6 diffs)
• web/script/util.js (added)
• web/user.jsp (modified) (1 diff)
• web/WEB-INF/tags/group.tag (modified) (1 diff)
• web/WEB-INF/tags/head.tag (modified) (1 diff)
• web/WEB-INF/tags/page.tag (modified) (1 diff)
• web/WEB-INF/tags/user.tag (modified) (1 diff)

ssme/trunk/src/com/kh/ssme/business/GroupService.java

@@ -28 +28 @@
 import com.kh.ssme.manage.GroupManager;
 import com.kh.ssme.manage.PersistenceManager;
+import com.kh.ssme.manage.UserManager;
 import com.kh.ssme.model.entity.GroupEntity;
 import com.kh.ssme.model.ifc.Group;
+import com.kh.ssme.model.ifc.User;
 import com.kh.ssme.rest.parsers.EntityParserTools;
 
@@ -40 +42 @@
         private static final Logger logger_ = LoggerFactory.getLogger(GroupService.class);
         
-        public static Group create(Object o){
+        public static Group create(Object json){
                 PersistenceManager.getInstance().beginTransaction();
                 try{
                         Group group = new GroupEntity();
-                        EntityParserTools.getMerger(o).parseAndMerge(o, group);                 
+                        EntityParserTools.getMerger(json).parseAndMerge(json, group);                   
                         GroupManager.createGroup(group);
+                        UserManager.addToOwnedGroups(group.getOwner(), group);
                         PersistenceManager.getInstance().commitTransaction();
                         return group;
@@ -55 +58 @@
         }
         
-        public static Group update(String uuid, Object o){
+        public static Group update(String uuid, Object json){
                 PersistenceManager.getInstance().beginTransaction();
                 try{
                         Group group = GroupManager.findGroupByUUID(uuid);
-                        EntityParserTools.getMerger(o).parseAndMerge(o, group);
+                        EntityParserTools.getMerger(json).parseAndMerge(json, group);
                         PersistenceManager.getInstance().commitTransaction();
                         return group;

ssme/trunk/src/com/kh/ssme/business/UserService.java

@@ -26 +26 @@
 import org.slf4j.LoggerFactory;
 
+import com.kh.ssme.manage.GroupManager;
 import com.kh.ssme.manage.PersistenceManager;
 import com.kh.ssme.manage.UserManager;
@@ -92 +93 @@
         }       
         
+        
 }

ssme/trunk/src/com/kh/ssme/manage/GroupManager.java

@@ -30 +30 @@
 import com.kh.ssme.model.entity.GroupEntity;
 import com.kh.ssme.model.ifc.Group;
+import com.kh.ssme.model.ifc.User;
 
 /**
@@ -105 +106 @@
                 return null;
         }               
+        
+        /**
+         * Adds user to group
+         * @param group
+         * @param user
+         */
+        public static void joinUserToGroup(Group group, User user) {
+                logger_.debug("User "+user+" added to group "+group);   
+                if(!group.getUsers().contains(user)){
+                        group.getUsers().add(user);
+                        PersistenceManager.getInstance().persistEntity(group);                  
+                }
+        }               
+        
 }

ssme/trunk/src/com/kh/ssme/manage/UserManager.java

@@ -29 +29 @@
 
 import com.kh.ssme.model.entity.UserEntity;
+import com.kh.ssme.model.ifc.Group;
 import com.kh.ssme.model.ifc.User;
 
@@ -104 +105 @@
                 }
                 return null;
+        }
+
+        /**
+         * Adds given group to users owned groups
+         * @param owner
+         * @param group
+         */
+        public static void addToOwnedGroups(User owner, Group group) {
+                logger_.debug("Group "+group+" added to user "+owner+" owned groups "); 
+                if(!owner.getOwnedGroups().contains(group)){
+                        owner.getOwnedGroups().add(group);
+                        PersistenceManager.getInstance().persistEntity(owner);
+                }
         }               
         

ssme/trunk/src/com/kh/ssme/model/entity/BasicDataEntity.java

@@ -38 +38 @@
 
 /**
- * @author Michal Szopinski
- * @param <T>
  *
  */

ssme/trunk/src/com/kh/ssme/model/entity/GroupEntity.java

@@ -23 +23 @@
 package com.kh.ssme.model.entity;
 
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.persistence.Basic;
@@ -64 +64 @@
                         joinColumns=@JoinColumn(name="ugroup__id", referencedColumnName="id"),
                         inverseJoinColumns=@JoinColumn(name="user__id", referencedColumnName="id"))
-        private Set<User> users_ = new TreeSet<User>();
+        private List<User> users_ = new ArrayList<User>();
         
         @ManyToOne(optional=false, targetEntity=UserEntity.class)
-        @JoinColumn(name="user_id", nullable=false, updatable=false)    
+        @JoinColumn(name="owner_user_id", nullable=false, updatable=false)      
         private User owner_;    
         
@@ -125 +125 @@
          */
         @Override
-        public Set<User> getUsers() {
+        public List<User> getUsers() {
                 return users_;
         }
 
         /* (non-Javadoc)
-         * @see com.kh.ssme.model.ifc.Group#setUsers(java.util.Set)
+         * @see com.kh.ssme.model.ifc.Group#setUsers(java.util.List)
          */
         @Override
-        public void setUsers(Set<User> users) {
+        public void setUsers(List<User> users) {
                 users_ = users;
         }

ssme/trunk/src/com/kh/ssme/model/entity/UserEntity.java

@@ -23 +23 @@
 package com.kh.ssme.model.entity;
 
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.persistence.Basic;
@@ -73 +73 @@
  
         @ManyToMany(targetEntity=GroupEntity.class, mappedBy="users_", cascade=CascadeType.ALL)
-        private Set<Group> groups_ = new TreeSet<Group>();
+        private List<Group> groups_ = new ArrayList<Group>();
         
         @OneToMany(targetEntity=StayPlaceEntity.class, cascade=CascadeType.ALL, mappedBy="user_")
-        private Set<StayPlace> stayPlaces_ = new TreeSet<StayPlace>();
+        private List<StayPlace> stayPlaces_ = new ArrayList<StayPlace>();
         
         @OneToMany(targetEntity=CalendarEntity.class, cascade=CascadeType.ALL, mappedBy="user_")
-        private Set<com.kh.ssme.model.ifc.Calendar> calendars_ = new TreeSet<com.kh.ssme.model.ifc.Calendar>();
+        private List<com.kh.ssme.model.ifc.Calendar> calendars_ = new ArrayList<com.kh.ssme.model.ifc.Calendar>();
         
         @OneToMany(targetEntity=GroupEntity.class, cascade=CascadeType.ALL, mappedBy="owner_")
-        private Set<Group> ownedGroups_ = new TreeSet<Group>();
+        private List<Group> ownedGroups_ = new ArrayList<Group>();
         
         
@@ -188 +188 @@
 
         @Override
-        public Set<Group> getGroups() {         
+        public List<Group> getGroups() {                
                 return groups_;
         }
 
         @Override
-        public void setGroups(Set<Group> groups) {
+        public void setGroups(List<Group> groups) {
                 groups_ = groups;               
         }
@@ -201 +201 @@
          */
         @Override
-        public Set<StayPlace> getStayPlaces() {
+        public List<StayPlace> getStayPlaces() {
                 return stayPlaces_;
         }
 
         /* (non-Javadoc)
-         * @see com.kh.ssme.model.ifc.User#setStayPlaces(java.util.Set)
-         */
-        @Override
-        public void setStayPlaces(Set<StayPlace> stayPlaces) {
+         * @see com.kh.ssme.model.ifc.User#setStayPlaces(java.util.List)
+         */
+        @Override
+        public void setStayPlaces(List<StayPlace> stayPlaces) {
                 stayPlaces_ = stayPlaces;
         }
@@ -217 +217 @@
          */
         @Override
-        public Set<com.kh.ssme.model.ifc.Calendar> getCalendars() {
+        public List<com.kh.ssme.model.ifc.Calendar> getCalendars() {
                 return calendars_;
         }
 
         /* (non-Javadoc)
-         * @see com.kh.ssme.model.ifc.User#setCalendars(java.util.Set)
-         */
-        @Override
-        public void setCalendars(Set<com.kh.ssme.model.ifc.Calendar> calendars) {
+         * @see com.kh.ssme.model.ifc.User#setCalendars(java.util.List)
+         */
+        @Override
+        public void setCalendars(List<com.kh.ssme.model.ifc.Calendar> calendars) {
                 calendars_ = calendars;
         }
@@ -233 +233 @@
          */
         @Override
-        public Set<Group> getOwnedGroups() {
+        public List<Group> getOwnedGroups() {
                 return ownedGroups_;
         }
 
         /* (non-Javadoc)
-         * @see com.kh.ssme.model.ifc.User#setOwnedGroups(java.util.Set)
-         */
-        @Override
-        public void setOwnedGroups(Set<Group> ownedGroups) {
+         * @see com.kh.ssme.model.ifc.User#setOwnedGroups(java.util.List)
+         */
+        @Override
+        public void setOwnedGroups(List<Group> ownedGroups) {
                 ownedGroups_ = ownedGroups;
         }

ssme/trunk/src/com/kh/ssme/model/ifc/Group.java

@@ -23 +23 @@
 package com.kh.ssme.model.ifc;
 
-import java.util.Set;
+import java.util.List;
 
 /**
@@ -32 +32 @@
         //private String name_ = "";
         //private String description_ = "";     
-        //private Set<User> users_ = new TreeSet<User>();
+        //private List<User> users_ = new ArrayList<User>();
         //private User owner_ = new User();     
                 
@@ -44 +44 @@
         public void setDescription(String description);
         
-        public Set<User> getUsers();
+        public List<User> getUsers();
         
-        public void setUsers(Set<User> users);
+        public void setUsers(List<User> users);
         
         public User getOwner();

ssme/trunk/src/com/kh/ssme/model/ifc/User.java

@@ -23 +23 @@
 package com.kh.ssme.model.ifc;
 
-import java.util.Set;
-
-import javax.persistence.Basic;
-import javax.persistence.Column;
+import java.util.List;
 
 /**
@@ -38 +35 @@
         //private String mail_ = "";
         //private String mobile_ = "";  
-        //private Set<GroupEntity> groups = new TreeSet<GroupEntity>();
-        //private Set<StayPlace> stayPlaces_ = new TreeSet<StayPlace>();
-        //private Set<com.kh.ssme.model.ifc.Calendar> calendars_ = new TreeSet<com.kh.ssme.model.ifc.Calendar>();
-        //private Set<Group> ownedGroups_ = new TreeSet<Group>();
+        //private List<GroupEntity> groups = new ArrayList<GroupEntity>();
+        //private List<StayPlace> stayPlaces_ = new ArrayList<StayPlace>();
+        //private List<com.kh.ssme.model.ifc.Calendar> calendars_ = new ArrayList<com.kh.ssme.model.ifc.Calendar>();
+        //private List<Group> ownedGroups_ = new ArrayList<Group>();
         
         public String getLogin();
@@ -63 +60 @@
         public void setMobile(String mobile);   
         
-        public Set<Group> getGroups();
+        public List<Group> getGroups();
         
-        public void setGroups(Set<Group> groups); 
+        public void setGroups(List<Group> groups); 
         
-        public Set<StayPlace> getStayPlaces();
+        public List<StayPlace> getStayPlaces();
         
-        public void setStayPlaces(Set<StayPlace> stayPlaces);
+        public void setStayPlaces(List<StayPlace> stayPlaces);
         
-        public Set<com.kh.ssme.model.ifc.Calendar> getCalendars();
+        public List<com.kh.ssme.model.ifc.Calendar> getCalendars();
         
-        public void setCalendars(Set<com.kh.ssme.model.ifc.Calendar> calendars);
+        public void setCalendars(List<com.kh.ssme.model.ifc.Calendar> calendars);
         
-        public Set<Group> getOwnedGroups();
+        public List<Group> getOwnedGroups();
         
-        public void setOwnedGroups(Set<Group> ownedGroups);     
+        public void setOwnedGroups(List<Group> ownedGroups);    
         
 }

ssme/trunk/src/com/kh/ssme/rest/parsers/JSONEntityCreator.java

@@ -111 +111 @@
                 //private User owner_ = new User();     
                 
+                create((BasicData)group, json);         
+                
                 if(group.getName() != null){
                         json.put("name", group.getName());                      
@@ -118 +120 @@
                         json.put("description", group.getDescription());                        
                 }                       
+                
+                if(group.getOwner() != null){
+                        JSONObject owner = new JSONObject();
+                        create(group.getOwner(), owner);
+                        json.put("owner", owner);                       
+                }               
                 
                 if(group.getUsers() != null){
@@ -128 +136 @@
                         json.put("users", users);
                 }       
-                
-                if(group.getOwner() != null){
-                        json.put("owner", group.getOwner().getUUID());                  
-                }       
+                        
         }
 
@@ -211 +216 @@
                 //private Set<com.kh.ssme.model.ifc.Calendar> calendars_ = new TreeSet<com.kh.ssme.model.ifc.Calendar>();
                 //private Set<Group> ownedGroups_ = new TreeSet<Group>();
+                
+                create((BasicData)user, json);          
                         
                 if(user.getLogin() != null){

ssme/trunk/src/com/kh/ssme/rest/parsers/JSONEntityMerger.java

@@ -110 +110 @@
                 //private User owner_ = new User();     
                 
-                JSONObject json = (JSONObject)o;
-                Set<User> tempSet = new TreeSet<User>();                
+                JSONObject json = (JSONObject)o;        
                 
                 String name = (String) json.get("name");
@@ -125 +124 @@
                 JSONArray users = (JSONArray) json.get("users");
                 if(users != null){
+                        group.getUsers().clear();                       
                         for (Object ob : users) {
-                                String uuid = (String) ob;
-                                if(uuid!=null){
-                                        boolean add = true;
-                                        for(User u : group.getUsers()){
-                                                if(uuid.equalsIgnoreCase(u.getUUID())){
-                                                        tempSet.add(u);
-                                                        add = false;
-                                                        break;
-                                                }                       
-                                        }
-                                        if(add){
-                                                tempSet.add(UserManager.findUserByUUID(uuid));
-                                        }
-                                }
+                                String uuid = (String) ob;                              
+                                group.getUsers().add(UserManager.findUserByUUID(uuid));
                         }
-                        group.getUsers().clear();
-                        group.getUsers().addAll(tempSet);
-                        tempSet.clear();
                 }
                 
@@ -250 +235 @@
                         user.setMobile(mobile);                 
                 }               
-
-                Set<Group> tempSet = new TreeSet<Group>();                              
+                        
                 JSONArray groups = (JSONArray) json.get("groups");
                 if(groups != null){
+                        user.getGroups().clear();                       
                         for (Object ob : groups) {
                                 String uuid = (String) ob;
-                                if(uuid!=null){
-                                        boolean add = true;
-                                        for(Group g : user.getGroups()){
-                                                if(uuid.equalsIgnoreCase(g.getUUID())){
-                                                        tempSet.add(g);
-                                                        add = false;
-                                                        break;
-                                                }                       
-                                        }
-                                        if(add){
-                                                tempSet.add(GroupManager.findGroupByUUID(uuid));
-                                        }
-                                }
+                                user.getGroups().add(GroupManager.findGroupByUUID(uuid));
                         }
-                        user.getGroups().clear();
-                        user.getGroups().addAll(tempSet);
-
-                }
-                
-                tempSet.clear();                
+                }
+        
                 JSONArray ownedGroups = (JSONArray) json.get("ownedGroups");
                 if(ownedGroups != null){
+                        user.getOwnedGroups().clear();                  
                         for (Object ob : ownedGroups) {
                                 String uuid = (String) ob;
-                                if(uuid!=null){
-                                        boolean add = true;
-                                        for(Group g : user.getOwnedGroups()){
-                                                if(uuid.equalsIgnoreCase(g.getUUID())){
-                                                        tempSet.add(g);
-                                                        add = false;                                                    
-                                                        break;
-                                                }                       
-                                        }
-                                        if(add){
-                                                tempSet.add(GroupManager.findGroupByUUID(uuid));
-                                        }
-                                }
+                                user.getOwnedGroups().add(GroupManager.findGroupByUUID(uuid));
                         }
-                        user.getOwnedGroups().clear();
-                        user.getOwnedGroups().addAll(tempSet);
                 }               
                 

ssme/trunk/web/css/ssme.css

@@ -66 +66 @@
         }
         
+        
+
+        /**
+         *      form fields
+         */
 input{
                 border: 0px solid red;
@@ -87 +92 @@
                 opacity:0.6     ;
                 font-color: black;              
+        }       
+        
+        
+                
+        /**
+         * lists of
+         * users, groups
+         */
+ul.groupList, ul.userList{       
+                list-style-type: none
+        }        
+ul.groupList li, ul.userList li{
+                padding: 3px;
+                
+        }
+        
+        
+        
+        /**
+         *      Wrappers
+         */     
+.excludedFromLayout{
+                visibility: hidden;
+                position: absolute; 
+        }
+span .container{
+                padding: 0px;
+                margin: 0px;
+                border: 0px;
+        }
+        
+        
+        
+        /**
+         * Toggle buttons
+         */
+.toggleButton {
+                border: 2px solid #bbffbb;
+                padding: 1px 3px 1px 3px;
+                margin-left: 2px;
+                margin-right: 2px;
+        }        
+        
+.toggleOn {
+                border-style: inset;    
+        }
+        
+.toggleOff {
+                border-style: outset;
         }               
-
-.detailsButton {
+        
+        
+        
+        /**
+         *      buttons
+         */
+a {     
+                text-decoration: none;
+        }
+a .faceboxButton {
+                border:2px outset #bbffbb;
+                padding: 1px 3px 1px 3px;
+        }       
+a:hover .faceboxButton{
                 border:1px outset #bbffbb;
+                padding: 2px 4px 2px 4px;
         }
+        
+a:active .faceboxButton{
+                border:1px inset #bbffbb;
+                padding: 2px 4px 2px 4px;
+        }
+        
+.button a{
+                border:2px outset #bbffbb;
+                padding: 1px 3px 1px 3px;
+        }       
+.button a:hover{
+                border:1px outset #bbffbb;
+                padding: 2px 4px 2px 4px;
+        }
+        
+.button a:active{
+                border:1px inset #bbffbb;
+                padding: 2px 4px 2px 4px;
+        }       
+        
 
         

ssme/trunk/web/group.jsp

@@ -10 +10 @@
 
         <jsp:body>
+        
                 <ssme:group id="group" editable="true" />
+                
+                <ssme:user id="userDetails" infoOnly="true" />                  
+                
         </jsp:body>
 

ssme/trunk/web/script/facebox.js

@@ -93 +93 @@
                 var f = this;
                 $$('a[rel=facebox]').each(function(elem,i){
-                        Event.observe(elem, 'click', function(e){
-                                // console.log("here's what f is :: "+ f);
+                                Event.observe(elem, 'click', function(e){
                                 Event.stop(e);
                                 f.click_handler(elem, e);
                         });
                 });
-                
         },
         
@@ -138 +136 @@
         
         close           : function(){
+                // restore parent
+                this.restore_to_parent();
+        
                 new Effect.Fade('facebox', { duration: 0.2 });
         },
@@ -143 +144 @@
         setLocation: function(){
                 var pageScroll = document.viewport.getScrollOffsets();
-                var top = /*pageScroll.top +*/ (document.viewport.getHeight()/ 10);
+                var top = pageScroll.top + (document.viewport.getHeight()/ 10);
                 var left = (document.viewport.getWidth()/2) - ($('facebox').getWidth()) + ($('facebox').getWidth()/2);
                 $('facebox').setStyle({
@@ -174 +175 @@
         
         click_handler   : function(elem, e){
+                // restore parent
+                this.restore_to_parent();
+        
                 this.loading();
                 Event.stop(e);
@@ -206 +210 @@
                         fb.ajax(url, klass);
                 }
+        },
+        
+        
+        
+        //-----------------------------------------------------------------
+        // SSME specific
+        /**
+         * Reference to parent of element that will be show in facebox
+         */
+        parent : null,
+        /**
+         * contetn id
+         */
+        contentID : null,
+        
+        /**
+         * Restores content to it's basic parent
+         */
+        restore_to_parent : function(){
+                if(this.parent!=null){                                                          
+                        Element.insert(this.parent, { bottom: $(this.contentID).remove() });                                                                            
+                }               
+                this.parent = null;
+        },
+        
+        buttonClick_handler     : function(elem){               
+                // restore parent
+                this.restore_to_parent();
+                
+                this.loading();
+                                
+                // div
+                this.open();
+                        
+                if (elem.href.match(/#/)){
+                        var url                 = window.location.href.split('#')[0];
+                        this.contentID  = elem.href.replace(url+'#','');        
+                        
+                        //store parent and move object  
+                        var d                   = $(this.contentID);
+                        this.parent = d.parentNode;             
+                        var data = new Element(d.parentNode.tagName);
+                        Element.insert(data, { bottom: d.remove() });   //move object                                   
+                        
+                        this.reveal(data, '');
+                }               
         }
+        //-----------------------------------------------------------------     
+        
 });
 

ssme/trunk/web/script/group.js

@@ -5 +5 @@
 
 Group.prototype = {
+        //-------------------------------------------
+        // ATTRIBUTES
+        //                      
         /**
          * unique ID of this component
@@ -25 +28 @@
         thisForm : null,        
         
+        //
+        //-------------------------------------------   
+        
+        
+        
+        //-------------------------------------------
+        // INITIALIZE
+        //              
         initialize: function(formElement){
-                $('logger').innerHTML += "Group.initialize()" + "<br/>";                 
+                         
                 this.id = Element.identify(formElement);                
-                $('logger').innerHTML += "formElement.id:[" + this.id + "]";                            
+                Logger.debug("Group.initialize() formElement.id:[" + this.id + "] UUDI[" + $(this.id+"_uuid").value + "]");                             
                 this.thisForm = {
+                        //fields                                
                         uuid            : $(this.id+"_uuid"),
                         name            : $(this.id+"_name"),
                         description : $(this.id+"_description"),                                                
-                        owner_login     : $(this.id+"_owner_login")
+                        owner_login     : $(this.id+"_owner_login"),
+                        
+                        //buttons
+                        apply_button: $(this.id+"_apply"),
+                        edit_button : $(this.id+"_edit")                        
                 };
+                this.isNew = (this.thisForm.uuid.value == "");          
+                
+                //submit button
+                if(this.thisForm.apply_button){         
+                        this.thisForm.apply_button.onclick = this.onApply.bindAsEventListener(this);                                    
+                }
+                
                 //editable
-                $(this.id+"_edit").checked = true;
-                $(this.id+"_edit").onmouseup = this.changeEdit.bindAsEventListener(this, $(this.id+"_edit"));           
-                $(this.id+"_edit").onmouseup();
-                $(this.id+"_edit").checked = false;
+                if(this.thisForm.edit_button){  
+                        this.thisForm.edit_button.toggle.toggleOn  = this.onEdit.bindAsEventListener(this, this.thisForm.edit_button, $$("#"+this.id+" tr.controlRow .submit")[0]);             
+                        this.thisForm.edit_button.toggle.toggleOff = this.onEdit.bindAsEventListener(this, this.thisForm.edit_button, $$("#"+this.id+" tr.controlRow .submit")[0]);                     
+                }       
                 
                 //users list - details buttons
                 $$("ul.userList li").each(
                         function(el){
-                                var elId = el.identify();
-                                $$('#'+elId+' input.detailsButton')[0].onmouseup = this.onGroupLiClick.bindAsEventListener(this, el, elId);                             
-                        }.bind(this)
+                                var liId = el.identify();
+                                var aElement = $$('#'+liId+' span.detailsButton a')[0];
+                                aElement.onclick = this.onUserLiClick.bindAsEventListener(this, aElement, liId);                                
+                        }.bind(this)                    
                 );
+                
+                //add to instances
+                Group.instances.set(this.id, this);
         },
-        
-        loadGroup: function(group){
+        /**
+         * Catch the onsubmit event - to make sure it is not submitted :)
+         */     
+        onSubmit : function(event)
+        {
+                return false;
+        },              
+        
+        //
+        //-------------------------------------------           
+        
+        
+        
+        //-------------------------------------------
+        // LOAD
+        //
+        
+        loadGroup: function(group){     
                 this.thisForm.uuid.value = group.uuid;
                 this.thisForm.name.value = group.name;
-                this.thisForm.name.description.iinnerHTML = group.description;
+                this.thisForm.description.innerHTML = group.description;
                 this.thisForm.owner_login.value = group.owner.login;            
+                Logger.debug("Group.loadGroup() : " + group.uuid + " | " + group.name + " | " + group.owner.login + " | " + group.owner);
                 
                 this.isNew = (this.thisForm.uuid.value == "");
         },      
         
-        load: function(){
-                        
-                 var req = new Ajax.Request("/group/"+this.thisForm.uuid.value, 
-                                  {
-                                                method: "get",
-                                                onSuccess: function(resp) 
-                                                {
-                                                        if ( resp.responseJSON === null )
-                                                        {
-                                                                resp.responseJSON = resp.responseText.evalJSON();
-                                                        }
-                                                        this.loadGroup(resp.responseJSON); 
-                                                        if (this.onLoad != null)
-                                                        {
-                                                                this.onLoad(this, true);
-                                                        } 
-                                                }
-                                                .bind(this),
-                                                onFailure: function(transport, problem)
-                                                {
-                                                        try {  console.debug(problem); } catch (e) {};
-                                                        if (this.onLoad != null)
-                                                        {
-                                                                this.onLoad(this, true);
-                                                        } 
-                                                }
-                                                .bind(this)
-                                        });             
+        load: function(uuid){
+                
+                if(uuid){
+                        this.thisForm.uuid.value = uuid;
+                }               
+                
+                Logger.debug("Group.load() PATH : " + CONTEXT_PATH+"/group/"+this.thisForm.uuid.value); 
+                var req = new Ajax.Request(CONTEXT_PATH+"/group/"+this.thisForm.uuid.value, 
+                {
+                        method: "get",
+                        onSuccess: function(resp){
+                                if ( resp.responseJSON === null )
+                                {
+                                        resp.responseJSON = resp.responseText.evalJSON();
+                                }
+                                this.loadGroup(resp.responseJSON); 
+                                if (this.onLoad != null)
+                                {
+                                        this.onLoad(this, true);
+                                }                                               
+                        }.bind(this),
+                        onFailure: function(transport, problem){
+                                Logger.error("Group.load.onFailure  TRANSPORT:" + Util.listAttributes(transport) + " PROBLEM:" + Util.listAttributes(problem));
+                                try {  console.debug(problem); } catch (e) {};
+                                if (this.onLoad != null)
+                                {
+                                        this.onLoad(this, true);
+                                } 
+                        }.bind(this)
+                });             
                  
         },                                              
+        
+        /**
+         * on-load callback  function (this-object, wasSuccessful)
+         */
+        onLoad: null,   
+        
+        //
+        //-------------------------------------------   
+        
+        
+        
+        //-------------------------------------------
+        // SAVE
+        //
         
         saveGroup: function(group){
@@ -94 +154 @@
         },       
                 
-        /**
-         * on-load callback  function (this-object, wasSuccessful)
-         */
-        onLoad: null,
+        save: function(){
+                var groupObject = $H(
+                {
+                        uuid                    : this.thisForm.uuid.value,     
+                        name                    : this.thisForm.name.value,
+                        description             : this.thisForm.description.value,
+                        owner_login             : this.thisForm.owner_login.value               
+                });     
+                                        
+                Logger.debug("Group.save() Group.toJSON() : " + groupObject.toJSON());                  
+                
+                var _method = ( this.isNew ) ? "put" : "post";
+                var additionalParameter = ( this.isNew ) ? "?_method=put" : "";
+                        
+                Logger.debug("Group.save() PATH : " + CONTEXT_PATH+"/group/"+this.thisForm.uuid.value+additionalParameter);
+                var req = new Ajax.Request(CONTEXT_PATH+"/group/"+this.thisForm.uuid.value+additionalParameter, 
+                {
+                        method: _method,
+                        contentType: "application/json",
+                        postBody: groupObject.toJSON(),
+                        onSuccess: this.onSuccessSave.bind(this),
+                        onComplete: function(resp){
+                                Logger.debug("Group.save.onComplete : RESP:" + resp);
+                        },
+                        onFailure: function(transport, problem){
+                                Logger.error("Group.save.onFailure  TRANSPORT:" + Util.listAttributes(transport) + " PROBLEM:" + Util.listAttributes(problem));                                 
+                                try {  console.debug(problem); } catch (e) {};
+                                if (this.onSave != null)
+                                {
+                                        this.onSave(this, false);
+                                } 
+                        }.bind(this)
+                });             
+        },      
+        
+        /**
+         * It was impossible to find any bug when it was inside the previous
+         * function.
+         */
+        onSuccessSave: function(resp) {
+                if ( resp.responseJSON === null )               
+                {                       
+                        resp.responseJSON = resp.responseText.evalJSON();
+                }                       
+                this.loadGroup(resp.responseJSON); 
+                if (this.onSave != null)
+                {
+                        this.onSave(this, true);
+                } 
+        },
         
         /**
@@ -103 +209 @@
          */
         onSave: null,           
-
-        onGroupLiClick: function(event, element, elId){
-                 facebox.reveal(event+'<br/>'+element+'<br/>'+elId+'</br> for group with UUID:'+this.thisForm.uuid.value,'');
+        
+        //
+        //-------------------------------------------   
+        
+        
+        
+        //-------------------------------------------
+        // LISTENERS
+        //
+        
+        onApply: function(event){
+                 Logger.debug("Group.onApply");
+                 this.save();
         },
         
-        changeEdit: function(event, element){
-                var disable = element.checked;
-                $('logger').innerHTML += disable+' -> '+element.checked + "<br/>";      
-                $$('#'+this.id+' .editable').each(
+        onCancel: function(event){
+                Logger.debug("Group.onCancel");
+                this.load(this.thisForm.uuid.value);
+        },              
+        
+        onEdit: function(event, element, submit){       
+                var isOn = element.toggle.stateIsOn
+                Logger.debug("Group.onEdit isOn["+isOn+"]");            
+                $$('#'+this.id+' input.editable').each(
                         function(el){
-                                el.disabled = disable;
-                                Element.addClassName(el,(disable)?'disabledInput':'enabledInput');
-                                Element.removeClassName(el,(disable)?'enabledInput':'disabledInput');
+                                el.disabled = !isOn;
+                                Element.addClassName(el,(isOn)?'enabledInput':'disabledInput');
+                                Element.removeClassName(el,(isOn)?'disabledInput':'enabledInput');
                         }.bind(this)
                 );      
-        }
+                if(isOn){       //enable submit
+                        Element.removeClassName(submit,'excludedFromLayout');
+                } else {        //disable submit        
+                        Element.addClassName(submit,'excludedFromLayout');
+                        this.onCancel(event);   
+                }
+        },              
+
+        onUserLiClick: function(event, element, liId){          /* element: <a>, liId: UUID */
+                 
+                 Event.stop(event);                      
+                 User.instances.get('userDetails').onLoad = function (){        
+                         facebox.buttonClick_handler(element);  
+                 }
+                 User.instances.get('userDetails').load(liId);
+                                         
+        },              
+        
+        //
+        //-------------------------------------------           
         
 }
 
+/**
+* Collection of Group instances 
+*/
+Group.instances = $H({});
+
 Group.preload = function() {
-        $('logger').innerHTML += "Group.preload()" + "<br/>";
+        Logger.debug("Group.preload()");
         $$("form.groupForm").each(
                 function(form){

ssme/trunk/web/script/user.js

@@ -5 +5 @@
 
 User.prototype = {
+        //-------------------------------------------
+        // ATTRIBUTES
+        //                      
         /**
          * unique ID of this component
@@ -23 +26 @@
          * The form that represents the user
          */
-        thisForm : null,        
-        
+        thisForm : null,
+        
+        //
+        //-------------------------------------------           
+        
+        
+        
+        
+        //-------------------------------------------
+        // INITIALIZE
+        //      
         initialize: function(formElement){
-                $('logger').innerHTML += "User.initialize()" + "<br/>";          
+         
                 this.id = Element.identify(formElement);                
-                $('logger').innerHTML += "formElement.id:[" + this.id + "]";                            
+                Logger.debug("User.initialize() formElement.id:[" + this.id + "] UUDI[" + $(this.id+"_uuid").value + "]");              
                 this.thisForm = {
+                        // fields       
                         uuid            : $(this.id+"_uuid"),
                         login           : $(this.id+"_login"),
@@ -35 +48 @@
                         surname         : $(this.id+"_surname"),
                         mail            : $(this.id+"_mail"),
-                        mobile          : $(this.id+"_mobile")                                          
+                        mobile          : $(this.id+"_mobile"),
+                        
+                        //buttons
+                        apply_button: $(this.id+"_apply"),
+                        edit_button : $(this.id+"_edit")
                 };
+                this.isNew = (this.thisForm.uuid.value == "");
+                
+                //submit button
+                if(this.thisForm.apply_button){         
+                        this.thisForm.apply_button.onclick = this.onApply.bindAsEventListener(this);                                    
+                }
+                
                 //editable
-                $('logger').innerHTML += (this.id+"_edit")+' -> '+$(this.id+"_edit") + "<br/>";                 
-                $(this.id+"_edit").checked = true;
-                $(this.id+"_edit").onmouseup = this.changeEdit.bindAsEventListener(this, $(this.id+"_edit"));           
-                $(this.id+"_edit").onmouseup();
-                $(this.id+"_edit").checked = false;
+                if(this.thisForm.edit_button){  
+                        this.thisForm.edit_button.toggle.toggleOn  = this.onEdit.bindAsEventListener(this, this.thisForm.edit_button, $$("#"+this.id+" tr.controlRow .submit")[0]);             
+                        this.thisForm.edit_button.toggle.toggleOff = this.onEdit.bindAsEventListener(this, this.thisForm.edit_button, $$("#"+this.id+" tr.controlRow .submit")[0]);                     
+                }               
                 
                 //group lists - details buttons
                 $$("ul.groupList li").each(
                         function(el){
-                                var elId = el.identify();
-                                $$('#'+elId+' input.detailsButton')[0].onmouseup = this.onGroupLiClick.bindAsEventListener(this, el, elId);                             
-                        }.bind(this)
-                );      
+                                var liId = el.identify();
+                                var aElement = $$('#'+liId+' span.detailsButton a')[0]; 
+                                aElement.onclick = this.onGroupLiClick.bindAsEventListener(this, aElement, liId);                               
+                        }.bind(this)
+                );                                      
+                
+                
+                //add to instances
+                User.instances.set(this.id, this);              
         },
+        
+        /**
+         * Catch the onsubmit event - to make sure it is not submitted :)
+         */     
+        onSubmit : function(event)
+        {
+                return false;
+        },              
+        
+        //
+        //-------------------------------------------   
+        
+        
+        
+        //-------------------------------------------
+        // LOAD
+        //
         
         loadUser: function(user){
@@ -60 +105 @@
                 this.thisForm.mail.value = user.mail;
                 this.thisForm.mobile.value = user.mobile;               
-                
+
                 this.isNew = (this.thisForm.uuid.value == "");
         },      
         
-        load: function(){
-                        
-                 var req = new Ajax.Request("/user/"+this.thisForm.uuid.value, 
-                                  {
-                                                method: "get",
-                                                onSuccess: function(resp) 
-                                                {
-                                                        if ( resp.responseJSON === null )
-                                                        {
-                                                                resp.responseJSON = resp.responseText.evalJSON();
-                                                        }
-                                                        this.loadUser(resp.responseJSON); 
-                                                        if (this.onLoad != null)
-                                                        {
-                                                                this.onLoad(this, true);
-                                                        } 
-                                                }
-                                                .bind(this),
-                                                onFailure: function(transport, problem)
-                                                {
-                                                        try {  console.debug(problem); } catch (e) {};
-                                                        if (this.onLoad != null)
-                                                        {
-                                                                this.onLoad(this, true);
-                                                        } 
-                                                }
-                                                .bind(this)
-                                        });             
+        load: function(uuid){
+                
+                if(uuid){
+                        this.thisForm.uuid.value = uuid;
+                }
+                        
+                Logger.debug("User.load() PATH : " + CONTEXT_PATH+"/user/"+this.thisForm.uuid.value);           
+                var req = new Ajax.Request(CONTEXT_PATH+"/user/"+this.thisForm.uuid.value, 
+                {
+                        method: "get",
+                        onSuccess: function(resp){
+                                if ( resp.responseJSON === null )
+                                {
+                                        resp.responseJSON = resp.responseText.evalJSON();
+                                }
+                                this.loadUser(resp.responseJSON); 
+                                if (this.onLoad != null)
+                                {
+                                        this.onLoad(this, true);
+                                } 
+                        }.bind(this),
+                        onFailure: function(transport, problem){
+                                Logger.error("User.load.onFailure  TRANSPORT:" + Util.listAttributes(transport) + " PROBLEM:" + Util.listAttributes(problem));                                  
+                                try {  console.debug(problem); } catch (e) {};
+                                if (this.onLoad != null)
+                                {
+                                        this.onLoad(this, true);
+                                } 
+                        }.bind(this)
+                });             
                  
-        },                                              
+        },              
+        
+        /**
+         * on-load callback  function (this-object, wasSuccessful)
+         */
+        onLoad: null,
+        
+        //
+        //-------------------------------------------   
+        
+        
+        
+        //-------------------------------------------
+        // SAVE
+        //
         
         saveUser: function(user){
@@ -101 +162 @@
         
         save: function(){
-                
-        },      
-        
-        /**
-         * on-load callback  function (this-object, wasSuccessful)
-         */
-        onLoad: null,
+                var userObject = $H(
+                {
+                        uuid                    : this.thisForm.uuid.value,
+                        login                   : this.thisForm.login.value,            
+                        name                    : this.thisForm.name.value,
+                        surname                 : this.thisForm.surname.value,
+                        mail                    : this.thisForm.mail.value,
+                        mobile                  : this.thisForm.mobile.value                    
+                });     
+                                        
+                Logger.debug("User.save() User.toJSON() : " + userObject.toJSON());                     
+                
+                var _method = ( this.isNew ) ? "put" : "post";
+                var additionalParameter = ( this.isNew ) ? "?_method=put" : "";
+                        
+                Logger.debug("User.save() PATH : " + CONTEXT_PATH+"/user/"+this.thisForm.uuid.value+additionalParameter);
+                var req = new Ajax.Request(CONTEXT_PATH+"/user/"+this.thisForm.uuid.value+additionalParameter, 
+                {
+                        method: _method,
+                        contentType: "application/json",
+                        postBody: userObject.toJSON(),
+                        onSuccess: this.onSuccessSave.bind(this),
+                        onComplete: function(resp){
+                                Logger.debug("User.save.onComplete : RESP:" + resp);
+                        },
+                        onFailure: function(transport, problem){
+                                Logger.error("User.save.onFailure  TRANSPORT:" + Util.listAttributes(transport) + " PROBLEM:" + Util.listAttributes(problem));                                  
+                                try {  console.debug(problem); } catch (e) {};
+                                if (this.onSave != null)
+                                {
+                                        this.onSave(this, false);
+                                } 
+                        }.bind(this)
+                });             
+        },      
+        
+        /**
+         * It was impossible to find any bug when it was inside the previous
+         * function.
+         */
+        onSuccessSave: function(resp) {
+                if ( resp.responseJSON === null )               
+                {
+                        
+                        resp.responseJSON = resp.responseText.evalJSON();
+                }                       
+                this.loadUser(resp.responseJSON); 
+                if (this.onSave != null)
+                {
+                        this.onSave(this, true);
+                } 
+        },
         
         /**
@@ -114 +220 @@
         onSave: null,           
         
-        onGroupLiClick: function(event, element, elId){
-                 alert('dimensions : ' + document.viewport.getDimensions() + ' | '+
-                           'width : ' + document.viewport.getDimensions().width + ' | '+
-                           'height : ' + document.viewport.getDimensions().height + ' | '+
-                           ' }'
-                 ); 
-                 //facebox.reveal(event+'<br/>'+element+'<br/>'+elId+'</br> for user with UUID:'+this.thisForm.uuid.value,'');
-                 //facebox.reveal('<ssme:user id="user" editable="true" />','');                 
+        //
+        //-------------------------------------------   
+        
+        
+        
+        //-------------------------------------------
+        // LISTENERS
+        //
+        
+        onApply: function(event){
+                 Logger.debug("User.onApply");
+                 this.save();
         },
         
-        changeEdit: function(event, element){
-                var disable = element.checked;
-                $('logger').innerHTML += disable+' -> '+element.checked + "<br/>";      
+        onCancel: function(event){
+                Logger.debug("User.onCancel");
+                this.load(this.thisForm.uuid.value);
+        },      
+        
+        onEdit: function(event, element, submit){       
+                var isOn = element.toggle.stateIsOn
+                Logger.debug("User.onEdit isOn["+isOn+"]");             
                 $$('#'+this.id+' input.editable').each(
                         function(el){
-                                el.disabled = disable;
-                                Element.addClassName(el,(disable)?'disabledInput':'enabledInput');
-                                Element.removeClassName(el,(disable)?'enabledInput':'disabledInput');
-                        }.bind(this)
-                );
-        }
+                                el.disabled = !isOn;
+                                Element.addClassName(el,(isOn)?'enabledInput':'disabledInput');
+                                Element.removeClassName(el,(isOn)?'disabledInput':'enabledInput');
+                        }.bind(this)
+                );      
+                if(isOn){       //enable submit
+                        Element.removeClassName(submit,'excludedFromLayout');
+                } else {        //disable submit        
+                        Element.addClassName(submit,'excludedFromLayout');
+                        this.onCancel(event);   
+                }
+        },      
+         
+        onGroupLiClick: function(event, element, liId){         /* element: <a>, liId: UUID */
+                 
+                 Event.stop(event);                      
+                 Group.instances.get('groupDetails').onLoad = function (){      
+                         facebox.buttonClick_handler(element);  
+                 }
+                 Group.instances.get('groupDetails').load(liId);
+                                         
+        }        
+        
+        //
+        //-------------------------------------------   
         
 }
 
+/**
+* Collection of User instances 
+*/
+User.instances = $H({});
+
 User.preload = function() {
-        $('logger').innerHTML += "User.preload()" + "<br/>";
+        Logger.debug("User.preload()");
         $$("form.userForm").each(
                 function(form){

ssme/trunk/web/user.jsp

@@ -10 +10 @@
 
         <jsp:body>
+        
                 <ssme:user id="user" editable="true" /> 
-                <!-- <ssme:user id="user" entity="${ rest:findUserByLogin('madmax') }"/> -->                            
+                                        
+                <ssme:group id="groupDetails" infoOnly="true" />
                 
-                <ssme:user id="user" infoOnly="true" />
         </jsp:body>
 

ssme/trunk/web/WEB-INF/tags/group.tag

@@ -15 +15 @@
 <c:if test="${ infoOnly eq true }">
         <c:set var="editable" value="false"/>
+        <c:set var="entity" value="${ null }"/>
+        <c:set var="uuid" value="${ null }"/>
 </c:if>
 
-<form class="groupForm" id="${ id }" action="">
-        <input type="hidden" id="${ id }_uuid" value="${ uuid }" />
-        
-        <table>
-                <tr class="title">
-                        <td class="label">
-                                <label for="${ id }_name">
-                                        Group name:
-                                </label>
-                        </td>
-                        <td>
-                                <input id="${ id }_name" class="editable disabledInput" disabled="true" value="${ entity.name }" />
-                        </td>
-                </tr>
-                <tr class="title">
-                        <td class="label">
-                                <label for="${ id }_description">
-                                        Description:
-                                </label>
-                        </td>
-                        <td>
-                                <textarea id="${ id }_description" class="editable disabledInput" disabled="true" rows="4" cols="30">${ entity.description }</textarea> 
-                        </td>
-                </tr>   
-                <tr class="title">
-                        <td class="label">
-                                <label for="${ id }_owner_login">
-                                        Owner:
-                                </label>
-                        </td>
-                        <td>
-                                <input id="${ id }_owner_login" class="disabledInput" disabled="true" value="${ entity.owner.login }" />
-                        </td>
-                </tr>   
-                <c:if test="${ editable }">
-                <tr class="title">
-                        <td class="label">
-                                <label for="${ id }_edit">
-                                        Edit:
-                                </label>
-                        </td>
-                        <td>
-                                <input id="${ id }_edit" type="checkbox" />
-                        </td>
-                </tr>
-                </c:if>
-        </table>
-                        
-        <c:if test="${ infoOnly != true }">
-                <ul class="userList">                   
-                        <c:forEach items="${entity.users}" var="user">
-                                <li id="${ user.UUID }" class="label" >
-                                        <span>
-                                                <a href="${pageContext.request.contextPath}/user/${user.UUID}" >
-                                                        ${ user.login }
-                                                </a>
-                                        </span>                         
-                                        <span>
-                                                <input class="detailsButton" type="button" value="details" />
-                                        </span>
-                                </li>   
-                        </c:forEach>
-                </ul>   
-        </c:if>                 
-          
-</form>
+<div id="${ id }_wrapper" class="${ (infoOnly)?'excludedFromLayout':'' }">
+        <form class="groupForm" id="${ id }" action="">
+                <input type="hidden" id="${ id }_uuid" value="${ uuid }" />
+                
+                <table>
+                        <tr>
+                                <td class="label">
+                                        <label for="${ id }_name">
+                                                Group name:
+                                        </label>
+                                </td>
+                                <td>
+                                        <input id="${ id }_name" class="editable disabledInput" disabled="true" value="${ entity.name }" />
+                                </td>
+                        </tr>
+                        <tr>
+                                <td class="label">
+                                        <label for="${ id }_description">
+                                                Description:
+                                        </label>
+                                </td>
+                                <td>
+                                        <textarea id="${ id }_description" class="editable disabledInput" disabled="true" rows="4" cols="30">${ entity.description }</textarea> 
+                                </td>
+                        </tr>   
+                        <tr>
+                                <td class="label">
+                                        <label for="${ id }_owner_login">
+                                                Owner:
+                                        </label>
+                                </td>
+                                <td>
+                                        <input id="${ id }_owner_login" class="disabledInput" disabled="true" value="${ entity.owner.login }" />
+                                </td>
+                        </tr>   
+                        <c:if test="${ editable }">     
+                        <tr class="controlRow">
+                                <td class="label" />                    
+                                <td>
+                                        <span id="${ id }_edit" class="toggleButton">Edit</span>
+                                        <span class="button excludedFromLayout submit"><a id="${ id }_apply">Apply</a></span>           
+                                </td>
+                        </tr>
+                        </c:if>
+                </table>
+                                
+                <c:if test="${ infoOnly != true }">
+                        <ul class="userList">                   
+                                <c:forEach items="${entity.users}" var="user">
+                                        <li id="${ user.UUID }">
+                                                <span>
+                                                        <a href="${pageContext.request.contextPath}/user/${user.UUID}" >
+                                                                ${ user.login }
+                                                        </a>
+                                                </span>                         
+                                                <span class="detailsButton">
+                                                        <a href="#userDetails">
+                                                                <span class="faceboxButton">Details</span>
+                                                        </a>
+                                                </span>                                         
+                                        </li>   
+                                </c:forEach>
+                        </ul>   
+                </c:if>                 
+                  
+        </form>
+</div>
 

ssme/trunk/web/WEB-INF/tags/head.tag

@@ -12 +12 @@
         <script type="text/javascript" src="${pageContext.request.contextPath}/script/facebox.js" type="text/javascript"></script>
                 
+        <script type="text/javascript" src="${pageContext.request.contextPath}/script/util.js" type="text/javascript"></script>         
+                
         <script type="text/javascript" src="${pageContext.request.contextPath}/script/user.js" type="text/javascript"></script>
         <script type="text/javascript" src="${pageContext.request.contextPath}/script/group.js" type="text/javascript"></script>        
+        
+        <script type='text/javascript'> 
+                /**
+                 * Global variables
+                 */
+                 var CONTEXT_PATH = '${pageContext.request.contextPath}';
+        </script>

ssme/trunk/web/WEB-INF/tags/page.tag

@@ -57 +57 @@
                                 
                                 <div id="loggerContainer">      
-                                        [Method: ${pageContext.request.method}][Query String: ${pageContext.request.queryString}][Request URI: ${pageContext.request.requestURI}]
-                                        [Request URL: ${pageContext.request.requestURL}][Servlet Path: ${pageContext.request.servletPath}][Context Path: ${pageContext.request.contextPath}]
+                                        <div style="padding: 5px 5px 5px 5px; border: 1px solid black;">
+                                                <span style="border: 2px outset black; padding: 1px 5px 1px 5px;" onClick="$('logger').innerHTML = '';">Clear Log</span>
+                                                [Method: ${pageContext.request.method}][Query String: ${pageContext.request.queryString}][Request URI: ${pageContext.request.requestURI}]
+                                                [Request URL: ${pageContext.request.requestURL}][Servlet Path: ${pageContext.request.servletPath}][Context Path: ${pageContext.request.contextPath}]                                    
+                                        </div>
                                         <div id="logger" />     
                                 </div>

ssme/trunk/web/WEB-INF/tags/user.tag

@@ -15 +15 @@
 <c:if test="${ infoOnly eq true }">
         <c:set var="editable" value="false"/>
+        <c:set var="entity" value="${ null }"/>
+        <c:set var="uuid" value="${ null }"/>   
 </c:if>
 
-<form class="userForm" id="${ id }" action="">
-        <input type="hidden" id="${ id }_uuid" value="${ uuid }" />
-        
-        <table>
-                <tr class="title">
-                        <td class="label">
-                                <label for="${ id }_login">
-                                        Login:
-                                </label>
-                        </td>
-                        <td>
-                                <input id="${ id }_login" class="disabledInput" disabled="true" value="${ entity.login }" />
-                        </td>
-                </tr>
-                <tr class="title">
-                        <td class="label">
-                                <label for="${ id }_name">
-                                        Name:
-                                </label>
-                        </td>
-                        <td>
-                                <input id="${ id }_name" class="editable disabledInput" disabled="true" value="${ entity.name }" />
-                        </td>
-                </tr>
-                <tr class="title">
-                        <td class="label">
-                                <label for="${ id }_surname">
-                                        Surname:
-                                </label>
-                        </td>
-                        <td>
-                                <input id="${ id }_surname" class="editable disabledInput" disabled="true" value="${ entity.surname }" />
-                        </td>
-                </tr>
-                <tr class="title">
-                        <td class="label">
-                                <label for="${ id }_mail">
-                                        Mail:
-                                </label>
-                        </td>
-                        <td>
-                                <input id="${ id }_mail" class="editable disabledInput" disabled="true" value="${ entity.mail }" />
-                        </td>
-                </tr>
-                <tr class="title">
-                        <td class="label">
-                                <label for="${ id }_mobile">
-                                        Mobile:
-                                </label>
-                        </td>
-                        <td>
-                                <input id="${ id }_mobile" class="editable disabledInput" disabled="true" value="${ entity.mobile }" />
-                        </td>
-                </tr>
-                <c:if test="${ editable }">
-                <tr class="title">
-                        <td class="label">
-                                <label for="${ id }_edit">
-                                        Edit:
-                                </label>
-                        </td>
-                        <td>
-                                <input id="${ id }_edit" type="checkbox" />
-                        </td>
-                </tr>
+<div id="${ id }_wrapper" class="${ (infoOnly)?'excludedFromLayout':'' }">
+        <form class="userForm" id="${ id }" action="">
+                <input type="hidden" id="${ id }_uuid" value="${ uuid }" />
+                
+                <table>
+                        <tr>
+                                <td class="label">
+                                        <label for="${ id }_login">
+                                                Login:
+                                        </label>
+                                </td>
+                                <td>
+                                        <input id="${ id }_login" class="disabledInput" disabled="true" value="${ entity.login }" />
+                                </td>
+                        </tr>
+                        <tr>
+                                <td class="label">
+                                        <label for="${ id }_name">
+                                                Name:
+                                        </label>
+                                </td>
+                                <td>
+                                        <input id="${ id }_name" class="editable disabledInput" disabled="true" value="${ entity.name }" />
+                                </td>
+                        </tr>
+                        <tr>
+                                <td class="label">
+                                        <label for="${ id }_surname">
+                                                Surname:
+                                        </label>
+                                </td>
+                                <td>
+                                        <input id="${ id }_surname" class="editable disabledInput" disabled="true" value="${ entity.surname }" />
+                                </td>
+                        </tr>
+                        <tr>
+                                <td class="label">
+                                        <label for="${ id }_mail">
+                                                Mail:
+                                        </label>
+                                </td>
+                                <td>
+                                        <input id="${ id }_mail" class="editable disabledInput" disabled="true" value="${ entity.mail }" />
+                                </td>
+                        </tr>
+                        <tr>
+                                <td class="label">
+                                        <label for="${ id }_mobile">
+                                                Mobile:
+                                        </label>
+                                </td>
+                                <td>
+                                        <input id="${ id }_mobile" class="editable disabledInput" disabled="true" value="${ entity.mobile }" />
+                                </td>
+                        </tr>
+                        
+                        <c:if test="${ editable }">     
+                        <tr class="controlRow">
+                                <td class="label" />                    
+                                <td>
+                                        <span id="${ id }_edit" class="toggleButton">Edit</span>
+                                        <span class="button excludedFromLayout submit"><a id="${ id }_apply">Apply</a></span>           
+                                </td>
+                        </tr>
+                        </c:if>
+                        
+                </table>
+                        
+                <c:if test="${ infoOnly != true }">
+                        <ul class="groupList">                  
+                                <c:forEach items="${entity.ownedGroups}" var="group">
+                                        <li id="${ group.UUID }">
+                                                <span>
+                                                        <a href="${pageContext.request.contextPath}/group/${group.UUID}" >
+                                                                ${ group.name }
+                                                        </a>
+                                                </span>                         
+                                                <span class="detailsButton">
+                                                        <a href="#groupDetails">
+                                                                <span class="faceboxButton">Details</span>
+                                                        </a>
+                                                </span>
+                                        </li>   
+                                </c:forEach>
+                        </ul>                   
+                                        
+                        <ul class="groupList">                  
+                                <c:forEach items="${entity.groups}" var="group">
+                                        <li id="${ group.UUID }">
+                                                <span>
+                                                        <a href="${pageContext.request.contextPath}/group/${group.UUID}" >
+                                                                ${ group.name }
+                                                        </a>
+                                                </span>                         
+                                                <span class="detailsButton">
+                                                        <a href="#groupDetails">
+                                                                <span class="faceboxButton">Details</span>
+                                                        </a>
+                                                </span>
+                                        </li>   
+                                </c:forEach>
+                        </ul>
                 </c:if>
-        </table>
                 
-        <c:if test="${ infoOnly != true }">
-                <ul class="groupList">                  
-                        <c:forEach items="${entity.ownedGroups}" var="group">
-                                <li id="${ group.UUID }" class="label" >
-                                        <span>
-                                                <a href="${pageContext.request.contextPath}/group/${group.UUID}" >
-                                                        ${ group.name }
-                                                </a>
-                                        </span>                         
-                                        <span>
-                                                <input class="detailsButton" type="button" value="details" />
-                                        </span>
-                                </li>   
-                        </c:forEach>
-                </ul>                   
-                                
-                <ul class="groupList">                  
-                        <c:forEach items="${entity.groups}" var="group">
-                                <li id="${ group.UUID }" class="label" >
-                                        <span>
-                                                <a href="${pageContext.request.contextPath}/group/${group.UUID}" >
-                                                        ${ group.name }
-                                                </a>
-                                        </span>                         
-                                        <span>
-                                                <input class="detailsButton" type="button" value="details" />
-                                        </span>
-                                </li>   
-                        </c:forEach>
-                </ul>
-        </c:if>
-        
-</form>
+        </form>
+</div>