aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--etherpad/src/static/css/pad2_ejs.css10
-rw-r--r--etherpad/src/templates/pad/pad_body2.ejs60
2 files changed, 37 insertions, 33 deletions
diff --git a/etherpad/src/static/css/pad2_ejs.css b/etherpad/src/static/css/pad2_ejs.css
index 5b4ca65..a7a01c2 100644
--- a/etherpad/src/static/css/pad2_ejs.css
+++ b/etherpad/src/static/css/pad2_ejs.css
@@ -70,6 +70,7 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; }
{
padding: 2px;
border-left: 1px solid #CCC;
+ white-space: nowrap;
}
.docbarbutton img
@@ -156,7 +157,6 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; }
width: 250px;
height: 24px;
width:520px;
- border-collapse:collapse
}
#editbarsavetable
@@ -166,7 +166,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 +183,7 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; }
.editbarbutton img
{
- margin: 1px 2px;
+ margin: 0px 2px;
border: 0px;
width: 16px;
height: 16px;
diff --git a/etherpad/src/templates/pad/pad_body2.ejs b/etherpad/src/templates/pad/pad_body2.ejs
index fbaa7bf..3322997 100644
--- a/etherpad/src/templates/pad/pad_body2.ejs
+++ b/etherpad/src/templates/pad/pad_body2.ejs
@@ -110,32 +110,32 @@ limitations under the License. */ %>
<td id="docbarpadtitle"><span><%= initialTitle %></span></td>
<td width="100%">&nbsp;</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&nbsp;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>
</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&nbsp;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&nbsp;Slider
</a>
@@ -436,46 +436,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>&nbsp;&nbsp;</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>&nbsp;&nbsp;</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>&nbsp;&nbsp;</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>&nbsp;&nbsp;</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%">&nbsp;</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>
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-02 03:34:03 +0000