Rename old icons.

wise-webapp/src/main/webapp/WEB-INF/app.properties

@@ -3,19 +3,18 @@
 ##################################################################################
 
 # MySQL 5.X configuration properties
-
-#database.url=jdbc:mysql://localhost/wisemapping
-#database.driver=com.mysql.jdbc.Driver
-#database.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
-#database.username=wisemapping
-#database.password=password
+database.url=jdbc:mysql://localhost/wisemapping
+database.driver=com.mysql.jdbc.Driver
+database.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+database.username=wisemapping
+database.password=password
 
 # HSQL Configuration properties
-database.url=jdbc:hsqldb:file:target/db/wisemapping
-database.driver=org.hsqldb.jdbcDriver
-database.hibernate.dialect=org.hibernate.dialect.HSQLDialect
-database.username=sa
-database.password=
+#database.url=jdbc:hsqldb:file:target/db/wisemapping
+#database.driver=org.hsqldb.jdbcDriver
+#database.hibernate.dialect=org.hibernate.dialect.HSQLDialect
+#database.username=sa
+#database.password=
 
 # Enable/Disable user confirmation by e-mail. If it's enabled, mail must be configured.
 user.confirm.registration=false

wise-webapp/src/main/webapp/WEB-INF/wisemapping-acegi-security.xml

@@ -109,7 +109,6 @@
                 /js/**=IS_AUTHENTICATED_ANONYMOUSLY
                 /ws/**=IS_AUTHENTICATED_ANONYMOUSLY
                 /images/*=IS_AUTHENTICATED_ANONYMOUSLY
-                /nicons/*=IS_AUTHENTICATED_ANONYMOUSLY
                 /c/embeddedview.htm=IS_AUTHENTICATED_ANONYMOUSLY
                 /c/export.htm=IS_AUTHENTICATED_ANONYMOUSLY
                 /c/publicview.htm=IS_AUTHENTICATED_ANONYMOUSLY

wise-webapp/src/main/webapp/css/common.css

@@ -188,7 +188,7 @@ h4 {
     margin-top: 8px;
     height: 80px;
     width: 160px;
-    background: url("../nicons/logo-medium.png") no-repeat;
+    background: url("../images/logo-medium.png") no-repeat;
     position: absolute;
     top: 0;
     left: -50px;

wise-webapp/src/main/webapp/css/editor2.css

@@ -259,7 +259,7 @@ div#header {
 }
 
 div#headerLogo {
-    background: url(../nicons/logo-small.png) no-repeat center top;
+    background: url(../images/logo-small.png) no-repeat center top;
     height: 40px;
     width: 80px;
     float: left;
@@ -347,17 +347,17 @@ div#toolbar .buttonOn, div#toolbar .buttonOff, div#toolbar .buttonActive, div#to
 div#toolbar .buttonOn:hover {
     cursor: pointer;
     opacity: 1;
-    background: url(../nicons/btn-bg-hover.png) no-repeat center top;
+    background: url(../images/btn-bg-hover.png) no-repeat center top;
 }
 
 div#toolbar .buttonOn {
     opacity: 0.8;
-    background: url(../nicons/btn-bg-normal.png) no-repeat center top;
+    background: url(../images/btn-bg-normal.png) no-repeat center top;
 }
 
 div#toolbar .buttonOff {
     opacity: 0.4;
-    background: url(../nicons/btn-bg-normal.png) no-repeat center top;
+    background: url(../images/btn-bg-normal.png) no-repeat center top;
 }
 
 div#exportAnchor {
@@ -381,24 +381,24 @@ div#toolbar .buttonExtOn, div#toolbar .buttonExtOff, div#toolbar .buttonExtActiv
 
 div#toolbar .buttonExtOn:hover {
     opacity: 1;
-    background: url(../nicons/btne-bg-hover.png) no-repeat center top;
+    background: url(../images/btne-bg-hover.png) no-repeat center top;
 
 }
 
 div#toolbar .buttonExtActive {
     opacity: 1;
-    background: url(../nicons/btne-bg-selected.png) no-repeat center top;
+    background: url(../images/btne-bg-selected.png) no-repeat center top;
 
 }
 
 div#toolbar .buttonExtOn {
     opacity: 0.8;
-    background: url(../nicons/btne-bg-normal.png) no-repeat center top;
+    background: url(../images/btne-bg-normal.png) no-repeat center top;
 }
 
 div#toolbar .buttonExtOff {
     opacity: 0.4;
-    background: url(../nicons/btne-bg-normal.png) no-repeat center top;
+    background: url(../images/btne-bg-normal.png) no-repeat center top;
 }
 
 div#exportAnchor {
@@ -410,107 +410,107 @@ div#exportAnchor {
 }
 
 /*div#saveButton {*/
-/*background: url(../nicons/save.png) no-repeat center top;*/
+/*background: url(../images/save.png) no-repeat center top;*/
 /*}*/
 
 /*div#undoEdition {*/
-/*background: url(../nicons/undo.png) no-repeat center top;*/
+/*background: url(../images/undo.png) no-repeat center top;*/
 /*}*/
 
 /*div#redoEdition {*/
-/*background: url(../nicons/redo.png) no-repeat center top;*/
+/*background: url(../images/redo.png) no-repeat center top;*/
 /*}*/
 
 /*div#export {*/
-/*background: url(../nicons/export.png) no-repeat center top;*/
+/*background: url(../images/export.png) no-repeat center top;*/
 /*}*/
 
 /*div#zoomIn {*/
-/*background: url(../nicons/zoom-in.png) no-repeat center top;*/
+/*background: url(../images/zoom-in.png) no-repeat center top;*/
 /*}*/
 
 /*div#zoomOut {*/
-/*background: url(../nicons/zoom-out.png) no-repeat center top;*/
+/*background: url(../images/zoom-out.png) no-repeat center top;*/
 /*}*/
 
 /*div#addTopic {*/
-/*background: url(../nicons/topic-add.png) no-repeat center top;*/
+/*background: url(../images/topic-add.png) no-repeat center top;*/
 /*}*/
 
 /*div#deleteTopic {*/
-/*background: url(../nicons/topic-delete.png) no-repeat center top;*/
+/*background: url(../images/topic-delete.png) no-repeat center top;*/
 /*}*/
 
 /*div#topicColor {*/
-/*background: url(../nicons/topic-color.png) no-repeat center top;*/
+/*background: url(../images/topic-color.png) no-repeat center top;*/
 /*}*/
 
 /*div#topicIcon {*/
-/*background: url(../nicons/topic-icon.png) no-repeat center top;*/
+/*background: url(../images/topic-icon.png) no-repeat center top;*/
 /*}*/
 
 /*div#topicNote {*/
-/*background: url(../nicons/note.png) no-repeat center top;*/
+/*background: url(../images/note.png) no-repeat center top;*/
 /*}*/
 
 /*div#topicNote {*/
-/*background: url(../nicons/topic-icon.png) no-repeat center top;*/
+/*background: url(../images/topic-icon.png) no-repeat center top;*/
 /*z-index: 4;*/
 /*}*/
 
 /*div#topicLink {*/
-/*background: url(../nicons/topic-link.png) no-repeat center top;*/
+/*background: url(../images/topic-link.png) no-repeat center top;*/
 /*z-index: 4;*/
 /*}*/
 
 /*div#topicNote {*/
-/*background-image: url(../nicons/note.png);*/
+/*background-image: url(../images/note.png);*/
 /*z-index: 4;*/
 /*}*/
 
 /*div#topicBorder {*/
-/*background: url(../nicons/topic-border.png) no-repeat center top;*/
+/*background: url(../images/topic-border.png) no-repeat center top;*/
 /*}*/
 
 /*div#fontFamily {*/
-/*background: url(../nicons/font-type.png) no-repeat center top;*/
+/*background: url(../images/font-type.png) no-repeat center top;*/
 /*}*/
 
 /*div#topicShape {*/
-/*background: url(../nicons/topic-shape.png) no-repeat center top;*/
+/*background: url(../images/topic-shape.png) no-repeat center top;*/
 /*}*/
 
 /*div#fontBold {*/
-/*background: url(../nicons/font-bold.png) no-repeat center top;*/
+/*background: url(../images/font-bold.png) no-repeat center top;*/
 /*}*/
 
 /*div#fontItalic {*/
-/*background: url(../nicons/font-italic.png) no-repeat center top;*/
+/*background: url(../images/font-italic.png) no-repeat center top;*/
 /*}*/
 
 /*div#fontColor {*/
-/*background: url(../nicons/font-color.png) no-repeat center top;*/
+/*background: url(../images/font-color.png) no-repeat center top;*/
 /*}*/
 
 /*div#fontSize {*/
-/*background: url(../nicons/font-size.png) no-repeat center top;*/
+/*background: url(../images/font-size.png) no-repeat center top;*/
 /*}*/
 
 /*div#shareIt {*/
-/*background: url(../nicons/share.png) no-repeat center top;*/
+/*background: url(../images/share.png) no-repeat center top;*/
 /*}*/
 
 /*div#publishIt {*/
-/*background: url(../nicons/publish.png) no-repeat center top;*/
+/*background: url(../images/publish.png) no-repeat center top;*/
 /*}*/
 
 /*div#tagIt {*/
-/*background: url(../nicons/tag.png) no-repeat center top;*/
+/*background: url(../images/tag.png) no-repeat center top;*/
 /*}*/
 
 div#topicRelation {
     width: 56px;
-    background: url(../nicons/topic-relation.png) no-repeat center top;
+    background: url(../images/topic-relation.png) no-repeat center top;
     z-index: 4;
 }
 

wise-webapp/src/main/webapp/css/embedded.css

@@ -69,7 +69,7 @@ div#logo {
     height: 65px;
     width: 80px;
     position: absolute;
-    background: url(../nicons/logo-small.png) no-repeat right top;
+    background: url(../images/logo-small.png) no-repeat right top;
     right: 10px;
     top: -10px;
 }
@@ -94,13 +94,13 @@ div#logo {
 }
 
 div#zoomIn {
-    background: url(../nicons/zoom-in.png) no-repeat left top;
+    background: url(../images/zoom-in.png) no-repeat left top;
     margin-top: 10px;
     margin-left: 10px;
 }
 
 #zoomOut {
-    background: url(../nicons/zoom-out.png) no-repeat left top;;
+    background: url(../images/zoom-out.png) no-repeat left top;;
     margin-top: 10px;
     margin-left: 5px;
 }

wise-webapp/src/main/webapp/css/print.css

@@ -18,6 +18,6 @@ div#printLogo {
     width: 170px;
     float: right;
     margin: 1px;
-    background: url(../nicons/logo-medium.png) no-repeat right top;
+    background: url(../images/logo-medium.png) no-repeat right top;
 }
 

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

@@ -133,92 +133,92 @@
     <div id="toolbar">
         <div id="persist" class="buttonContainer">
             <div id="save" class="buttonOn" title="Save">
-                <img src="../nicons/save.png"/>
+                <img src="../images/save.png"/>
             </div>
             <div id="discard" class="buttonOn" title="Discard">
-                <img src="../nicons/discard.png"/>
+                <img src="../images/discard.png"/>
             </div>
             <div id="print" class="buttonOn" title="Print">
-                <img src="../nicons/print.png"/>
+                <img src="../images/print.png"/>
             </div>
             <div id="export" class="buttonOn" title="Export">
-                <img src="../nicons/export.png"/>
+                <img src="../images/export.png"/>
             </div>
         </div>
         <div id="edit" class="buttonContainer">
             <div id="undoEdition" class="buttonOn" title="Undo Edition">
-                <img src="../nicons/undo.png"/>
+                <img src="../images/undo.png"/>
             </div>
             <div id="redoEdition" class="buttonOn" title="Redo Edition">
-                <img src="../nicons/redo.png"/>
+                <img src="../images/redo.png"/>
             </div>
         </div>
         <div id="zoom" class="buttonContainer">
             <div id="zoomIn" class="buttonOn" title="Zoom In">
-                <img src="../nicons/zoom-in.png"/>
+                <img src="../images/zoom-in.png"/>
             </div>
             <div id="zoomOut" class="buttonOn" title="Zoom Out">
-                <img src="../nicons/zoom-out.png"/>
+                <img src="../images/zoom-out.png"/>
             </div>
         </div>
         <div id="node" class="buttonContainer">
             <div id="topicShape" class="buttonExtOn" title="Topic Shape">
-                <img src="../nicons/topic-shape.png"/>
+                <img src="../images/topic-shape.png"/>
             </div>
             <div id="addTopic" class="buttonOn" title="Add Topic">
-                <img src="../nicons/topic-add.png"/>
+                <img src="../images/topic-add.png"/>
             </div>
             <div id="deleteTopic" class="buttonOn" title="Delete">
-                <img src="../nicons/topic-delete.png"/>
+                <img src="../images/topic-delete.png"/>
             </div>
             <div id="topicBorder" class="buttonOn" title="Border Color">
-                <img src="../nicons/topic-border.png"/>
+                <img src="../images/topic-border.png"/>
             </div>
             <div id="topicColor" class="buttonExtOn" title="Background Color">
-                <img src="../nicons/topic-color.png"/>
+                <img src="../images/topic-color.png"/>
             </div>
             <div id="topicIcon" class="buttonExtOn" title="Add Icon">
-                <img src="../nicons/topic-icon.png"/>
+                <img src="../images/topic-icon.png"/>
             </div>
             <div id="topicNote" class="buttonOn" title="Add Note">
-                <img src="../nicons/topic-note.png"/>
+                <img src="../images/topic-note.png"/>
             </div>
             <div id="topicLink" class="buttonOn" title="Add Link">
-                <img src="../nicons/topic-link.png"/>
+                <img src="../images/topic-link.png"/>
             </div>
             <div id="topicRelation" class="buttonOn" title="Add Relationship">
-                <img src="../nicons/topic-relation.png"/>
+                <img src="../images/topic-relation.png"/>
             </div>
         </div>
         <div id="font" class="buttonContainer">
             <div id="fontFamily" class="buttonOn" title="Font Style">
-                <img src="../nicons/font-type.png"/>
+                <img src="../images/font-type.png"/>
             </div>
             <div id="fontSize" class="buttonExtOn" title="Font Size">
-                <img src="../nicons/font-size.png"/>
+                <img src="../images/font-size.png"/>
             </div>
             <div id="fontBold" class="buttonOn" title="Bold Style">
-                <img src="../nicons/font-bold.png"/>
+                <img src="../images/font-bold.png"/>
             </div>
             <div id="fontItalic" class="buttonOn" title="Italic Style">
-                <img src="../nicons/font-italic.png"/>
+                <img src="../images/font-italic.png"/>
             </div>
             <div id="fontColor" class="buttonExtOn" title="Fond Color" style="padding-top:4px">
-                <img src="../nicons/font-color.png"/>
+                <img src="../images/font-color.png"/>
             </div>
         </div>
         <div id="collaboration" class="buttonContainer">
             <div id="tagIt" class="buttonOn" title="Tag">
-                <img src="../nicons/tag.png"/>
+                <img src="../images/tag.png"/>
             </div>
             <div id="shareIt" class="buttonOn" title="Share">
-                <img src="../nicons/share.png"/>
+                <img src="../images/share.png"/>
             </div>
             <div id="publishIt" class="buttonOn" title="Publish">
-                <img src="../nicons/public.png"/>
+                <img src="../images/public.png"/>
             </div>
             <div id="history" class="buttonOn" title="History">
-                <img src="../nicons/history.png"/>
+                <img src="../images/history.png"/>
             </div>
         </div>
     </div>

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

@@ -23,7 +23,6 @@
     <link rel="stylesheet" type="text/css" href="../css/wisehome.css"/>
     <link rel="icon" href="${pageContext.request.contextPath}/images/favicon.ico" type="image/x-icon"/>
     <link rel="shortcut icon" href="${pageContext.request.contextPath}/images/favicon.ico" type="image/x-icon"/>
-    <script type="text/javascript" src="${pageContext.request.contextPath}/js/wiseLibrary.js"></script>
     <script type='text/javascript'
             src='https://ajax.googleapis.com/ajax/libs/mootools/1.3.2/mootools-yui-compressed.js'></script>
     <script type='text/javascript' src='../js/libraries/mootools/mootools-more-1.3.2.1-yui.js'></script>