From a53de45b3257524f7932b0d7acc8da10d6fdc14b Mon Sep 17 00:00:00 2001 From: John McLear Date: Fri, 27 Jan 2012 01:00:14 +0000 Subject: [PATCH] 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.. --- static/css/pad.css | 36 +++++++++++++++++++++++++++++++++++ static/js/pad2.js | 6 +++++- static/pad.html | 47 ++++++++++++++++++++++++++-------------------- 3 files changed, 68 insertions(+), 21 deletions(-) diff --git a/static/css/pad.css b/static/css/pad.css index 88775fa26..2e93f67f9 100644 --- a/static/css/pad.css +++ b/static/css/pad.css @@ -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; +} diff --git a/static/js/pad2.js b/static/js/pad2.js index 65cd72218..00cc0cb25 100644 --- a/static/js/pad2.js +++ b/static/js/pad2.js @@ -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, diff --git a/static/pad.html b/static/pad.html index 3a5d01a38..5117159e7 100644 --- a/static/pad.html +++ b/static/pad.html @@ -141,26 +141,33 @@

Pad settings

-

Global

-

These options affect everyone viewing this pad. [BETA]

-

- Authorship colors -

-

- Line numbers -

-

- Used font for this pad: - -

-

Local

-

- Sticky chat -

-
+
+

My view only

+

+ Chat always on screen +

+

+ Authorship colors +

+

+ Line numbers +

+

+ Font type: + +

+ +
+
+
+

Everyones view

+

Warning:
These options affect everyone viewing this pad.

+
There are no settings currently available to alter everyones view
+
+