diff --git a/wise-doc/src/main/webapp/nicons/btn-bg-hover.png b/wise-doc/src/main/webapp/images/btn-bg-hover.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/btn-bg-hover.png rename to wise-doc/src/main/webapp/images/btn-bg-hover.png diff --git a/wise-doc/src/main/webapp/nicons/btn-bg-normal.png b/wise-doc/src/main/webapp/images/btn-bg-normal.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/btn-bg-normal.png rename to wise-doc/src/main/webapp/images/btn-bg-normal.png diff --git a/wise-doc/src/main/webapp/nicons/btne-bg-hover.png b/wise-doc/src/main/webapp/images/btne-bg-hover.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/btne-bg-hover.png rename to wise-doc/src/main/webapp/images/btne-bg-hover.png diff --git a/wise-doc/src/main/webapp/nicons/btne-bg-normal.png b/wise-doc/src/main/webapp/images/btne-bg-normal.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/btne-bg-normal.png rename to wise-doc/src/main/webapp/images/btne-bg-normal.png diff --git a/wise-doc/src/main/webapp/nicons/btne-bg-selected.png b/wise-doc/src/main/webapp/images/btne-bg-selected.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/btne-bg-selected.png rename to wise-doc/src/main/webapp/images/btne-bg-selected.png diff --git a/wise-doc/src/main/webapp/nicons/discard.png b/wise-doc/src/main/webapp/images/discard.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/discard.png rename to wise-doc/src/main/webapp/images/discard.png diff --git a/wise-doc/src/main/webapp/nicons/discart.png b/wise-doc/src/main/webapp/images/discart.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/discart.png rename to wise-doc/src/main/webapp/images/discart.png diff --git a/wise-doc/src/main/webapp/nicons/export.png b/wise-doc/src/main/webapp/images/export.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/export.png rename to wise-doc/src/main/webapp/images/export.png diff --git a/wise-doc/src/main/webapp/nicons/favicon.ico b/wise-doc/src/main/webapp/images/favicon.ico similarity index 100% rename from wise-doc/src/main/webapp/nicons/favicon.ico rename to wise-doc/src/main/webapp/images/favicon.ico diff --git a/wise-doc/src/main/webapp/nicons/font-bold.png b/wise-doc/src/main/webapp/images/font-bold.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/font-bold.png rename to wise-doc/src/main/webapp/images/font-bold.png diff --git a/wise-doc/src/main/webapp/nicons/font-color.png b/wise-doc/src/main/webapp/images/font-color.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/font-color.png rename to wise-doc/src/main/webapp/images/font-color.png diff --git a/wise-doc/src/main/webapp/nicons/font-italic.png b/wise-doc/src/main/webapp/images/font-italic.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/font-italic.png rename to wise-doc/src/main/webapp/images/font-italic.png diff --git a/wise-doc/src/main/webapp/nicons/font-size.png b/wise-doc/src/main/webapp/images/font-size.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/font-size.png rename to wise-doc/src/main/webapp/images/font-size.png diff --git a/wise-doc/src/main/webapp/nicons/font-type.png b/wise-doc/src/main/webapp/images/font-type.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/font-type.png rename to wise-doc/src/main/webapp/images/font-type.png diff --git a/wise-doc/src/main/webapp/images/history.png b/wise-doc/src/main/webapp/images/history.png index 6e8052ff..fa33bab4 100644 Binary files a/wise-doc/src/main/webapp/images/history.png and b/wise-doc/src/main/webapp/images/history.png differ diff --git a/wise-doc/src/main/webapp/nicons/links.png b/wise-doc/src/main/webapp/images/links.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/links.png rename to wise-doc/src/main/webapp/images/links.png diff --git a/wise-doc/src/main/webapp/nicons/logo-medium.png b/wise-doc/src/main/webapp/images/logo-medium.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/logo-medium.png rename to wise-doc/src/main/webapp/images/logo-medium.png diff --git a/wise-doc/src/main/webapp/nicons/logo-small.png b/wise-doc/src/main/webapp/images/logo-small.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/logo-small.png rename to wise-doc/src/main/webapp/images/logo-small.png diff --git a/wise-doc/src/main/webapp/nicons/notes.png b/wise-doc/src/main/webapp/images/notes.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/notes.png rename to wise-doc/src/main/webapp/images/notes.png diff --git a/wise-doc/src/main/webapp/nicons/print.png b/wise-doc/src/main/webapp/images/print.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/print.png rename to wise-doc/src/main/webapp/images/print.png diff --git a/wise-doc/src/main/webapp/nicons/public.png b/wise-doc/src/main/webapp/images/public.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/public.png rename to wise-doc/src/main/webapp/images/public.png diff --git a/wise-doc/src/main/webapp/nicons/rebota.gif b/wise-doc/src/main/webapp/images/rebota.gif similarity index 100% rename from wise-doc/src/main/webapp/nicons/rebota.gif rename to wise-doc/src/main/webapp/images/rebota.gif diff --git a/wise-doc/src/main/webapp/nicons/redo.png b/wise-doc/src/main/webapp/images/redo.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/redo.png rename to wise-doc/src/main/webapp/images/redo.png diff --git a/wise-doc/src/main/webapp/images/save.png b/wise-doc/src/main/webapp/images/save.png index a98b0c3b..174c6d6e 100644 Binary files a/wise-doc/src/main/webapp/images/save.png and b/wise-doc/src/main/webapp/images/save.png differ diff --git a/wise-doc/src/main/webapp/nicons/shape-circle.png b/wise-doc/src/main/webapp/images/shape-circle.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/shape-circle.png rename to wise-doc/src/main/webapp/images/shape-circle.png diff --git a/wise-doc/src/main/webapp/images/shape-line.png b/wise-doc/src/main/webapp/images/shape-line.png index de12b941..89f5a5bc 100644 Binary files a/wise-doc/src/main/webapp/images/shape-line.png and b/wise-doc/src/main/webapp/images/shape-line.png differ diff --git a/wise-doc/src/main/webapp/nicons/shape-rectangle-round.png b/wise-doc/src/main/webapp/images/shape-rectangle-round.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/shape-rectangle-round.png rename to wise-doc/src/main/webapp/images/shape-rectangle-round.png diff --git a/wise-doc/src/main/webapp/images/shape-rectangle.png b/wise-doc/src/main/webapp/images/shape-rectangle.png index ff399b22..9f05ac23 100644 Binary files a/wise-doc/src/main/webapp/images/shape-rectangle.png and b/wise-doc/src/main/webapp/images/shape-rectangle.png differ diff --git a/wise-doc/src/main/webapp/nicons/share.png b/wise-doc/src/main/webapp/images/share.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/share.png rename to wise-doc/src/main/webapp/images/share.png diff --git a/wise-doc/src/main/webapp/nicons/tag.png b/wise-doc/src/main/webapp/images/tag.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/tag.png rename to wise-doc/src/main/webapp/images/tag.png diff --git a/wise-doc/src/main/webapp/nicons/topic-add.png b/wise-doc/src/main/webapp/images/topic-add.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/topic-add.png rename to wise-doc/src/main/webapp/images/topic-add.png diff --git a/wise-doc/src/main/webapp/nicons/topic-border.png b/wise-doc/src/main/webapp/images/topic-border.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/topic-border.png rename to wise-doc/src/main/webapp/images/topic-border.png diff --git a/wise-doc/src/main/webapp/nicons/topic-color.png b/wise-doc/src/main/webapp/images/topic-color.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/topic-color.png rename to wise-doc/src/main/webapp/images/topic-color.png diff --git a/wise-doc/src/main/webapp/nicons/topic-delete.png b/wise-doc/src/main/webapp/images/topic-delete.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/topic-delete.png rename to wise-doc/src/main/webapp/images/topic-delete.png diff --git a/wise-doc/src/main/webapp/nicons/topic-icon.png b/wise-doc/src/main/webapp/images/topic-icon.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/topic-icon.png rename to wise-doc/src/main/webapp/images/topic-icon.png diff --git a/wise-doc/src/main/webapp/nicons/topic-link.png b/wise-doc/src/main/webapp/images/topic-link.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/topic-link.png rename to wise-doc/src/main/webapp/images/topic-link.png diff --git a/wise-doc/src/main/webapp/nicons/topic-note.png b/wise-doc/src/main/webapp/images/topic-note.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/topic-note.png rename to wise-doc/src/main/webapp/images/topic-note.png diff --git a/wise-doc/src/main/webapp/nicons/topic-relation.png b/wise-doc/src/main/webapp/images/topic-relation.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/topic-relation.png rename to wise-doc/src/main/webapp/images/topic-relation.png diff --git a/wise-doc/src/main/webapp/nicons/topic-shape.png b/wise-doc/src/main/webapp/images/topic-shape.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/topic-shape.png rename to wise-doc/src/main/webapp/images/topic-shape.png diff --git a/wise-doc/src/main/webapp/nicons/undo.png b/wise-doc/src/main/webapp/images/undo.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/undo.png rename to wise-doc/src/main/webapp/images/undo.png diff --git a/wise-doc/src/main/webapp/nicons/zoom-in.png b/wise-doc/src/main/webapp/images/zoom-in.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/zoom-in.png rename to wise-doc/src/main/webapp/images/zoom-in.png diff --git a/wise-doc/src/main/webapp/nicons/zoom-out.png b/wise-doc/src/main/webapp/images/zoom-out.png similarity index 100% rename from wise-doc/src/main/webapp/nicons/zoom-out.png rename to wise-doc/src/main/webapp/images/zoom-out.png diff --git a/wise-doc/src/main/webapp/nicons/history.png b/wise-doc/src/main/webapp/nicons/history.png deleted file mode 100644 index fa33bab4..00000000 Binary files a/wise-doc/src/main/webapp/nicons/history.png and /dev/null differ diff --git a/wise-doc/src/main/webapp/nicons/save.png b/wise-doc/src/main/webapp/nicons/save.png deleted file mode 100644 index 174c6d6e..00000000 Binary files a/wise-doc/src/main/webapp/nicons/save.png and /dev/null differ diff --git a/wise-doc/src/main/webapp/nicons/shape-line.png b/wise-doc/src/main/webapp/nicons/shape-line.png deleted file mode 100644 index 89f5a5bc..00000000 Binary files a/wise-doc/src/main/webapp/nicons/shape-line.png and /dev/null differ diff --git a/wise-doc/src/main/webapp/nicons/shape-rectangle.png b/wise-doc/src/main/webapp/nicons/shape-rectangle.png deleted file mode 100644 index 9f05ac23..00000000 Binary files a/wise-doc/src/main/webapp/nicons/shape-rectangle.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/WEB-INF/app.properties b/wise-webapp/src/main/webapp/WEB-INF/app.properties index c3f02de3..6d283009 100755 --- a/wise-webapp/src/main/webapp/WEB-INF/app.properties +++ b/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 diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-acegi-security.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-acegi-security.xml index 668cde65..02a1603a 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-acegi-security.xml +++ b/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 diff --git a/wise-webapp/src/main/webapp/css/common.css b/wise-webapp/src/main/webapp/css/common.css index 2fb7c659..6fa8b1e4 100644 --- a/wise-webapp/src/main/webapp/css/common.css +++ b/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; diff --git a/wise-webapp/src/main/webapp/css/editor2.css b/wise-webapp/src/main/webapp/css/editor2.css index 962599f2..e6511028 100644 --- a/wise-webapp/src/main/webapp/css/editor2.css +++ b/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; } diff --git a/wise-webapp/src/main/webapp/css/embedded.css b/wise-webapp/src/main/webapp/css/embedded.css index cf2ba015..2e4a60c2 100644 --- a/wise-webapp/src/main/webapp/css/embedded.css +++ b/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; } diff --git a/wise-webapp/src/main/webapp/css/print.css b/wise-webapp/src/main/webapp/css/print.css index 7a629d36..58c7f6c9 100644 --- a/wise-webapp/src/main/webapp/css/print.css +++ b/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; } diff --git a/wise-webapp/src/main/webapp/images/bin.png b/wise-webapp/src/main/webapp/images/bin.png deleted file mode 100755 index ebad933c..00000000 Binary files a/wise-webapp/src/main/webapp/images/bin.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/nicons/btn-bg-hover.png b/wise-webapp/src/main/webapp/images/btn-bg-hover.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/btn-bg-hover.png rename to wise-webapp/src/main/webapp/images/btn-bg-hover.png diff --git a/wise-webapp/src/main/webapp/nicons/btn-bg-normal.png b/wise-webapp/src/main/webapp/images/btn-bg-normal.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/btn-bg-normal.png rename to wise-webapp/src/main/webapp/images/btn-bg-normal.png diff --git a/wise-webapp/src/main/webapp/nicons/btne-bg-hover.png b/wise-webapp/src/main/webapp/images/btne-bg-hover.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/btne-bg-hover.png rename to wise-webapp/src/main/webapp/images/btne-bg-hover.png diff --git a/wise-webapp/src/main/webapp/nicons/btne-bg-normal.png b/wise-webapp/src/main/webapp/images/btne-bg-normal.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/btne-bg-normal.png rename to wise-webapp/src/main/webapp/images/btne-bg-normal.png diff --git a/wise-webapp/src/main/webapp/nicons/btne-bg-selected.png b/wise-webapp/src/main/webapp/images/btne-bg-selected.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/btne-bg-selected.png rename to wise-webapp/src/main/webapp/images/btne-bg-selected.png diff --git a/wise-webapp/src/main/webapp/images/collab_publish.png b/wise-webapp/src/main/webapp/images/collab_publish.png deleted file mode 100644 index fa862d61..00000000 Binary files a/wise-webapp/src/main/webapp/images/collab_publish.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/collab_tag.png b/wise-webapp/src/main/webapp/images/collab_tag.png deleted file mode 100644 index b06c7d25..00000000 Binary files a/wise-webapp/src/main/webapp/images/collab_tag.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/nicons/discard.png b/wise-webapp/src/main/webapp/images/discard.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/discard.png rename to wise-webapp/src/main/webapp/images/discard.png diff --git a/wise-webapp/src/main/webapp/images/errorIcon.png b/wise-webapp/src/main/webapp/images/errorIcon.png deleted file mode 100644 index bc396479..00000000 Binary files a/wise-webapp/src/main/webapp/images/errorIcon.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/nicons/export.png b/wise-webapp/src/main/webapp/images/export.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/export.png rename to wise-webapp/src/main/webapp/images/export.png diff --git a/wise-webapp/src/main/webapp/images/file_export.png b/wise-webapp/src/main/webapp/images/file_export.png deleted file mode 100644 index aec7cfb2..00000000 Binary files a/wise-webapp/src/main/webapp/images/file_export.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/file_printer.png b/wise-webapp/src/main/webapp/images/file_printer.png deleted file mode 100644 index ecd1ff26..00000000 Binary files a/wise-webapp/src/main/webapp/images/file_printer.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/file_redo.png b/wise-webapp/src/main/webapp/images/file_redo.png deleted file mode 100644 index 3a8502c6..00000000 Binary files a/wise-webapp/src/main/webapp/images/file_redo.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/file_redo_dis.png b/wise-webapp/src/main/webapp/images/file_redo_dis.png deleted file mode 100644 index 36cf9df3..00000000 Binary files a/wise-webapp/src/main/webapp/images/file_redo_dis.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/file_undo.png b/wise-webapp/src/main/webapp/images/file_undo.png deleted file mode 100644 index acd5a581..00000000 Binary files a/wise-webapp/src/main/webapp/images/file_undo.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/file_undo_dis.png b/wise-webapp/src/main/webapp/images/file_undo_dis.png deleted file mode 100644 index 6af29fe2..00000000 Binary files a/wise-webapp/src/main/webapp/images/file_undo_dis.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/nicons/font-bold.png b/wise-webapp/src/main/webapp/images/font-bold.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/font-bold.png rename to wise-webapp/src/main/webapp/images/font-bold.png diff --git a/wise-webapp/src/main/webapp/nicons/font-color.png b/wise-webapp/src/main/webapp/images/font-color.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/font-color.png rename to wise-webapp/src/main/webapp/images/font-color.png diff --git a/wise-webapp/src/main/webapp/nicons/font-italic.png b/wise-webapp/src/main/webapp/images/font-italic.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/font-italic.png rename to wise-webapp/src/main/webapp/images/font-italic.png diff --git a/wise-webapp/src/main/webapp/nicons/font-size.png b/wise-webapp/src/main/webapp/images/font-size.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/font-size.png rename to wise-webapp/src/main/webapp/images/font-size.png diff --git a/wise-webapp/src/main/webapp/nicons/font-type.png b/wise-webapp/src/main/webapp/images/font-type.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/font-type.png rename to wise-webapp/src/main/webapp/images/font-type.png diff --git a/wise-webapp/src/main/webapp/images/font_bold.png b/wise-webapp/src/main/webapp/images/font_bold.png deleted file mode 100644 index e35db88c..00000000 Binary files a/wise-webapp/src/main/webapp/images/font_bold.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/font_color.png b/wise-webapp/src/main/webapp/images/font_color.png deleted file mode 100644 index de227993..00000000 Binary files a/wise-webapp/src/main/webapp/images/font_color.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/font_italic.png b/wise-webapp/src/main/webapp/images/font_italic.png deleted file mode 100644 index 8d915b04..00000000 Binary files a/wise-webapp/src/main/webapp/images/font_italic.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/font_size.png b/wise-webapp/src/main/webapp/images/font_size.png deleted file mode 100644 index e3499795..00000000 Binary files a/wise-webapp/src/main/webapp/images/font_size.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/font_type.png b/wise-webapp/src/main/webapp/images/font_type.png deleted file mode 100644 index eaccc509..00000000 Binary files a/wise-webapp/src/main/webapp/images/font_type.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/footerBody.png b/wise-webapp/src/main/webapp/images/footerBody.png deleted file mode 100644 index da6cf551..00000000 Binary files a/wise-webapp/src/main/webapp/images/footerBody.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/footerEnd.png b/wise-webapp/src/main/webapp/images/footerEnd.png deleted file mode 100644 index 31504fe9..00000000 Binary files a/wise-webapp/src/main/webapp/images/footerEnd.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/footerStart.png b/wise-webapp/src/main/webapp/images/footerStart.png deleted file mode 100644 index 93c33f9d..00000000 Binary files a/wise-webapp/src/main/webapp/images/footerStart.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/grid.gif b/wise-webapp/src/main/webapp/images/grid.gif deleted file mode 100644 index ab95bfb3..00000000 Binary files a/wise-webapp/src/main/webapp/images/grid.gif and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/help.png b/wise-webapp/src/main/webapp/images/help.png deleted file mode 100755 index 5c870176..00000000 Binary files a/wise-webapp/src/main/webapp/images/help.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/history.png b/wise-webapp/src/main/webapp/images/history.png index 6e8052ff..fa33bab4 100644 Binary files a/wise-webapp/src/main/webapp/images/history.png and b/wise-webapp/src/main/webapp/images/history.png differ diff --git a/wise-webapp/src/main/webapp/nicons/links.png b/wise-webapp/src/main/webapp/images/links.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/links.png rename to wise-webapp/src/main/webapp/images/links.png diff --git a/wise-webapp/src/main/webapp/images/loadingIcon.gif b/wise-webapp/src/main/webapp/images/loadingIcon.gif deleted file mode 100644 index 2dfb06a6..00000000 Binary files a/wise-webapp/src/main/webapp/images/loadingIcon.gif and /dev/null differ diff --git a/wise-webapp/src/main/webapp/nicons/logo-medium.png b/wise-webapp/src/main/webapp/images/logo-medium.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/logo-medium.png rename to wise-webapp/src/main/webapp/images/logo-medium.png diff --git a/wise-webapp/src/main/webapp/images/logo-small.png b/wise-webapp/src/main/webapp/images/logo-small.png old mode 100755 new mode 100644 index 1b8e9692..107b817b Binary files a/wise-webapp/src/main/webapp/images/logo-small.png and b/wise-webapp/src/main/webapp/images/logo-small.png differ diff --git a/wise-webapp/src/main/webapp/images/logo-vsmall.png b/wise-webapp/src/main/webapp/images/logo-vsmall.png deleted file mode 100755 index 4947f72e..00000000 Binary files a/wise-webapp/src/main/webapp/images/logo-vsmall.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/moor_boverlay.png b/wise-webapp/src/main/webapp/images/moor_boverlay.png deleted file mode 100755 index 7ac228b0..00000000 Binary files a/wise-webapp/src/main/webapp/images/moor_boverlay.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/moor_cursor.gif b/wise-webapp/src/main/webapp/images/moor_cursor.gif deleted file mode 100755 index 9515a38e..00000000 Binary files a/wise-webapp/src/main/webapp/images/moor_cursor.gif and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/moor_slider.png b/wise-webapp/src/main/webapp/images/moor_slider.png deleted file mode 100755 index 9f4c47bf..00000000 Binary files a/wise-webapp/src/main/webapp/images/moor_slider.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/moor_woverlay.png b/wise-webapp/src/main/webapp/images/moor_woverlay.png deleted file mode 100755 index c3f3e96e..00000000 Binary files a/wise-webapp/src/main/webapp/images/moor_woverlay.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/note.png b/wise-webapp/src/main/webapp/images/note.png deleted file mode 100644 index ffea2b8b..00000000 Binary files a/wise-webapp/src/main/webapp/images/note.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/nicons/notes.png b/wise-webapp/src/main/webapp/images/notes.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/notes.png rename to wise-webapp/src/main/webapp/images/notes.png diff --git a/wise-webapp/src/main/webapp/nicons/print.png b/wise-webapp/src/main/webapp/images/print.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/print.png rename to wise-webapp/src/main/webapp/images/print.png diff --git a/wise-webapp/src/main/webapp/nicons/public.png b/wise-webapp/src/main/webapp/images/public.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/public.png rename to wise-webapp/src/main/webapp/images/public.png diff --git a/wise-webapp/src/main/webapp/nicons/rebota.gif b/wise-webapp/src/main/webapp/images/rebota.gif similarity index 100% rename from wise-webapp/src/main/webapp/nicons/rebota.gif rename to wise-webapp/src/main/webapp/images/rebota.gif diff --git a/wise-webapp/src/main/webapp/nicons/redo.png b/wise-webapp/src/main/webapp/images/redo.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/redo.png rename to wise-webapp/src/main/webapp/images/redo.png diff --git a/wise-webapp/src/main/webapp/images/save.png b/wise-webapp/src/main/webapp/images/save.png index a98b0c3b..174c6d6e 100644 Binary files a/wise-webapp/src/main/webapp/images/save.png and b/wise-webapp/src/main/webapp/images/save.png differ diff --git a/wise-webapp/src/main/webapp/nicons/shape-circle.png b/wise-webapp/src/main/webapp/images/shape-circle.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/shape-circle.png rename to wise-webapp/src/main/webapp/images/shape-circle.png diff --git a/wise-webapp/src/main/webapp/images/shape-elipse.png b/wise-webapp/src/main/webapp/images/shape-elipse.png deleted file mode 100644 index 2e3ea734..00000000 Binary files a/wise-webapp/src/main/webapp/images/shape-elipse.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/shape-line.png b/wise-webapp/src/main/webapp/images/shape-line.png index de12b941..89f5a5bc 100644 Binary files a/wise-webapp/src/main/webapp/images/shape-line.png and b/wise-webapp/src/main/webapp/images/shape-line.png differ diff --git a/wise-webapp/src/main/webapp/nicons/shape-rectangle-round.png b/wise-webapp/src/main/webapp/images/shape-rectangle-round.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/shape-rectangle-round.png rename to wise-webapp/src/main/webapp/images/shape-rectangle-round.png diff --git a/wise-webapp/src/main/webapp/images/shape-rectangle-rounded.png b/wise-webapp/src/main/webapp/images/shape-rectangle-rounded.png deleted file mode 100644 index eaed09fb..00000000 Binary files a/wise-webapp/src/main/webapp/images/shape-rectangle-rounded.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/shape-rectangle.png b/wise-webapp/src/main/webapp/images/shape-rectangle.png index ff399b22..9f05ac23 100644 Binary files a/wise-webapp/src/main/webapp/images/shape-rectangle.png and b/wise-webapp/src/main/webapp/images/shape-rectangle.png differ diff --git a/wise-webapp/src/main/webapp/images/shape.png b/wise-webapp/src/main/webapp/images/shape.png deleted file mode 100755 index 7bfb84ea..00000000 Binary files a/wise-webapp/src/main/webapp/images/shape.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/shape_handles.png b/wise-webapp/src/main/webapp/images/shape_handles.png deleted file mode 100755 index 5a88b2f3..00000000 Binary files a/wise-webapp/src/main/webapp/images/shape_handles.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/shape_square_add.png b/wise-webapp/src/main/webapp/images/shape_square_add.png deleted file mode 100755 index 31edfce5..00000000 Binary files a/wise-webapp/src/main/webapp/images/shape_square_add.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/shape_square_delete.png b/wise-webapp/src/main/webapp/images/shape_square_delete.png deleted file mode 100755 index ede912de..00000000 Binary files a/wise-webapp/src/main/webapp/images/shape_square_delete.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/shape_square_edit.png b/wise-webapp/src/main/webapp/images/shape_square_edit.png deleted file mode 100755 index d28dc6b1..00000000 Binary files a/wise-webapp/src/main/webapp/images/shape_square_edit.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/nicons/share.png b/wise-webapp/src/main/webapp/images/share.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/share.png rename to wise-webapp/src/main/webapp/images/share.png diff --git a/wise-webapp/src/main/webapp/nicons/tag.png b/wise-webapp/src/main/webapp/images/tag.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/tag.png rename to wise-webapp/src/main/webapp/images/tag.png diff --git a/wise-webapp/src/main/webapp/nicons/topic-add.png b/wise-webapp/src/main/webapp/images/topic-add.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/topic-add.png rename to wise-webapp/src/main/webapp/images/topic-add.png diff --git a/wise-webapp/src/main/webapp/nicons/topic-border.png b/wise-webapp/src/main/webapp/images/topic-border.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/topic-border.png rename to wise-webapp/src/main/webapp/images/topic-border.png diff --git a/wise-webapp/src/main/webapp/nicons/topic-color.png b/wise-webapp/src/main/webapp/images/topic-color.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/topic-color.png rename to wise-webapp/src/main/webapp/images/topic-color.png diff --git a/wise-webapp/src/main/webapp/nicons/topic-delete.png b/wise-webapp/src/main/webapp/images/topic-delete.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/topic-delete.png rename to wise-webapp/src/main/webapp/images/topic-delete.png diff --git a/wise-webapp/src/main/webapp/nicons/topic-icon.png b/wise-webapp/src/main/webapp/images/topic-icon.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/topic-icon.png rename to wise-webapp/src/main/webapp/images/topic-icon.png diff --git a/wise-webapp/src/main/webapp/nicons/topic-link.png b/wise-webapp/src/main/webapp/images/topic-link.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/topic-link.png rename to wise-webapp/src/main/webapp/images/topic-link.png diff --git a/wise-webapp/src/main/webapp/nicons/topic-note.png b/wise-webapp/src/main/webapp/images/topic-note.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/topic-note.png rename to wise-webapp/src/main/webapp/images/topic-note.png diff --git a/wise-webapp/src/main/webapp/nicons/topic-relation.png b/wise-webapp/src/main/webapp/images/topic-relation.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/topic-relation.png rename to wise-webapp/src/main/webapp/images/topic-relation.png diff --git a/wise-webapp/src/main/webapp/nicons/topic-shape.png b/wise-webapp/src/main/webapp/images/topic-shape.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/topic-shape.png rename to wise-webapp/src/main/webapp/images/topic-shape.png diff --git a/wise-webapp/src/main/webapp/images/topic_add.png b/wise-webapp/src/main/webapp/images/topic_add.png deleted file mode 100644 index 833f77c0..00000000 Binary files a/wise-webapp/src/main/webapp/images/topic_add.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/topic_bgcolor.png b/wise-webapp/src/main/webapp/images/topic_bgcolor.png deleted file mode 100644 index 70699e6b..00000000 Binary files a/wise-webapp/src/main/webapp/images/topic_bgcolor.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/topic_border.png b/wise-webapp/src/main/webapp/images/topic_border.png deleted file mode 100644 index ce42be54..00000000 Binary files a/wise-webapp/src/main/webapp/images/topic_border.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/topic_delete.png b/wise-webapp/src/main/webapp/images/topic_delete.png deleted file mode 100644 index 00552b36..00000000 Binary files a/wise-webapp/src/main/webapp/images/topic_delete.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/topic_icon.png b/wise-webapp/src/main/webapp/images/topic_icon.png deleted file mode 100644 index d9e245a1..00000000 Binary files a/wise-webapp/src/main/webapp/images/topic_icon.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/topic_link.png b/wise-webapp/src/main/webapp/images/topic_link.png deleted file mode 100644 index 247ce29c..00000000 Binary files a/wise-webapp/src/main/webapp/images/topic_link.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/topic_relationship.png b/wise-webapp/src/main/webapp/images/topic_relationship.png deleted file mode 100644 index 10d6ee9b..00000000 Binary files a/wise-webapp/src/main/webapp/images/topic_relationship.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/topic_shape.png b/wise-webapp/src/main/webapp/images/topic_shape.png deleted file mode 100644 index 6f004cae..00000000 Binary files a/wise-webapp/src/main/webapp/images/topic_shape.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/nicons/undo.png b/wise-webapp/src/main/webapp/images/undo.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/undo.png rename to wise-webapp/src/main/webapp/images/undo.png diff --git a/wise-webapp/src/main/webapp/images/world_link.png b/wise-webapp/src/main/webapp/images/world_link.png deleted file mode 100755 index b8edc126..00000000 Binary files a/wise-webapp/src/main/webapp/images/world_link.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/nicons/zoom-in.png b/wise-webapp/src/main/webapp/images/zoom-in.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/zoom-in.png rename to wise-webapp/src/main/webapp/images/zoom-in.png diff --git a/wise-webapp/src/main/webapp/nicons/zoom-out.png b/wise-webapp/src/main/webapp/images/zoom-out.png similarity index 100% rename from wise-webapp/src/main/webapp/nicons/zoom-out.png rename to wise-webapp/src/main/webapp/images/zoom-out.png diff --git a/wise-webapp/src/main/webapp/images/zoom_in.png b/wise-webapp/src/main/webapp/images/zoom_in.png deleted file mode 100755 index 1984e62d..00000000 Binary files a/wise-webapp/src/main/webapp/images/zoom_in.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/zoom_out.png b/wise-webapp/src/main/webapp/images/zoom_out.png deleted file mode 100755 index da2b3de4..00000000 Binary files a/wise-webapp/src/main/webapp/images/zoom_out.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp index e3efe900..8376ba3b 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp @@ -133,92 +133,92 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
diff --git a/wise-webapp/src/main/webapp/jsp/template.jsp b/wise-webapp/src/main/webapp/jsp/template.jsp index 7be1bf5a..48e123d5 100644 --- a/wise-webapp/src/main/webapp/jsp/template.jsp +++ b/wise-webapp/src/main/webapp/jsp/template.jsp @@ -23,7 +23,6 @@ - diff --git a/wise-webapp/src/main/webapp/nicons/history.png b/wise-webapp/src/main/webapp/nicons/history.png deleted file mode 100644 index fa33bab4..00000000 Binary files a/wise-webapp/src/main/webapp/nicons/history.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/nicons/logo-small.png b/wise-webapp/src/main/webapp/nicons/logo-small.png deleted file mode 100644 index 107b817b..00000000 Binary files a/wise-webapp/src/main/webapp/nicons/logo-small.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/nicons/save.png b/wise-webapp/src/main/webapp/nicons/save.png deleted file mode 100644 index 174c6d6e..00000000 Binary files a/wise-webapp/src/main/webapp/nicons/save.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/nicons/shape-line.png b/wise-webapp/src/main/webapp/nicons/shape-line.png deleted file mode 100644 index 89f5a5bc..00000000 Binary files a/wise-webapp/src/main/webapp/nicons/shape-line.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/nicons/shape-rectangle.png b/wise-webapp/src/main/webapp/nicons/shape-rectangle.png deleted file mode 100644 index 9f05ac23..00000000 Binary files a/wise-webapp/src/main/webapp/nicons/shape-rectangle.png and /dev/null differ diff --git a/wise-webapp/src/main/webapp/images/WP1.png b/wise-webapp/src/main/webapp/oimages/WP1.png similarity index 100% rename from wise-webapp/src/main/webapp/images/WP1.png rename to wise-webapp/src/main/webapp/oimages/WP1.png diff --git a/wise-webapp/src/main/webapp/images/WP2.png b/wise-webapp/src/main/webapp/oimages/WP2.png similarity index 100% rename from wise-webapp/src/main/webapp/images/WP2.png rename to wise-webapp/src/main/webapp/oimages/WP2.png diff --git a/wise-webapp/src/main/webapp/images/WP3.png b/wise-webapp/src/main/webapp/oimages/WP3.png similarity index 100% rename from wise-webapp/src/main/webapp/images/WP3.png rename to wise-webapp/src/main/webapp/oimages/WP3.png diff --git a/wise-webapp/src/main/webapp/images/WP4.png b/wise-webapp/src/main/webapp/oimages/WP4.png similarity index 100% rename from wise-webapp/src/main/webapp/images/WP4.png rename to wise-webapp/src/main/webapp/oimages/WP4.png diff --git a/wise-webapp/src/main/webapp/images/add.png b/wise-webapp/src/main/webapp/oimages/add.png similarity index 100% rename from wise-webapp/src/main/webapp/images/add.png rename to wise-webapp/src/main/webapp/oimages/add.png diff --git a/wise-webapp/src/main/webapp/images/ajax-loader.gif b/wise-webapp/src/main/webapp/oimages/ajax-loader.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/ajax-loader.gif rename to wise-webapp/src/main/webapp/oimages/ajax-loader.gif diff --git a/wise-webapp/src/main/webapp/images/ajax-loader2.gif b/wise-webapp/src/main/webapp/oimages/ajax-loader2.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/ajax-loader2.gif rename to wise-webapp/src/main/webapp/oimages/ajax-loader2.gif diff --git a/wise-webapp/src/main/webapp/images/animatedPresentation.gif b/wise-webapp/src/main/webapp/oimages/animatedPresentation.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/animatedPresentation.gif rename to wise-webapp/src/main/webapp/oimages/animatedPresentation.gif diff --git a/wise-webapp/src/main/webapp/images/application_view_icons.png b/wise-webapp/src/main/webapp/oimages/application_view_icons.png similarity index 100% rename from wise-webapp/src/main/webapp/images/application_view_icons.png rename to wise-webapp/src/main/webapp/oimages/application_view_icons.png diff --git a/wise-webapp/src/main/webapp/images/application_view_tile.png b/wise-webapp/src/main/webapp/oimages/application_view_tile.png similarity index 100% rename from wise-webapp/src/main/webapp/images/application_view_tile.png rename to wise-webapp/src/main/webapp/oimages/application_view_tile.png diff --git a/wise-webapp/src/main/webapp/images/arrow_down.gif b/wise-webapp/src/main/webapp/oimages/arrow_down.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/arrow_down.gif rename to wise-webapp/src/main/webapp/oimages/arrow_down.gif diff --git a/wise-webapp/src/main/webapp/images/arrow_down.png b/wise-webapp/src/main/webapp/oimages/arrow_down.png similarity index 100% rename from wise-webapp/src/main/webapp/images/arrow_down.png rename to wise-webapp/src/main/webapp/oimages/arrow_down.png diff --git a/wise-webapp/src/main/webapp/images/arrow_left.png b/wise-webapp/src/main/webapp/oimages/arrow_left.png similarity index 100% rename from wise-webapp/src/main/webapp/images/arrow_left.png rename to wise-webapp/src/main/webapp/oimages/arrow_left.png diff --git a/wise-webapp/src/main/webapp/images/arrow_merge.png b/wise-webapp/src/main/webapp/oimages/arrow_merge.png similarity index 100% rename from wise-webapp/src/main/webapp/images/arrow_merge.png rename to wise-webapp/src/main/webapp/oimages/arrow_merge.png diff --git a/wise-webapp/src/main/webapp/images/arrow_right.png b/wise-webapp/src/main/webapp/oimages/arrow_right.png similarity index 100% rename from wise-webapp/src/main/webapp/images/arrow_right.png rename to wise-webapp/src/main/webapp/oimages/arrow_right.png diff --git a/wise-webapp/src/main/webapp/images/arrow_rotate_anticlockwise.png b/wise-webapp/src/main/webapp/oimages/arrow_rotate_anticlockwise.png similarity index 100% rename from wise-webapp/src/main/webapp/images/arrow_rotate_anticlockwise.png rename to wise-webapp/src/main/webapp/oimages/arrow_rotate_anticlockwise.png diff --git a/wise-webapp/src/main/webapp/images/arrow_rotate_clockwise.png b/wise-webapp/src/main/webapp/oimages/arrow_rotate_clockwise.png similarity index 100% rename from wise-webapp/src/main/webapp/images/arrow_rotate_clockwise.png rename to wise-webapp/src/main/webapp/oimages/arrow_rotate_clockwise.png diff --git a/wise-webapp/src/main/webapp/images/arrow_turn_left.png b/wise-webapp/src/main/webapp/oimages/arrow_turn_left.png similarity index 100% rename from wise-webapp/src/main/webapp/images/arrow_turn_left.png rename to wise-webapp/src/main/webapp/oimages/arrow_turn_left.png diff --git a/wise-webapp/src/main/webapp/images/arrow_turn_right.png b/wise-webapp/src/main/webapp/oimages/arrow_turn_right.png similarity index 100% rename from wise-webapp/src/main/webapp/images/arrow_turn_right.png rename to wise-webapp/src/main/webapp/oimages/arrow_turn_right.png diff --git a/wise-webapp/src/main/webapp/images/arrow_up.png b/wise-webapp/src/main/webapp/oimages/arrow_up.png similarity index 100% rename from wise-webapp/src/main/webapp/images/arrow_up.png rename to wise-webapp/src/main/webapp/oimages/arrow_up.png diff --git a/wise-webapp/src/main/webapp/images/backColor.png b/wise-webapp/src/main/webapp/oimages/backColor.png similarity index 100% rename from wise-webapp/src/main/webapp/images/backColor.png rename to wise-webapp/src/main/webapp/oimages/backColor.png diff --git a/wise-webapp/src/main/webapp/images/balloon.gif b/wise-webapp/src/main/webapp/oimages/balloon.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/balloon.gif rename to wise-webapp/src/main/webapp/oimages/balloon.gif diff --git a/wise-webapp/src/main/webapp/images/balloon.png b/wise-webapp/src/main/webapp/oimages/balloon.png similarity index 100% rename from wise-webapp/src/main/webapp/images/balloon.png rename to wise-webapp/src/main/webapp/oimages/balloon.png diff --git a/wise-webapp/src/main/webapp/images/bg-center.gif b/wise-webapp/src/main/webapp/oimages/bg-center.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/bg-center.gif rename to wise-webapp/src/main/webapp/oimages/bg-center.gif diff --git a/wise-webapp/src/main/webapp/images/bg-left.gif b/wise-webapp/src/main/webapp/oimages/bg-left.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/bg-left.gif rename to wise-webapp/src/main/webapp/oimages/bg-left.gif diff --git a/wise-webapp/src/main/webapp/images/bg-right.gif b/wise-webapp/src/main/webapp/oimages/bg-right.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/bg-right.gif rename to wise-webapp/src/main/webapp/oimages/bg-right.gif diff --git a/wise-doc/src/main/webapp/images/bin.png b/wise-webapp/src/main/webapp/oimages/bin.png old mode 100644 new mode 100755 similarity index 100% rename from wise-doc/src/main/webapp/images/bin.png rename to wise-webapp/src/main/webapp/oimages/bin.png diff --git a/wise-webapp/src/main/webapp/images/black-keyboard.png b/wise-webapp/src/main/webapp/oimages/black-keyboard.png similarity index 100% rename from wise-webapp/src/main/webapp/images/black-keyboard.png rename to wise-webapp/src/main/webapp/oimages/black-keyboard.png diff --git a/wise-webapp/src/main/webapp/images/blank.gif b/wise-webapp/src/main/webapp/oimages/blank.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/blank.gif rename to wise-webapp/src/main/webapp/oimages/blank.gif diff --git a/wise-webapp/src/main/webapp/images/bodyImg.png b/wise-webapp/src/main/webapp/oimages/bodyImg.png similarity index 100% rename from wise-webapp/src/main/webapp/images/bodyImg.png rename to wise-webapp/src/main/webapp/oimages/bodyImg.png diff --git a/wise-webapp/src/main/webapp/images/body_btn.gif b/wise-webapp/src/main/webapp/oimages/body_btn.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/body_btn.gif rename to wise-webapp/src/main/webapp/oimages/body_btn.gif diff --git a/wise-webapp/src/main/webapp/images/bold.png b/wise-webapp/src/main/webapp/oimages/bold.png similarity index 100% rename from wise-webapp/src/main/webapp/images/bold.png rename to wise-webapp/src/main/webapp/oimages/bold.png diff --git a/wise-webapp/src/main/webapp/images/borderColor.png b/wise-webapp/src/main/webapp/oimages/borderColor.png similarity index 100% rename from wise-webapp/src/main/webapp/images/borderColor.png rename to wise-webapp/src/main/webapp/oimages/borderColor.png diff --git a/wise-webapp/src/main/webapp/images/btnBody.png b/wise-webapp/src/main/webapp/oimages/btnBody.png similarity index 100% rename from wise-webapp/src/main/webapp/images/btnBody.png rename to wise-webapp/src/main/webapp/oimages/btnBody.png diff --git a/wise-webapp/src/main/webapp/images/btnBody2.png b/wise-webapp/src/main/webapp/oimages/btnBody2.png similarity index 100% rename from wise-webapp/src/main/webapp/images/btnBody2.png rename to wise-webapp/src/main/webapp/oimages/btnBody2.png diff --git a/wise-webapp/src/main/webapp/images/btnEnd.png b/wise-webapp/src/main/webapp/oimages/btnEnd.png similarity index 100% rename from wise-webapp/src/main/webapp/images/btnEnd.png rename to wise-webapp/src/main/webapp/oimages/btnEnd.png diff --git a/wise-webapp/src/main/webapp/images/btnEnd2.png b/wise-webapp/src/main/webapp/oimages/btnEnd2.png similarity index 100% rename from wise-webapp/src/main/webapp/images/btnEnd2.png rename to wise-webapp/src/main/webapp/oimages/btnEnd2.png diff --git a/wise-webapp/src/main/webapp/images/btnStart.png b/wise-webapp/src/main/webapp/oimages/btnStart.png similarity index 100% rename from wise-webapp/src/main/webapp/images/btnStart.png rename to wise-webapp/src/main/webapp/oimages/btnStart.png diff --git a/wise-webapp/src/main/webapp/images/btnStart2.png b/wise-webapp/src/main/webapp/oimages/btnStart2.png similarity index 100% rename from wise-webapp/src/main/webapp/images/btnStart2.png rename to wise-webapp/src/main/webapp/oimages/btnStart2.png diff --git a/wise-webapp/src/main/webapp/images/btn_newdoc.gif b/wise-webapp/src/main/webapp/oimages/btn_newdoc.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/btn_newdoc.gif rename to wise-webapp/src/main/webapp/oimages/btn_newdoc.gif diff --git a/wise-webapp/src/main/webapp/images/bullet_black.png b/wise-webapp/src/main/webapp/oimages/bullet_black.png similarity index 100% rename from wise-webapp/src/main/webapp/images/bullet_black.png rename to wise-webapp/src/main/webapp/oimages/bullet_black.png diff --git a/wise-webapp/src/main/webapp/images/bullet_blue.png b/wise-webapp/src/main/webapp/oimages/bullet_blue.png similarity index 100% rename from wise-webapp/src/main/webapp/images/bullet_blue.png rename to wise-webapp/src/main/webapp/oimages/bullet_blue.png diff --git a/wise-webapp/src/main/webapp/images/bullet_green.png b/wise-webapp/src/main/webapp/oimages/bullet_green.png similarity index 100% rename from wise-webapp/src/main/webapp/images/bullet_green.png rename to wise-webapp/src/main/webapp/oimages/bullet_green.png diff --git a/wise-webapp/src/main/webapp/images/bullet_orange.png b/wise-webapp/src/main/webapp/oimages/bullet_orange.png similarity index 100% rename from wise-webapp/src/main/webapp/images/bullet_orange.png rename to wise-webapp/src/main/webapp/oimages/bullet_orange.png diff --git a/wise-webapp/src/main/webapp/images/bullet_pink.png b/wise-webapp/src/main/webapp/oimages/bullet_pink.png similarity index 100% rename from wise-webapp/src/main/webapp/images/bullet_pink.png rename to wise-webapp/src/main/webapp/oimages/bullet_pink.png diff --git a/wise-webapp/src/main/webapp/images/bullet_purple.png b/wise-webapp/src/main/webapp/oimages/bullet_purple.png similarity index 100% rename from wise-webapp/src/main/webapp/images/bullet_purple.png rename to wise-webapp/src/main/webapp/oimages/bullet_purple.png diff --git a/wise-webapp/src/main/webapp/images/bullet_red.png b/wise-webapp/src/main/webapp/oimages/bullet_red.png similarity index 100% rename from wise-webapp/src/main/webapp/images/bullet_red.png rename to wise-webapp/src/main/webapp/oimages/bullet_red.png diff --git a/wise-webapp/src/main/webapp/images/buttons.gif b/wise-webapp/src/main/webapp/oimages/buttons.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/buttons.gif rename to wise-webapp/src/main/webapp/oimages/buttons.gif diff --git a/wise-webapp/src/main/webapp/images/buttonsaqua.gif b/wise-webapp/src/main/webapp/oimages/buttonsaqua.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/buttonsaqua.gif rename to wise-webapp/src/main/webapp/oimages/buttonsaqua.gif diff --git a/wise-webapp/src/main/webapp/images/chart_bar.png b/wise-webapp/src/main/webapp/oimages/chart_bar.png similarity index 100% rename from wise-webapp/src/main/webapp/images/chart_bar.png rename to wise-webapp/src/main/webapp/oimages/chart_bar.png diff --git a/wise-webapp/src/main/webapp/images/chart_curve.png b/wise-webapp/src/main/webapp/oimages/chart_curve.png similarity index 100% rename from wise-webapp/src/main/webapp/images/chart_curve.png rename to wise-webapp/src/main/webapp/oimages/chart_curve.png diff --git a/wise-webapp/src/main/webapp/images/chart_line.png b/wise-webapp/src/main/webapp/oimages/chart_line.png similarity index 100% rename from wise-webapp/src/main/webapp/images/chart_line.png rename to wise-webapp/src/main/webapp/oimages/chart_line.png diff --git a/wise-webapp/src/main/webapp/images/chart_organisation.png b/wise-webapp/src/main/webapp/oimages/chart_organisation.png similarity index 100% rename from wise-webapp/src/main/webapp/images/chart_organisation.png rename to wise-webapp/src/main/webapp/oimages/chart_organisation.png diff --git a/wise-webapp/src/main/webapp/images/chart_pie.png b/wise-webapp/src/main/webapp/oimages/chart_pie.png similarity index 100% rename from wise-webapp/src/main/webapp/images/chart_pie.png rename to wise-webapp/src/main/webapp/oimages/chart_pie.png diff --git a/wise-webapp/src/main/webapp/images/cleardot.gif b/wise-webapp/src/main/webapp/oimages/cleardot.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/cleardot.gif rename to wise-webapp/src/main/webapp/oimages/cleardot.gif diff --git a/wise-webapp/src/main/webapp/images/clock.png b/wise-webapp/src/main/webapp/oimages/clock.png similarity index 100% rename from wise-webapp/src/main/webapp/images/clock.png rename to wise-webapp/src/main/webapp/oimages/clock.png diff --git a/wise-webapp/src/main/webapp/images/clock_red.png b/wise-webapp/src/main/webapp/oimages/clock_red.png similarity index 100% rename from wise-webapp/src/main/webapp/images/clock_red.png rename to wise-webapp/src/main/webapp/oimages/clock_red.png diff --git a/wise-doc/src/main/webapp/images/close.png b/wise-webapp/src/main/webapp/oimages/close.png similarity index 100% rename from wise-doc/src/main/webapp/images/close.png rename to wise-webapp/src/main/webapp/oimages/close.png diff --git a/wise-webapp/src/main/webapp/images/close12_1.gif b/wise-webapp/src/main/webapp/oimages/close12_1.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/close12_1.gif rename to wise-webapp/src/main/webapp/oimages/close12_1.gif diff --git a/wise-webapp/src/main/webapp/images/closelabel.gif b/wise-webapp/src/main/webapp/oimages/closelabel.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/closelabel.gif rename to wise-webapp/src/main/webapp/oimages/closelabel.gif diff --git a/wise-webapp/src/main/webapp/images/coins.png b/wise-webapp/src/main/webapp/oimages/coins.png similarity index 100% rename from wise-webapp/src/main/webapp/images/coins.png rename to wise-webapp/src/main/webapp/oimages/coins.png diff --git a/wise-doc/src/main/webapp/images/collab_publish.png b/wise-webapp/src/main/webapp/oimages/collab_publish.png similarity index 100% rename from wise-doc/src/main/webapp/images/collab_publish.png rename to wise-webapp/src/main/webapp/oimages/collab_publish.png diff --git a/wise-doc/src/main/webapp/images/collab_share.png b/wise-webapp/src/main/webapp/oimages/collab_share.png similarity index 100% rename from wise-doc/src/main/webapp/images/collab_share.png rename to wise-webapp/src/main/webapp/oimages/collab_share.png diff --git a/wise-doc/src/main/webapp/images/collab_tag.png b/wise-webapp/src/main/webapp/oimages/collab_tag.png similarity index 100% rename from wise-doc/src/main/webapp/images/collab_tag.png rename to wise-webapp/src/main/webapp/oimages/collab_tag.png diff --git a/wise-webapp/src/main/webapp/images/color_swatch.png b/wise-webapp/src/main/webapp/oimages/color_swatch.png similarity index 100% rename from wise-webapp/src/main/webapp/images/color_swatch.png rename to wise-webapp/src/main/webapp/oimages/color_swatch.png diff --git a/wise-webapp/src/main/webapp/images/comment.png b/wise-webapp/src/main/webapp/oimages/comment.png similarity index 100% rename from wise-webapp/src/main/webapp/images/comment.png rename to wise-webapp/src/main/webapp/oimages/comment.png diff --git a/wise-webapp/src/main/webapp/images/connect.png b/wise-webapp/src/main/webapp/oimages/connect.png similarity index 100% rename from wise-webapp/src/main/webapp/images/connect.png rename to wise-webapp/src/main/webapp/oimages/connect.png diff --git a/wise-webapp/src/main/webapp/images/cross.png b/wise-webapp/src/main/webapp/oimages/cross.png similarity index 100% rename from wise-webapp/src/main/webapp/images/cross.png rename to wise-webapp/src/main/webapp/oimages/cross.png diff --git a/wise-webapp/src/main/webapp/images/delNode.png b/wise-webapp/src/main/webapp/oimages/delNode.png similarity index 100% rename from wise-webapp/src/main/webapp/images/delNode.png rename to wise-webapp/src/main/webapp/oimages/delNode.png diff --git a/wise-webapp/src/main/webapp/images/delete.png b/wise-webapp/src/main/webapp/oimages/delete.png similarity index 100% rename from wise-webapp/src/main/webapp/images/delete.png rename to wise-webapp/src/main/webapp/oimages/delete.png diff --git a/wise-webapp/src/main/webapp/images/disconnect.png b/wise-webapp/src/main/webapp/oimages/disconnect.png similarity index 100% rename from wise-webapp/src/main/webapp/images/disconnect.png rename to wise-webapp/src/main/webapp/oimages/disconnect.png diff --git a/wise-webapp/src/main/webapp/images/east.gif b/wise-webapp/src/main/webapp/oimages/east.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/east.gif rename to wise-webapp/src/main/webapp/oimages/east.gif diff --git a/wise-webapp/src/main/webapp/images/end_btn.gif b/wise-webapp/src/main/webapp/oimages/end_btn.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/end_btn.gif rename to wise-webapp/src/main/webapp/oimages/end_btn.gif diff --git a/wise-doc/src/main/webapp/images/errorIcon.png b/wise-webapp/src/main/webapp/oimages/errorIcon.png similarity index 100% rename from wise-doc/src/main/webapp/images/errorIcon.png rename to wise-webapp/src/main/webapp/oimages/errorIcon.png diff --git a/wise-webapp/src/main/webapp/images/error_icon.png b/wise-webapp/src/main/webapp/oimages/error_icon.png similarity index 100% rename from wise-webapp/src/main/webapp/images/error_icon.png rename to wise-webapp/src/main/webapp/oimages/error_icon.png diff --git a/wise-webapp/src/main/webapp/images/es.gif b/wise-webapp/src/main/webapp/oimages/es.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/es.gif rename to wise-webapp/src/main/webapp/oimages/es.gif diff --git a/wise-webapp/src/main/webapp/images/face-angel.png b/wise-webapp/src/main/webapp/oimages/face-angel.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-angel.png rename to wise-webapp/src/main/webapp/oimages/face-angel.png diff --git a/wise-webapp/src/main/webapp/images/face-crying.png b/wise-webapp/src/main/webapp/oimages/face-crying.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-crying.png rename to wise-webapp/src/main/webapp/oimages/face-crying.png diff --git a/wise-webapp/src/main/webapp/images/face-devilish.png b/wise-webapp/src/main/webapp/oimages/face-devilish.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-devilish.png rename to wise-webapp/src/main/webapp/oimages/face-devilish.png diff --git a/wise-webapp/src/main/webapp/images/face-glasses.png b/wise-webapp/src/main/webapp/oimages/face-glasses.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-glasses.png rename to wise-webapp/src/main/webapp/oimages/face-glasses.png diff --git a/wise-webapp/src/main/webapp/images/face-grin.png b/wise-webapp/src/main/webapp/oimages/face-grin.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-grin.png rename to wise-webapp/src/main/webapp/oimages/face-grin.png diff --git a/wise-webapp/src/main/webapp/images/face-kiss.png b/wise-webapp/src/main/webapp/oimages/face-kiss.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-kiss.png rename to wise-webapp/src/main/webapp/oimages/face-kiss.png diff --git a/wise-webapp/src/main/webapp/images/face-monkey.png b/wise-webapp/src/main/webapp/oimages/face-monkey.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-monkey.png rename to wise-webapp/src/main/webapp/oimages/face-monkey.png diff --git a/wise-webapp/src/main/webapp/images/face-plain.png b/wise-webapp/src/main/webapp/oimages/face-plain.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-plain.png rename to wise-webapp/src/main/webapp/oimages/face-plain.png diff --git a/wise-webapp/src/main/webapp/images/face-sad.png b/wise-webapp/src/main/webapp/oimages/face-sad.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-sad.png rename to wise-webapp/src/main/webapp/oimages/face-sad.png diff --git a/wise-webapp/src/main/webapp/images/face-smile-big.png b/wise-webapp/src/main/webapp/oimages/face-smile-big.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-smile-big.png rename to wise-webapp/src/main/webapp/oimages/face-smile-big.png diff --git a/wise-webapp/src/main/webapp/images/face-smile.png b/wise-webapp/src/main/webapp/oimages/face-smile.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-smile.png rename to wise-webapp/src/main/webapp/oimages/face-smile.png diff --git a/wise-webapp/src/main/webapp/images/face-surprise.png b/wise-webapp/src/main/webapp/oimages/face-surprise.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-surprise.png rename to wise-webapp/src/main/webapp/oimages/face-surprise.png diff --git a/wise-webapp/src/main/webapp/images/face-wink.png b/wise-webapp/src/main/webapp/oimages/face-wink.png similarity index 100% rename from wise-webapp/src/main/webapp/images/face-wink.png rename to wise-webapp/src/main/webapp/oimages/face-wink.png diff --git a/wise-webapp/src/main/webapp/nicons/favicon.ico b/wise-webapp/src/main/webapp/oimages/favicon.ico similarity index 100% rename from wise-webapp/src/main/webapp/nicons/favicon.ico rename to wise-webapp/src/main/webapp/oimages/favicon.ico diff --git a/wise-doc/src/main/webapp/images/file_export.png b/wise-webapp/src/main/webapp/oimages/file_export.png similarity index 100% rename from wise-doc/src/main/webapp/images/file_export.png rename to wise-webapp/src/main/webapp/oimages/file_export.png diff --git a/wise-doc/src/main/webapp/images/file_printer.png b/wise-webapp/src/main/webapp/oimages/file_printer.png similarity index 100% rename from wise-doc/src/main/webapp/images/file_printer.png rename to wise-webapp/src/main/webapp/oimages/file_printer.png diff --git a/wise-doc/src/main/webapp/images/file_redo.png b/wise-webapp/src/main/webapp/oimages/file_redo.png similarity index 100% rename from wise-doc/src/main/webapp/images/file_redo.png rename to wise-webapp/src/main/webapp/oimages/file_redo.png diff --git a/wise-doc/src/main/webapp/images/file_redo_dis.png b/wise-webapp/src/main/webapp/oimages/file_redo_dis.png similarity index 100% rename from wise-doc/src/main/webapp/images/file_redo_dis.png rename to wise-webapp/src/main/webapp/oimages/file_redo_dis.png diff --git a/wise-doc/src/main/webapp/images/file_undo.png b/wise-webapp/src/main/webapp/oimages/file_undo.png similarity index 100% rename from wise-doc/src/main/webapp/images/file_undo.png rename to wise-webapp/src/main/webapp/oimages/file_undo.png diff --git a/wise-doc/src/main/webapp/images/file_undo_dis.png b/wise-webapp/src/main/webapp/oimages/file_undo_dis.png similarity index 100% rename from wise-doc/src/main/webapp/images/file_undo_dis.png rename to wise-webapp/src/main/webapp/oimages/file_undo_dis.png diff --git a/wise-webapp/src/main/webapp/images/firefox.gif b/wise-webapp/src/main/webapp/oimages/firefox.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/firefox.gif rename to wise-webapp/src/main/webapp/oimages/firefox.gif diff --git a/wise-webapp/src/main/webapp/images/firstSteps.png b/wise-webapp/src/main/webapp/oimages/firstSteps.png similarity index 100% rename from wise-webapp/src/main/webapp/images/firstSteps.png rename to wise-webapp/src/main/webapp/oimages/firstSteps.png diff --git a/wise-webapp/src/main/webapp/images/flag_blue.png b/wise-webapp/src/main/webapp/oimages/flag_blue.png similarity index 100% rename from wise-webapp/src/main/webapp/images/flag_blue.png rename to wise-webapp/src/main/webapp/oimages/flag_blue.png diff --git a/wise-webapp/src/main/webapp/images/flag_green.png b/wise-webapp/src/main/webapp/oimages/flag_green.png similarity index 100% rename from wise-webapp/src/main/webapp/images/flag_green.png rename to wise-webapp/src/main/webapp/oimages/flag_green.png diff --git a/wise-webapp/src/main/webapp/images/flag_orange.png b/wise-webapp/src/main/webapp/oimages/flag_orange.png similarity index 100% rename from wise-webapp/src/main/webapp/images/flag_orange.png rename to wise-webapp/src/main/webapp/oimages/flag_orange.png diff --git a/wise-webapp/src/main/webapp/images/flag_pink.png b/wise-webapp/src/main/webapp/oimages/flag_pink.png similarity index 100% rename from wise-webapp/src/main/webapp/images/flag_pink.png rename to wise-webapp/src/main/webapp/oimages/flag_pink.png diff --git a/wise-webapp/src/main/webapp/images/flag_purple.png b/wise-webapp/src/main/webapp/oimages/flag_purple.png similarity index 100% rename from wise-webapp/src/main/webapp/images/flag_purple.png rename to wise-webapp/src/main/webapp/oimages/flag_purple.png diff --git a/wise-webapp/src/main/webapp/images/flag_yellow.png b/wise-webapp/src/main/webapp/oimages/flag_yellow.png similarity index 100% rename from wise-webapp/src/main/webapp/images/flag_yellow.png rename to wise-webapp/src/main/webapp/oimages/flag_yellow.png diff --git a/wise-webapp/src/main/webapp/images/font.png b/wise-webapp/src/main/webapp/oimages/font.png similarity index 100% rename from wise-webapp/src/main/webapp/images/font.png rename to wise-webapp/src/main/webapp/oimages/font.png diff --git a/wise-webapp/src/main/webapp/images/fontColor.png b/wise-webapp/src/main/webapp/oimages/fontColor.png similarity index 100% rename from wise-webapp/src/main/webapp/images/fontColor.png rename to wise-webapp/src/main/webapp/oimages/fontColor.png diff --git a/wise-webapp/src/main/webapp/images/fontSize.png b/wise-webapp/src/main/webapp/oimages/fontSize.png similarity index 100% rename from wise-webapp/src/main/webapp/images/fontSize.png rename to wise-webapp/src/main/webapp/oimages/fontSize.png diff --git a/wise-doc/src/main/webapp/images/font_bold.png b/wise-webapp/src/main/webapp/oimages/font_bold.png similarity index 100% rename from wise-doc/src/main/webapp/images/font_bold.png rename to wise-webapp/src/main/webapp/oimages/font_bold.png diff --git a/wise-doc/src/main/webapp/images/font_color.png b/wise-webapp/src/main/webapp/oimages/font_color.png similarity index 100% rename from wise-doc/src/main/webapp/images/font_color.png rename to wise-webapp/src/main/webapp/oimages/font_color.png diff --git a/wise-doc/src/main/webapp/images/font_italic.png b/wise-webapp/src/main/webapp/oimages/font_italic.png similarity index 100% rename from wise-doc/src/main/webapp/images/font_italic.png rename to wise-webapp/src/main/webapp/oimages/font_italic.png diff --git a/wise-doc/src/main/webapp/images/font_size.png b/wise-webapp/src/main/webapp/oimages/font_size.png similarity index 100% rename from wise-doc/src/main/webapp/images/font_size.png rename to wise-webapp/src/main/webapp/oimages/font_size.png diff --git a/wise-doc/src/main/webapp/images/font_type.png b/wise-webapp/src/main/webapp/oimages/font_type.png similarity index 100% rename from wise-doc/src/main/webapp/images/font_type.png rename to wise-webapp/src/main/webapp/oimages/font_type.png diff --git a/wise-doc/src/main/webapp/images/footerBody.png b/wise-webapp/src/main/webapp/oimages/footerBody.png similarity index 100% rename from wise-doc/src/main/webapp/images/footerBody.png rename to wise-webapp/src/main/webapp/oimages/footerBody.png diff --git a/wise-doc/src/main/webapp/images/footerEnd.png b/wise-webapp/src/main/webapp/oimages/footerEnd.png similarity index 100% rename from wise-doc/src/main/webapp/images/footerEnd.png rename to wise-webapp/src/main/webapp/oimages/footerEnd.png diff --git a/wise-doc/src/main/webapp/images/footerStart.png b/wise-webapp/src/main/webapp/oimages/footerStart.png similarity index 100% rename from wise-doc/src/main/webapp/images/footerStart.png rename to wise-webapp/src/main/webapp/oimages/footerStart.png diff --git a/wise-webapp/src/main/webapp/images/fr.gif b/wise-webapp/src/main/webapp/oimages/fr.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/fr.gif rename to wise-webapp/src/main/webapp/oimages/fr.gif diff --git a/wise-doc/src/main/webapp/images/grid.gif b/wise-webapp/src/main/webapp/oimages/grid.gif similarity index 100% rename from wise-doc/src/main/webapp/images/grid.gif rename to wise-webapp/src/main/webapp/oimages/grid.gif diff --git a/wise-webapp/src/main/webapp/images/group.png b/wise-webapp/src/main/webapp/oimages/group.png similarity index 100% rename from wise-webapp/src/main/webapp/images/group.png rename to wise-webapp/src/main/webapp/oimages/group.png diff --git a/wise-webapp/src/main/webapp/images/group2.png b/wise-webapp/src/main/webapp/oimages/group2.png similarity index 100% rename from wise-webapp/src/main/webapp/images/group2.png rename to wise-webapp/src/main/webapp/oimages/group2.png diff --git a/wise-webapp/src/main/webapp/images/group_go.png b/wise-webapp/src/main/webapp/oimages/group_go.png similarity index 100% rename from wise-webapp/src/main/webapp/images/group_go.png rename to wise-webapp/src/main/webapp/oimages/group_go.png diff --git a/wise-webapp/src/main/webapp/images/hd-sprite.gif b/wise-webapp/src/main/webapp/oimages/hd-sprite.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/hd-sprite.gif rename to wise-webapp/src/main/webapp/oimages/hd-sprite.gif diff --git a/wise-doc/src/main/webapp/images/help.png b/wise-webapp/src/main/webapp/oimages/help.png old mode 100644 new mode 100755 similarity index 100% rename from wise-doc/src/main/webapp/images/help.png rename to wise-webapp/src/main/webapp/oimages/help.png diff --git a/wise-webapp/src/main/webapp/images/collab_share.png b/wise-webapp/src/main/webapp/oimages/history.png similarity index 67% rename from wise-webapp/src/main/webapp/images/collab_share.png rename to wise-webapp/src/main/webapp/oimages/history.png index 2e1594eb..6e8052ff 100644 Binary files a/wise-webapp/src/main/webapp/images/collab_share.png and b/wise-webapp/src/main/webapp/oimages/history.png differ diff --git a/wise-webapp/src/main/webapp/images/icon-small.png b/wise-webapp/src/main/webapp/oimages/icon-small.png similarity index 100% rename from wise-webapp/src/main/webapp/images/icon-small.png rename to wise-webapp/src/main/webapp/oimages/icon-small.png diff --git a/wise-webapp/src/main/webapp/images/icon.gif b/wise-webapp/src/main/webapp/oimages/icon.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/icon.gif rename to wise-webapp/src/main/webapp/oimages/icon.gif diff --git a/wise-webapp/src/main/webapp/images/icon.png b/wise-webapp/src/main/webapp/oimages/icon.png similarity index 100% rename from wise-webapp/src/main/webapp/images/icon.png rename to wise-webapp/src/main/webapp/oimages/icon.png diff --git a/wise-webapp/src/main/webapp/images/icon_doc_big.gif b/wise-webapp/src/main/webapp/oimages/icon_doc_big.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/icon_doc_big.gif rename to wise-webapp/src/main/webapp/oimages/icon_doc_big.gif diff --git a/wise-webapp/src/main/webapp/images/icon_list.png b/wise-webapp/src/main/webapp/oimages/icon_list.png similarity index 100% rename from wise-webapp/src/main/webapp/images/icon_list.png rename to wise-webapp/src/main/webapp/oimages/icon_list.png diff --git a/wise-webapp/src/main/webapp/images/icon_menu.png b/wise-webapp/src/main/webapp/oimages/icon_menu.png similarity index 100% rename from wise-webapp/src/main/webapp/images/icon_menu.png rename to wise-webapp/src/main/webapp/oimages/icon_menu.png diff --git a/wise-webapp/src/main/webapp/images/icon_triangle_green_13x19.gif b/wise-webapp/src/main/webapp/oimages/icon_triangle_green_13x19.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/icon_triangle_green_13x19.gif rename to wise-webapp/src/main/webapp/oimages/icon_triangle_green_13x19.gif diff --git a/wise-webapp/src/main/webapp/images/icon_triangle_grey_10x13.gif b/wise-webapp/src/main/webapp/oimages/icon_triangle_grey_10x13.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/icon_triangle_grey_10x13.gif rename to wise-webapp/src/main/webapp/oimages/icon_triangle_grey_10x13.gif diff --git a/wise-webapp/src/main/webapp/images/icon_triangle_grey_12x13.gif b/wise-webapp/src/main/webapp/oimages/icon_triangle_grey_12x13.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/icon_triangle_grey_12x13.gif rename to wise-webapp/src/main/webapp/oimages/icon_triangle_grey_12x13.gif diff --git a/wise-webapp/src/main/webapp/images/icon_triangle_grey_13x19.gif b/wise-webapp/src/main/webapp/oimages/icon_triangle_grey_13x19.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/icon_triangle_grey_13x19.gif rename to wise-webapp/src/main/webapp/oimages/icon_triangle_grey_13x19.gif diff --git a/wise-webapp/src/main/webapp/images/info.png b/wise-webapp/src/main/webapp/oimages/info.png similarity index 100% rename from wise-webapp/src/main/webapp/images/info.png rename to wise-webapp/src/main/webapp/oimages/info.png diff --git a/wise-webapp/src/main/webapp/images/italic.png b/wise-webapp/src/main/webapp/oimages/italic.png similarity index 100% rename from wise-webapp/src/main/webapp/images/italic.png rename to wise-webapp/src/main/webapp/oimages/italic.png diff --git a/wise-webapp/src/main/webapp/images/key.png b/wise-webapp/src/main/webapp/oimages/key.png similarity index 100% rename from wise-webapp/src/main/webapp/images/key.png rename to wise-webapp/src/main/webapp/oimages/key.png diff --git a/wise-webapp/src/main/webapp/images/lightbulb.png b/wise-webapp/src/main/webapp/oimages/lightbulb.png similarity index 100% rename from wise-webapp/src/main/webapp/images/lightbulb.png rename to wise-webapp/src/main/webapp/oimages/lightbulb.png diff --git a/wise-webapp/src/main/webapp/images/lightbulb_off.png b/wise-webapp/src/main/webapp/oimages/lightbulb_off.png similarity index 100% rename from wise-webapp/src/main/webapp/images/lightbulb_off.png rename to wise-webapp/src/main/webapp/oimages/lightbulb_off.png diff --git a/wise-webapp/src/main/webapp/images/loading.gif b/wise-webapp/src/main/webapp/oimages/loading.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/loading.gif rename to wise-webapp/src/main/webapp/oimages/loading.gif diff --git a/wise-doc/src/main/webapp/images/loadingIcon.gif b/wise-webapp/src/main/webapp/oimages/loadingIcon.gif similarity index 100% rename from wise-doc/src/main/webapp/images/loadingIcon.gif rename to wise-webapp/src/main/webapp/oimages/loadingIcon.gif diff --git a/wise-webapp/src/main/webapp/images/lock.png b/wise-webapp/src/main/webapp/oimages/lock.png similarity index 100% rename from wise-webapp/src/main/webapp/images/lock.png rename to wise-webapp/src/main/webapp/oimages/lock.png diff --git a/wise-webapp/src/main/webapp/images/lock_open.png b/wise-webapp/src/main/webapp/oimages/lock_open.png similarity index 100% rename from wise-webapp/src/main/webapp/images/lock_open.png rename to wise-webapp/src/main/webapp/oimages/lock_open.png diff --git a/wise-webapp/src/main/webapp/images/logo-big.png b/wise-webapp/src/main/webapp/oimages/logo-big.png similarity index 100% rename from wise-webapp/src/main/webapp/images/logo-big.png rename to wise-webapp/src/main/webapp/oimages/logo-big.png diff --git a/wise-webapp/src/main/webapp/images/logo-small.gif b/wise-webapp/src/main/webapp/oimages/logo-small.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/logo-small.gif rename to wise-webapp/src/main/webapp/oimages/logo-small.gif diff --git a/wise-webapp/src/main/webapp/oimages/logo-small.png b/wise-webapp/src/main/webapp/oimages/logo-small.png new file mode 100755 index 00000000..1b8e9692 Binary files /dev/null and b/wise-webapp/src/main/webapp/oimages/logo-small.png differ diff --git a/wise-webapp/src/main/webapp/images/logo-vsmall.gif b/wise-webapp/src/main/webapp/oimages/logo-vsmall.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/logo-vsmall.gif rename to wise-webapp/src/main/webapp/oimages/logo-vsmall.gif diff --git a/wise-doc/src/main/webapp/images/logo-vsmall.png b/wise-webapp/src/main/webapp/oimages/logo-vsmall.png old mode 100644 new mode 100755 similarity index 100% rename from wise-doc/src/main/webapp/images/logo-vsmall.png rename to wise-webapp/src/main/webapp/oimages/logo-vsmall.png diff --git a/wise-webapp/src/main/webapp/images/logo-vvsmall.png b/wise-webapp/src/main/webapp/oimages/logo-vvsmall.png similarity index 100% rename from wise-webapp/src/main/webapp/images/logo-vvsmall.png rename to wise-webapp/src/main/webapp/oimages/logo-vvsmall.png diff --git a/wise-webapp/src/main/webapp/images/mac-metaKey.png b/wise-webapp/src/main/webapp/oimages/mac-metaKey.png similarity index 100% rename from wise-webapp/src/main/webapp/images/mac-metaKey.png rename to wise-webapp/src/main/webapp/oimages/mac-metaKey.png diff --git a/wise-webapp/src/main/webapp/images/marca-vsmall.png b/wise-webapp/src/main/webapp/oimages/marca-vsmall.png similarity index 100% rename from wise-webapp/src/main/webapp/images/marca-vsmall.png rename to wise-webapp/src/main/webapp/oimages/marca-vsmall.png diff --git a/wise-webapp/src/main/webapp/images/mindmap.png b/wise-webapp/src/main/webapp/oimages/mindmap.png similarity index 100% rename from wise-webapp/src/main/webapp/images/mindmap.png rename to wise-webapp/src/main/webapp/oimages/mindmap.png diff --git a/wise-webapp/src/main/webapp/images/money.png b/wise-webapp/src/main/webapp/oimages/money.png similarity index 100% rename from wise-webapp/src/main/webapp/images/money.png rename to wise-webapp/src/main/webapp/oimages/money.png diff --git a/wise-webapp/src/main/webapp/images/money_dollar.png b/wise-webapp/src/main/webapp/oimages/money_dollar.png similarity index 100% rename from wise-webapp/src/main/webapp/images/money_dollar.png rename to wise-webapp/src/main/webapp/oimages/money_dollar.png diff --git a/wise-webapp/src/main/webapp/images/money_euro.png b/wise-webapp/src/main/webapp/oimages/money_euro.png similarity index 100% rename from wise-webapp/src/main/webapp/images/money_euro.png rename to wise-webapp/src/main/webapp/oimages/money_euro.png diff --git a/wise-webapp/src/main/webapp/images/money_pound.png b/wise-webapp/src/main/webapp/oimages/money_pound.png similarity index 100% rename from wise-webapp/src/main/webapp/images/money_pound.png rename to wise-webapp/src/main/webapp/oimages/money_pound.png diff --git a/wise-webapp/src/main/webapp/images/money_yen.png b/wise-webapp/src/main/webapp/oimages/money_yen.png similarity index 100% rename from wise-webapp/src/main/webapp/images/money_yen.png rename to wise-webapp/src/main/webapp/oimages/money_yen.png diff --git a/wise-webapp/src/main/webapp/images/moor_arrows.gif b/wise-webapp/src/main/webapp/oimages/moor_arrows.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/moor_arrows.gif rename to wise-webapp/src/main/webapp/oimages/moor_arrows.gif diff --git a/wise-doc/src/main/webapp/images/moor_boverlay.png b/wise-webapp/src/main/webapp/oimages/moor_boverlay.png old mode 100644 new mode 100755 similarity index 100% rename from wise-doc/src/main/webapp/images/moor_boverlay.png rename to wise-webapp/src/main/webapp/oimages/moor_boverlay.png diff --git a/wise-doc/src/main/webapp/images/moor_cursor.gif b/wise-webapp/src/main/webapp/oimages/moor_cursor.gif old mode 100644 new mode 100755 similarity index 100% rename from wise-doc/src/main/webapp/images/moor_cursor.gif rename to wise-webapp/src/main/webapp/oimages/moor_cursor.gif diff --git a/wise-doc/src/main/webapp/images/moor_slider.png b/wise-webapp/src/main/webapp/oimages/moor_slider.png old mode 100644 new mode 100755 similarity index 100% rename from wise-doc/src/main/webapp/images/moor_slider.png rename to wise-webapp/src/main/webapp/oimages/moor_slider.png diff --git a/wise-doc/src/main/webapp/images/moor_woverlay.png b/wise-webapp/src/main/webapp/oimages/moor_woverlay.png old mode 100644 new mode 100755 similarity index 100% rename from wise-doc/src/main/webapp/images/moor_woverlay.png rename to wise-webapp/src/main/webapp/oimages/moor_woverlay.png diff --git a/wise-webapp/src/main/webapp/images/move.png b/wise-webapp/src/main/webapp/oimages/move.png similarity index 100% rename from wise-webapp/src/main/webapp/images/move.png rename to wise-webapp/src/main/webapp/oimages/move.png diff --git a/wise-webapp/src/main/webapp/images/mymaps.png b/wise-webapp/src/main/webapp/oimages/mymaps.png similarity index 100% rename from wise-webapp/src/main/webapp/images/mymaps.png rename to wise-webapp/src/main/webapp/oimages/mymaps.png diff --git a/wise-webapp/src/main/webapp/images/newMap1.png b/wise-webapp/src/main/webapp/oimages/newMap1.png similarity index 100% rename from wise-webapp/src/main/webapp/images/newMap1.png rename to wise-webapp/src/main/webapp/oimages/newMap1.png diff --git a/wise-webapp/src/main/webapp/images/newMap2.png b/wise-webapp/src/main/webapp/oimages/newMap2.png similarity index 100% rename from wise-webapp/src/main/webapp/images/newMap2.png rename to wise-webapp/src/main/webapp/oimages/newMap2.png diff --git a/wise-webapp/src/main/webapp/images/newNode.png b/wise-webapp/src/main/webapp/oimages/newNode.png similarity index 100% rename from wise-webapp/src/main/webapp/images/newNode.png rename to wise-webapp/src/main/webapp/oimages/newNode.png diff --git a/wise-webapp/src/main/webapp/images/newmap.png b/wise-webapp/src/main/webapp/oimages/newmap.png similarity index 100% rename from wise-webapp/src/main/webapp/images/newmap.png rename to wise-webapp/src/main/webapp/oimages/newmap.png diff --git a/wise-webapp/src/main/webapp/images/newmap3.png b/wise-webapp/src/main/webapp/oimages/newmap3.png similarity index 100% rename from wise-webapp/src/main/webapp/images/newmap3.png rename to wise-webapp/src/main/webapp/oimages/newmap3.png diff --git a/wise-webapp/src/main/webapp/images/newmap4.png b/wise-webapp/src/main/webapp/oimages/newmap4.png similarity index 100% rename from wise-webapp/src/main/webapp/images/newmap4.png rename to wise-webapp/src/main/webapp/oimages/newmap4.png diff --git a/wise-webapp/src/main/webapp/images/newmap5.png b/wise-webapp/src/main/webapp/oimages/newmap5.png similarity index 100% rename from wise-webapp/src/main/webapp/images/newmap5.png rename to wise-webapp/src/main/webapp/oimages/newmap5.png diff --git a/wise-webapp/src/main/webapp/images/newsLinks.png b/wise-webapp/src/main/webapp/oimages/newsLinks.png similarity index 100% rename from wise-webapp/src/main/webapp/images/newsLinks.png rename to wise-webapp/src/main/webapp/oimages/newsLinks.png diff --git a/wise-webapp/src/main/webapp/images/nicEditorIcons.gif b/wise-webapp/src/main/webapp/oimages/nicEditorIcons.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/nicEditorIcons.gif rename to wise-webapp/src/main/webapp/oimages/nicEditorIcons.gif diff --git a/wise-webapp/src/main/webapp/images/node_add.png b/wise-webapp/src/main/webapp/oimages/node_add.png similarity index 100% rename from wise-webapp/src/main/webapp/images/node_add.png rename to wise-webapp/src/main/webapp/oimages/node_add.png diff --git a/wise-webapp/src/main/webapp/images/node_border.png b/wise-webapp/src/main/webapp/oimages/node_border.png similarity index 100% rename from wise-webapp/src/main/webapp/images/node_border.png rename to wise-webapp/src/main/webapp/oimages/node_border.png diff --git a/wise-webapp/src/main/webapp/images/node_border2.png b/wise-webapp/src/main/webapp/oimages/node_border2.png similarity index 100% rename from wise-webapp/src/main/webapp/images/node_border2.png rename to wise-webapp/src/main/webapp/oimages/node_border2.png diff --git a/wise-webapp/src/main/webapp/images/node_elipse.png b/wise-webapp/src/main/webapp/oimages/node_elipse.png similarity index 100% rename from wise-webapp/src/main/webapp/images/node_elipse.png rename to wise-webapp/src/main/webapp/oimages/node_elipse.png diff --git a/wise-webapp/src/main/webapp/images/north.gif b/wise-webapp/src/main/webapp/oimages/north.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/north.gif rename to wise-webapp/src/main/webapp/oimages/north.gif diff --git a/wise-doc/src/main/webapp/images/note.png b/wise-webapp/src/main/webapp/oimages/note.png similarity index 100% rename from wise-doc/src/main/webapp/images/note.png rename to wise-webapp/src/main/webapp/oimages/note.png diff --git a/wise-webapp/src/main/webapp/images/note1.png b/wise-webapp/src/main/webapp/oimages/note1.png similarity index 100% rename from wise-webapp/src/main/webapp/images/note1.png rename to wise-webapp/src/main/webapp/oimages/note1.png diff --git a/wise-webapp/src/main/webapp/images/page_delete.png b/wise-webapp/src/main/webapp/oimages/page_delete.png similarity index 100% rename from wise-webapp/src/main/webapp/images/page_delete.png rename to wise-webapp/src/main/webapp/oimages/page_delete.png diff --git a/wise-webapp/src/main/webapp/images/page_go.png b/wise-webapp/src/main/webapp/oimages/page_go.png similarity index 100% rename from wise-webapp/src/main/webapp/images/page_go.png rename to wise-webapp/src/main/webapp/oimages/page_go.png diff --git a/wise-webapp/src/main/webapp/images/paypal-donate.gif b/wise-webapp/src/main/webapp/oimages/paypal-donate.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/paypal-donate.gif rename to wise-webapp/src/main/webapp/oimages/paypal-donate.gif diff --git a/wise-webapp/src/main/webapp/images/printNews.png b/wise-webapp/src/main/webapp/oimages/printNews.png similarity index 100% rename from wise-webapp/src/main/webapp/images/printNews.png rename to wise-webapp/src/main/webapp/oimages/printNews.png diff --git a/wise-webapp/src/main/webapp/images/printer.png b/wise-webapp/src/main/webapp/oimages/printer.png similarity index 100% rename from wise-webapp/src/main/webapp/images/printer.png rename to wise-webapp/src/main/webapp/oimages/printer.png diff --git a/wise-webapp/src/main/webapp/images/removeUser.jpeg b/wise-webapp/src/main/webapp/oimages/removeUser.jpeg similarity index 100% rename from wise-webapp/src/main/webapp/images/removeUser.jpeg rename to wise-webapp/src/main/webapp/oimages/removeUser.jpeg diff --git a/wise-webapp/src/main/webapp/images/ruby.png b/wise-webapp/src/main/webapp/oimages/ruby.png similarity index 100% rename from wise-webapp/src/main/webapp/images/ruby.png rename to wise-webapp/src/main/webapp/oimages/ruby.png diff --git a/wise-webapp/src/main/webapp/images/s.gif b/wise-webapp/src/main/webapp/oimages/s.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/s.gif rename to wise-webapp/src/main/webapp/oimages/s.gif diff --git a/wise-webapp/src/main/webapp/images/close.png b/wise-webapp/src/main/webapp/oimages/save.png similarity index 69% rename from wise-webapp/src/main/webapp/images/close.png rename to wise-webapp/src/main/webapp/oimages/save.png index 4de1c381..a98b0c3b 100644 Binary files a/wise-webapp/src/main/webapp/images/close.png and b/wise-webapp/src/main/webapp/oimages/save.png differ diff --git a/wise-webapp/src/main/webapp/images/se-handle.gif b/wise-webapp/src/main/webapp/oimages/se-handle.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/se-handle.gif rename to wise-webapp/src/main/webapp/oimages/se-handle.gif diff --git a/wise-webapp/src/main/webapp/images/search.png b/wise-webapp/src/main/webapp/oimages/search.png similarity index 100% rename from wise-webapp/src/main/webapp/images/search.png rename to wise-webapp/src/main/webapp/oimages/search.png diff --git a/wise-webapp/src/main/webapp/images/search2.png b/wise-webapp/src/main/webapp/oimages/search2.png similarity index 100% rename from wise-webapp/src/main/webapp/images/search2.png rename to wise-webapp/src/main/webapp/oimages/search2.png diff --git a/wise-webapp/src/main/webapp/images/search3.png b/wise-webapp/src/main/webapp/oimages/search3.png similarity index 100% rename from wise-webapp/src/main/webapp/images/search3.png rename to wise-webapp/src/main/webapp/oimages/search3.png diff --git a/wise-webapp/src/main/webapp/images/seast.png b/wise-webapp/src/main/webapp/oimages/seast.png similarity index 100% rename from wise-webapp/src/main/webapp/images/seast.png rename to wise-webapp/src/main/webapp/oimages/seast.png diff --git a/wise-doc/src/main/webapp/images/shape-elipse.png b/wise-webapp/src/main/webapp/oimages/shape-elipse.png similarity index 100% rename from wise-doc/src/main/webapp/images/shape-elipse.png rename to wise-webapp/src/main/webapp/oimages/shape-elipse.png diff --git a/wise-webapp/src/main/webapp/oimages/shape-line.png b/wise-webapp/src/main/webapp/oimages/shape-line.png new file mode 100644 index 00000000..de12b941 Binary files /dev/null and b/wise-webapp/src/main/webapp/oimages/shape-line.png differ diff --git a/wise-doc/src/main/webapp/images/shape-rectangle-rounded.png b/wise-webapp/src/main/webapp/oimages/shape-rectangle-rounded.png similarity index 100% rename from wise-doc/src/main/webapp/images/shape-rectangle-rounded.png rename to wise-webapp/src/main/webapp/oimages/shape-rectangle-rounded.png diff --git a/wise-webapp/src/main/webapp/oimages/shape-rectangle.png b/wise-webapp/src/main/webapp/oimages/shape-rectangle.png new file mode 100644 index 00000000..ff399b22 Binary files /dev/null and b/wise-webapp/src/main/webapp/oimages/shape-rectangle.png differ diff --git a/wise-doc/src/main/webapp/images/shape.png b/wise-webapp/src/main/webapp/oimages/shape.png old mode 100644 new mode 100755 similarity index 100% rename from wise-doc/src/main/webapp/images/shape.png rename to wise-webapp/src/main/webapp/oimages/shape.png diff --git a/wise-doc/src/main/webapp/images/shape_handles.png b/wise-webapp/src/main/webapp/oimages/shape_handles.png old mode 100644 new mode 100755 similarity index 100% rename from wise-doc/src/main/webapp/images/shape_handles.png rename to wise-webapp/src/main/webapp/oimages/shape_handles.png diff --git a/wise-doc/src/main/webapp/images/shape_square_add.png b/wise-webapp/src/main/webapp/oimages/shape_square_add.png old mode 100644 new mode 100755 similarity index 100% rename from wise-doc/src/main/webapp/images/shape_square_add.png rename to wise-webapp/src/main/webapp/oimages/shape_square_add.png diff --git a/wise-doc/src/main/webapp/images/shape_square_delete.png b/wise-webapp/src/main/webapp/oimages/shape_square_delete.png old mode 100644 new mode 100755 similarity index 100% rename from wise-doc/src/main/webapp/images/shape_square_delete.png rename to wise-webapp/src/main/webapp/oimages/shape_square_delete.png diff --git a/wise-doc/src/main/webapp/images/shape_square_edit.png b/wise-webapp/src/main/webapp/oimages/shape_square_edit.png old mode 100644 new mode 100755 similarity index 100% rename from wise-doc/src/main/webapp/images/shape_square_edit.png rename to wise-webapp/src/main/webapp/oimages/shape_square_edit.png diff --git a/wise-webapp/src/main/webapp/images/shrink_animation.gif b/wise-webapp/src/main/webapp/oimages/shrink_animation.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/shrink_animation.gif rename to wise-webapp/src/main/webapp/oimages/shrink_animation.gif diff --git a/wise-webapp/src/main/webapp/images/signUpBodyBtn.png b/wise-webapp/src/main/webapp/oimages/signUpBodyBtn.png similarity index 100% rename from wise-webapp/src/main/webapp/images/signUpBodyBtn.png rename to wise-webapp/src/main/webapp/oimages/signUpBodyBtn.png diff --git a/wise-webapp/src/main/webapp/images/signUpEndBtn.png b/wise-webapp/src/main/webapp/oimages/signUpEndBtn.png similarity index 100% rename from wise-webapp/src/main/webapp/images/signUpEndBtn.png rename to wise-webapp/src/main/webapp/oimages/signUpEndBtn.png diff --git a/wise-webapp/src/main/webapp/images/signUpStartBtn.png b/wise-webapp/src/main/webapp/oimages/signUpStartBtn.png similarity index 100% rename from wise-webapp/src/main/webapp/images/signUpStartBtn.png rename to wise-webapp/src/main/webapp/oimages/signUpStartBtn.png diff --git a/wise-webapp/src/main/webapp/images/sne.png b/wise-webapp/src/main/webapp/oimages/sne.png similarity index 100% rename from wise-webapp/src/main/webapp/images/sne.png rename to wise-webapp/src/main/webapp/oimages/sne.png diff --git a/wise-webapp/src/main/webapp/images/snorth.png b/wise-webapp/src/main/webapp/oimages/snorth.png similarity index 100% rename from wise-webapp/src/main/webapp/images/snorth.png rename to wise-webapp/src/main/webapp/oimages/snorth.png diff --git a/wise-webapp/src/main/webapp/images/snw.png b/wise-webapp/src/main/webapp/oimages/snw.png similarity index 100% rename from wise-webapp/src/main/webapp/images/snw.png rename to wise-webapp/src/main/webapp/oimages/snw.png diff --git a/wise-webapp/src/main/webapp/images/south.gif b/wise-webapp/src/main/webapp/oimages/south.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/south.gif rename to wise-webapp/src/main/webapp/oimages/south.gif diff --git a/wise-webapp/src/main/webapp/images/sse.png b/wise-webapp/src/main/webapp/oimages/sse.png similarity index 100% rename from wise-webapp/src/main/webapp/images/sse.png rename to wise-webapp/src/main/webapp/oimages/sse.png diff --git a/wise-webapp/src/main/webapp/images/ssouth.png b/wise-webapp/src/main/webapp/oimages/ssouth.png similarity index 100% rename from wise-webapp/src/main/webapp/images/ssouth.png rename to wise-webapp/src/main/webapp/oimages/ssouth.png diff --git a/wise-webapp/src/main/webapp/images/ssw.png b/wise-webapp/src/main/webapp/oimages/ssw.png similarity index 100% rename from wise-webapp/src/main/webapp/images/ssw.png rename to wise-webapp/src/main/webapp/oimages/ssw.png diff --git a/wise-webapp/src/main/webapp/images/start_btn.gif b/wise-webapp/src/main/webapp/oimages/start_btn.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/start_btn.gif rename to wise-webapp/src/main/webapp/oimages/start_btn.gif diff --git a/wise-webapp/src/main/webapp/images/swest.png b/wise-webapp/src/main/webapp/oimages/swest.png similarity index 100% rename from wise-webapp/src/main/webapp/images/swest.png rename to wise-webapp/src/main/webapp/oimages/swest.png diff --git a/wise-webapp/src/main/webapp/images/tab.png b/wise-webapp/src/main/webapp/oimages/tab.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tab.png rename to wise-webapp/src/main/webapp/oimages/tab.png diff --git a/wise-webapp/src/main/webapp/images/tab2.png b/wise-webapp/src/main/webapp/oimages/tab2.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tab2.png rename to wise-webapp/src/main/webapp/oimages/tab2.png diff --git a/wise-webapp/src/main/webapp/images/tab3.png b/wise-webapp/src/main/webapp/oimages/tab3.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tab3.png rename to wise-webapp/src/main/webapp/oimages/tab3.png diff --git a/wise-webapp/src/main/webapp/images/tab4.png b/wise-webapp/src/main/webapp/oimages/tab4.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tab4.png rename to wise-webapp/src/main/webapp/oimages/tab4.png diff --git a/wise-webapp/src/main/webapp/images/tab5.png b/wise-webapp/src/main/webapp/oimages/tab5.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tab5.png rename to wise-webapp/src/main/webapp/oimages/tab5.png diff --git a/wise-webapp/src/main/webapp/images/tag_blue.png b/wise-webapp/src/main/webapp/oimages/tag_blue.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tag_blue.png rename to wise-webapp/src/main/webapp/oimages/tag_blue.png diff --git a/wise-webapp/src/main/webapp/images/tag_blue_add.png b/wise-webapp/src/main/webapp/oimages/tag_blue_add.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tag_blue_add.png rename to wise-webapp/src/main/webapp/oimages/tag_blue_add.png diff --git a/wise-webapp/src/main/webapp/images/tag_blue_add2.png b/wise-webapp/src/main/webapp/oimages/tag_blue_add2.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tag_blue_add2.png rename to wise-webapp/src/main/webapp/oimages/tag_blue_add2.png diff --git a/wise-webapp/src/main/webapp/images/tag_green.png b/wise-webapp/src/main/webapp/oimages/tag_green.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tag_green.png rename to wise-webapp/src/main/webapp/oimages/tag_green.png diff --git a/wise-webapp/src/main/webapp/images/tag_orange.png b/wise-webapp/src/main/webapp/oimages/tag_orange.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tag_orange.png rename to wise-webapp/src/main/webapp/oimages/tag_orange.png diff --git a/wise-webapp/src/main/webapp/images/tag_pink.png b/wise-webapp/src/main/webapp/oimages/tag_pink.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tag_pink.png rename to wise-webapp/src/main/webapp/oimages/tag_pink.png diff --git a/wise-webapp/src/main/webapp/images/tag_purple.png b/wise-webapp/src/main/webapp/oimages/tag_purple.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tag_purple.png rename to wise-webapp/src/main/webapp/oimages/tag_purple.png diff --git a/wise-webapp/src/main/webapp/images/tag_red.png b/wise-webapp/src/main/webapp/oimages/tag_red.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tag_red.png rename to wise-webapp/src/main/webapp/oimages/tag_red.png diff --git a/wise-webapp/src/main/webapp/images/tag_yellow.png b/wise-webapp/src/main/webapp/oimages/tag_yellow.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tag_yellow.png rename to wise-webapp/src/main/webapp/oimages/tag_yellow.png diff --git a/wise-webapp/src/main/webapp/images/text_bold.png b/wise-webapp/src/main/webapp/oimages/text_bold.png similarity index 100% rename from wise-webapp/src/main/webapp/images/text_bold.png rename to wise-webapp/src/main/webapp/oimages/text_bold.png diff --git a/wise-webapp/src/main/webapp/images/text_italic.png b/wise-webapp/src/main/webapp/oimages/text_italic.png similarity index 100% rename from wise-webapp/src/main/webapp/images/text_italic.png rename to wise-webapp/src/main/webapp/oimages/text_italic.png diff --git a/wise-webapp/src/main/webapp/images/thumb_down.png b/wise-webapp/src/main/webapp/oimages/thumb_down.png similarity index 100% rename from wise-webapp/src/main/webapp/images/thumb_down.png rename to wise-webapp/src/main/webapp/oimages/thumb_down.png diff --git a/wise-webapp/src/main/webapp/images/thumb_up.png b/wise-webapp/src/main/webapp/oimages/thumb_up.png similarity index 100% rename from wise-webapp/src/main/webapp/images/thumb_up.png rename to wise-webapp/src/main/webapp/oimages/thumb_up.png diff --git a/wise-webapp/src/main/webapp/images/tick.png b/wise-webapp/src/main/webapp/oimages/tick.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tick.png rename to wise-webapp/src/main/webapp/oimages/tick.png diff --git a/wise-webapp/src/main/webapp/images/toolbar2.png b/wise-webapp/src/main/webapp/oimages/toolbar2.png similarity index 100% rename from wise-webapp/src/main/webapp/images/toolbar2.png rename to wise-webapp/src/main/webapp/oimages/toolbar2.png diff --git a/wise-webapp/src/main/webapp/images/toolbarNews.png b/wise-webapp/src/main/webapp/oimages/toolbarNews.png similarity index 100% rename from wise-webapp/src/main/webapp/images/toolbarNews.png rename to wise-webapp/src/main/webapp/oimages/toolbarNews.png diff --git a/wise-doc/src/main/webapp/images/topic_add.png b/wise-webapp/src/main/webapp/oimages/topic_add.png similarity index 100% rename from wise-doc/src/main/webapp/images/topic_add.png rename to wise-webapp/src/main/webapp/oimages/topic_add.png diff --git a/wise-doc/src/main/webapp/images/topic_bgcolor.png b/wise-webapp/src/main/webapp/oimages/topic_bgcolor.png similarity index 100% rename from wise-doc/src/main/webapp/images/topic_bgcolor.png rename to wise-webapp/src/main/webapp/oimages/topic_bgcolor.png diff --git a/wise-doc/src/main/webapp/images/topic_border.png b/wise-webapp/src/main/webapp/oimages/topic_border.png similarity index 100% rename from wise-doc/src/main/webapp/images/topic_border.png rename to wise-webapp/src/main/webapp/oimages/topic_border.png diff --git a/wise-doc/src/main/webapp/images/topic_delete.png b/wise-webapp/src/main/webapp/oimages/topic_delete.png similarity index 100% rename from wise-doc/src/main/webapp/images/topic_delete.png rename to wise-webapp/src/main/webapp/oimages/topic_delete.png diff --git a/wise-doc/src/main/webapp/images/topic_icon.png b/wise-webapp/src/main/webapp/oimages/topic_icon.png similarity index 100% rename from wise-doc/src/main/webapp/images/topic_icon.png rename to wise-webapp/src/main/webapp/oimages/topic_icon.png diff --git a/wise-doc/src/main/webapp/images/topic_link.png b/wise-webapp/src/main/webapp/oimages/topic_link.png similarity index 100% rename from wise-doc/src/main/webapp/images/topic_link.png rename to wise-webapp/src/main/webapp/oimages/topic_link.png diff --git a/wise-doc/src/main/webapp/images/topic_relationship.png b/wise-webapp/src/main/webapp/oimages/topic_relationship.png similarity index 100% rename from wise-doc/src/main/webapp/images/topic_relationship.png rename to wise-webapp/src/main/webapp/oimages/topic_relationship.png diff --git a/wise-doc/src/main/webapp/images/topic_shape.png b/wise-webapp/src/main/webapp/oimages/topic_shape.png similarity index 100% rename from wise-doc/src/main/webapp/images/topic_shape.png rename to wise-webapp/src/main/webapp/oimages/topic_shape.png diff --git a/wise-webapp/src/main/webapp/images/transparent.gif b/wise-webapp/src/main/webapp/oimages/transparent.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/transparent.gif rename to wise-webapp/src/main/webapp/oimages/transparent.gif diff --git a/wise-webapp/src/main/webapp/images/tryItBodyBtn.png b/wise-webapp/src/main/webapp/oimages/tryItBodyBtn.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tryItBodyBtn.png rename to wise-webapp/src/main/webapp/oimages/tryItBodyBtn.png diff --git a/wise-webapp/src/main/webapp/images/tryItBodyBtn2.png b/wise-webapp/src/main/webapp/oimages/tryItBodyBtn2.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tryItBodyBtn2.png rename to wise-webapp/src/main/webapp/oimages/tryItBodyBtn2.png diff --git a/wise-webapp/src/main/webapp/images/tryItEndBtn.png b/wise-webapp/src/main/webapp/oimages/tryItEndBtn.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tryItEndBtn.png rename to wise-webapp/src/main/webapp/oimages/tryItEndBtn.png diff --git a/wise-webapp/src/main/webapp/images/tryItEndBtn2.png b/wise-webapp/src/main/webapp/oimages/tryItEndBtn2.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tryItEndBtn2.png rename to wise-webapp/src/main/webapp/oimages/tryItEndBtn2.png diff --git a/wise-webapp/src/main/webapp/images/tryItStartBtn.png b/wise-webapp/src/main/webapp/oimages/tryItStartBtn.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tryItStartBtn.png rename to wise-webapp/src/main/webapp/oimages/tryItStartBtn.png diff --git a/wise-webapp/src/main/webapp/images/tryItStartBtn2.png b/wise-webapp/src/main/webapp/oimages/tryItStartBtn2.png similarity index 100% rename from wise-webapp/src/main/webapp/images/tryItStartBtn2.png rename to wise-webapp/src/main/webapp/oimages/tryItStartBtn2.png diff --git a/wise-webapp/src/main/webapp/images/uk.gif b/wise-webapp/src/main/webapp/oimages/uk.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/uk.gif rename to wise-webapp/src/main/webapp/oimages/uk.gif diff --git a/wise-webapp/src/main/webapp/images/usability_editing_text.png b/wise-webapp/src/main/webapp/oimages/usability_editing_text.png similarity index 100% rename from wise-webapp/src/main/webapp/images/usability_editing_text.png rename to wise-webapp/src/main/webapp/oimages/usability_editing_text.png diff --git a/wise-webapp/src/main/webapp/images/user.gif b/wise-webapp/src/main/webapp/oimages/user.gif similarity index 100% rename from wise-webapp/src/main/webapp/images/user.gif rename to wise-webapp/src/main/webapp/oimages/user.gif diff --git a/wise-webapp/src/main/webapp/images/user_delete.png b/wise-webapp/src/main/webapp/oimages/user_delete.png similarity index 100% rename from wise-webapp/src/main/webapp/images/user_delete.png rename to wise-webapp/src/main/webapp/oimages/user_delete.png diff --git a/wise-webapp/src/main/webapp/images/video-icon.png b/wise-webapp/src/main/webapp/oimages/video-icon.png similarity index 100% rename from wise-webapp/src/main/webapp/images/video-icon.png rename to wise-webapp/src/main/webapp/oimages/video-icon.png diff --git a/wise-webapp/src/main/webapp/images/videoBody.png b/wise-webapp/src/main/webapp/oimages/videoBody.png similarity index 100% rename from wise-webapp/src/main/webapp/images/videoBody.png rename to wise-webapp/src/main/webapp/oimages/videoBody.png diff --git a/wise-webapp/src/main/webapp/images/videoEnd.png b/wise-webapp/src/main/webapp/oimages/videoEnd.png similarity index 100% rename from wise-webapp/src/main/webapp/images/videoEnd.png rename to wise-webapp/src/main/webapp/oimages/videoEnd.png diff --git a/wise-webapp/src/main/webapp/images/videoStart.png b/wise-webapp/src/main/webapp/oimages/videoStart.png similarity index 100% rename from wise-webapp/src/main/webapp/images/videoStart.png rename to wise-webapp/src/main/webapp/oimages/videoStart.png diff --git a/wise-webapp/src/main/webapp/images/waring_icon.png b/wise-webapp/src/main/webapp/oimages/waring_icon.png similarity index 100% rename from wise-webapp/src/main/webapp/images/waring_icon.png rename to wise-webapp/src/main/webapp/oimages/waring_icon.png diff --git a/wise-webapp/src/main/webapp/images/weather-clear-night.png b/wise-webapp/src/main/webapp/oimages/weather-clear-night.png similarity index 100% rename from wise-webapp/src/main/webapp/images/weather-clear-night.png rename to wise-webapp/src/main/webapp/oimages/weather-clear-night.png diff --git a/wise-webapp/src/main/webapp/images/weather-clear.png b/wise-webapp/src/main/webapp/oimages/weather-clear.png similarity index 100% rename from wise-webapp/src/main/webapp/images/weather-clear.png rename to wise-webapp/src/main/webapp/oimages/weather-clear.png diff --git a/wise-webapp/src/main/webapp/images/weather-few-clouds-night.png b/wise-webapp/src/main/webapp/oimages/weather-few-clouds-night.png similarity index 100% rename from wise-webapp/src/main/webapp/images/weather-few-clouds-night.png rename to wise-webapp/src/main/webapp/oimages/weather-few-clouds-night.png diff --git a/wise-webapp/src/main/webapp/images/weather-few-clouds.png b/wise-webapp/src/main/webapp/oimages/weather-few-clouds.png similarity index 100% rename from wise-webapp/src/main/webapp/images/weather-few-clouds.png rename to wise-webapp/src/main/webapp/oimages/weather-few-clouds.png diff --git a/wise-webapp/src/main/webapp/images/weather-overcast.png b/wise-webapp/src/main/webapp/oimages/weather-overcast.png similarity index 100% rename from wise-webapp/src/main/webapp/images/weather-overcast.png rename to wise-webapp/src/main/webapp/oimages/weather-overcast.png diff --git a/wise-webapp/src/main/webapp/images/weather-severe-alert.png b/wise-webapp/src/main/webapp/oimages/weather-severe-alert.png similarity index 100% rename from wise-webapp/src/main/webapp/images/weather-severe-alert.png rename to wise-webapp/src/main/webapp/oimages/weather-severe-alert.png diff --git a/wise-webapp/src/main/webapp/images/weather-showers-scattered.png b/wise-webapp/src/main/webapp/oimages/weather-showers-scattered.png similarity index 100% rename from wise-webapp/src/main/webapp/images/weather-showers-scattered.png rename to wise-webapp/src/main/webapp/oimages/weather-showers-scattered.png diff --git a/wise-webapp/src/main/webapp/images/weather-showers.png b/wise-webapp/src/main/webapp/oimages/weather-showers.png similarity index 100% rename from wise-webapp/src/main/webapp/images/weather-showers.png rename to wise-webapp/src/main/webapp/oimages/weather-showers.png diff --git a/wise-webapp/src/main/webapp/images/weather-snow.png b/wise-webapp/src/main/webapp/oimages/weather-snow.png similarity index 100% rename from wise-webapp/src/main/webapp/images/weather-snow.png rename to wise-webapp/src/main/webapp/oimages/weather-snow.png diff --git a/wise-webapp/src/main/webapp/images/weather-storm.png b/wise-webapp/src/main/webapp/oimages/weather-storm.png similarity index 100% rename from wise-webapp/src/main/webapp/images/weather-storm.png rename to wise-webapp/src/main/webapp/oimages/weather-storm.png diff --git a/wise-webapp/src/main/webapp/images/world.png b/wise-webapp/src/main/webapp/oimages/world.png similarity index 100% rename from wise-webapp/src/main/webapp/images/world.png rename to wise-webapp/src/main/webapp/oimages/world.png diff --git a/wise-webapp/src/main/webapp/images/world2.png b/wise-webapp/src/main/webapp/oimages/world2.png similarity index 100% rename from wise-webapp/src/main/webapp/images/world2.png rename to wise-webapp/src/main/webapp/oimages/world2.png diff --git a/wise-webapp/src/main/webapp/images/world_go.png b/wise-webapp/src/main/webapp/oimages/world_go.png similarity index 100% rename from wise-webapp/src/main/webapp/images/world_go.png rename to wise-webapp/src/main/webapp/oimages/world_go.png diff --git a/wise-doc/src/main/webapp/images/world_link.png b/wise-webapp/src/main/webapp/oimages/world_link.png old mode 100644 new mode 100755 similarity index 100% rename from wise-doc/src/main/webapp/images/world_link.png rename to wise-webapp/src/main/webapp/oimages/world_link.png diff --git a/wise-doc/src/main/webapp/images/zoom_in.png b/wise-webapp/src/main/webapp/oimages/zoom_in.png old mode 100644 new mode 100755 similarity index 100% rename from wise-doc/src/main/webapp/images/zoom_in.png rename to wise-webapp/src/main/webapp/oimages/zoom_in.png diff --git a/wise-doc/src/main/webapp/images/zoom_out.png b/wise-webapp/src/main/webapp/oimages/zoom_out.png old mode 100644 new mode 100755 similarity index 100% rename from wise-doc/src/main/webapp/images/zoom_out.png rename to wise-webapp/src/main/webapp/oimages/zoom_out.png