Some more OpeningDesign specific styling

havenwood · Apr 28, 2011 · 193baa6 · 193baa6
1 parent d5a83f2
commit 193baa6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/etherpad/src/plugins/sketchSpace/hooks.js b/etherpad/src/plugins/sketchSpace/hooks.js
@@ -5,6 +5,11 @@ import("etherpad.globals.*");
 import("dispatch.{Dispatcher,PrefixMatcher,forward}");
 import("etherpad.helpers");
 
+function docbarItemsPad() {
+    return ['<a href="javascript:sketchSpace.insertImage()" title="SketchSpace"><img src="/static/html/plugins/sketchSpace/editbar_icon.png">New blank SketchSpace</a>',
+	    '<a href="javascript:void(0)" title="SketchSpace upload PDF" id="sketchSpaceAddPdfImage"><img src="/static/html/plugins/sketchSpace/editbar_pdf_icon.png">New SketchSpace(s) from PDF</a>'];
+}
+
 function editBarItemsLeftPad(arg) {
   return arg.template.include('sketchSpaceEditbarButtons.ejs', undefined, ['sketchSpace']);
 }

diff --git a/etherpad/src/plugins/sketchSpace/main.js b/etherpad/src/plugins/sketchSpace/main.js
@@ -3,11 +3,12 @@ import("plugins.sketchSpace.hooks");
 import("plugins.sketchSpace.static.js.main");
 
 function sketchSpaceInit() {
- this.hooks = ['editBarItemsLeftPad', 'aceAttribsToClasses', 'aceCreateDomLine', 'modals', 'editBarItemsLeftPadView'];
+ this.hooks = ['editBarItemsLeftPad', 'aceAttribsToClasses', 'aceCreateDomLine', 'modals', 'editBarItemsLeftPadView', 'docbarItemsPad'];
  this.description = 'sketchSpace';
  this.client = new main.sketchSpaceInit();
  this.editBarItemsLeftPad = hooks.editBarItemsLeftPad;
  this.editBarItemsLeftPadView = hooks.editBarItemsLeftPadView;
+ this.docbarItemsPad = hooks.docbarItemsPad;
  this.aceAttribsToClasses = this.client.aceAttribsToClasses;
  this.aceCreateDomLine = this.client.aceCreateDomLine;
  this.modals = hooks.modals;

diff --git a/etherpad/src/plugins/sketchSpace/static/css/editor.css b/etherpad/src/plugins/sketchSpace/static/css/editor.css
@@ -104,7 +104,6 @@
 
 
 /* Openingdesign specific */
-/*
 #padchat, #hdraggie, #docbarsavedrevs-outer, #docbarimpexp-outer, #docbaroptions-outer {
   display: none;
 }
@@ -113,4 +112,3 @@
   height: auto;
   bottom: 0;
 }
-*/
diff --git a/etherpad/src/plugins/sketchSpace/static/js/sketchSpaceDesigner/designer/ui.js b/etherpad/src/plugins/sketchSpace/static/js/sketchSpaceDesigner/designer/ui.js
@@ -24,7 +24,6 @@ dojo.declare("sketchSpaceDesigner.designer.DesignerUI", [dijit._Widget, dijit._T
                   '      <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>' +

diff --git a/etherpad/src/plugins/sketchSpace/templates/sketchSpaceEditbarButtons.ejs b/etherpad/src/plugins/sketchSpace/templates/sketchSpaceEditbarButtons.ejs
@@ -1,7 +1,9 @@
+<!--
 <td>&nbsp;&nbsp;</td>
 <td><img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24"></td>
 <td id="editbarattach-outer" class="editbarbutton editbargroupsfirst">
   <a href="javascript:sketchSpace.insertImage()" title="SketchSpace"><img src="/static/html/plugins/sketchSpace/editbar_icon.png"></a>
   <a href="javascript:void(0)" title="SketchSpace upload PDF" id="sketchSpaceAddPdfImage"><img src="/static/html/plugins/sketchSpace/editbar_pdf_icon.png"></a>
 </td>
 <td><img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24"></td>
+-->