vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-21 21:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix toolbar.

Browse Source
This commit is contained in:
Paulo Veiga 2011-10-02 21:05:17 -03:00
parent 410180e744
commit b7bbe2c0b7
9 changed files with 55 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mindplot/pom.xml
View File

@ -218,6 +218,7 @@
<fileset dir="${basedir}/src/main/javascript/">
<include name="libraries/**/*"/>
<include name="widget/colorPalette.*"/>
<include name="widget/*.css"/>
</fileset>
</copy>
</tasks>

40
mindplot/src/main/javascript/ModelCodeName.js
View File

@ -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"
};

9
wise-doc/src/main/webapp/css/editor.css
View File

@ -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;
}

31
wise-webapp/src/main/webapp/css/common.css
View File

@ -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;
}

5
wise-webapp/src/main/webapp/css/editor.css
View File

@ -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 {

10
wise-webapp/src/main/webapp/css/embedded.css
View File

@ -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
}

2
wise-webapp/src/main/webapp/css/mymaps.css
View File

@ -1,6 +1,4 @@
@import "common.css";
@import "commonLibs.css";
@import "thirdparty.css";
#recentText {
width: 100px;

2
wise-webapp/src/main/webapp/css/wisehome.css
View File

@ -1,7 +1,5 @@
/* GLOBAL COMPONENTS */
@import "common.css";
@import "commonLibs.css";
@import "thirdparty.css";
/* INTRO STYLES */
.button {

39
wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
View File

@ -18,7 +18,8 @@
<title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
<link rel="stylesheet" type="text/css" href="../css/editor.css"/>
<script type='text/javascript' src='https://ajax.googleapis.com/ajax/libs/mootools/1.3.2/mootools-yui-compressed.js'></script>
<script type='text/javascript'
src='https://ajax.googleapis.com/ajax/libs/mootools/1.3.2/mootools-yui-compressed.js'></script>
<script type='text/javascript' src='../js/libraries/mootools/mootools-more-1.3.2.1-yui.js'></script>
<script type="text/javascript" src="../dwr/engine.js"></script>
<script type="text/javascript" src="../dwr/interface/LoggerService.js"></script>
@ -106,37 +107,7 @@
</script>
<div id="colorPalette">
<div id="paletteHeader"></div>
</div>
<div id="fontFamilyPanel" class="toolbarPanel">
<div id="times" class="toolbarPanelLink" style="font-family:times;">Times</div>
<div id="arial" class="toolbarPanelLink" style="font-family:arial;">Arial</div>
<div id="tahoma" class="toolbarPanelLink" style="font-family:tahoma;">Tahoma</div>
<div id="verdana" class="toolbarPanelLink" style="font-family:verdana;">Verdana</div>
</div>
<div id="fontSizePanel" class="toolbarPanel">
<div id="small" class="toolbarPanelLink" style="font-size:8px">Small</div>
<div id="normal" class="toolbarPanelLink" style="font-size:12px">Normal</div>
<div id="large" class="toolbarPanelLink" style="font-size:15px">Large</div>
<div id="huge" class="toolbarPanelLink" style="font-size:24px">Huge</div>
</div>
<div id="topicShapePanel" class="toolbarPanel">
<!--<div id="automatic" class="toolbarPanelLink">Automatic</div>-->
<div id="rectagle" class="toolbarPanelLink"><img src="../images/shape-rectangle.png" alt="Rectangle" width="40"
height="25"></div>
<div id="rounded_rectagle" class="toolbarPanelLink"><img src="../images/shape-rectangle-rounded.png"
alt="Rounded Rectangle" width="40" height="25"></div>
<div id="line" class="toolbarPanelLink"><img src="../images/shape-line.png" alt="Line" width="40" height="7"></div>
<div id="elipse" class="toolbarPanelLink"><img src="../images/shape-elipse.png" alt="Elipse" width="40" height="25">
</div>
</div>
<div id="actionsContainer">
</div>
<div id="actionsContainer"></div>
<div>
<c:url value="mymaps.htm" var="shareMap">
<c:param name="action" value="collaborator"/>
@ -144,6 +115,10 @@
</c:url>
</div>
<div id="colorPalette">
<div id="paletteHeader"></div>
</div>
<div id="toolbar">
<div id="editTab" class="tabContent">
<div id="file" class="buttonContainer" title="<spring:message code="FILE"/>">