fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Beautifying 0ips commit to give settings option, also add warning prior to altering everyones view and moved everyones view stuff into my view only that needed to be moved..

This commit is contained in:
John McLear 2012-01-27 01:00:14 +00:00
parent 47ee0ec383
commit a53de45b32
3 changed files with 68 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
static/css/pad.css
View File

@ -746,6 +746,7 @@ a#topbarmaximize {
top:40px;
right:20px;
width:400px;
height:135px;
z-index:500;
padding:10px;
border-radius:6px;
@ -1248,3 +1249,38 @@ label[for=readonlyinput] {
.rtl{
direction:RTL;
}
#settingslocal{
left:10px;
position:absolute;
width:200px;
}
#settingseveryone{
position:absolute;
right:10px;
width:200px;
}
#settingsline{
border-left: 1px solid #fff;
height: 110px;
position:absolute;
width:0px;
left:200px;
opacity:.8;
}
.warning{
padding:10px;
background-color:#FFA4A4;
opacity:.8;
}
#settingseveryoneitems{
display:none;
}
#settingswarning{
mouse:cursor;
}

6
static/js/pad2.js
View File

@ -448,9 +448,13 @@ var pad = {
// order of inits is important here:
padcookie.init(clientVars.cookiePrefsToSet);
$("#widthprefcheck").click(pad.toggleWidthPref);
$("#sidebarcheck").click(pad.toggleSidebar);
$("#settingswarning").click(function(){
$("#settingswarning").hide();
$("#settingseveryoneitems").show();
});
pad.myUserInfo = {
userId: clientVars.userId,

47
static/pad.html
View File

@ -141,26 +141,33 @@
<div id="settingsmenu">
<h3>Pad settings</h3>
<h4>Global</h4>
<p>These options affect everyone viewing this pad. [BETA]</p>
<p>
<input type="checkbox" id="options-colorscheck" checked> Authorship colors
</p>
<p>
<input type="checkbox" id="options-linenoscheck" checked> Line numbers
</p>
<p>
Used font for this pad:
<select id="viewfontmenu">
<option value="normal">Normal</option>
<option value="monospace">Monospaced</option>
</select>
</p>
<h4>Local</h4>
<p>
<input type="checkbox" id="options-stickychat" onClick="chat.stickToScreen();"> Sticky chat
</p>
</div>
<div id="settingslocal">
<h4>My view only</h4>
<p>
<input type="checkbox" id="options-stickychat" onClick="chat.stickToScreen();"> Chat always on screen
</p>
<p>
<input type="checkbox" id="options-colorscheck" checked> Authorship colors
</p>
<p>
<input type="checkbox" id="options-linenoscheck" checked> Line numbers
</p>
<p>
Font type:
<select id="viewfontmenu">
<option value="normal">Normal</option>
<option value="monospace">Monospaced</option>
</select>
</p>
</div>
<div id="settingsline"></div>
<div id="settingseveryone">
<h4>Everyones view</h4>
<p><div id=settingswarning class=warning>Warning:<br/>These options affect everyone viewing this pad.</div></p>
<div id="settingseveryoneitems">There are no settings currently available to alter everyones view</div>
</div>
</div>
<div id="importexport">
<div id="import">