small redesign. refactored html/css, broke things, but looks a lot better.

This commit is contained in:
HansPinckaers 2011-04-07 17:56:33 +02:00
parent effc043025
commit d828eeefa0
4 changed files with 1623 additions and 258 deletions

View file

@ -18,14 +18,12 @@ var clientVars = {}; // ]]>
<!-- <script type="text/javascript" src="/static/js/client.js"></script>-->
<script type="text/javascript" src="/static/js/plugins.js"></script>
<script type="text/javascript" src="/static/js/undo-xpopup.js"></script>
<!--
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js"></script>
-->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
<script type="text/javascript" src="/static/js/json.js"></script>
<!--<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>-->
<!-- <script type="text/javascript" src="/static/js/json.js"></script> -->
<script type="text/javascript" src="/static/js/json2.js"></script>
<script type="text/javascript" src="/static/js/colorutils.js"></script>
<script type="text/javascript" src="/static/js/draggable.js"></script>
<!--<script type="text/javascript" src="/static/js/colorutils.js"></script>-->
<!--<script type="text/javascript" src="/static/js/draggable.js"></script>-->
<script type="text/javascript" src="/static/js/pad_utils.js"></script>
<script type="text/javascript" src="/static/js/pad_cookie.js"></script>
<script type="text/javascript" src="/static/js/pad_editor.js"></script>
@ -41,156 +39,122 @@ var clientVars = {}; // ]]>
<script type="text/javascript" src="/static/js/pad2.js"></script>
<script type="text/javascript" src="/socket.io/socket.io.js"></script>
</head>
<body id="padbody" class="limwidth nonpropad nonprouser">
<div id="padeditor">
<div id="editbar" class="disabledtoolbar">
<table cellpadding="0" cellspacing="0" border="0" id="editbartable">
<tr>
<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>
<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 class="editbarbutton">
<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 width="100%">
&nbsp;
</td>
</tr>
</table>
<table cellpadding="0" cellspacing="0" border="0" id="editbarsavetable">
<tr>
<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('showusers'));" title="Show connected users"><img id="showusersicon" src="/static/img/mar11/editbar_showusers.gif"></a>
</td>
<td>
<img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24">
</td>
<td>
&nbsp;&nbsp;
</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 class="editbarbutton">
<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 class="editbarbutton">
<a href="javascript:void (window.pad&&pad.editbarClick('save'));" title="Save Revision"><img src="/static/img/jun09/pad/editbar_save.gif"></a>
</td>
<td class="editbarbutton">
<a href="javascript:void (window.pad&&pad.editbarClick('embed'));" title="Embed this pad"><img src="/static/img/mar11/editbar_embed.gif"></a>
</td>
<td>
<!-- The below is completely temporary and should be deleted CAKE -->
<script type="text/javascript">
function shinyshiny(){
$('#showusersicon').fadeOut('fast');
$('#showusersicon').fadeIn('fast');
$('#showusersicon').fadeOut('fast');
$('#showusersicon').fadeIn('fast');
}
</script>
<input type="button" onclick="shinyshiny();" value="shiny">
<!-- end of temporary section designed to be deleted -->
</td>
<td>
<img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24">
</td>
<td>
&nbsp;&nbsp;
</td>
<td>
<img src="/static/img/jun09/pad/editbar_groupleft.gif" width="2" height="24">
</td>
<td class="editbarbutton editbargroupsfirst">
<select id="viewzoommenu">
<option value="z85">85%</option>
<option value="z100">100%</option>
<option value="z115">115%</option>
<option value="z150">150%</option>
<option value="z200">200%</option>
<option value="z300">300%</option>
</select>
</td>
<td>
<img src="/static/img/jun09/pad/editbar_groupright.gif" width="2" height="24">
</td>
</tr>
</table>
<div id="users">
<ul>
<li><a onclick="showColorPicker();" title="Change my name/color">John</a></li>
<li>Joe</li>
</ul>
<!-- some example code so I can make the css -->
<div id="mycolorpicker">
<ul id="colorpickerswatches">
</ul>
<div id="mycolorpickersave">
<a onclick="closeColorPicker()">Save</a>
</div>
<div id="mycolorpickercancel">
<a onclick="closeColorPicker()">Cancel</a>
</div>
</div>
</div>
</div>
<div id="embed">
</div>
<body>
<div id="editbar">
<ul id="menu_left">
<li>
<a href="javascript:void (window.pad&&pad.editbarClick('bold'));" title="Bold (ctrl-B)">
<img src="/static/img/jun09/pad/editbar_bold.gif" />
</a>
</li>
<li>
<a href="javascript:void (window.pad&&pad.editbarClick('underline'));" title="Underline (ctrl-U)">
<img src="/static/img/jun09/pad/editbar_underline.gif" />
</a>
</li>
<li>
<a href="javascript:void (window.pad&&pad.editbarClick('strikethrough'));" title="Strikethrough">
<img src="/static/img/jun09/pad/editbar_strikethrough.gif" />
</a>
</li>
<li class="separator"></li>
<li>
<a href="javascript:void (window.pad&&pad.editbarClick('insertunorderedlist'));" title="Toggle Bullet List">
<img src="/static/img/jun09/pad/editbar_insertunorderedlist.gif" />
</a>
</li>
<li>
<a href="javascript:void (window.pad&&pad.editbarClick('indent'));" title="Indent List">
<img src="/static/img/jun09/pad/editbar_indent.gif" />
</a>
</li>
<li>
<a href="javascript:void (window.pad&&pad.editbarClick('outdent'));" title="Unindent List">
<img src="/static/img/jun09/pad/editbar_outdent.gif" />
</a>
</li>
</ul>
<ul id="menu_right">
<li>
<a href="javascript:void (window.pad&&pad.editbarClick('showusers'));" title="Show connected users">
<img id="showusersicon" src="/static/img/mar11/editbar_showusers.gif" />
</a>
</li>
<li class="separator"></li>
<li>
<a href="javascript:void (window.pad&&pad.editbarClick('clearauthorship'));" title="Clear Authorship Colors">
<img src="/static/img/jun09/pad/editbar_clearauthorship.gif" />
</a>
</li>
<li>
<a href="javascript:void (window.pad&&pad.editbarClick('undo'));" title="Undo (ctrl-Z)">
<img src="/static/img/jun09/pad/editbar_undo.gif" />
</a>
</li>
<li>
<a href="javascript:void (window.pad&&pad.editbarClick('redo'));" title="Redo (ctrl-Y)">
<img src="/static/img/jun09/pad/editbar_redo.gif" />
</a>
</li>
<li>
<a href="javascript:void (window.pad&&pad.editbarClick('save'));" title="Save Revision">
<img src="/static/img/jun09/pad/editbar_save.gif" />
</a>
</li>
<li>
<a href="javascript:void (window.pad&&pad.editbarClick('embed'));" title="Embed this pad">
<img src="/static/img/mar11/editbar_embed.gif" />
</a>
</li>
<li>
<select id="viewzoommenu">
<option value="z85">85%</option>
<option value="z100">100%</option>
<option value="z115">115%</option>
<option value="z150">150%</option>
<option value="z200">200%</option>
<option value="z300">300%</option>
</select>
</li>
</ul>
</div>
<div id="editorcontainerbox">
<div id="users">
<ul>
<li><a onclick="showColorPicker();" title="Change my name/color">John</a></li>
<li>Joe</li>
</ul>
<!-- some example code so I can make the css -->
<div id="mycolorpicker">
<ul id="colorpickerswatches">
</ul>
<span id="mycolorpickersave">
<a onclick="closeColorPicker()">Save</a>
</span>
<span id="mycolorpickercancel">
<a onclick="closeColorPicker()">Cancel</a>
</span>
</div>
</div>
<div id="editorcontainer">
<!-- -->
<div id="editor">
<!-- -->
</div>
<div id="editorloadingbox">
Loading Etherpad Lite...
</div>
<div id="editorloading">
<!-- Loading Etherpad Lite...-->
</div>
</div>
<!-- needed? -->
<div id="embed"></div>
<!-- /padeditor -->
<div id="modaloverlay">
@ -255,8 +219,6 @@ var clientVars = {}; // ]]>
</div>
</div>
</div>
</div>
</div>
<form id="reconnectform" method="post" action="/ep/pad/reconnect" accept-charset="UTF-8" style="display: none;">
<input type="hidden" class="padId" name="padId"/>