Fix toolbar.

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

View File

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

View File

@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
mindplot.ModelCodeName ={}; mindplot.ModelCodeName = {
BETA : "beta",
mindplot.ModelCodeName.BETA = "beta"; PELA : "pela"
mindplot.ModelCodeName.PELA = "pela"; };

View File

@ -1,6 +1,7 @@
@import "common.css"; @import "common.css";
@import "commonLibs.css"; /* @Todo: Fix this ...*/
@import "thirdparty.css"; @import "widget/lightbox.css";
@import "libraries/moodialog/css/MooDialog.css";
html { html {
overflow: hidden; overflow: hidden;
@ -685,7 +686,3 @@ div#toolbar .topicRelation:hover {
div#toolbar .relationshiplabel { div#toolbar .relationshiplabel {
width: 56px; width: 56px;
} }
.nicEdit-main {
outline: none;
}

View File

@ -572,7 +572,6 @@ span.fieldRequired {
padding: 5px; padding: 5px;
} }
div.installCFG { div.installCFG {
width: 100%; width: 100%;
font-size: 130%; font-size: 130%;

View File

@ -375,12 +375,15 @@ div#fontColor {
.toolbarPanel { .toolbarPanel {
color: black; color: black;
border: 1px solid #bbb4d6; border-color: #CCC #666 #666 #CCC;
border-style: solid;
border-width: 1px;
background: #E5E5E5; background: #E5E5E5;
display: none; display: none;
position: absolute; position: absolute;
z-index: 4; z-index: 4;
top: 71px; top: 71px;
text-align: left;
} }
div.toolbarPanelLink { div.toolbarPanelLink {

View File

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

View File

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

View File

@ -18,7 +18,8 @@
<title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title> <title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
<link rel="stylesheet" type="text/css" href="../css/editor.css"/> <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='../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/engine.js"></script>
<script type="text/javascript" src="../dwr/interface/LoggerService.js"></script> <script type="text/javascript" src="../dwr/interface/LoggerService.js"></script>
@ -106,37 +107,7 @@
</script> </script>
<div id="colorPalette"> <div id="actionsContainer"></div>
<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> <div>
<c:url value="mymaps.htm" var="shareMap"> <c:url value="mymaps.htm" var="shareMap">
<c:param name="action" value="collaborator"/> <c:param name="action" value="collaborator"/>
@ -144,6 +115,10 @@
</c:url> </c:url>
</div> </div>
<div id="colorPalette">
<div id="paletteHeader"></div>
</div>
<div id="toolbar"> <div id="toolbar">
<div id="editTab" class="tabContent"> <div id="editTab" class="tabContent">
<div id="file" class="buttonContainer" title="<spring:message code="FILE"/>"> <div id="file" class="buttonContainer" title="<spring:message code="FILE"/>">