From b7bbe2c0b7969c00353b8ba1a93cd76c5df5332b Mon Sep 17 00:00:00 2001 From: Paulo Veiga Date: Sun, 2 Oct 2011 21:05:17 -0300 Subject: [PATCH] Fix toolbar. --- mindplot/pom.xml | 1 + mindplot/src/main/javascript/ModelCodeName.js | 40 +++++++++---------- wise-doc/src/main/webapp/css/editor.css | 9 ++--- wise-webapp/src/main/webapp/css/common.css | 31 +++++++------- wise-webapp/src/main/webapp/css/editor.css | 5 ++- wise-webapp/src/main/webapp/css/embedded.css | 10 ++--- wise-webapp/src/main/webapp/css/mymaps.css | 2 - wise-webapp/src/main/webapp/css/wisehome.css | 2 - .../src/main/webapp/jsp/mindmapEditor.jsp | 39 ++++-------------- 9 files changed, 55 insertions(+), 84 deletions(-) diff --git a/mindplot/pom.xml b/mindplot/pom.xml index 1e2081f3..38cbc270 100644 --- a/mindplot/pom.xml +++ b/mindplot/pom.xml @@ -218,6 +218,7 @@ + diff --git a/mindplot/src/main/javascript/ModelCodeName.js b/mindplot/src/main/javascript/ModelCodeName.js index a683bb67..edc66ea9 100644 --- a/mindplot/src/main/javascript/ModelCodeName.js +++ b/mindplot/src/main/javascript/ModelCodeName.js @@ -1,21 +1,21 @@ /* -* Copyright [2011] [wisemapping] -* -* Licensed under WiseMapping Public License, Version 1.0 (the "License"). -* It is basically the Apache License, Version 2.0 (the "License") plus the -* "powered by wisemapping" text requirement on every single page; -* you may not use this file except in compliance with the License. -* You may obtain a copy of the license at -* -* http://www.wisemapping.org/license -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -mindplot.ModelCodeName ={}; - -mindplot.ModelCodeName.BETA = "beta"; -mindplot.ModelCodeName.PELA = "pela"; + * Copyright [2011] [wisemapping] + * + * Licensed under WiseMapping Public License, Version 1.0 (the "License"). + * It is basically the Apache License, Version 2.0 (the "License") plus the + * "powered by wisemapping" text requirement on every single page; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the license at + * + * http://www.wisemapping.org/license + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +mindplot.ModelCodeName = { + BETA : "beta", + PELA : "pela" +}; \ No newline at end of file diff --git a/wise-doc/src/main/webapp/css/editor.css b/wise-doc/src/main/webapp/css/editor.css index 0dfeaf86..e7f25174 100644 --- a/wise-doc/src/main/webapp/css/editor.css +++ b/wise-doc/src/main/webapp/css/editor.css @@ -1,6 +1,7 @@ @import "common.css"; -@import "commonLibs.css"; -@import "thirdparty.css"; +/* @Todo: Fix this ...*/ +@import "widget/lightbox.css"; +@import "libraries/moodialog/css/MooDialog.css"; html { overflow: hidden; @@ -685,7 +686,3 @@ div#toolbar .topicRelation:hover { div#toolbar .relationshiplabel { width: 56px; } - -.nicEdit-main { - outline: none; -} \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/css/common.css b/wise-webapp/src/main/webapp/css/common.css index 2f79b4be..3b1892a8 100644 --- a/wise-webapp/src/main/webapp/css/common.css +++ b/wise-webapp/src/main/webapp/css/common.css @@ -130,7 +130,7 @@ h1 { } h3 { -/* use as subhead on main body */ + /* use as subhead on main body */ clear: left; font-style: normal; font-size: 130%; @@ -138,7 +138,7 @@ h3 { } h4 { -/* use as headers in footer */ + /* use as headers in footer */ font-weight: bold; font-size: 120%; border-bottom: 1px solid #8e9181; @@ -249,7 +249,7 @@ span#headerSubTitle { } div#headerButtons a:hover { -/*text-decoration: underline;*/ + /*text-decoration: underline;*/ color: #7e72ad; } @@ -572,25 +572,24 @@ span.fieldRequired { padding: 5px; } - div.installCFG { - width:100%; - font-size:130%; + width: 100%; + font-size: 130%; } -div.installCFG h1{ - width:100%; - font-size:130%; +div.installCFG h1 { + width: 100%; + font-size: 130%; } -div.installCFG h2{ - font-size:100%; - border-bottom:0 solid black; +div.installCFG h2 { + font-size: 100%; + border-bottom: 0 solid black; } .chromeFrameInstallDefaultStyle { - position:relative; - left:0; - top:0; - margin:0; + position: relative; + left: 0; + top: 0; + margin: 0; } \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/css/editor.css b/wise-webapp/src/main/webapp/css/editor.css index c27b9d86..4ff33c4d 100644 --- a/wise-webapp/src/main/webapp/css/editor.css +++ b/wise-webapp/src/main/webapp/css/editor.css @@ -375,12 +375,15 @@ div#fontColor { .toolbarPanel { color: black; - border: 1px solid #bbb4d6; + border-color: #CCC #666 #666 #CCC; + border-style: solid; + border-width: 1px; background: #E5E5E5; display: none; position: absolute; z-index: 4; top: 71px; + text-align: left; } div.toolbarPanelLink { diff --git a/wise-webapp/src/main/webapp/css/embedded.css b/wise-webapp/src/main/webapp/css/embedded.css index 1828111b..f54024ee 100644 --- a/wise-webapp/src/main/webapp/css/embedded.css +++ b/wise-webapp/src/main/webapp/css/embedded.css @@ -29,7 +29,7 @@ html { padding: 15px; width: 100%; border: 1px solid; - border-color:#a9a9a9; + border-color: #a9a9a9; } @@ -46,7 +46,7 @@ html { #loadingContainer .loadingIcon { position: relative; - background: url( ../images/ajax-loader2.gif ) no-repeat; + background: url(../images/ajax-loader2.gif) no-repeat; top: 25px; height: 100px; width: 70px; @@ -69,7 +69,7 @@ div#logo { height: 65px; width: 80px; position: absolute; - background: url( ../images/logo-vvsmall.png ) no-repeat right top; + background: url(../images/logo-vvsmall.png) no-repeat right top; right: 10px; top: -10px; } @@ -91,13 +91,13 @@ div#logo { } #zoomIn { - background: url( ../images/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( ../images/zoom_out.png ) no-repeat left top;; + background: url(../images/zoom_out.png) no-repeat left top;; margin-top: 10px } diff --git a/wise-webapp/src/main/webapp/css/mymaps.css b/wise-webapp/src/main/webapp/css/mymaps.css index a5c25f4a..2950b4da 100644 --- a/wise-webapp/src/main/webapp/css/mymaps.css +++ b/wise-webapp/src/main/webapp/css/mymaps.css @@ -1,6 +1,4 @@ @import "common.css"; -@import "commonLibs.css"; -@import "thirdparty.css"; #recentText { width: 100px; diff --git a/wise-webapp/src/main/webapp/css/wisehome.css b/wise-webapp/src/main/webapp/css/wisehome.css index 73bdf2d0..3942d17e 100644 --- a/wise-webapp/src/main/webapp/css/wisehome.css +++ b/wise-webapp/src/main/webapp/css/wisehome.css @@ -1,7 +1,5 @@ /* GLOBAL COMPONENTS */ @import "common.css"; -@import "commonLibs.css"; -@import "thirdparty.css"; /* INTRO STYLES */ .button { diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp index fe14b33a..e2e4334e 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp @@ -18,7 +18,8 @@ <spring:message code="SITE.TITLE"/> - ${mindmap.title} - + @@ -106,37 +107,7 @@ -
-
-
- -
- - - - -
- -
- - - - -
- -
- - - - - -
- -
-
+
@@ -144,6 +115,10 @@
+
+
+
+
">