From aad6d156a407640baeddce9cf78ea6545e547788 Mon Sep 17 00:00:00 2001 From: Peter Martischka Date: Wed, 7 Apr 2010 15:57:32 +0200 Subject: Redesign of the editbar --- etherpad/src/static/css/pad2_ejs.css | 99 +++++++++++---------- etherpad/src/static/img/jun09/pad/editbar3.gif | Bin 9587 -> 0 bytes .../static/img/jun09/pad/editbar_background.gif | Bin 0 -> 181 bytes .../img/jun09/pad/editbar_background_left.gif | Bin 0 -> 204 bytes .../img/jun09/pad/editbar_background_right.gif | Bin 0 -> 867 bytes etherpad/src/static/img/jun09/pad/editbar_bold.gif | Bin 0 -> 224 bytes .../img/jun09/pad/editbar_clearauthorship.gif | Bin 0 -> 397 bytes .../src/static/img/jun09/pad/editbar_groupleft.gif | Bin 0 -> 186 bytes .../static/img/jun09/pad/editbar_groupright.gif | Bin 0 -> 185 bytes .../src/static/img/jun09/pad/editbar_indent.gif | Bin 0 -> 99 bytes .../img/jun09/pad/editbar_insertunorderedlist.gif | Bin 0 -> 147 bytes .../src/static/img/jun09/pad/editbar_italic.gif | Bin 0 -> 201 bytes .../src/static/img/jun09/pad/editbar_outdent.gif | Bin 0 -> 99 bytes etherpad/src/static/img/jun09/pad/editbar_redo.gif | Bin 0 -> 232 bytes etherpad/src/static/img/jun09/pad/editbar_save.gif | Bin 0 -> 139 bytes .../static/img/jun09/pad/editbar_strikethrough.gif | Bin 0 -> 336 bytes .../src/static/img/jun09/pad/editbar_underline.gif | Bin 0 -> 223 bytes etherpad/src/static/img/jun09/pad/editbar_undo.gif | Bin 0 -> 230 bytes etherpad/src/templates/pad/pad_body2.ejs | 60 ++++++++++--- 19 files changed, 98 insertions(+), 61 deletions(-) delete mode 100644 etherpad/src/static/img/jun09/pad/editbar3.gif create mode 100644 etherpad/src/static/img/jun09/pad/editbar_background.gif create mode 100644 etherpad/src/static/img/jun09/pad/editbar_background_left.gif create mode 100644 etherpad/src/static/img/jun09/pad/editbar_background_right.gif create mode 100644 etherpad/src/static/img/jun09/pad/editbar_bold.gif create mode 100644 etherpad/src/static/img/jun09/pad/editbar_clearauthorship.gif create mode 100644 etherpad/src/static/img/jun09/pad/editbar_groupleft.gif create mode 100644 etherpad/src/static/img/jun09/pad/editbar_groupright.gif create mode 100644 etherpad/src/static/img/jun09/pad/editbar_indent.gif create mode 100644 etherpad/src/static/img/jun09/pad/editbar_insertunorderedlist.gif create mode 100644 etherpad/src/static/img/jun09/pad/editbar_italic.gif create mode 100644 etherpad/src/static/img/jun09/pad/editbar_outdent.gif create mode 100644 etherpad/src/static/img/jun09/pad/editbar_redo.gif create mode 100644 etherpad/src/static/img/jun09/pad/editbar_save.gif create mode 100644 etherpad/src/static/img/jun09/pad/editbar_strikethrough.gif create mode 100644 etherpad/src/static/img/jun09/pad/editbar_underline.gif create mode 100644 etherpad/src/static/img/jun09/pad/editbar_undo.gif diff --git a/etherpad/src/static/css/pad2_ejs.css b/etherpad/src/static/css/pad2_ejs.css index 0029e7d..1448070 100644 --- a/etherpad/src/static/css/pad2_ejs.css +++ b/etherpad/src/static/css/pad2_ejs.css @@ -141,57 +141,62 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; } .hidesidebar #padeditor { margin-right: 0; } #editbar { height: 36px; - background: #a5bfe2 url(/static/img/jun09/pad/editbar3.gif) repeat-x left -36px; position: relative; } + background: #a5bfe2 url(/static/img/jun09/pad/editbar_background.gif) repeat-x; position: relative; } #editbarleft { float: left; height: 100%; overflow: hidden; - background: url(/static/img/jun09/pad/editbar3.gif) no-repeat left top; width: 3px; } + background: url(/static/img/jun09/pad/editbar_background_left.gif) no-repeat left top; width: 2px; } #editbarright { float: right; height: 100%; overflow: hidden; - background: url(/static/img/jun09/pad/editbar3.gif) no-repeat right top; width: 3px; } + background: url(/static/img/jun09/pad/editbar_background_right.gif) no-repeat right top; width: 2px; } -#editbar a.editbarbutton { - display: block; - position: absolute; - height: 26px; - width: 26px; - background-image: url(/static/img/jun09/pad/editbar3.gif); - background-color: transparent; - background-repeat: no-repeat; - text-decoration: none; - top: 5px; -} -#editbar.disabledtoolbar a.editbarbutton { - opacity: 0.5; - filter: alpha(opacity = 50); /* IE */ - zoom: 1; - cursor: auto; -} -/*#editbar .divider { position: absolute; width: 4px; height: 15px; - background-image: url(/static/img/jun09/pad/editbar3.gif); - background-color: transparent; background-repeat: no-repeat; } -#editbar .divider1 { left: 137px; top: 11px; background-position: -137px -11px; } -#editbar .divider2 { left: 188px; top: 11px; background-position: -188px -11px; }*/ -#editbar a:focus { outline: 0; } - -<% function editbarButton(name, pos, width, fromRight) { - width = width || 26; - var bposX = - (fromRight ? 600-width-pos : pos); - return "div#editbar a."+name+" { "+ - (fromRight?'right':'left')+": "+pos+"px; background-position: "+ - bposX+"px -5px; width: "+width+"px; }\n"+ - "div#padeditor div.enabledtoolbar a."+name+":active { background-position: "+ - bposX+"px -77px; }"; -} %> -<%= editbarButton('bold', 7, 25) %> -<%= editbarButton('italic', 32, 23) %> -<%= editbarButton('underline', 55, 23) %> -<%= editbarButton('strikethrough', 78, 24) %> -<%= editbarButton('clearauthorship', 195) %> -<%= editbarButton('undo', 227, 25) %> -<%= editbarButton('redo', 252, 24) %> -<%= editbarButton('insertunorderedlist', 108) %> -<%= editbarButton('indent', 140, 25) %> -<%= editbarButton('outdent', 165, 24) %> -<%= editbarButton('save', 6, null, true) %> +#editbartable +{ + position:absolute; + top: 6px; + left: 7px; + width: 250px; + height: 24px; + width:520px; + border-collapse:collapse +} + +#editbarsavetable +{ + position:absolute; + top: 6px; + right: 7px; + width: 50px; + height: 24px; + width:15px; + border-collapse:collapse +} + +.editbarbutton +{ + border-top: 1px solid #8b9eba; + border-bottom: 1px solid #8b9eba; + border-left: 1px solid #758aa9; + background-color: white; +} + +.editbarbutton img +{ + margin: 1px 2px; + border: 0px; + width: 16px; + height: 16px; +} + +.editbarbutton a:active +{ + position: relative; + top: 1px; + left: 1px; +} + +.editbargroupsfirst +{ + border-left-width: 0px !important; +} #editbar #syncstatussyncing { position: absolute; height: 26px; width: 26px; background: url(/static/img/jun09/pad/syncing2.gif) no-repeat center center; diff --git a/etherpad/src/static/img/jun09/pad/editbar3.gif b/etherpad/src/static/img/jun09/pad/editbar3.gif deleted file mode 100644 index e73c505..0000000 Binary files a/etherpad/src/static/img/jun09/pad/editbar3.gif and /dev/null differ diff --git a/etherpad/src/static/img/jun09/pad/editbar_background.gif b/etherpad/src/static/img/jun09/pad/editbar_background.gif new file mode 100644 index 0000000..54ef6e4 Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/editbar_background.gif differ diff --git a/etherpad/src/static/img/jun09/pad/editbar_background_left.gif b/etherpad/src/static/img/jun09/pad/editbar_background_left.gif new file mode 100644 index 0000000..fe8d06e Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/editbar_background_left.gif differ diff --git a/etherpad/src/static/img/jun09/pad/editbar_background_right.gif b/etherpad/src/static/img/jun09/pad/editbar_background_right.gif new file mode 100644 index 0000000..55ab00a Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/editbar_background_right.gif differ diff --git a/etherpad/src/static/img/jun09/pad/editbar_bold.gif b/etherpad/src/static/img/jun09/pad/editbar_bold.gif new file mode 100644 index 0000000..d22bcaf Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/editbar_bold.gif differ diff --git a/etherpad/src/static/img/jun09/pad/editbar_clearauthorship.gif b/etherpad/src/static/img/jun09/pad/editbar_clearauthorship.gif new file mode 100644 index 0000000..2c6d109 Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/editbar_clearauthorship.gif differ diff --git a/etherpad/src/static/img/jun09/pad/editbar_groupleft.gif b/etherpad/src/static/img/jun09/pad/editbar_groupleft.gif new file mode 100644 index 0000000..3e18749 Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/editbar_groupleft.gif differ diff --git a/etherpad/src/static/img/jun09/pad/editbar_groupright.gif b/etherpad/src/static/img/jun09/pad/editbar_groupright.gif new file mode 100644 index 0000000..bf8b757 Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/editbar_groupright.gif differ diff --git a/etherpad/src/static/img/jun09/pad/editbar_indent.gif b/etherpad/src/static/img/jun09/pad/editbar_indent.gif new file mode 100644 index 0000000..989523a Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/editbar_indent.gif differ diff --git a/etherpad/src/static/img/jun09/pad/editbar_insertunorderedlist.gif b/etherpad/src/static/img/jun09/pad/editbar_insertunorderedlist.gif new file mode 100644 index 0000000..b032d59 Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/editbar_insertunorderedlist.gif differ diff --git a/etherpad/src/static/img/jun09/pad/editbar_italic.gif b/etherpad/src/static/img/jun09/pad/editbar_italic.gif new file mode 100644 index 0000000..a017402 Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/editbar_italic.gif differ diff --git a/etherpad/src/static/img/jun09/pad/editbar_outdent.gif b/etherpad/src/static/img/jun09/pad/editbar_outdent.gif new file mode 100644 index 0000000..4b9bf38 Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/editbar_outdent.gif differ diff --git a/etherpad/src/static/img/jun09/pad/editbar_redo.gif b/etherpad/src/static/img/jun09/pad/editbar_redo.gif new file mode 100644 index 0000000..826a254 Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/editbar_redo.gif differ diff --git a/etherpad/src/static/img/jun09/pad/editbar_save.gif b/etherpad/src/static/img/jun09/pad/editbar_save.gif new file mode 100644 index 0000000..2ccced6 Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/editbar_save.gif differ diff --git a/etherpad/src/static/img/jun09/pad/editbar_strikethrough.gif b/etherpad/src/static/img/jun09/pad/editbar_strikethrough.gif new file mode 100644 index 0000000..92ffa23 Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/editbar_strikethrough.gif differ diff --git a/etherpad/src/static/img/jun09/pad/editbar_underline.gif b/etherpad/src/static/img/jun09/pad/editbar_underline.gif new file mode 100644 index 0000000..ec3cc4e Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/editbar_underline.gif differ diff --git a/etherpad/src/static/img/jun09/pad/editbar_undo.gif b/etherpad/src/static/img/jun09/pad/editbar_undo.gif new file mode 100644 index 0000000..78ae0be Binary files /dev/null and b/etherpad/src/static/img/jun09/pad/editbar_undo.gif differ diff --git a/etherpad/src/templates/pad/pad_body2.ejs b/etherpad/src/templates/pad/pad_body2.ejs index c359b14..4382e8f 100644 --- a/etherpad/src/templates/pad/pad_body2.ejs +++ b/etherpad/src/templates/pad/pad_body2.ejs @@ -1,4 +1,6 @@ -<% /* Copyright 2009 Google Inc. +<% /* +Copyright 2009 Google Inc. +Copyright 2010 Pita, Peter Martischka Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -427,19 +429,49 @@ limitations under the License. */ %>
<% /* non-floated */ %>
-   -   -   -   -   -   -   -   -   -   -
-
-   + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
         
+ + + + + + +
-- cgit v1.2.3-1-g7c22