From 0b8b380d2b044d8fb8910cd459b5af5ba72aa66b Mon Sep 17 00:00:00 2001 From: HansPinckaers Date: Thu, 7 Apr 2011 20:45:28 +0200 Subject: [PATCH 1/7] userlist/embed working again --- static/css/pad_lite.css | 106 +++++++++++----- static/img/jun09/pad/inviteshare2.gif | Bin 1836 -> 2297 bytes static/js/pad_editbar.js | 21 ++-- static/js/pad_modals.js | 4 +- static/js/pad_userlist.js | 171 +++++++++++++------------- static/padhtml | 90 ++++++++++---- 6 files changed, 239 insertions(+), 153 deletions(-) diff --git a/static/css/pad_lite.css b/static/css/pad_lite.css index 3f47f298..b3483946 100644 --- a/static/css/pad_lite.css +++ b/static/css/pad_lite.css @@ -7,6 +7,33 @@ html { font-size: 62.5%; } body { background: #ccc;} body, textarea { font-family: Helvetica, Arial, sans-serif; } +#users +{ + position: absolute; + z-index: 3; + background-color: rgba(0,0,0,0.7); + width: 160px; + right: 4px; + top: 40px; + color: #fff; + padding: 5px; + + -moz-border-radius: 6px; + border-radius: 6px; +} + +#sharebutton { + background: url(/static/img/jun09/pad/inviteshare2.gif) no-repeat 0 -31px; + position: relative; + display: block; + top: 6px; + padding-top: 30px; + height: 0; overflow: hidden; width: 96px; + left:50%; + margin-left: -48px; +} + + a img { border: 0; @@ -40,11 +67,11 @@ a img margin-left: 2px; background-color: #fff; - -moz-border-radius: 2px; - border-radius: 2px; + -moz-border-radius: 4px; + border-radius: 4px; border: 1px solid #ccc; - padding: 4px 6px; + padding: 4px 5px; height: 18px; @@ -55,6 +82,18 @@ a img background: -webkit-gradient(linear, 0 0, 0 100%, from(#eee), color-stop(20%, white), color-stop(20%, white)); } +#editbar ul li a +{ + text-decoration: none; + color: #ccc; +} + +#editbar ul li a span +{ + position: relative; + top:-2px +} + #editbar ul li:hover { border: 1px solid #888; @@ -373,8 +412,11 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; } #myswatchbox { position: absolute; left: 5px; top: 5px; width: 22px; height: 22px; /*border-top: 1px solid #c3cfe0; border-left: 1px solid #c3cfe0; border-right: 1px solid #ecf3fc; border-bottom: 1px solid #ecf3fc;*/ - border: 1px solid #bbb; - padding: 1px; background: transparent; cursor: pointer; } + border: 1px solid #fff; + padding: 1px; background: transparent; cursor: pointer; + -moz-border-radius: 3px; + border-radius: 3px; + } /* #myuser .myswatchboxhoverable, #myuser .myswatchboxunhoverable { background: white; @@ -389,13 +431,17 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; } background: url(/static/img/jun09/pad/colorpicker.gif) no-repeat left top; width: 232px; height: 140px; position: absolute; - left: 10px; top: 18px; z-index: 101; + left: -240px; top: 0px; z-index: 101; display: none;/*...initially*/ } -#mycolorpicker .picked { border: 1px solid #fff !important; } +#mycolorpicker ul li +{ + float: left; +} +#mycolorpicker .picked { border: 1px solid #000 !important; } -#mycolorpicker .picked .pickerswatch { border: 1px solid #666; } +#mycolorpicker .picked .pickerswatch { border: 1px solid #fff; } #mycolorpickersave { position: absolute; left: 14px; top: 102px; width: 47px; height: 0; padding-top: 20px; overflow: hidden; cursor: pointer; } @@ -403,11 +449,11 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; } width: 44px; height: 0; padding-top: 20px; overflow: hidden; cursor: pointer; } #myusernameform { margin-left: 35px; } -#myusernameedit { font-size: 1.6em; color: #444; +#myusernameedit { font-size: 1.3em; color: #fff; padding: 3px; height: 18px; margin: 0; border: 0; - width: 197px; background: transparent; } -#myusernameform input.editable { border: 1px solid #bbb; } -#myuser .myusernameedithoverable:hover { background: white; } + width: 117px; background: transparent; } +#myusernameform input.editable { border: 1px solid #444; } +#myuser .myusernameedithoverable:hover { background: white; color: black} #mystatusform { margin-left: 35px; margin-top: 5px; } #mystatusedit { font-size: 1.2em; color: #777; font-style: italic; display: none; @@ -421,18 +467,19 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; } #myusernameform .editempty { color: #ef641e; } table#otheruserstable { display: none; } -#nootherusers { padding: 10px; font-size: 1.2em; color: #999; font-weight: bold;} -#nootherusers a { color: #48d; } +#nootherusers { padding: 10px; font-size: 1.2em; color: #eee; font-weight: bold;} +#nootherusers a { color: #3C88FF; } #otheruserstable td { - border-bottom: 1px solid #e1e1e1; + border-bottom: 1px solid #555; height: 26px; vertical-align: middle; padding: 0 2px; + color: #fff; } #otheruserstable .swatch { - border: 1px solid #999; width: 13px; height: 13px; overflow: hidden; + border: 1px solid #000; width: 13px; height: 13px; overflow: hidden; margin: 0 4px; } @@ -448,15 +495,6 @@ table#otheruserstable { display: none; } border-right: 1px solid #e6e6e6; border-bottom: 1px solid #e6e6e6; } .usertdname input.editempty { color: #888; font-style: italic;} - -#sharebutton { - background: url(/static/img/jun09/pad/inviteshare2.gif) no-repeat 0 -31px; - position: absolute; display: block; top: 3px; padding-top: 23px; - height: 0; overflow: hidden; width: 96px; - left:50%; - margin-left: -48px; -} - /*#guestslabel { font-size: 1.2em; position: absolute; width: auto; height: 22px; line-height: 22px; top: 4px; left: 8px; } #guestsmenu { font-size: 1.2em; position: absolute; left: 100px; @@ -1053,9 +1091,17 @@ a#topbarmaximize { #embed{ display:none; position:absolute; -top:42px; +top:40px; font-size:14px; -width:100%; +width:400px; +right: 5px; +z-index: 500; +background-color: #000; +color: white; +background-color: rgba(0,0,0,0.7); +padding: 10px; +-moz-border-radius: 6px; +border-radius: 6px; } #embedcode{ @@ -1063,11 +1109,11 @@ margin-left:10px; } #embedinput{ -width:80%; +width:375px; height:24px; display:inline; +margin-top: 10px; padding-left:4px; -margin-left:4px; } ul#colorpickerswatches @@ -1078,7 +1124,7 @@ ul#colorpickerswatches ul#colorpickerswatches li { - border: 1px solid #999; + border: 1px solid #fff; width: 14px; height: 14px; overflow: hidden; diff --git a/static/img/jun09/pad/inviteshare2.gif b/static/img/jun09/pad/inviteshare2.gif index 98d4c8597710877be2562be79c89fdb5adb1cd40..fe07332bbafd86bb3f22ed4b795c3c66be83033a 100644 GIT binary patch literal 2297 zcmah~3s6&M7Ctw*yyPLeRxqM-W!IJpII(3lXk8^yFfCvvibckbgm96-C4{_+6kA>^ zS~cPu1qB5ms7Q9O6(~+)ThLYzrh;e}X#hn*Km^M}!R&t%gzVJW{b%l<@1FCWbH4K@ z|49JfpW`bE2M#m?e5Cq~yYm6>i+2B%$NcoCfqVLcGCG6y4Q<@>SfCjZ?(Y>IdKr@S zEadRumi?VuPfTn(()-!*!SItq;$x4=?5DA3hp5v%RKZwW&SP28M8erVW#MyG$t$(? zMPkXw7sb81O8Qevhca{{dv*Q$t_&Wi7(eoD-;rw*$10y4uX>(c{UYc3SYgc{#kXFT z)%~HXANg0qXm#`OwU*Ie9*o{@AHUc2^0)4ZNB!fkU%!U8twm$F9e^(^GLG|kJYfJg zU>SSa2LM)VkxWK02!J@LQjY9I=+-d8<~}fB9@qm5>_uXQ%ugT)q_fi8KW87l3m9#^ zGYZlraNNLC>^!Y9l^(CoT zKZ&ulNYT1akbNl<+!INzTaU08!rCZ_KObQa^t49F{X@(cTOv{NH=8kIiP^^og`z*VV{WOcE@|gCd$+t_y z4F?BMUb-@^hR$o&Nav?Dne&U0T0i8aUE25 z(I#n8${Qk3Lb`3beKo=qdLvB*-;|@JOqZHIKE%C|T^W;{U+cp|@3d;8a8iQYeAXk#0FsFG4*? zVJGrVYBm1X>4N#bp&t#pO97;mluN_}Jp%;t_$UcQnjGfs|F|uf{|nNy#q1AL0bEi5 zxcE%lhJ>a$g3WE1wkd-ER`;Ws&^T@LKv&|OJb;SjVwGGySr5bN0hDASy7vIQc-c<5 zWJk1;_<+q`LHMDuMG}0ecqz||5K$Ci@+k;8sUYQQGIA*>qCP~!5G~Asi-tv;(Kv+e zpv_@`i9<%?t8+% z?;SpJ^w{we*(Xosv9{#G#Y?4^%Sva?%lCEBU9G6Bs&e6e_r3ml zCD*Q|_QuVhf4Nmxf4iZvmTS}0eAmXs({r}Xdp<5L?H!%XZHDIivmQR}@bT`v^U$5M zV!4lvCud>rc++Cfroq08@9MU%aU1!mW_|!OAf4GdsL~3~hNU|#xXd@G^SQOLj?9ki z(C7M^n7`EUM>jZj@?tz^5*a57QtER!q(P9d$x35nab!9VXZPqvTPxX<-0R@6x^Vd} z>yY+4-GaRN?yip{3Z|2*U+kR57@u`m*_wnp{oYNssaIv4=dOuTQ#QKJkQxY`h>6W! zWf%C3;lqryGT9<{0PWJYYoWWiDTa~K7S@bVgDsYdW41AN@C_vTw^m3u=ItJE*D~^0 zwsrSjC0PsJNejBwR?@M%|7!W~KeWZUWLi7Eko~w`lQXt`UU^XF?b4T}S=hbu*oMnn zc{4hhQ8Q(!%%4W)Fqzd!CadH@o(oj{EMY)P!?{{gooigb0l`LJcCZX$O zfiw2E3s27NU*7YiAj^Nr`_`OnqWk>b8JNB(SKZTHoWFZXkG61SIK#TIsH&vs!nZv= j7j?B?M_;;fHzxKX<}gcNT0I;Sds%~f_Uh7c3|9RI#!=f* literal 1836 zcmeH`Syz$?0ER&nKbMNp7N@B2Q;U|aZ*gbK_3`kCDJ*@18RJ6t8i8sBw$q+O^lXg7-0mV~F0gi?LXBk`jqb;qC~ zvr#`HwZuR9mRuznmY5{!+5Fdr`j7hB9yz01d%Q%E{7k~^)#vi33tN(g6E^|78JpgYCciwg2#+ zPrv{xY>opO&!F>D0N2$-0V6gb808W61YcA5`j*@Jgh8LkdmVQ%K^f>!X7QT`*xi-H zH_Vc*Z101ePeNIx-MKzzB!h2QWxWNs6vw4u?DBU-_y?=^cd{$qml2A>^1@zLetZ_i zN*L;V`D~z?)SBTZW<3AQI?{cb*u|-e<{Ugq33Zu(hIkh=lA*5J>XD}F@NJg&$HcS>z?A{t(4r#`Wcj`TF}&P$ROq+6Ho zjDb5Z+d6~AY7ij?opS7MyyBYq;s&**)yiMlIAjMyVlhjoZSRmyP69|U*Jk5)Q3|}% z9dX_9XE#zR>Tpgh2>2iQ9f7%t1)Zq%eK^NCQTNjAJR#Jm)50jsC>6UAN1?614-{ss zef0@Ob7%T^q^}YIakLdKt31+zC`Ynw2_dT{=2NerChVz4AUqg?7roA+l29qORDw7V zvu{OQdk!J4Zo)pQ^s`r%U)yzlZsZIExJM^o$a$no?g8`8Cx|JTyT1IwFQje!!p~bH z@+R9;zY|&=-NO3<>|Mv9bbHrCF???3@kj*H*LyW3YiT;Jq9iB6`WSDYnSrq>yOjj} zG3SCOGZokzjtK_a3Y#uwKgvqQU*PqxkVc?)l&-Y|RHhkM$z@zI{APjxMr{(8D=K8eWcc37Uc z$abqv%EI{5a3P?74ul6#hai0a1{{g)fbzT#?>*<~g0#Jc8DjN&&`2Bl!?s*K3;5%3 ztsl0gLBO2A=ws7B!p&dx0AieD^j|5i*Divalzu_rgGDam;0<+1VxHaynx7S7HW^A(5#XwLEY*2O&p g=WVza6oZ~xt5>Gs*y#%$7~VIyZl_kk;jk@#1H@n%@&Et; diff --git a/static/js/pad_editbar.js b/static/js/pad_editbar.js index 28e15808..4f73ca73 100644 --- a/static/js/pad_editbar.js +++ b/static/js/pad_editbar.js @@ -81,29 +81,29 @@ var padeditbar = (function(){ if (cmd == 'showusers') { // show users shows the current users on teh pad // get current height - var editbarheight = $('#editbar').css('height'); - if (editbarheight == "36px"){ + var editbarheight = $('#users').css('display'); + if (editbarheight == "none"){ // increase the size of the editbar - $('#editbar').animate({height:'72px'}); - $('#editorcontainerbox').animate({top:'72px'}); + //$('#editbar').animate({height:'72px'}); + //$('#editorcontainerbox').animate({top:'72px'}); $('#embed').hide(); $('#users').show(); } else { // increase the size of the editbar - $('#editbar').animate({height:'36px'}); - $('#editorcontainerbox').animate({top:'36px'}); + //$('#editbar').animate({height:'36px'}); + //$('#editorcontainerbox').animate({top:'36px'}); $('#users').hide(); } } if (cmd == 'embed') { // embed shows the embed link // get current height - var editbarheight = $('#editbar').css('height'); - if (editbarheight == "36px"){ + var editbarheight = $('#embed').css('display'); + if (editbarheight == "none"){ // increase the size of the editbar - $('#editbar').animate({height:'72px'}); + //$('#editbar').animate({height:'72px'}); $('#editorcontainerbox').animate({top:'72px'}); // hide the users $('#users').hide(); @@ -111,12 +111,13 @@ var padeditbar = (function(){ padurl = document.location; // change the div contents to include the pad url in an input box $('#embed').html('
Embed code:>
'); + $('#users').hide(); $('#embed').show(); } else { // increase the size of the editbar - $('#editbar').animate({height:'36px'}); + //$('#editbar').animate({height:'36px'}); $('#editorcontainerbox').animate({top:'36px'}); $('#embed').hide(); } diff --git a/static/js/pad_modals.js b/static/js/pad_modals.js index 37a3386f..183b7ff3 100644 --- a/static/js/pad_modals.js +++ b/static/js/pad_modals.js @@ -59,6 +59,7 @@ var padmodals = (function() { init: function() { self.initFeedback(); self.initShareBox(); + console.log("self.initShareBox"); }, initFeedback: function() { /*var emailField = $("#feedbackbox-email"); @@ -78,8 +79,9 @@ var padmodals = (function() { }); }, initShareBox: function() { - $("#sharebutton, #nootherusers a").click(function() { + $("#sharebutton").click(function() { self.showShareBox(); + console.log("share"); }); $("#sharebox-hide").click(function() { self.hideModal(); diff --git a/static/js/pad_userlist.js b/static/js/pad_userlist.js index 3e2f38b5..0745b542 100644 --- a/static/js/pad_userlist.js +++ b/static/js/pad_userlist.js @@ -20,67 +20,6 @@ var colorPickerOpen = false; var colorPickerSetup = false; var previousColorId = 0; -function getColorPickerSwatchIndex(jnode) { -// return Number(jnode.get(0).className.match(/\bn([0-9]+)\b/)[1])-1; - return $("#colorpickerswatches li").index(jnode); -} -function closeColorPicker(accept) { - if (accept) { - var newColorId = getColorPickerSwatchIndex($("#colorpickerswatches .picked")); - if (newColorId >= 0) { // fails on NaN - myUserInfo.colorId = newColorId; - pad.notifyChangeColor(newColorId); - } - } else { - pad.notifyChangeColor(previousColorId); - } - colorPickerOpen = false; - $("#mycolorpicker").css('display', 'none'); - //renderMyUserInfo(); -} - -function showColorPicker() { - previousColorId = myUserInfo.colorId ; - - if (! colorPickerOpen) { - var palette = pad.getColorPalette(); - - if(!colorPickerSetup) { - var colorsList = $("#colorpickerswatches") - for(var i=0;i', { - style: 'background: '+palette[i]+';' - }); - - li.appendTo(colorsList); - - li.bind('click', function(event){ - $("#colorpickerswatches li").removeClass('picked'); - $(event.target).addClass("picked"); - - var newColorId = getColorPickerSwatchIndex($("#colorpickerswatches .picked")); - pad.notifyChangeColor(newColorId); - }); - - if(myUserInfo.colorId == i){ - $(event.target).addClass("picked"); - } - } - - colorPickerSetup = true; - } - - $("#mycolorpicker").css('display', 'block'); - colorPickerOpen = true; - - $("#colorpickerswatches li").removeClass('picked'); - $($("#colorpickerswatches li")[myUserInfo.colorId]).addClass("picked"); //seems weird - - //paduserlist.renderMyUserInfo(); - } -} - var paduserlist = (function() { @@ -366,26 +305,6 @@ var paduserlist = (function() { }); } - function renderMyUserInfo() { - if (myUserInfo.name) { - $("#myusernameedit").removeClass("editempty").val( - myUserInfo.name); - } - else { - $("#myusernameedit").addClass("editempty").val( - "< enter your name >"); - } - if (colorPickerOpen) { - $("#myswatchbox").addClass('myswatchboxunhoverable').removeClass( - 'myswatchboxhoverable'); - } - else { - $("#myswatchbox").addClass('myswatchboxhoverable').removeClass( - 'myswatchboxunhoverable'); - } - $("#myswatch").css('background', pad.getColorPalette()[myUserInfo.colorId]); - } - function findExistingIndex(userId) { var existingIndex = -1; for(var i=0;i= 0) { // fails on NaN + myUserInfo.colorId = newColorId; + pad.notifyChangeColor(newColorId); + } + + paduserlist.renderMyUserInfo(); + } else { + pad.notifyChangeColor(previousColorId); + paduserlist.renderMyUserInfo(); + } + + colorPickerOpen = false; + $("#mycolorpicker").css('display', 'none'); +} + +function showColorPicker() { + previousColorId = myUserInfo.colorId ; + + if (! colorPickerOpen) { + var palette = pad.getColorPalette(); + + if(!colorPickerSetup) { + var colorsList = $("#colorpickerswatches") + for(var i=0;i', { + style: 'background: '+palette[i]+';' + }); + + li.appendTo(colorsList); + + li.bind('click', function(event){ + $("#colorpickerswatches li").removeClass('picked'); + $(event.target).addClass("picked"); + + var newColorId = getColorPickerSwatchIndex($("#colorpickerswatches .picked")); + pad.notifyChangeColor(newColorId); + }); + + if(myUserInfo.colorId == i){ + $(event.target).addClass("picked"); + } + } + + colorPickerSetup = true; + } + + $("#mycolorpicker").css('display', 'block'); + colorPickerOpen = true; + + $("#colorpickerswatches li").removeClass('picked'); + $($("#colorpickerswatches li")[myUserInfo.colorId]).addClass("picked"); //seems weird + console.log(paduserlist); + } +} \ No newline at end of file diff --git a/static/padhtml b/static/padhtml index e6a43e53..b6d9333e 100644 --- a/static/padhtml +++ b/static/padhtml @@ -84,17 +84,6 @@ var clientVars = {}; // ]]>
- - -
-
    -
- - Save - - - Cancel - -
-
+
+ +
+ +
+ +
+
    +
+ + Save + + + Cancel + +
+
Save
+
Cancel
+ +
+
+
+
+ +
+
+ + + + + +
+
+ +
+ Invite other users and they will show up here. +
+
+ +
+ +
+ + + + + +
From d53f155c56d674297bbabf2a6934dcc88d38a7f8 Mon Sep 17 00:00:00 2001 From: HansPinckaers Date: Thu, 7 Apr 2011 20:59:18 +0200 Subject: [PATCH 2/7] removed logging --- static/js/pad_userlist.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/static/js/pad_userlist.js b/static/js/pad_userlist.js index 0745b542..eb98b880 100644 --- a/static/js/pad_userlist.js +++ b/static/js/pad_userlist.js @@ -370,7 +370,6 @@ var paduserlist = (function() { var self = { init: function(myInitialUserInfo) { self.setMyUserInfo(myInitialUserInfo); - console.log(myInitialUserInfo); $("#otheruserstable tr").remove(); if (pad.getUserIsGuest()) { @@ -633,6 +632,5 @@ function showColorPicker() { $("#colorpickerswatches li").removeClass('picked'); $($("#colorpickerswatches li")[myUserInfo.colorId]).addClass("picked"); //seems weird - console.log(paduserlist); } } \ No newline at end of file From e3e2a7c5627b561b93d3969d32b8e0577bc79165 Mon Sep 17 00:00:00 2001 From: HansPinckaers Date: Thu, 7 Apr 2011 21:05:55 +0200 Subject: [PATCH 3/7] Names working correctly now --- node/MessageHandler.js | 1 + 1 file changed, 1 insertion(+) diff --git a/node/MessageHandler.js b/node/MessageHandler.js index 89a72754..7fd27308 100644 --- a/node/MessageHandler.js +++ b/node/MessageHandler.js @@ -529,6 +529,7 @@ function handleClientReady(client, message) userInfo: { "ip": "127.0.0.1", "colorId": authorManager.getAuthorColorId(sessioninfos[pad2sessions[message.padId][i]].author), + "name": authorManager.getAuthorName(sessioninfos[pad2sessions[message.padId][i]].author), "userAgent": "Anonymous", "userId": sessioninfos[pad2sessions[message.padId][i]].author } From efdb3b896345d588f94101d0022425caaab8e22c Mon Sep 17 00:00:00 2001 From: HansPinckaers Date: Thu, 7 Apr 2011 21:08:41 +0200 Subject: [PATCH 4/7] fixed userlist css --- static/css/pad_lite.css | 3 ++- static/js/pad_userlist.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/static/css/pad_lite.css b/static/css/pad_lite.css index b3483946..e40a7cb2 100644 --- a/static/css/pad_lite.css +++ b/static/css/pad_lite.css @@ -463,6 +463,7 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; } background: white; border-left: 1px solid #c3c3c3; border-top: 1px solid #c3c3c3; border-right: 1px solid #e6e6e6; border-bottom: 1px solid #e6e6e6; + color: #000 } #myusernameform .editempty { color: #ef641e; } @@ -471,7 +472,7 @@ table#otheruserstable { display: none; } #nootherusers a { color: #3C88FF; } #otheruserstable td { - border-bottom: 1px solid #555; + border-top: 1px solid #555; height: 26px; vertical-align: middle; padding: 0 2px; diff --git a/static/js/pad_userlist.js b/static/js/pad_userlist.js index eb98b880..49ebf52e 100644 --- a/static/js/pad_userlist.js +++ b/static/js/pad_userlist.js @@ -370,6 +370,7 @@ var paduserlist = (function() { var self = { init: function(myInitialUserInfo) { self.setMyUserInfo(myInitialUserInfo); + $("#otheruserstable tr").remove(); if (pad.getUserIsGuest()) { From ad86901f0bbaf9df71e231750cf4fc1f82c244c5 Mon Sep 17 00:00:00 2001 From: HansPinckaers Date: Thu, 7 Apr 2011 21:18:49 +0200 Subject: [PATCH 5/7] online counter now working --- static/js/pad_userlist.js | 15 +++++++++++++++ static/padhtml | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/static/js/pad_userlist.js b/static/js/pad_userlist.js index 49ebf52e..d1104904 100644 --- a/static/js/pad_userlist.js +++ b/static/js/pad_userlist.js @@ -468,6 +468,19 @@ var paduserlist = (function() { } updateInviteNotice(); + + console.log(self.updateNumberOfOnlineUsers()); + }, + updateNumberOfOnlineUsers: function(){ + var online = 1; // you are always online! + for(var i=0;i
  • - 1 + 1
    • From dc15daaa40f898d20711b8ae47c8cc13109f395e Mon Sep 17 00:00:00 2001 From: HansPinckaers Date: Thu, 7 Apr 2011 21:34:06 +0200 Subject: [PATCH 6/7] broke ie/ff working again --- static/js/pad_modals.js | 2 -- static/js/pad_userlist.js | 9 +++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/static/js/pad_modals.js b/static/js/pad_modals.js index 183b7ff3..0d0f57f0 100644 --- a/static/js/pad_modals.js +++ b/static/js/pad_modals.js @@ -59,7 +59,6 @@ var padmodals = (function() { init: function() { self.initFeedback(); self.initShareBox(); - console.log("self.initShareBox"); }, initFeedback: function() { /*var emailField = $("#feedbackbox-email"); @@ -81,7 +80,6 @@ var padmodals = (function() { initShareBox: function() { $("#sharebutton").click(function() { self.showShareBox(); - console.log("share"); }); $("#sharebox-hide").click(function() { self.hideModal(); diff --git a/static/js/pad_userlist.js b/static/js/pad_userlist.js index d1104904..3e476fad 100644 --- a/static/js/pad_userlist.js +++ b/static/js/pad_userlist.js @@ -467,9 +467,9 @@ var paduserlist = (function() { rowManager.insertRow(newIndex, userData); } - updateInviteNotice(); + updateInviteNotice(); - console.log(self.updateNumberOfOnlineUsers()); + self.updateNumberOfOnlineUsers(); }, updateNumberOfOnlineUsers: function(){ var online = 1; // you are always online! @@ -480,6 +480,7 @@ var paduserlist = (function() { } } $("#online_count").text(online); + return online; }, userLeave: function(info) { @@ -510,9 +511,9 @@ var paduserlist = (function() { }, 8000); // how long to wait userData.leaveTimer = thisLeaveTimer; } - updateInviteNotice(); + updateInviteNotice(); - console.log(self.updateNumberOfOnlineUsers()); + self.updateNumberOfOnlineUsers(); }, showGuestPrompt: function(userId, displayName) { if (knocksToIgnore[userId]) { From 89e78ed9be82f9ace6e649aa68a25f76061a8121 Mon Sep 17 00:00:00 2001 From: HansPinckaers Date: Fri, 8 Apr 2011 12:20:26 +0200 Subject: [PATCH 7/7] IE scrollbar and disappearing editor fixed. Still no background beneave userlist and embed though --- static/css/pad_ie_lite.css | 38 ++++++++++++++++++++++++++++++++++++++ static/css/pad_lite.css | 6 ++++-- static/padhtml | 7 +++++-- 3 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 static/css/pad_ie_lite.css diff --git a/static/css/pad_ie_lite.css b/static/css/pad_ie_lite.css new file mode 100644 index 00000000..d9ece8bd --- /dev/null +++ b/static/css/pad_ie_lite.css @@ -0,0 +1,38 @@ +#users, #embed +{ +background:transparent; +filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00000070,endColorstr=#00000070); +zoom: 1; +} + + +#editorcontainerbox +{ +position: relative; +top: 1px; +padding-top: 37px; +} +#editorcontainer +{ + position: absolute; + + width: 100%; + + top: 0px; + left: 0px; + bottom: 0px; + + z-index: 1; + + overflow: hidden; +} + +#editorcontainer iframe { + height: 100%; + width: 100%; + padding-bottom: 37px; + margin: 0; +} + +#editorloadingbox { padding-top: 100px; padding-bottom: 100px; font-size: 2.5em; color: #aaa; + text-align: center; position: absolute; width: 100%; height: 30px; z-index: 100; } diff --git a/static/css/pad_lite.css b/static/css/pad_lite.css index e40a7cb2..354bce67 100644 --- a/static/css/pad_lite.css +++ b/static/css/pad_lite.css @@ -10,14 +10,14 @@ body, textarea { font-family: Helvetica, Arial, sans-serif; } #users { position: absolute; - z-index: 3; + z-index: 10; + background-color: #000; background-color: rgba(0,0,0,0.7); width: 160px; right: 4px; top: 40px; color: #fff; padding: 5px; - -moz-border-radius: 6px; border-radius: 6px; } @@ -104,6 +104,7 @@ a img { border: inherit; background: inherit; + visibility:hidden; } #editbar ul li a { @@ -1099,6 +1100,7 @@ right: 5px; z-index: 500; background-color: #000; color: white; +background-color: rgb(0,0,0); background-color: rgba(0,0,0,0.7); padding: 10px; -moz-border-radius: 6px; diff --git a/static/padhtml b/static/padhtml index 88279dfc..6bb0c934 100644 --- a/static/padhtml +++ b/static/padhtml @@ -10,6 +10,9 @@ +