Skip to content
This repository has been archived by the owner on Oct 1, 2019. It is now read-only.

Commit

Permalink
Some more options styling
Browse files Browse the repository at this point in the history
  • Loading branch information
Egil Moeller committed Apr 28, 2011
1 parent 79c88db commit d5a83f2
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 5 deletions.
9 changes: 5 additions & 4 deletions etherpad/src/plugins/sketchSpace/static/css/editor.css
View file
Expand Up @@ -34,7 +34,7 @@
bottom: 20pt;
}

.sketchSpace.sketchSpaceMaximized .editorui {
.sketchSpace.sketchSpaceMaximized #sketchSpaceEditorUI .editorui {
left: 0;
right: 0;
width: auto;
Expand All @@ -43,7 +43,7 @@
.sketchSpace #sketchSpaceEditBar {
position: absolute;
left: 0;
top: 25px;
top: 62px; /* 25 + 6 + 25 + 2 */
width: 100%;
height: 36px;
background: white;
Expand All @@ -52,7 +52,7 @@
.sketchSpace #sketchSpaceEditor {
position: absolute;
left: 0;
top: 61px;
top: 98px; /* 25 + 6 + 25 + 6 + 35 + 1 */
bottom: 0;
width: 100%;
background: white;
Expand Down Expand Up @@ -104,7 +104,7 @@


/* Openingdesign specific */

/*
#padchat, #hdraggie, #docbarsavedrevs-outer, #docbarimpexp-outer, #docbaroptions-outer {
display: none;
}
Expand All @@ -113,3 +113,4 @@
height: auto;
bottom: 0;
}
*/
4 changes: 4 additions & 0 deletions etherpad/src/plugins/sketchSpace/static/js/sketchSpaceDesigner/designer/modes/Mode.js
View file
Expand Up @@ -28,11 +28,13 @@ dojo.declare("sketchSpaceDesigner.designer.modes.Mode", [], {
this.onContextMenuHandle = dojo.connect(this.designer.container, "contextmenu", this, this.onContextMenu);
this.setOptionsHandle = dojo.connect(this.designer, "setOptions", this, this.onSetOptions);

/*
this.shareCurrentImageOption = new sketchSpaceDesigner.designer.widgets.OptionCheckBox({title:"Shared image selection:", optionsPath:"shareCurrentImage", designer:this.designer});
this.designer.ui.options.addChild(this.shareCurrentImageOption);
this.showAuthorshipColorOption = new sketchSpaceDesigner.designer.widgets.OptionCheckBox({title:"Show authorship:", optionsPath:"showAuthorshipColors", designer:this.designer});
this.designer.ui.options.addChild(this.showAuthorshipColorOption);
*/

this.designer.ui.options.layout();
},
Expand All @@ -48,8 +50,10 @@ dojo.declare("sketchSpaceDesigner.designer.modes.Mode", [], {
dojo.disconnect(this.onKeyDownHandle);
dojo.disconnect(this.onMouseWheelHandle);
this.designer.forEachObjectShape(function (shape) { mode.disableShape(shape); });
/*
this.shareCurrentImageOption.destroyRecursive();
this.showAuthorshipColorOption.destroyRecursive();
*/
this.designer.ui.options.layout();
for (var name in this.outlines)
this.disableOutline(name);
Expand Down
19 changes: 18 additions & 1 deletion etherpad/src/plugins/sketchSpace/static/js/sketchSpaceDesigner/designer/ui.js
View file
Expand Up @@ -20,6 +20,19 @@ dojo.declare("sketchSpaceDesigner.designer.DesignerUI", [dijit._Widget, dijit._T
' </div>' +
' <div class="specialkeyarea"><!-- --></div>' +
' </div>' +
' <div id="sketchSpaceDocbar" class="menu docbar docbar-public">' +
' <table border="0" cellpadding="0" cellspacing="0" width="100%" id="docbartable" class="docbartable">' +
' <tbody><tr>' +
' <td><img src="/static/img/jun09/pad/roundcorner_left.gif"></td>' +
' <td id="docbarpadtitle" class="docbarpadtitle" title=""><span></span></td>' +
' <td width="100%">&nbsp;</td>' +
' <td class="docbarbutton"><a dojoAttachPoint="addImgButton">Add PDF background</a></td>' +
' <td class="docbarbutton">Sync view: <div dojoAttachPoint="shareCurrentImageOptionDiv"></div></td>' +
' <td class="docbarbutton">Authorship colors: <div dojoAttachPoint="showAuthorshipColorOptionDiv"></div></td>' +
' <td><img src="/static/img/jun09/pad/roundcorner_right_orange.gif"></td>' +
' </tbody>' +
' </table>' +
' </div>' +
' <div id="sketchSpaceEditBar" dojoAttachPoint="toolbar">' +
' <div class="editbar enabledtoolbar" id="editbar">' +
' <div class="editbarinner" id="editbarinner">' +
Expand All @@ -35,7 +48,6 @@ dojo.declare("sketchSpaceDesigner.designer.DesignerUI", [dijit._Widget, dijit._T
' <td class="editbarbutton tool addPathFreehand" unselectable="on" dojoAttachEvent="onclick:_onAddPathFreehand"><img title="Add freehand path" src="/static/html/plugins/sketchSpace/imgeditbar_add_path_freehand_icon.png"></td>' +
' <td class="editbarbutton tool addPathPolyline" unselectable="on" dojoAttachEvent="onclick:_onAddPathPolyline"><img title="Add polyline path" src="/static/html/plugins/sketchSpace/imgeditbar_add_path_polyline_icon.png"></td>' +
' <td class="editbarbutton tool addRect" unselectable="on" dojoAttachEvent="onclick:_onAddRect"><img title="Add rectangle" src="/static/html/plugins/sketchSpace/imgeditbar_add_rect_icon.png"></td>' +
' <td class="editbarbutton" unselectable="on"><img dojoAttachPoint="addImgButton" title="Add image" src="/static/html/plugins/sketchSpace/imgeditbar_add_img_icon.png"></td>' +
' <td><img height="24" width="2" src="/static/img/jun09/pad/editbar_groupright.gif"></td>' +
'' +
' <td width="100%">&nbsp;</td>' +
Expand Down Expand Up @@ -99,6 +111,11 @@ dojo.declare("sketchSpaceDesigner.designer.DesignerUI", [dijit._Widget, dijit._T

if (typeof(pad) == "undefined")
$(this.toolbar).find(".tools").css({display:"none"});

this.shareCurrentImageOption = new sketchSpaceDesigner.designer.widgets.OptionCheckBox({title:"Shared image selection:", optionsPath:"shareCurrentImage", designer:this.editor}, this.shareCurrentImageOptionDiv);
this.shareCurrentImageOption.startup();
this.showAuthorshipColorOption = new sketchSpaceDesigner.designer.widgets.OptionCheckBox({title:"Show authorship:", optionsPath:"showAuthorshipColors", designer:this.editor}, this.showAuthorshipColorOptionDiv);
this.showAuthorshipColorOption.startup();
},
_onMaximize: function () {
$('body').toggleClass('sketchSpaceMaximized');
Expand Down

0 comments on commit d5a83f2

Please sign in to comment.