diff options
Diffstat (limited to '')
| -rw-r--r-- | etherpad/etc/etherpad.localdev-default.properties | 2 | ||||
| -rw-r--r-- | etherpad/src/static/css/pad2_ejs.css | 33 | ||||
| -rw-r--r-- | etherpad/src/static/img/jun09/pad/icon_time_slider.gif | bin | 92 -> 74 bytes | |||
| -rw-r--r-- | etherpad/src/static/img/jun09/pad/padtop5.gif | bin | 3917 -> 3872 bytes | |||
| -rw-r--r-- | etherpad/src/static/img/jun09/pad/padtopback2.gif | bin | 384 -> 372 bytes | |||
| -rw-r--r-- | etherpad/src/static/img/jun09/pad/public.gif | bin | 1141 -> 1034 bytes | |||
| -rw-r--r-- | etherpad/src/static/img/jun09/pad/roundcorner_left.gif | bin | 147 -> 123 bytes | |||
| -rw-r--r-- | etherpad/src/static/img/jun09/pad/roundcorner_right.gif | bin | 156 -> 131 bytes | |||
| -rw-r--r-- | etherpad/src/static/img/jun09/pad/roundcorner_right_orange.gif | bin | 196 -> 171 bytes | |||
| -rw-r--r-- | etherpad/src/templates/pad/pad_body2.ejs | 72 |
10 files changed, 55 insertions, 52 deletions
diff --git a/etherpad/etc/etherpad.localdev-default.properties b/etherpad/etc/etherpad.localdev-default.properties index 07dce96..98327fd 100644 --- a/etherpad/etc/etherpad.localdev-default.properties +++ b/etherpad/etc/etherpad.localdev-default.properties @@ -15,7 +15,7 @@ listen = 9000 logDir = ./data/logs modulePath = ./src motdPage = /ep/pad/view/ro.3PfHCD0ApLc/latest?fullScreen=1&slider=0&sidebar=0 -topdomains = localhost +topdomains = localhost,localbox.info transportPrefix = /comet transportUseWildcardSubdomains = true useHttpsUrls = false diff --git a/etherpad/src/static/css/pad2_ejs.css b/etherpad/src/static/css/pad2_ejs.css index 5b4ca65..08e95d2 100644 --- a/etherpad/src/static/css/pad2_ejs.css +++ b/etherpad/src/static/css/pad2_ejs.css @@ -63,13 +63,15 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; } #shuttingdown { position: relative; zoom: 1; border: 1px solid #992; background: #ffc; padding: 0.6em; font-size: 1.2em; margin-top: 6px; } -#docbar { margin-top: 6px; height: 30px; position: relative; zoom: 1; +#docbar { margin-top: 6px; height: 25px; position: relative; zoom: 1; background: #fbfbfb url(/static/img/jun09/pad/padtopback2.gif) repeat-x 0 -31px; } .docbarbutton { padding: 2px; border-left: 1px solid #CCC; + white-space: nowrap; + vertical-align: top; } .docbarbutton img @@ -77,9 +79,9 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; } border: 0px; width: 13px; height: 13px; - position: relative; - top: 2px; margin-right: 2px; + position:relative; + top: 3px; } .docbarbutton a @@ -88,7 +90,9 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; } text-decoration: none; color: #444; font-weight: bold; - float: right; + margin:0 2px; + position:relative; + top: 1px; } .docbarbutton.highlight @@ -108,18 +112,18 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; } #docbarpadtitle { position: absolute; height: auto; left: 9px; width: 280px; font-size: 1.6em; color: #444; font-weight: normal; - line-height: 22px; margin-left: 2px; height: 22px; top: 4px; + line-height: 22px; margin-left: 2px; height: 22px; top: 2px; overflow: hidden; text-overflow: ellipsis /*not supported in FF*/; white-space:nowrap; } .docbar-public #docbarpadtitle { padding-left: 22px; background: url(/static/img/jun09/pad/public.gif) no-repeat left center; } -#docbarrenamelink { position: absolute; top: 9px; +#docbarrenamelink { position: absolute; top: 6px; font-size: 1.1em; display: none; } #docbarrenamelink a { color: #999; } #docbarrenamelink a:hover { color: #48d; } #padtitlebuttons { position: absolute; width: 74px; zoom: 1; - height: 17px; top: 6px; left: 170px; display: none; + height: 17px; top: 4px; left: 170px; display: none; background: url(/static/img/jun09/pad/ok_or_cancel.gif) 0px 0px; } #padtitlesave { position: absolute; display: block; height: 0; padding-top: 17px; overflow: hidden; @@ -127,8 +131,8 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; } #padtitlecancel { position: absolute; display: block; height: 0; padding-top: 17px; overflow: hidden; width: 35px; right: 0; top: 0; } -#padtitleedit { position: absolute; top: 4px; left: 5px; - height: 17px; padding: 2px; font-size: 1.4em; +#padtitleedit { position: absolute; top: 2px; left: 5px; + height: 15px; padding: 2px; font-size: 1.4em; background: white; border-left: 1px solid #c3c3c3; border-top: 1px solid #c3c3c3; border-right: 1px solid #e6e6e6; border-bottom: 1px solid #e6e6e6; @@ -156,7 +160,6 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; } width: 250px; height: 24px; width:520px; - border-collapse:collapse } #editbarsavetable @@ -166,7 +169,11 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; } left: 570px; height: 24px; width:15px; - border-collapse:collapse +} + +#editbarsavetable td, #editbartable td +{ + white-space: nowrap; } .editbarbutton @@ -179,7 +186,7 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; } .editbarbutton img { - margin: 1px 2px; + margin: 0px 2px; border: 0px; width: 16px; height: 16px; @@ -508,7 +515,7 @@ table#otheruserstable { display: none; } /* We don't ever actually hide the wrapper, even when the panel is cloased, so that its contents can always be manipulated accurately. */ .dbpanel-wrapper { position: absolute; - overflow: hidden; /* animated: */ height: 0; top: 30px; /* /animated */ + overflow: hidden; /* animated: */ height: 0; top: 25px; /* /animated */ z-index: 51; zoom: 1; } .dbpanel-panel { position: absolute; bottom: 0; width: 100%; } diff --git a/etherpad/src/static/img/jun09/pad/icon_time_slider.gif b/etherpad/src/static/img/jun09/pad/icon_time_slider.gif Binary files differindex 2006186..5e4b4ab 100644 --- a/etherpad/src/static/img/jun09/pad/icon_time_slider.gif +++ b/etherpad/src/static/img/jun09/pad/icon_time_slider.gif diff --git a/etherpad/src/static/img/jun09/pad/padtop5.gif b/etherpad/src/static/img/jun09/pad/padtop5.gif Binary files differindex a163f30..e6e071d 100644 --- a/etherpad/src/static/img/jun09/pad/padtop5.gif +++ b/etherpad/src/static/img/jun09/pad/padtop5.gif diff --git a/etherpad/src/static/img/jun09/pad/padtopback2.gif b/etherpad/src/static/img/jun09/pad/padtopback2.gif Binary files differindex eb92358..db46567 100644 --- a/etherpad/src/static/img/jun09/pad/padtopback2.gif +++ b/etherpad/src/static/img/jun09/pad/padtopback2.gif diff --git a/etherpad/src/static/img/jun09/pad/public.gif b/etherpad/src/static/img/jun09/pad/public.gif Binary files differindex e6f09c7..ac3093b 100644 --- a/etherpad/src/static/img/jun09/pad/public.gif +++ b/etherpad/src/static/img/jun09/pad/public.gif diff --git a/etherpad/src/static/img/jun09/pad/roundcorner_left.gif b/etherpad/src/static/img/jun09/pad/roundcorner_left.gif Binary files differindex c023c36..000de75 100644 --- a/etherpad/src/static/img/jun09/pad/roundcorner_left.gif +++ b/etherpad/src/static/img/jun09/pad/roundcorner_left.gif diff --git a/etherpad/src/static/img/jun09/pad/roundcorner_right.gif b/etherpad/src/static/img/jun09/pad/roundcorner_right.gif Binary files differindex 456b156..97acfbf 100644 --- a/etherpad/src/static/img/jun09/pad/roundcorner_right.gif +++ b/etherpad/src/static/img/jun09/pad/roundcorner_right.gif diff --git a/etherpad/src/static/img/jun09/pad/roundcorner_right_orange.gif b/etherpad/src/static/img/jun09/pad/roundcorner_right_orange.gif Binary files differindex 884c87b..717e3fc 100644 --- a/etherpad/src/static/img/jun09/pad/roundcorner_right_orange.gif +++ b/etherpad/src/static/img/jun09/pad/roundcorner_right_orange.gif diff --git a/etherpad/src/templates/pad/pad_body2.ejs b/etherpad/src/templates/pad/pad_body2.ejs index fbaa7bf..0eb9029 100644 --- a/etherpad/src/templates/pad/pad_body2.ejs +++ b/etherpad/src/templates/pad/pad_body2.ejs @@ -110,35 +110,31 @@ limitations under the License. */ %> <td id="docbarpadtitle"><span><%= initialTitle %></span></td> <td width="100%"> </td> <% - plugins.callHookStr('docbarItemsAll', {}, '', '<td class="docbarbutton" nowrap>', '</td>'); - plugins.callHookStr('docbarItemsPad', {}, '', '<td class="docbarbutton" nowrap>', '</td>'); + plugins.callHookStr('docbarItemsAll', {}, '', '<td class="docbarbutton">', '</td>'); + plugins.callHookStr('docbarItemsPad', {}, '', '<td class="docbarbutton">', '</td>'); %> <% if (isProAccountHolder) { %> - <td id="docbarsecurity-outer" class="docbarbutton" nowrap> + <td id="docbarsecurity-outer" class="docbarbutton"> <a href="javascript:void(0)" id="docbarsecurity"> <img src="/static/img/jun09/pad/icon_security.gif">Security </a> </td> <% } /* isProAccountHolder */ %> - <td id="docbaroptions-outer" class="docbarbutton" nowrap> + <td id="docbaroptions-outer" class="docbarbutton"> <a href="javascript:void(0)" id="docbaroptions"> - <img src="/static/img/jun09/pad/icon_pad_options.gif">Pad Options - </a> + <img src="/static/img/jun09/pad/icon_pad_options.gif">Pad Options</a> </td> - <td id="docbarimpexp-outer" class="docbarbutton" nowrap> + <td id="docbarimpexp-outer" class="docbarbutton"> <a href="javascript:void(0)" id="docbarimpexp"> - <img src="/static/img/jun09/pad/icon_import_export.gif">Import/Export - </a> + <img src="/static/img/jun09/pad/icon_import_export.gif">Import/Export</a> </td> - <td id="docbarsavedrevs-outer" class="docbarbutton" nowrap> + <td id="docbarsavedrevs-outer" class="docbarbutton"> <a href="javascript:void(0)" id="docbarsavedrevs"> - <img src="/static/img/jun09/pad/icon_saved_revisions.gif">Saved revisions - </a> + <img src="/static/img/jun09/pad/icon_saved_revisions.gif">Saved revisions</a> </td> - <td id="docbarslider-outer" class="docbarbutton highlight" nowrap> + <td id="docbarslider-outer" class="docbarbutton highlight"> <a target="_blank" href="/ep/pad/view/<%= localPadId %>/latest" id="docbarslider"> - <img src="/static/img/jun09/pad/icon_time_slider.gif">Time Slider - </a> + <img src="/static/img/jun09/pad/icon_time_slider.gif">Time Slider</a> </td> <td><img src="/static/img/jun09/pad/roundcorner_right_orange.gif"></td> </tr> @@ -436,46 +432,46 @@ limitations under the License. */ %> <% /* non-floated */ %> <div id="editbarinner"> <table cellpadding="0" cellspacing="0" border = "0" id="editbartable"><tr> - <td nowrap><img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24"></td> - <td nowrap class="editbarbutton editbargroupsfirst"><a href="javascript:void (window.pad&&pad.editbarClick('bold'));" title="Bold (ctrl-B)"><img src="/static/img/jun09/pad/editbar_bold.gif"></a></td> - <td nowrap class="editbarbutton"> <a href="javascript:void (window.pad&&pad.editbarClick('italic'));" title="Italics (ctrl-I)"><img src="/static/img/jun09/pad/editbar_italic.gif"></a></td> - <td nowrap class="editbarbutton"> <a href="javascript:void (window.pad&&pad.editbarClick('underline'));" title="Underline (ctrl-U)"><img src="/static/img/jun09/pad/editbar_underline.gif"></a></td> - <td nowrap class="editbarbutton"> <a href="javascript:void (window.pad&&pad.editbarClick('strikethrough'));" title="Strikethrough"><img src="/static/img/jun09/pad/editbar_strikethrough.gif"></a></td> - <td nowrap><img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24"></td> + <td><img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24"></td> + <td class="editbarbutton editbargroupsfirst"><a href="javascript:void (window.pad&&pad.editbarClick('bold'));" title="Bold (ctrl-B)"><img src="/static/img/jun09/pad/editbar_bold.gif"></a></td> + <td class="editbarbutton"> <a href="javascript:void (window.pad&&pad.editbarClick('italic'));" title="Italics (ctrl-I)"><img src="/static/img/jun09/pad/editbar_italic.gif"></a></td> + <td class="editbarbutton"> <a href="javascript:void (window.pad&&pad.editbarClick('underline'));" title="Underline (ctrl-U)"><img src="/static/img/jun09/pad/editbar_underline.gif"></a></td> + <td class="editbarbutton"> <a href="javascript:void (window.pad&&pad.editbarClick('strikethrough'));" title="Strikethrough"><img src="/static/img/jun09/pad/editbar_strikethrough.gif"></a></td> + <td><img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24"></td> <td> </td> - <td nowrap><img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24"></td> - <td nowrap class="editbarbutton editbargroupsfirst"><a href="javascript:void (window.pad&&pad.editbarClick('insertunorderedlist'));" title="Toggle Bullet List"><img src="/static/img/jun09/pad/editbar_insertunorderedlist.gif"></a></td> - <td nowrap><img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24"></td> + <td><img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24"></td> + <td class="editbarbutton editbargroupsfirst"><a href="javascript:void (window.pad&&pad.editbarClick('insertunorderedlist'));" title="Toggle Bullet List"><img src="/static/img/jun09/pad/editbar_insertunorderedlist.gif"></a></td> + <td><img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24"></td> <td> </td> - <td nowrap><img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24"></td> - <td nowrap class="editbarbutton editbargroupsfirst"><a href="javascript:void (window.pad&&pad.editbarClick('indent'));" title="Indent List"><img src="/static/img/jun09/pad/editbar_indent.gif"></a></td> - <td nowrap class="editbarbutton"><a href="javascript:void (window.pad&&pad.editbarClick('outdent'));" title="Unindent List"><img src="/static/img/jun09/pad/editbar_outdent.gif"></a></td> - <td nowrap><img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24"></td> + <td><img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24"></td> + <td class="editbarbutton editbargroupsfirst"><a href="javascript:void (window.pad&&pad.editbarClick('indent'));" title="Indent List"><img src="/static/img/jun09/pad/editbar_indent.gif"></a></td> + <td class="editbarbutton"><a href="javascript:void (window.pad&&pad.editbarClick('outdent'));" title="Unindent List"><img src="/static/img/jun09/pad/editbar_outdent.gif"></a></td> + <td><img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24"></td> <td> </td> - <td nowrap><img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24"></td> - <td nowrap class="editbarbutton editbargroupsfirst"><a href="javascript:void (window.pad&&pad.editbarClick('clearauthorship'));" title="Clear Authorship Colors"><img src="/static/img/jun09/pad/editbar_clearauthorship.gif"></a></td> - <td nowrap><img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24"></td> + <td><img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24"></td> + <td class="editbarbutton editbargroupsfirst"><a href="javascript:void (window.pad&&pad.editbarClick('clearauthorship'));" title="Clear Authorship Colors"><img src="/static/img/jun09/pad/editbar_clearauthorship.gif"></a></td> + <td><img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24"></td> <td> </td> - <td nowrap><img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24"></td> - <td nowrap class="editbarbutton editbargroupsfirst"><a href="javascript:void (window.pad&&pad.editbarClick('undo'));" title="Undo (ctrl-Z)"><img src="/static/img/jun09/pad/editbar_undo.gif"></a></td> - <td nowrap class="editbarbutton"><a href="javascript:void (window.pad&&pad.editbarClick('redo'));" title="Redo (ctrl-Y)"><img src="/static/img/jun09/pad/editbar_redo.gif"></a></td> - <td nowrap><img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24"></td> + <td><img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24"></td> + <td class="editbarbutton editbargroupsfirst"><a href="javascript:void (window.pad&&pad.editbarClick('undo'));" title="Undo (ctrl-Z)"><img src="/static/img/jun09/pad/editbar_undo.gif"></a></td> + <td class="editbarbutton"><a href="javascript:void (window.pad&&pad.editbarClick('redo'));" title="Redo (ctrl-Y)"><img src="/static/img/jun09/pad/editbar_redo.gif"></a></td> + <td><img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24"></td> <td width="100%"> </td> </tr></table> <table cellpadding="0" cellspacing="0" border = "0" id="editbarsavetable"> <tr> - <td nowrap><img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24"></td> - <td nowrap class="editbarbutton editbargroupsfirst"><a href="javascript:void (window.pad&&pad.editbarClick('save'));" title="Save Revision"><img src="/static/img/jun09/pad/editbar_save.gif"></a></td> - <td nowrap><img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24"></td> + <td><img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24"></td> + <td class="editbarbutton editbargroupsfirst"><a href="javascript:void (window.pad&&pad.editbarClick('save'));" title="Save Revision"><img src="/static/img/jun09/pad/editbar_save.gif"></a></td> + <td><img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24"></td> </tr> </table> </div> |
