diff options
| author | Egil Moeller <egil.moller@freecode.no> | 2010-04-05 18:48:08 +0200 |
|---|---|---|
| committer | Egil Moeller <egil.moller@freecode.no> | 2010-04-05 18:48:08 +0200 |
| commit | ceaf334e40ea01d58a5ace5417b9c6df78fe31e8 (patch) | |
| tree | 7f0f303a2084db2e7c7f648826f5a70957f2d6d5 | |
| parent | 34934fa2b3d511c8d729e205417808ed548d8d88 (diff) | |
| parent | d446814c564d215e7a13f0eb177fd40c800d05d0 (diff) | |
| download | etherpad-ceaf334e40ea01d58a5ace5417b9c6df78fe31e8.tar.gz etherpad-ceaf334e40ea01d58a5ace5417b9c6df78fe31e8.tar.bz2 etherpad-ceaf334e40ea01d58a5ace5417b9c6df78fe31e8.zip | |
Merge branch 'master' of git://github.com/Pita/pad
| -rw-r--r-- | etherpad/src/static/css/pad2_ejs.css | 3 | ||||
| -rw-r--r-- | etherpad/src/templates/pad/pad_body2.ejs | 45 |
2 files changed, 13 insertions, 35 deletions
diff --git a/etherpad/src/static/css/pad2_ejs.css b/etherpad/src/static/css/pad2_ejs.css index 44e1a08..0029e7d 100644 --- a/etherpad/src/static/css/pad2_ejs.css +++ b/etherpad/src/static/css/pad2_ejs.css @@ -77,6 +77,9 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; } border: 0px; width: 13px; height: 13px; + position: relative; + top: 2px; + margin-right: 2px; } .docbarbutton a diff --git a/etherpad/src/templates/pad/pad_body2.ejs b/etherpad/src/templates/pad/pad_body2.ejs index 07b0967..c359b14 100644 --- a/etherpad/src/templates/pad/pad_body2.ejs +++ b/etherpad/src/templates/pad/pad_body2.ejs @@ -107,55 +107,30 @@ limitations under the License. */ %> <td id="docbarpadtitle"><span><%= initialTitle %></span></td> <td width="100%"> </td> <% if (isProAccountHolder) { %> - <td id="docbarsecurity-outer" class="docbarbutton"> + <td id="docbarsecurity-outer" class="docbarbutton" nowrap> <a href="javascript:void(0)" id="docbarsecurity"> - <table> - <tr> - <td><img src="/static/img/jun09/pad/icon_security.gif"></td> - <td>Security</td> - </tr> - </table> + <img src="/static/img/jun09/pad/icon_security.gif">Security </a> </td> <% } /* isProAccountHolder */ %> - <td id="docbaroptions-outer" class="docbarbutton"> + <td id="docbaroptions-outer" class="docbarbutton" nowrap> <a href="javascript:void(0)" id="docbaroptions"> - <table> - <tr> - <td><img src="/static/img/jun09/pad/icon_pad_options.gif"></td> - <td>Pad Options</td> - </tr> - </table> + <img src="/static/img/jun09/pad/icon_pad_options.gif">Pad Options </a> </td> - <td id="docbarimpexp-outer" class="docbarbutton"> + <td id="docbarimpexp-outer" class="docbarbutton" nowrap> <a href="javascript:void(0)" id="docbarimpexp"> - <table> - <tr> - <td><img src="/static/img/jun09/pad/icon_import_export.gif"></td> - <td>Import/Export</td> - </tr> - </table> + <img src="/static/img/jun09/pad/icon_import_export.gif">Import/Export </a> </td> - <td id="docbarsavedrevs-outer" class="docbarbutton"> + <td id="docbarsavedrevs-outer" class="docbarbutton" nowrap> <a href="javascript:void(0)" id="docbarsavedrevs"> - <table> - <tr> - <td><img src="/static/img/jun09/pad/icon_saved_revisions.gif"></td> - <td>Saved revisions</td> - </tr> - </table> + <img src="/static/img/jun09/pad/icon_saved_revisions.gif">Saved revisions </a> </td> - <td id="docbarslider-outer" class="docbarbutton"> + <td id="docbarslider-outer" class="docbarbutton" nowrap> <a target="_blank" href="/ep/pad/view/<%= localPadId %>/latest" id="docbarslider"> - <table> - <tr> - <td><img src="/static/img/jun09/pad/icon_time_slider.gif"></td> - <td>Time Slider</td> - </tr> - </table> + <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> |