zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add new priority icons.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-11-14 21:19:56 -03:00
parent 0c433352c5
commit 2c5f7139d5
20 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wise-webapp/src/main/java/com/wisemapping/model/IconFamily.java
View File

@@ -44,5 +44,7 @@ public enum IconFamily {
BULLET,
TAG,
OBJECT,
WEATHER;
WEATHER,
TASK,
NUMBER
}

30
wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java
View File

@@ -45,12 +45,6 @@ public class MindmapIcons {
public static final MindmapIcon ARROW_LEFT = new MindmapIcon(IconFamily.ARROW, "left");
public static final MindmapIcon ARROW_RIGHT = new MindmapIcon(IconFamily.ARROW, "right");
// public static final MindmapIcon TASK_ONE = new MindmapIcon(IconFamily.TASK, "one");
// public static final MindmapIcon TASK_TWO = new MindmapIcon(IconFamily.TASK, "two");
// public static final MindmapIcon TASK_THREE = new MindmapIcon(IconFamily.TASK, "three");
// public static final MindmapIcon TASK_FOUR = new MindmapIcon(IconFamily.TASK, "four");
// public static final MindmapIcon TASK_FIVE = new MindmapIcon(IconFamily.TASK, "five");
// public static final MindmapIcon ARROWC_UNDO = new MindmapIcon(IconFamily.ARROWC, "undo");
public static final MindmapIcon ARROWC_ANTICLOCK_WISE = new MindmapIcon(IconFamily.ARROWC, "rotate_anticlockwise");
public static final MindmapIcon ARROWC_CLOCK_WISE = new MindmapIcon(IconFamily.ARROWC, "rotate_clockwise");
@@ -84,15 +78,21 @@ public class MindmapIcons {
public static final MindmapIcon TAG_PINK = new MindmapIcon(IconFamily.TAG, "pink");
public static final MindmapIcon TAG_YELLOW = new MindmapIcon(IconFamily.TAG, "yellow");
// public static final MindmapIcon NUMBER_ONE = new MindmapIcon(IconFamily.NUMBER, "one");
// public static final MindmapIcon NUMBER_TWO = new MindmapIcon(IconFamily.NUMBER, "two");
// public static final MindmapIcon NUMBER_THREE = new MindmapIcon(IconFamily.NUMBER, "three");
// public static final MindmapIcon NUMBER_FOUR = new MindmapIcon(IconFamily.NUMBER, "four");
// public static final MindmapIcon NUMBER_FIVE = new MindmapIcon(IconFamily.NUMBER, "five");
// public static final MindmapIcon NUMBER_SIX = new MindmapIcon(IconFamily.NUMBER, "six");
// public static final MindmapIcon NUMBER_SEVEN = new MindmapIcon(IconFamily.NUMBER, "seven");
// public static final MindmapIcon NUMBER_EIGHT = new MindmapIcon(IconFamily.NUMBER, "eight");
// public static final MindmapIcon NUMBER_NINE = new MindmapIcon(IconFamily.NUMBER, "nine");
public static final MindmapIcon NUMBER_1 = new MindmapIcon(IconFamily.NUMBER, "1");
public static final MindmapIcon NUMBER_2 = new MindmapIcon(IconFamily.NUMBER, "2");
public static final MindmapIcon NUMBER_3 = new MindmapIcon(IconFamily.NUMBER, "3");
public static final MindmapIcon NUMBER_4 = new MindmapIcon(IconFamily.NUMBER, "4");
public static final MindmapIcon NUMBER_5 = new MindmapIcon(IconFamily.NUMBER, "5");
public static final MindmapIcon NUMBER_6 = new MindmapIcon(IconFamily.NUMBER, "6");
public static final MindmapIcon NUMBER_7 = new MindmapIcon(IconFamily.NUMBER, "7");
public static final MindmapIcon NUMBER_8 = new MindmapIcon(IconFamily.NUMBER, "8");
public static final MindmapIcon NUMBER_9 = new MindmapIcon(IconFamily.NUMBER, "9");
public static final MindmapIcon TASK_0 = new MindmapIcon(IconFamily.TASK, "0");
public static final MindmapIcon TASK_25 = new MindmapIcon(IconFamily.TASK, "25");
public static final MindmapIcon TASK_50 = new MindmapIcon(IconFamily.TASK, "50");
public static final MindmapIcon TASK_75 = new MindmapIcon(IconFamily.TASK, "75");
public static final MindmapIcon TASK_100 = new MindmapIcon(IconFamily.TASK, "100");
public static final MindmapIcon FUNNY_ANGEL = new MindmapIcon(IconFamily.FUNY, "angel");

9
wise-webapp/src/main/java/com/wisemapping/webmvc/MindmapController.java
View File

@@ -21,11 +21,10 @@ package com.wisemapping.webmvc;
import com.wisemapping.exceptions.WiseMappingException;
import com.wisemapping.model.CollaborationRole;
import com.wisemapping.model.Mindmap;
import com.wisemapping.model.MindMapHistory;
import com.wisemapping.model.Mindmap;
import com.wisemapping.model.User;
import com.wisemapping.security.Utils;
import com.wisemapping.service.LockInfo;
import com.wisemapping.service.LockManager;
import com.wisemapping.service.MindmapService;
import com.wisemapping.view.MindMapBean;
@@ -36,7 +35,10 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.servlet.ModelAndView;
import java.io.IOException;
@@ -161,7 +163,6 @@ public class MindmapController {
readOnlyMode = true;
model.addAttribute("mindmapLocked", true);
} else {
final LockInfo lock = lockManager.lock(mindmap, collaborator);
model.addAttribute("lockTimestamp", mindmap.getLastModificationTime().getTimeInMillis());
model.addAttribute(LOCK_SESSION_ATTRIBUTE, lockManager.generateSession());
}