- Add support for starred.

- Remove tags temporally.

wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties

@@ -2,6 +2,9 @@ log4j.rootLogger=WARN, stdout, R
 log4j.logger.com.wisemapping=WARN,stdout,R
 log4j.logger.org.springframework=WARN,stdout,R
 log4j.logger.org.codehaus.jackson=WARN,stdout,R
+log4j.logger.org.hibernate.SQL=DEBUG, stdout,R
+log4j.additivity.org.hibernate.SQL=false
+
 
 # Stdout logger <20>
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender

wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml

@@ -27,6 +27,7 @@
                 <value>com/wisemapping/model/Collaborator.hbm.xml</value>
                 <value>com/wisemapping/model/MindMap.hbm.xml</value>
                 <value>com/wisemapping/model/MindmapUser.hbm.xml</value>
+                <value>com/wisemapping/model/CollaboratorProperties.hbm.xml</value>
                 <value>com/wisemapping/model/UserLogin.hbm.xml</value>
                 <value>com/wisemapping/model/MindMapHistory.hbm.xml</value>
             </list>

wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml

@@ -137,20 +137,6 @@
         <property name="userService" ref="userService"/>
     </bean>
 
-    <bean id="tagValidator" class="com.wisemapping.validator.TagValidator">
-    </bean>
-
-    <bean id="tagsController" class="com.wisemapping.controller.TagsController">
-        <property name="sessionForm" value="false"/>
-        <property name="commandName" value="tag"/>
-        <property name="commandClass" value="com.wisemapping.view.TagBean"/>
-        <property name="validator" ref="tagValidator"/>
-        <property name="formView" value="mindmapTags"/>
-        <property name="successView" value="closeDialog"/>
-        <property name="mindmapService" ref="mindmapService"/>
-        <property name="userService" ref="userService"/>
-    </bean>
-
     <bean id="multipartResolver"
           class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
         <!-- one of the properties available; the maximum file size in bytes -->
@@ -196,7 +182,6 @@
                 <prop key="/c/cooker.htm">cookerController</prop>
                 <prop key="/c/settings.htm">settingsController</prop>
                 <prop key="/c/editProfile.htm">editProfileController</prop>
-                <prop key="/c/tags.htm">tagsController</prop>
                 <prop key="/c/history.htm">historyController</prop>
             </props>
         </property>

wise-webapp/src/main/webapp/css/mymaps.less

@@ -132,6 +132,10 @@ input#selectAll {
 
 /* ----------------------------- Misc ----------------------------------- */
 
+.messagesPanel {
+    width: @body-width;
+}
+
 .dataTables_empty {
 	text-align: center;
 }
@@ -174,3 +178,23 @@ input#selectAll {
     margin-right: 2%;
     margin-top: 80px
 }
+
+span.starredOff{
+    background: url('../images/star-off.png') no-repeat center left;
+    padding: 10px;
+    margin: 0 0px 0 15px;
+}
+
+span.starredOff:hover{
+    background: url('../images/star-off-hover.png') no-repeat center left;
+}
+
+span.starredOn{
+    background: url('../images/star-on.png') no-repeat center left;
+    padding: 10px;
+    margin: 0 0px 0 15px;
+}
+
+span.starredOn:hover{
+    background: url('../images/star-on-hover.png') no-repeat center left;
+}

wise-webapp/src/main/webapp/js/mymaps.js

@@ -71,7 +71,7 @@ jQuery.fn.dataTableExt.selectAllMaps = function() {
             $(this).prop("checked", false);
         });
     }
-    updateStatus();
+    updateStatusToolbar();
 };
 
 jQuery.fn.dataTableExt.getSelectedMapsIds = function() {
@@ -93,7 +93,7 @@ jQuery.fn.dataTableExt.removeSelectedRows = function() {
     trs.each(function() {
         $('#mindmapListTable').dataTable().fnDeleteRow(this);
     });
-    updateStatus();
+    updateStatusToolbar();
 };
 
 
@@ -179,7 +179,7 @@ jQuery.fn.dialogForm = function(options) {
 
 
 // Update toolbar events ...
-function updateStatus() {
+function updateStatusToolbar() {
 
     // Mark column row selection values ...
     $("#mindmapListTable tbody input:checked").parent().parent().addClass('row-selected');
@@ -206,4 +206,51 @@ function updateStatus() {
 }
 
 
+// Update toolbar events ...
+function updateStarred(spanElem) {
+    $(spanElem).removeClass('starredOff');
+    $(spanElem).addClass('starredOn');
+
+    // Retrieve row data ...
+    var tableElem = $('#mindmapListTable');
+    var trElem = $(spanElem).parent().parent();
+    var rowData = tableElem.dataTable().fnGetData(trElem[0]);
+
+    // Update status ...
+    var starred = !rowData.starred;
+    var mapId = rowData.id;
+    if (starred) {
+        $(spanElem).removeClass('starredOff');
+        $(spanElem).addClass('starredOn');
+    } else {
+        $(spanElem).removeClass('starredOn');
+        $(spanElem).addClass('starredOff');
+    }
+
+    jQuery.ajax("service/maps/" + mapId + "/starred", {
+        async:false,
+        dataType: 'json',
+        data: "" + starred,
+        type: 'PUT',
+        contentType:"text/plain",
+        success : function() {
+            if (starred) {
+                $(spanElem).removeClass('starredOff');
+                $(spanElem).addClass('starredOn');
+            } else {
+                $(spanElem).removeClass('starredOn');
+                $(spanElem).addClass('starredOff');
+            }
+        },
+        error: function(jqXHR, textStatus, errorThrown) {
+            $('#messagesPanel div').text(errorThrown).parent().show();
+        }
+    });
+
+    // Finally update st
+    rowData.starred = starred;
+}
+
+
+
 

wise-webapp/src/main/webapp/jsp/mindmapList.jsp

@@ -31,25 +31,31 @@
             sAjaxSource : "../service/maps",
             sAjaxDataProp: 'mindmapsInfo',
             fnInitComplete: function() {
-                $('#mindmapListTable tbody').change(updateStatus);
+                $('#mindmapListTable tbody').change(updateStatusToolbar);
+                $('#mindmapListTable .starredOff').click(function() {
+                    updateStarred(this);
+                });
             },
             aoColumns: [
                 {
                     sTitle : '<input type="checkbox" id="selectAll"/>',
-                    sWidth : "15px",
+                    sWidth : "55px",
                     sClass : "select",
                     bSortable : false,
                     bSearchable : false,
+                    mDataProp: "starred",
+                    bUseRendered : false,
                     fnRender : function(obj) {
-                        return '<input type="checkbox" id="' + obj.aData.id + '"/>';
+                        return '<input type="checkbox" id="' + obj.aData.id + '"/><span data-mid="' + obj.aData.id + '" class="' + (obj.aData.starred ? 'starredOn' : 'starredOff') + '"></span>';
                     }
                 },
                 {
                     sTitle : "Name",
+                    sWidth:"270px",
                     bUseRendered : false,
                     mDataProp: "title",
                     fnRender : function(obj) {
-                        return '<a href="c/maps/' + obj.aData.id + '/edit.htm">' + obj.aData.title + '</a>';
+                        return '<span class="starOff"></span><a href="c/maps/' + obj.aData.id + '/edit.htm">' + obj.aData.title + '</a>';
                     }
                 },
                 {
@@ -224,11 +230,6 @@
         $("#actionButtons .shareMap").click(function() {
         });
 
-        $("#actionButtons .tagMap").click(function() {
-        });
-
-        $("#actionButtons .tags").click(function() {
-        });
 
         $('#foldersContainer li').click(function(event) {
             // Deselect previous option ...
@@ -277,6 +278,7 @@
                 <li data-filter="all" class="active"><a href="#"><i class="icon-inbox icon-white"></i> All</a></li>
                 <li data-filter="my_maps"><a href="#"><i class="icon-user"></i> My Maps</a></li>
                 <li data-filter="shared_with_me"><a href="#"><i class="icon-share"></i> Shared With Me</a></li>
+                <li data-filter="starred"><a href="#"><i class="icon-star"></i> Starred</a></li>
                 <li data-filter="public"><a href="#"><i class="icon-globe"></i> Public Maps</a></li>
             </ul>
         </div>
@@ -309,10 +311,9 @@
                             Duplicate</a></li>
                         <li id="renameBtn"><a href="#" onclick="return false"><i class="icon-edit"></i> Rename</a></li>
                         <li id="printBtn"><a href="#" onclick="return false"><i class="icon-print"></i> Print</a></li>
-                        <li id="publishBtn"><a href="#" onclick="return false"><i class="icon-globe"></i>Publish</a>
+                        <li id="publishBtn"><a href="#" onclick="return false"><i class="icon-globe"></i> Publish</a>
                         </li>
                         <li id="shareBtn"><a href="#" onclick="return false"><i class="icon-share"></i> Share</a></li>
-                        <li id="tagBtn"><a href="#" onclick="return false"><i class="icon-tags"></i> Tag</a></li>
                         <li id="historyBtn"><a href="#" onclick="return false"><i class="icon-time"></i> History</a>
                         </li>
                     </ul>

wise-webapp/src/main/webapp/jsp/toolbar.jsf

@@ -76,10 +76,7 @@
         </div>
     </div>
     <div id="collaboration" class="buttonContainer">
-        <div id="tagIt" class="buttonOn">
-            <img src="../images/tag.png"/>
-        </div>
-        <div id="shareIt" class="buttonOn">
+    <div id="shareIt" class="buttonOn">
             <img src="../images/share.png"/>
         </div>
         <div id="publishIt" class="buttonOn">