From 0206803549d6ec4f79ff4bc3f5aa03a5c2ef013f Mon Sep 17 00:00:00 2001 From: John McLear Date: Tue, 19 Jul 2011 02:06:54 +0100 Subject: [PATCH 01/24] move userlist so it doesnt overlap with scrollbar --- static/css/pad_lite.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/css/pad_lite.css b/static/css/pad_lite.css index 169c91f2..17efd40a 100644 --- a/static/css/pad_lite.css +++ b/static/css/pad_lite.css @@ -15,7 +15,7 @@ iframe {position:absolute;} background-color: #000; background-color: rgba(0,0,0,0.7); width: 160px; - right: 4px; + right: 20px; top: 40px; color: #fff; padding: 5px; From 00a74d806746d8acefd5191185430d2188d6a277 Mon Sep 17 00:00:00 2001 From: John McLear Date: Tue, 19 Jul 2011 02:08:09 +0100 Subject: [PATCH 02/24] Make chat icon background white --- static/css/pad_lite.css | 1 + 1 file changed, 1 insertion(+) diff --git a/static/css/pad_lite.css b/static/css/pad_lite.css index 17efd40a..3bea8898 100644 --- a/static/css/pad_lite.css +++ b/static/css/pad_lite.css @@ -1255,6 +1255,7 @@ padding-top:2px; border-top: 1px solid #999; border-top-left-radius: 5px; border-top-right-radius: 5px; + background-color:#fff; } #chaticon a From ab7b043fd17bf7d4e6808bbef43458c3c9fef654 Mon Sep 17 00:00:00 2001 From: John McLear Date: Tue, 19 Jul 2011 02:10:29 +0100 Subject: [PATCH 03/24] Dont show IP addy or browser info when hovering# --- static/js/pad_userlist.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/js/pad_userlist.js b/static/js/pad_userlist.js index 2e6238d2..11b29bbb 100644 --- a/static/js/pad_userlist.js +++ b/static/js/pad_userlist.js @@ -144,7 +144,7 @@ var paduserlist = (function() var titleText = data.titleText; window.setTimeout(function() { - tr.attr('title', titleText) + /* tr.attr('title', titleText)*/ }, 0); } else From 6ca7dcf9991f4450cb03d7f1e295593640c2c32a Mon Sep 17 00:00:00 2001 From: John McLear Date: Tue, 19 Jul 2011 02:21:59 +0100 Subject: [PATCH 04/24] stop timeslider from taking up more than 100% room --- static/css/broadcast.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/css/broadcast.css b/static/css/broadcast.css index 0aeeb207..cfbf7784 100644 --- a/static/css/broadcast.css +++ b/static/css/broadcast.css @@ -25,7 +25,7 @@ #timeslider-right { position: absolute; top:0px; - right:-2px; + right:0px; background-image: url(../../static/img/timeslider_right.png); width: 155px; height: 63px; From fb332cf6997352a3777c3717732325f109cab7ff Mon Sep 17 00:00:00 2001 From: John McLear Date: Tue, 19 Jul 2011 13:26:05 +0100 Subject: [PATCH 05/24] removed outcommented css --- static/css/broadcast.css | 82 -------- static/css/pad_lite.css | 431 +-------------------------------------- 2 files changed, 3 insertions(+), 510 deletions(-) diff --git a/static/css/broadcast.css b/static/css/broadcast.css index cfbf7784..be5390cb 100644 --- a/static/css/broadcast.css +++ b/static/css/broadcast.css @@ -169,88 +169,6 @@ div #timeslider div#steppers div#rightstep { font-size: 11px; } - - -/*#rightbars { - margin-left: 730px; - margin-top: 5px; - margin-bottom: 5px; - margin-right: 7px; - position: absolute; - top:27px; -} - -#rightbar { - width: 143px; - background-color: white; - border: 1px solid rgb(194, 194, 194); - padding: 16px; - padding-top: 13px; - font-size: 1.20em; - line-height: 1.8em; - vertical-align: top; -} - - -#rightbar h2 { - font-weight: 700; - font-size: 1.2em; - padding-top: 20px; - padding-bottom: 4px; -} - -#rightbar a { - color: rgb(50, 132, 213); - text-decoration: none; -} - -#rightbars h2 { - font-weight: 700; - font-size: 1.2em; - padding-top: 20px; - padding-bottom: 4px; -} - -#rightbar img { - padding-left: 4px; - padding-right: 8px; - vertical-align: text-bottom; -} -#rightbar a { - color: rgb(50, 132, 213); - text-decoration: none; -} -*/ - - -/*#legend { - width: 143px; - background-color: white; - border: 1px solid rgb(194, 194, 194); - padding: 16px; - padding-top: 0px; - font-size: 1.20em; - line-height: 1.8em; - vertical-align: top; - margin-top: 10px; -} -#legend h2 { - padding-top: 10px; -} - -#authorstable { - vertical-align: middle; -} - -#authorstable div.swatch { - width:15px; - height:15px; - margin: 5px; - margin-top:3px; - margin-right: 14px; - border: rgb(149, 149, 149) 1px solid; -}*/ - .topbarcenter{ display:none; } diff --git a/static/css/pad_lite.css b/static/css/pad_lite.css index 3bea8898..d4c0b77b 100644 --- a/static/css/pad_lite.css +++ b/static/css/pad_lite.css @@ -1,6 +1,3 @@ -/* @override - static/css/pad_lite.css */ - *,html,body,p{ margin: 0; padding: 0; } .clear { clear: both; } html { font-size: 62.5%; } @@ -23,18 +20,6 @@ iframe {position:absolute;} border-radius: 6px; } -/*#sharebutton { - background: url(static/img/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; @@ -163,14 +148,6 @@ a img } -/** - -OLD -*/ - -/* @override - static/css/pad_lite.css */ - #padpage { position: absolute; top: 0px; @@ -199,18 +176,6 @@ a#backtoprosite { padding-left: 20px; left: 6px; background: url(static/img/protop.gif) no-repeat -5px -6px; } #accountnav { right: 30px; color: #fff; } -/*#topbarcenter { margin-left: 150px; margin-right: 150px; text-align:center;} -a#topbaretherpad { margin-left: auto; margin-right: auto; display: block; width: 103px; - position: relative; top: 3px; height: 0; padding-top: 20px; -}*/ - - -/*#topbarBrand {font-size:2.1em; color: white; font-weight: bold; text-decoration: none; text-align: center;} - -#EtherpadLink {font-size: 1.2em; color: white;float:left;margin-left:-140px;margin-top:4px; text-decoration: none; } -#Licensing {font-size: 1.2em; color: white;float:left;margin-top:4px;margin-left:-75px; text-decoration: none; } -#fullscreen {font-size: 1.2em; color: white;float:right;margin-top:4px;margin-right:-120px; text-decoration: none; }*/ - .propad a#topbaretherpad { background: url(static/img/protop.gif) no-repeat -397px -3px; } #specialkeyarea { top: 5px; left: 250px; color: yellow; font-weight: bold; @@ -364,72 +329,12 @@ a#hidetopmsg { position: absolute; right: 5px; bottom: 5px; } white-space: nowrap; } -/*.editbarbutton -{ - border-top: 1px solid #8b9eba; - border-bottom: 1px solid #8b9eba; - border-left: 1px solid #758aa9; - background-color: white; - padding: 0px 2px; -} - -.editbarbutton img -{ - border: 0px; - width: 16px; - height: 16px; -} - -.editbarbutton a { - text-decoration: none; -} - -.editbarbutton a:active -{ - position: relative; - top: 1px; - left: 1px; -}*/ - -/*.editbargroupsfirst -{ - border-left-width: 0px !important; -}*/ - -/*#editbar #syncstatussyncing { position: absolute; height: 26px; width: 26px; - background: url(static/img/syncing2.gif) no-repeat center center; - right: 38px; top: 5px; display: none; } -#editbar #syncstatusdone { position: absolute; height: 26px; width: 26px; - background: url(static/img/syncdone.gif) no-repeat center center; - right: 38px; top: 5px; display: none; }*/ - -/*#padsidebar { - bottom: 0px; - position: absolute; - right: 0; - top: 0; - width: 290px; - overflow: hidden; - z-index: 11; -} -.hidesidebar #padsidebar { width: 0; overflow: hidden; }*/ - #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 #fff; padding: 1px; background: transparent; cursor: pointer; -moz-border-radius: 3px; border-radius: 3px; } -/* -#myuser .myswatchboxhoverable, #myuser .myswatchboxunhoverable { - background: white; -} -#myuser .myswatchboxhoverable:hover { - background: #bbb; -} -*/ #myswatch { width: 100%; height: 100%; background: transparent;/*...initially*/ } #mycolorpicker { @@ -501,43 +406,7 @@ table#otheruserstable { display: none; } border-right: 1px solid #e6e6e6; border-bottom: 1px solid #e6e6e6; } .usertdname input.editempty { color: #888; font-style: italic;} - /*#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; - top: 5px; width: 95px; } -.guestpolicystuff { display: none; }*/ - -/*.guestprompt { border: 1px solid #ccc; font-size: 1.2em; - padding: 5px; color: #222; background: #ffc; } -.guestprompt .choices { float: right; } -.guestprompt a { margin: 0 0.5em; }*/ - -/*#chattop { background: #ecf2fa; padding: 5px; font-size: 1.2em; border-bottom: 1px solid #ddd; } -#chattop a { color: #36b; } -#chatlines .chatline { color: #444; padding-left: 5px; padding-top: 2px; padding-bottom: 2px; - background: #ddd; overflow: hidden; } -#chatlines .chatlinetime { display: block; font-size: 1em; color: #666; float: right; width: auto; - padding-right: 5px; } -#chatlines .chatlinename, #chatlines .chatlinetext { font-size: 1.2em; } -#chatlines h2 { margin: 0; padding-left: 5px; padding-top: 2px; padding-bottom: 2px; color: #999; font-style: italic; font-weight: bold; font-size: 1.2em; } -#chatprompt { font-size: 1.2em; color: #444; float: left; line-height: 22px; width: 35px; text-align: right; } -#chatentryform { margin-left: 40px; } -#chatentrybox { font-size: 1.2em; color: #444; - padding: 2px; height: 16px; margin: 0; border-left: 1px solid #c3c3c3; - border-top: 1px solid #c3c3c3; - border-right: 1px solid #e6e6e6; border-bottom: 1px solid #e6e6e6; - width: 230px; } -#padchat a#chatloadmore { display: none; font-size: 1.2em; padding: 2px 5px; font-style: italic; } -#padchat #chatloadingmore { display: none; font-size: 1.2em; padding: 2px 5px; font-style: italic; - color: #999; } -#padchat a#chatloadmore:focus { outline: 0; }*/ - -/*#djs { font-family: monospace; font-size: 10pt; - height: 200px; overflow: auto; border: 1px solid #ccc; - background: #fee; margin: 0; padding: 6px; -} -#djs p { margin: 0; padding: 0; display: block; }*/ - + .modaldialog.cboxreconnecting .modaldialog-inner, .modaldialog.cboxconnecting .modaldialog-inner { background: url(static/img/connectingbar.gif) no-repeat center 60px; @@ -638,169 +507,7 @@ table#otheruserstable { display: none; } /* We don't ever actually hide the wrapper, even when the panel is cloased, so that its contents can always be manipulated accurately. */ -/*.dbpanel-wrapper { position: absolute; - overflow: hidden; height: 0; top: 25px; - z-index: 51; zoom: 1; } -.dbpanel-panel { position: absolute; bottom: 0; width: 100%; } -.dbpanel-middle { margin-left: 7px; margin-right: 7px; - position: relative; height: 100%; overflow: hidden; zoom: 1; } -.dbpanel-inner { background: #f7f7f7 ; - width: 100%; height: 100%; position: absolute; overflow: hidden; top: -10px; } - -.dbpanel-top { position: absolute; top: 0; width: 100%; - height: 400px; background-image: url(static/img/docpanelmiddle2.png); - background-position: left top; } - -.dbpanel-bottom { position: absolute; height: 400px; - bottom: -390px; width: 100%; - background-image: url(static/img/docpanelmiddle2.png); - background-position: left top; -} - -* html .dbpanel-top, * html .dbpanel-bottom { - background-color: transparent; - background-image: url(static/img/apr09/blank.gif); - - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="static/img/docpanelmiddle2.png", sizingMethod="scale"); -} - -.dbpanel-leftedge, .dbpanel-rightedge, .dbpanel-botleftcorner, .dbpanel-botrightcorner { - position: absolute; - background-repeat: no-repeat; - background-color: transparent; - background-image: url(static/img/docpaneledge2.png); -} - -.dbpanel-leftedge, .dbpanel-rightedge { height: 100%; width: 7px; bottom: 11px; } -.dbpanel-botleftcorner, .dbpanel-botrightcorner { height: 11px; width: 7px; bottom: 0; } - -.dbpanel-leftedge, .dbpanel-botleftcorner { left: 0; background-position: -7px 0; } -.dbpanel-rightedge, .dbpanel-botrightcorner { right: 0; background-position: 0 0; } - -#importexport { position: absolute; top: 5px; left: 0; font-size: 1.2em; color: #444; - height: 100%; width: 100%; } - -* html .dbpanel-leftedge, * html .dbpanel-rightedge, * html .dbpanel-botleftcorner, * html .dbpanel-botrightcorner { - background-color: transparent; - background-image: url(static/img/apr09/blank.gif); - - filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="static/img/docpaneledge2.png", sizingMethod="crop"); -} -* html .dbpanel-leftedge, * html .dbpanel-botleftcorner { left: -7px; width: 14px; } -*/ -/*#impexp-importlabel { position: absolute; top: 5px; left: 10px; width: 300px; } - -#importform { position: absolute; top: 24px; left: 5px; width: 300px; height: 60px; } -#importformsubmitdiv, #importformfilediv { padding: 5px 5px; } -#importexport .importformenabled { - background: #cfc; - border: 1px solid #292; -} -#importexport span.nowrap { white-space: nowrap; } -#importexport #importstatusball { margin-left: 3px; padding-top: 1px; display: none; } -#importexport #importarrow { margin-left: 5px; padding-top: 1px; display: none; } -#importexport .importmessage { border: 1px solid #992; - background: #ffc; padding: 5px; font-size: 85%; display: none; } -#importexport #importmessagefail { margin-top: 5px; } -#importexport #importmessagesuccess { margin: 0 20px; } -#importexport a.disabledexport { - color: #333; text-decoration: none; - opacity: 0.5; filter: alpha(opacity = 50) ; -} -#importexport #importfileinput { padding: 2px 0; } -#importexport #importsubmitinput { padding: 2px; } - -#impexp-divider { position: absolute; left: 320px; top: 5px; height: 135px; width: 2px; - background: #ddd; } -#impexp-close { display: block; position: absolute; right: 2px; bottom: 15px; - width: auto; height: auto; font-size: 85%; color: #444; - z-index: 61} -#impexp-disabled-clickcatcher { - display: none; - position: absolute; width: 100%; height: 100%; - z-index: 60; -} - -#impexp-exportlabel { position: absolute; top: 5px; left: 350px; - width: 300px; } - #exportlinks .exportlink { - display: block; position: absolute; height: 22px; width: auto; - background-repeat: no-repeat; - background-image: url(static/img/fileicons.gif); - line-height: 22px; padding-left: 22px; padding-right: 2px; -} -#exportlinks .n1 { left: 350px; top: 30px; } -#exportlinks .n2 { left: 350px; top: 57px; } -#exportlinks .n3 { left: 350px; top: 84px; } -#exportlinks .n4 { left: 485px; top: 30px; } -#exportlinks .n5 { left: 485px; top: 57px; } -#exportlinks .n6 { left: 485px; top: 84px; } -#exportlinks .exporthrefdoc { background-position: 2px -1px; } -#exportlinks .exporthrefhtml { background-position: 2px -25px; } -#exportlinks .exporthreflink { background-position: 2px -49px; } -#exportlinks .exporthrefodt { background-position: 2px -73px; } -#exportlinks .exporthrefpdf { background-position: 2px -97px; } -#exportlinks .exporthreftxt { background-position: 2px -121px; } - -#savedrevisions { position: absolute; top: 0; left: 0; font-size: 1.2em; - color: #444; height: 100%; width: 100%; } -#savedrevs-scrolly { height: 75px; width: auto; margin-right: 136px; - overflow: hidden; position: relative; top: 1px; -} -#savedrevs-scrollleft { height: 100%; width: 14px; position: absolute; - left: 0; top: 0; cursor: pointer; - background: url(static/img/savedrevarrows.gif) no-repeat right top; -} -#savedrevs-scrollright { height: 100%; width: 14px; position: absolute; - right: 0; top: 0; cursor: pointer; - background: url(static/img/savedrevarrows.gif) no-repeat left top; -} -#savedrevs-scrolly .disabledscrollleft { background-position: right bottom; } -#savedrevs-scrolly .disabledscrollright { background-position: left bottom; } -#savedrevs-scrollouter { margin-left: 14px; margin-right: 14px; - width: auto; height: 100%; overflow: hidden; position: relative; -} -#savedrevs-scrollinner { position: absolute; width: 1px; height: 100%; - overflow: visible; right: 0; top: 0; } -#savedrevisions .srouterbox { width: 120px; height: 100%; - position: absolute; top: 0; -} -#savedrevisions .srinnerbox { position: relative; top: 8px; - height: 59px; width: auto; border-left: 1px solid #ddd; - padding: 0 8px 0 8px; } -#savedrevisions a.srname { display: block; white-space: nowrap; - text-overflow: ellipsis ; overflow: hidden; - text-decoration: none; color: #444; cursor: text; - padding: 1px; height: 14px; position: relative; left: -1px; - width: 100px ; -} -#savedrevisions a.srname:hover { text-decoration: none; color: #444; - border: 1px solid #ccc; padding: 0; } -#savedrevisions .sractions { font-size: 85%; color: #ccc; - margin-top: 1px; height: 12px; } -#savedrevisions .sractions a { text-decoration: none; - color: #06c; } -#savedrevisions .sractions a:hover { text-decoration: underline; } -#savedrevisions .srtime { color: #666; font-size: 90%; - white-space: nowrap; margin-top: 3px; } -#savedrevisions .srauthor { color: #666; font-size: 90%; - white-space: nowrap; overflow: hidden; text-overflow: ellipsis; -} -#savedrevisions .srtwirly { position: absolute; display: block; - bottom: 0; right: 10px; display: none; } -#savedrevisions .srnameedit { - position: absolute; -} -#savedrevs-savenow { display: block; position: absolute; - overflow: hidden; height: 0; padding-top: 24px; width: 81px; - top: 22px; right: 27px; - background: url(static/img/savedrevsgfx2.gif) no-repeat 0 0; -} -#savedrevs-savenow:active { background-position: 0 -24px; } -#savedrevs-close { display: block; position: absolute; right: 7px; bottom: 8px; - width: auto; height: auto; font-size: 85%; color: #444; } -form#reconnectform { display: none; }*/ #padoptions { position: absolute; top: 0; left: 0; font-size: 1.2em; color: #444; height: 100%; width: 100%; line-height: 15px; } @@ -820,104 +527,11 @@ form#reconnectform { display: none; }*/ #options-close { display: block; position: absolute; right: 7px; bottom: 8px; width: auto; height: auto; font-size: 85%; color: #444; } -/*#padsecurity { position: absolute; top: 0; left: 0; font-size: 1.1em; - color: #444; height: 100%; width: 100%; line-height: 15px; } -#security-close { display: block; position: absolute; right: 7px; bottom: 8px; - width: auto; height: auto; font-size: 85%; color: #444; } -#security-passhead { font-weight: bold; position: absolute; top: 90px; left: 15px; - width: auto; height: auto; } -#security-passbody { position: absolute; left: 75px; top: 90px; } -#security-passwordedit { height: 15px; border: 1px solid #bbb; - position: absolute; top: 0; left: 15px; width: 120px; } -#security-password a { text-decoration: none; display: block; - width: auto; height: auto; } -#password-savelink, #password-cancellink {position: absolute; top: 0; } -#security-password a:hover { text-decoration: underline; } -#password-savelink { left: 144px; color: #06c; } -#password-cancellink { left: 180px; color: #666; } -#password-nonedit { left: 15px; position: absolute; - width: 220px; top: 0; } -#password-setlink { color: #06c; } -#password-clearlink { color: #06c; } -#password-display { height: 15px; width: auto; } -#password-inedit { display: none; } -#password-display, #password-setlink, #password-clearlink { - float: left; margin-right: 10px; -} -#password-display { font-size: 18px; } -#security-password .nopassword #password-display { font-size: 100%; } -#security-password .nopassword #password-clearlink { display: none; } -#security-password .nopassword #password-setlink { left: 60px; } - -#security-access { position: absolute; left: 15px; width: 200px; } -#security-accesshead { font-weight: bold; position: absolute; top: 10px; - left: 0; width: auto; height: auto; } -#security-access input, #security-access label { position: absolute; } -#security-access input { left: 10px; } -#security-access label { left: 30px; width: 250px; } -#access-private, #access-private-label { top: 35px; } -#access-public, #access-public-label { top: 60px; } -#security-access label { color: #999; } -#security-access label strong { font-weight: normal; padding-right: 10px; - color: #444; }*/ - #mainmodals { z-index: 600; /* higher than the modals themselves - so that modals are on top in IE */ } - + so that modals are on top in IE */ } .modalfield { font-size: 1.2em; padding: 1px; border: 1px solid #bbb;} #mainmodals .editempty { color: #aaa; } - -/*#feedbackbox { - position: absolute; display: none; - width: 400px; height: 270px; - left: 100px ; bottom: 50px; - z-index: 501; zoom: 1; -} -#feedbackbox-tl, #feedbackbox-tr, #feedbackbox-bl, #feedbackbox-br, -#feedbackbox-hide, #feedbackbox-send, #feedbackbox-back { - position: absolute; display: block; - background-repeat: no-repeat; - background-image: url(static/img/feedbackbox2.gif); -} -#feedbackbox-tl { width: 392px; - height: 262px; left: 0; top: 0; - background-position: left top; } -#feedbackbox-tr { width: 8px; height: 262px; - right: 0; top: 0; background-position: right top; } -#feedbackbox-bl { width: 392px; - height: 8px; left: 0; bottom: 0; - background-position: left bottom; } -#feedbackbox-br { width: 8px; height: 8px; bottom: 0; right: 0; - background-position: right bottom; } -#feedbackbox-hide { width: 22px; height: 22px; right: 9px; top: 7px; - background-position: -569px -6px; -} -#feedbackbox-back { width: 384px; - height: 254px; left: 8px; top: 8px; - background-position: -8px -8px; - background-color: white; } -#feedbackbox-contents { width: 384px; - height: 254px; left: 8px; top: 8px; - position: absolute; font-size: 1.4em; color: #444; } -#feedbackbox-contentsinner { padding: 10px; } -#feedbackbox-send { width: 50px; height: 22px; right: 15px; bottom: 15px; - background-position: -535px -363px; -} -#feedbackbox-email { left: 90px; top: 48px; width: 356px; height: auto; } -#feedbackbox-message { left: 90px; top: 84px; width: 358px; height: 100px; } -#feedbackbox-response { position: absolute; bottom: 15px; left: 15px; - width: 390px; height: auto; font-size: 1.2em; display: none; } -#feedbackbox .goodresponse { font-weight: bold; color: green; } -#feedbackbox .badresponse { font-weight: bold; color: red; } -#feedbackbox p { margin-bottom: 1em; } -#feedbackbox ul { margin: 1em 0 1em 2em } -#feedbackbox li { padding: 0.3em 0; } -#feedbackbox li a { display: block; font-weight: bold; } -#feedbackbox li a:hover { background: #ffe; } -#feedbackbox a, #feedbackbox li a:visited { color: #47b; } -#feedbackbox tt { font-size: 110%; } -*/ .expand-collapse { height: 22px; background-image: url(static/img/sharedistri.gif); @@ -1145,47 +759,7 @@ ul#colorpickerswatches li:hover cursor: pointer; } -/*.user{ -border: 1px solid #BBBBBB; -padding-left:2px; -padding-right:2px; -height:20px; -border-style:solid; -border-width:1px; -border-color:grey; -background-color:lightblue; -display:inline; -min-width:20px; -display:inline; -cursor:default; -} -.myuser{ -border: 1px solid #BBBBBB; -padding-left:2px; -padding-right:2px; -height:20px; -border-style:solid; -border-width:1px; -border-color:grey; -background-color:lightblue; -display:inline; -min-width:20px; -display:inline; -cursor:pointer; -} - -.myuser a{ -text-decoration:none; -color:#000; -} - - -.username{ -padding-left:4px; -padding-right:4px; -padding-top:2px; -}*/ #chatbox { @@ -1218,6 +792,7 @@ padding-top:2px; #chattext p { padding: 3px; + overflow-x: hidden; } #chatinputbox From 2dd2a4a0553fff218f044b0155f9f5c1a6ca81c0 Mon Sep 17 00:00:00 2001 From: John McLear Date: Tue, 19 Jul 2011 14:22:25 +0100 Subject: [PATCH 06/24] Added support to resize chat --- static/js/chat.js | 1 + 1 file changed, 1 insertion(+) diff --git a/static/js/chat.js b/static/js/chat.js index 4be86d54..facd3b1e 100644 --- a/static/js/chat.js +++ b/static/js/chat.js @@ -6,6 +6,7 @@ var chat = (function() $("#chaticon").hide("slide", { direction: "down" }, 500, function() { $("#chatbox").show("slide", { direction: "down" }, 750, self.scrollDown); + $("#chatbox").resizable(); }); }, hide: function () From f7ce124ce284ba8fa9c4d394ccd028fcef03c3ea Mon Sep 17 00:00:00 2001 From: John McLear Date: Tue, 19 Jul 2011 14:23:15 +0100 Subject: [PATCH 07/24] Add a new version of jquery ui with support for resizable --- static/js/jquery-ui.js | 143 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 static/js/jquery-ui.js diff --git a/static/js/jquery-ui.js b/static/js/jquery-ui.js new file mode 100644 index 00000000..a640b895 --- /dev/null +++ b/static/js/jquery-ui.js @@ -0,0 +1,143 @@ +/*! + * jQuery UI 1.8.14 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI + */ +(function(c,j){function k(a,b){var d=a.nodeName.toLowerCase();if("area"===d){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&l(a)}return(/input|select|textarea|button|object/.test(d)?!a.disabled:"a"==d?a.href||b:b)&&l(a)}function l(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.14", +keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=this;setTimeout(function(){c(d).focus(); +b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this, +"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection", +function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,m,n){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(m)g-=parseFloat(c.curCSS(f,"border"+this+"Width",true))||0;if(n)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,outerWidth:c.fn.outerWidth, +outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h,d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){return k(a,!isNaN(c.attr(a,"tabindex")))},tabbable:function(a){var b=c.attr(a,"tabindex"),d=isNaN(b); +return(d||b>=0)&&k(a,!d)}});c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&a.element[0].parentNode)for(var e= +0;e0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a=9)&&!a.button)return this._mouseUp(a);if(this._mouseStarted){this._mouseDrag(a);return a.preventDefault()}if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,a)!==false)?this._mouseDrag(a):this._mouseUp(a);return!this._mouseStarted},_mouseUp:function(a){b(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted= +false;a.target==this._mouseDownEvent.target&&b.data(a.target,this.widgetName+".preventClickEvent",true);this._mouseStop(a)}return false},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery); +;/* + * jQuery UI Resizable 1.8.14 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Resizables + * + * Depends: + * jquery.ui.core.js + * jquery.ui.mouse.js + * jquery.ui.widget.js + */ +(function(e){e.widget("ui.resizable",e.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1E3},_create:function(){var b=this,a=this.options;this.element.addClass("ui-resizable");e.extend(this,{_aspectRatio:!!a.aspectRatio,aspectRatio:a.aspectRatio,originalElement:this.element, +_proportionallyResizeElements:[],_helper:a.helper||a.ghost||a.animate?a.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){/relative/.test(this.element.css("position"))&&e.browser.opera&&this.element.css({position:"relative",top:"auto",left:"auto"});this.element.wrap(e('
').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(), +top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle= +this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=a.handles||(!e(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne", +nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all")this.handles="n,e,s,w,se,sw,ne,nw";var c=this.handles.split(",");this.handles={};for(var d=0;d');/sw|se|ne|nw/.test(f)&&g.css({zIndex:++a.zIndex});"se"==f&&g.addClass("ui-icon ui-icon-gripsmall-diagonal-se");this.handles[f]=".ui-resizable-"+f;this.element.append(g)}}this._renderAxis=function(h){h=h||this.element;for(var i in this.handles){if(this.handles[i].constructor== +String)this.handles[i]=e(this.handles[i],this.element).show();if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var j=e(this.handles[i],this.element),l=0;l=/sw|ne|nw|se|n|s/.test(i)?j.outerHeight():j.outerWidth();j=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join("");h.css(j,l);this._proportionallyResize()}e(this.handles[i])}};this._renderAxis(this.element);this._handles=e(".ui-resizable-handle",this.element).disableSelection(); +this._handles.mouseover(function(){if(!b.resizing){if(this.className)var h=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);b.axis=h&&h[1]?h[1]:"se"}});if(a.autoHide){this._handles.hide();e(this.element).addClass("ui-resizable-autohide").hover(function(){if(!a.disabled){e(this).removeClass("ui-resizable-autohide");b._handles.show()}},function(){if(!a.disabled)if(!b.resizing){e(this).addClass("ui-resizable-autohide");b._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy(); +var b=function(c){e(c).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){b(this.element);var a=this.element;a.after(this.originalElement.css({position:a.css("position"),width:a.outerWidth(),height:a.outerHeight(),top:a.css("top"),left:a.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);b(this.originalElement);return this},_mouseCapture:function(b){var a= +false;for(var c in this.handles)if(e(this.handles[c])[0]==b.target)a=true;return!this.options.disabled&&a},_mouseStart:function(b){var a=this.options,c=this.element.position(),d=this.element;this.resizing=true;this.documentScroll={top:e(document).scrollTop(),left:e(document).scrollLeft()};if(d.is(".ui-draggable")||/absolute/.test(d.css("position")))d.css({position:"absolute",top:c.top,left:c.left});e.browser.opera&&/relative/.test(d.css("position"))&&d.css({position:"relative",top:"auto",left:"auto"}); +this._renderProxy();c=m(this.helper.css("left"));var f=m(this.helper.css("top"));if(a.containment){c+=e(a.containment).scrollLeft()||0;f+=e(a.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:c,top:f};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:c,top:f};this.sizeDiff= +{width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:b.pageX,top:b.pageY};this.aspectRatio=typeof a.aspectRatio=="number"?a.aspectRatio:this.originalSize.width/this.originalSize.height||1;a=e(".ui-resizable-"+this.axis).css("cursor");e("body").css("cursor",a=="auto"?this.axis+"-resize":a);d.addClass("ui-resizable-resizing");this._propagate("start",b);return true},_mouseDrag:function(b){var a=this.helper,c=this.originalMousePosition,d=this._change[this.axis]; +if(!d)return false;c=d.apply(this,[b,b.pageX-c.left||0,b.pageY-c.top||0]);this._updateVirtualBoundaries(b.shiftKey);if(this._aspectRatio||b.shiftKey)c=this._updateRatio(c,b);c=this._respectSize(c,b);this._propagate("resize",b);a.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize();this._updateCache(c);this._trigger("resize",b,this.ui());return false}, +_mouseStop:function(b){this.resizing=false;var a=this.options,c=this;if(this._helper){var d=this._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName);d=f&&e.ui.hasScroll(d[0],"left")?0:c.sizeDiff.height;f=f?0:c.sizeDiff.width;f={width:c.helper.width()-f,height:c.helper.height()-d};d=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null;var g=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null;a.animate||this.element.css(e.extend(f, +{top:g,left:d}));c.helper.height(c.size.height);c.helper.width(c.size.width);this._helper&&!a.animate&&this._proportionallyResize()}e("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",b);this._helper&&this.helper.remove();return false},_updateVirtualBoundaries:function(b){var a=this.options,c,d,f;a={minWidth:k(a.minWidth)?a.minWidth:0,maxWidth:k(a.maxWidth)?a.maxWidth:Infinity,minHeight:k(a.minHeight)?a.minHeight:0,maxHeight:k(a.maxHeight)?a.maxHeight: +Infinity};if(this._aspectRatio||b){b=a.minHeight*this.aspectRatio;d=a.minWidth/this.aspectRatio;c=a.maxHeight*this.aspectRatio;f=a.maxWidth/this.aspectRatio;if(b>a.minWidth)a.minWidth=b;if(d>a.minHeight)a.minHeight=d;if(cb.width,h=k(b.height)&&a.minHeight&&a.minHeight>b.height;if(g)b.width=a.minWidth;if(h)b.height=a.minHeight;if(d)b.width=a.maxWidth;if(f)b.height=a.maxHeight;var i=this.originalPosition.left+this.originalSize.width,j=this.position.top+this.size.height,l=/sw|nw|w/.test(c);c=/nw|ne|n/.test(c);if(g&&l)b.left=i-a.minWidth;if(d&&l)b.left=i-a.maxWidth;if(h&&c)b.top=j-a.minHeight;if(f&&c)b.top=j-a.maxHeight;if((a=!b.width&&!b.height)&&!b.left&&b.top)b.top=null;else if(a&&!b.top&&b.left)b.left= +null;return b},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var b=this.helper||this.element,a=0;a');var a=e.browser.msie&&e.browser.version<7,c=a?1:0;a=a?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+ +a,height:this.element.outerHeight()+a,position:"absolute",left:this.elementOffset.left-c+"px",top:this.elementOffset.top-c+"px",zIndex:++b.zIndex});this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(b,a){return{width:this.originalSize.width+a}},w:function(b,a){return{left:this.originalPosition.left+a,width:this.originalSize.width-a}},n:function(b,a,c){return{top:this.originalPosition.top+c,height:this.originalSize.height-c}},s:function(b,a,c){return{height:this.originalSize.height+ +c}},se:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},sw:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,a,c]))},ne:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},nw:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,a,c]))}},_propagate:function(b,a){e.ui.plugin.call(this,b,[a,this.ui()]); +b!="resize"&&this._trigger(b,a,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});e.extend(e.ui.resizable,{version:"1.8.14"});e.ui.plugin.add("resizable","alsoResize",{start:function(){var b=e(this).data("resizable").options,a=function(c){e(c).each(function(){var d=e(this);d.data("resizable-alsoresize",{width:parseInt(d.width(), +10),height:parseInt(d.height(),10),left:parseInt(d.css("left"),10),top:parseInt(d.css("top"),10),position:d.css("position")})})};if(typeof b.alsoResize=="object"&&!b.alsoResize.parentNode)if(b.alsoResize.length){b.alsoResize=b.alsoResize[0];a(b.alsoResize)}else e.each(b.alsoResize,function(c){a(c)});else a(b.alsoResize)},resize:function(b,a){var c=e(this).data("resizable");b=c.options;var d=c.originalSize,f=c.originalPosition,g={height:c.size.height-d.height||0,width:c.size.width-d.width||0,top:c.position.top- +f.top||0,left:c.position.left-f.left||0},h=function(i,j){e(i).each(function(){var l=e(this),q=e(this).data("resizable-alsoresize"),p={},r=j&&j.length?j:l.parents(a.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(r,function(n,o){if((n=(q[o]||0)+(g[o]||0))&&n>=0)p[o]=n||null});if(e.browser.opera&&/relative/.test(l.css("position"))){c._revertToRelativePosition=true;l.css({position:"absolute",top:"auto",left:"auto"})}l.css(p)})};typeof b.alsoResize=="object"&&!b.alsoResize.nodeType? +e.each(b.alsoResize,function(i,j){h(i,j)}):h(b.alsoResize)},stop:function(){var b=e(this).data("resizable"),a=b.options,c=function(d){e(d).each(function(){var f=e(this);f.css({position:f.data("resizable-alsoresize").position})})};if(b._revertToRelativePosition){b._revertToRelativePosition=false;typeof a.alsoResize=="object"&&!a.alsoResize.nodeType?e.each(a.alsoResize,function(d){c(d)}):c(a.alsoResize)}e(this).removeData("resizable-alsoresize")}});e.ui.plugin.add("resizable","animate",{stop:function(b){var a= +e(this).data("resizable"),c=a.options,d=a._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName),g=f&&e.ui.hasScroll(d[0],"left")?0:a.sizeDiff.height;f={width:a.size.width-(f?0:a.sizeDiff.width),height:a.size.height-g};g=parseInt(a.element.css("left"),10)+(a.position.left-a.originalPosition.left)||null;var h=parseInt(a.element.css("top"),10)+(a.position.top-a.originalPosition.top)||null;a.element.animate(e.extend(f,h&&g?{top:h,left:g}:{}),{duration:c.animateDuration,easing:c.animateEasing, +step:function(){var i={width:parseInt(a.element.css("width"),10),height:parseInt(a.element.css("height"),10),top:parseInt(a.element.css("top"),10),left:parseInt(a.element.css("left"),10)};d&&d.length&&e(d[0]).css({width:i.width,height:i.height});a._updateCache(i);a._propagate("resize",b)}})}});e.ui.plugin.add("resizable","containment",{start:function(){var b=e(this).data("resizable"),a=b.element,c=b.options.containment;if(a=c instanceof e?c.get(0):/parent/.test(c)?a.parent().get(0):c){b.containerElement= +e(a);if(/document/.test(c)||c==document){b.containerOffset={left:0,top:0};b.containerPosition={left:0,top:0};b.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}}else{var d=e(a),f=[];e(["Top","Right","Left","Bottom"]).each(function(i,j){f[i]=m(d.css("padding"+j))});b.containerOffset=d.offset();b.containerPosition=d.position();b.containerSize={height:d.innerHeight()-f[3],width:d.innerWidth()-f[1]};c=b.containerOffset; +var g=b.containerSize.height,h=b.containerSize.width;h=e.ui.hasScroll(a,"left")?a.scrollWidth:h;g=e.ui.hasScroll(a)?a.scrollHeight:g;b.parentData={element:a,left:c.left,top:c.top,width:h,height:g}}}},resize:function(b){var a=e(this).data("resizable"),c=a.options,d=a.containerOffset,f=a.position;b=a._aspectRatio||b.shiftKey;var g={top:0,left:0},h=a.containerElement;if(h[0]!=document&&/static/.test(h.css("position")))g=d;if(f.left<(a._helper?d.left:0)){a.size.width+=a._helper?a.position.left-d.left: +a.position.left-g.left;if(b)a.size.height=a.size.width/c.aspectRatio;a.position.left=c.helper?d.left:0}if(f.top<(a._helper?d.top:0)){a.size.height+=a._helper?a.position.top-d.top:a.position.top;if(b)a.size.width=a.size.height*c.aspectRatio;a.position.top=a._helper?d.top:0}a.offset.left=a.parentData.left+a.position.left;a.offset.top=a.parentData.top+a.position.top;c=Math.abs((a._helper?a.offset.left-g.left:a.offset.left-g.left)+a.sizeDiff.width);d=Math.abs((a._helper?a.offset.top-g.top:a.offset.top- +d.top)+a.sizeDiff.height);f=a.containerElement.get(0)==a.element.parent().get(0);g=/relative|absolute/.test(a.containerElement.css("position"));if(f&&g)c-=a.parentData.left;if(c+a.size.width>=a.parentData.width){a.size.width=a.parentData.width-c;if(b)a.size.height=a.size.width/a.aspectRatio}if(d+a.size.height>=a.parentData.height){a.size.height=a.parentData.height-d;if(b)a.size.width=a.size.height*a.aspectRatio}},stop:function(){var b=e(this).data("resizable"),a=b.options,c=b.containerOffset,d=b.containerPosition, +f=b.containerElement,g=e(b.helper),h=g.offset(),i=g.outerWidth()-b.sizeDiff.width;g=g.outerHeight()-b.sizeDiff.height;b._helper&&!a.animate&&/relative/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g});b._helper&&!a.animate&&/static/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g})}});e.ui.plugin.add("resizable","ghost",{start:function(){var b=e(this).data("resizable"),a=b.options,c=b.size;b.ghost=b.originalElement.clone();b.ghost.css({opacity:0.25, +display:"block",position:"relative",height:c.height,width:c.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof a.ghost=="string"?a.ghost:"");b.ghost.appendTo(b.helper)},resize:function(){var b=e(this).data("resizable");b.ghost&&b.ghost.css({position:"relative",height:b.size.height,width:b.size.width})},stop:function(){var b=e(this).data("resizable");b.ghost&&b.helper&&b.helper.get(0).removeChild(b.ghost.get(0))}});e.ui.plugin.add("resizable","grid",{resize:function(){var b= +e(this).data("resizable"),a=b.options,c=b.size,d=b.originalSize,f=b.originalPosition,g=b.axis;a.grid=typeof a.grid=="number"?[a.grid,a.grid]:a.grid;var h=Math.round((c.width-d.width)/(a.grid[0]||1))*(a.grid[0]||1);a=Math.round((c.height-d.height)/(a.grid[1]||1))*(a.grid[1]||1);if(/^(se|s|e)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else if(/^(ne)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}else{if(/^(sw)$/.test(g)){b.size.width=d.width+h;b.size.height= +d.height+a}else{b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}b.position.left=f.left-h}}});var m=function(b){return parseInt(b,10)||0},k=function(b){return!isNaN(parseInt(b,10))}})(jQuery); +;/* + * jQuery UI Effects 1.8.14 + * + * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Effects/ + */ +jQuery.effects||function(f,j){function m(c){var a;if(c&&c.constructor==Array&&c.length==3)return c;if(a=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c))return[parseInt(a[1],10),parseInt(a[2],10),parseInt(a[3],10)];if(a=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c))return[parseFloat(a[1])*2.55,parseFloat(a[2])*2.55,parseFloat(a[3])*2.55];if(a=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c))return[parseInt(a[1], +16),parseInt(a[2],16),parseInt(a[3],16)];if(a=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c))return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(c))return n.transparent;return n[f.trim(c).toLowerCase()]}function s(c,a){var b;do{b=f.curCSS(c,a);if(b!=""&&b!="transparent"||f.nodeName(c,"body"))break;a="backgroundColor"}while(c=c.parentNode);return m(b)}function o(){var c=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle, +a={},b,d;if(c&&c.length&&c[0]&&c[c[0]])for(var e=c.length;e--;){b=c[e];if(typeof c[b]=="string"){d=b.replace(/\-(\w)/g,function(g,h){return h.toUpperCase()});a[d]=c[b]}}else for(b in c)if(typeof c[b]==="string")a[b]=c[b];return a}function p(c){var a,b;for(a in c){b=c[a];if(b==null||f.isFunction(b)||a in t||/scrollbar/.test(a)||!/color/i.test(a)&&isNaN(parseFloat(b)))delete c[a]}return c}function u(c,a){var b={_:0},d;for(d in a)if(c[d]!=a[d])b[d]=a[d];return b}function k(c,a,b,d){if(typeof c=="object"){d= +a;b=null;a=c;c=a.effect}if(f.isFunction(a)){d=a;b=null;a={}}if(typeof a=="number"||f.fx.speeds[a]){d=b;b=a;a={}}if(f.isFunction(b)){d=b;b=null}a=a||{};b=b||a.duration;b=f.fx.off?0:typeof b=="number"?b:b in f.fx.speeds?f.fx.speeds[b]:f.fx.speeds._default;d=d||a.complete;return[c,a,b,d]}function l(c){if(!c||typeof c==="number"||f.fx.speeds[c])return true;if(typeof c==="string"&&!f.effects[c])return true;return false}f.effects={};f.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor", +"borderTopColor","borderColor","color","outlineColor"],function(c,a){f.fx.step[a]=function(b){if(!b.colorInit){b.start=s(b.elem,a);b.end=m(b.end);b.colorInit=true}b.elem.style[a]="rgb("+Math.max(Math.min(parseInt(b.pos*(b.end[0]-b.start[0])+b.start[0],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[1]-b.start[1])+b.start[1],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[2]-b.start[2])+b.start[2],10),255),0)+")"}});var n={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0, +0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211, +211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},q=["add","remove","toggle"],t={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};f.effects.animateClass=function(c,a,b, +d){if(f.isFunction(b)){d=b;b=null}return this.queue(function(){var e=f(this),g=e.attr("style")||" ",h=p(o.call(this)),r,v=e.attr("class");f.each(q,function(w,i){c[i]&&e[i+"Class"](c[i])});r=p(o.call(this));e.attr("class",v);e.animate(u(h,r),{queue:false,duration:a,easing:b,complete:function(){f.each(q,function(w,i){c[i]&&e[i+"Class"](c[i])});if(typeof e.attr("style")=="object"){e.attr("style").cssText="";e.attr("style").cssText=g}else e.attr("style",g);d&&d.apply(this,arguments);f.dequeue(this)}})})}; +f.fn.extend({_addClass:f.fn.addClass,addClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{add:c},a,b,d]):this._addClass(c)},_removeClass:f.fn.removeClass,removeClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{remove:c},a,b,d]):this._removeClass(c)},_toggleClass:f.fn.toggleClass,toggleClass:function(c,a,b,d,e){return typeof a=="boolean"||a===j?b?f.effects.animateClass.apply(this,[a?{add:c}:{remove:c},b,d,e]):this._toggleClass(c,a):f.effects.animateClass.apply(this, +[{toggle:c},a,b,d])},switchClass:function(c,a,b,d,e){return f.effects.animateClass.apply(this,[{add:a,remove:c},b,d,e])}});f.extend(f.effects,{version:"1.8.14",save:function(c,a){for(var b=0;b").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}); +c.wrap(b);b=c.parent();if(c.css("position")=="static"){b.css({position:"relative"});c.css({position:"relative"})}else{f.extend(a,{position:c.css("position"),zIndex:c.css("z-index")});f.each(["top","left","bottom","right"],function(d,e){a[e]=c.css(e);if(isNaN(parseInt(a[e],10)))a[e]="auto"});c.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}return b.css(a).show()},removeWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent().replaceWith(c);return c},setTransition:function(c, +a,b,d){d=d||{};f.each(a,function(e,g){unit=c.cssUnit(g);if(unit[0]>0)d[g]=unit[0]*b+unit[1]});return d}});f.fn.extend({effect:function(c){var a=k.apply(this,arguments),b={options:a[1],duration:a[2],callback:a[3]};a=b.options.mode;var d=f.effects[c];if(f.fx.off||!d)return a?this[a](b.duration,b.callback):this.each(function(){b.callback&&b.callback.call(this)});return d.call(this,b)},_show:f.fn.show,show:function(c){if(l(c))return this._show.apply(this,arguments);else{var a=k.apply(this,arguments); +a[1].mode="show";return this.effect.apply(this,a)}},_hide:f.fn.hide,hide:function(c){if(l(c))return this._hide.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="hide";return this.effect.apply(this,a)}},__toggle:f.fn.toggle,toggle:function(c){if(l(c)||typeof c==="boolean"||f.isFunction(c))return this.__toggle.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="toggle";return this.effect.apply(this,a)}},cssUnit:function(c){var a=this.css(c),b=[];f.each(["em","px","%", +"pt"],function(d,e){if(a.indexOf(e)>0)b=[parseFloat(a),e]});return b}});f.easing.jswing=f.easing.swing;f.extend(f.easing,{def:"easeOutQuad",swing:function(c,a,b,d,e){return f.easing[f.easing.def](c,a,b,d,e)},easeInQuad:function(c,a,b,d,e){return d*(a/=e)*a+b},easeOutQuad:function(c,a,b,d,e){return-d*(a/=e)*(a-2)+b},easeInOutQuad:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a+b;return-d/2*(--a*(a-2)-1)+b},easeInCubic:function(c,a,b,d,e){return d*(a/=e)*a*a+b},easeOutCubic:function(c,a,b,d,e){return d* +((a=a/e-1)*a*a+1)+b},easeInOutCubic:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a+b;return d/2*((a-=2)*a*a+2)+b},easeInQuart:function(c,a,b,d,e){return d*(a/=e)*a*a*a+b},easeOutQuart:function(c,a,b,d,e){return-d*((a=a/e-1)*a*a*a-1)+b},easeInOutQuart:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a+b;return-d/2*((a-=2)*a*a*a-2)+b},easeInQuint:function(c,a,b,d,e){return d*(a/=e)*a*a*a*a+b},easeOutQuint:function(c,a,b,d,e){return d*((a=a/e-1)*a*a*a*a+1)+b},easeInOutQuint:function(c,a,b,d,e){if((a/= +e/2)<1)return d/2*a*a*a*a*a+b;return d/2*((a-=2)*a*a*a*a+2)+b},easeInSine:function(c,a,b,d,e){return-d*Math.cos(a/e*(Math.PI/2))+d+b},easeOutSine:function(c,a,b,d,e){return d*Math.sin(a/e*(Math.PI/2))+b},easeInOutSine:function(c,a,b,d,e){return-d/2*(Math.cos(Math.PI*a/e)-1)+b},easeInExpo:function(c,a,b,d,e){return a==0?b:d*Math.pow(2,10*(a/e-1))+b},easeOutExpo:function(c,a,b,d,e){return a==e?b+d:d*(-Math.pow(2,-10*a/e)+1)+b},easeInOutExpo:function(c,a,b,d,e){if(a==0)return b;if(a==e)return b+d;if((a/= +e/2)<1)return d/2*Math.pow(2,10*(a-1))+b;return d/2*(-Math.pow(2,-10*--a)+2)+b},easeInCirc:function(c,a,b,d,e){return-d*(Math.sqrt(1-(a/=e)*a)-1)+b},easeOutCirc:function(c,a,b,d,e){return d*Math.sqrt(1-(a=a/e-1)*a)+b},easeInOutCirc:function(c,a,b,d,e){if((a/=e/2)<1)return-d/2*(Math.sqrt(1-a*a)-1)+b;return d/2*(Math.sqrt(1-(a-=2)*a)+1)+b},easeInElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h Date: Tue, 19 Jul 2011 14:23:35 +0100 Subject: [PATCH 08/24] Remove old jquery ui file --- static/js/jquery-ui-slide.js | 45 ------------------------------------ 1 file changed, 45 deletions(-) delete mode 100644 static/js/jquery-ui-slide.js diff --git a/static/js/jquery-ui-slide.js b/static/js/jquery-ui-slide.js deleted file mode 100644 index 37fcf639..00000000 --- a/static/js/jquery-ui-slide.js +++ /dev/null @@ -1,45 +0,0 @@ -/* - * jQuery UI Effects 1.8.14 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Effects/ - */ -jQuery.effects||function(f,j){function m(c){var a;if(c&&c.constructor==Array&&c.length==3)return c;if(a=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c))return[parseInt(a[1],10),parseInt(a[2],10),parseInt(a[3],10)];if(a=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c))return[parseFloat(a[1])*2.55,parseFloat(a[2])*2.55,parseFloat(a[3])*2.55];if(a=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c))return[parseInt(a[1], -16),parseInt(a[2],16),parseInt(a[3],16)];if(a=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c))return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(c))return n.transparent;return n[f.trim(c).toLowerCase()]}function s(c,a){var b;do{b=f.curCSS(c,a);if(b!=""&&b!="transparent"||f.nodeName(c,"body"))break;a="backgroundColor"}while(c=c.parentNode);return m(b)}function o(){var c=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle, -a={},b,d;if(c&&c.length&&c[0]&&c[c[0]])for(var e=c.length;e--;){b=c[e];if(typeof c[b]=="string"){d=b.replace(/\-(\w)/g,function(g,h){return h.toUpperCase()});a[d]=c[b]}}else for(b in c)if(typeof c[b]==="string")a[b]=c[b];return a}function p(c){var a,b;for(a in c){b=c[a];if(b==null||f.isFunction(b)||a in t||/scrollbar/.test(a)||!/color/i.test(a)&&isNaN(parseFloat(b)))delete c[a]}return c}function u(c,a){var b={_:0},d;for(d in a)if(c[d]!=a[d])b[d]=a[d];return b}function k(c,a,b,d){if(typeof c=="object"){d= -a;b=null;a=c;c=a.effect}if(f.isFunction(a)){d=a;b=null;a={}}if(typeof a=="number"||f.fx.speeds[a]){d=b;b=a;a={}}if(f.isFunction(b)){d=b;b=null}a=a||{};b=b||a.duration;b=f.fx.off?0:typeof b=="number"?b:b in f.fx.speeds?f.fx.speeds[b]:f.fx.speeds._default;d=d||a.complete;return[c,a,b,d]}function l(c){if(!c||typeof c==="number"||f.fx.speeds[c])return true;if(typeof c==="string"&&!f.effects[c])return true;return false}f.effects={};f.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor", -"borderTopColor","borderColor","color","outlineColor"],function(c,a){f.fx.step[a]=function(b){if(!b.colorInit){b.start=s(b.elem,a);b.end=m(b.end);b.colorInit=true}b.elem.style[a]="rgb("+Math.max(Math.min(parseInt(b.pos*(b.end[0]-b.start[0])+b.start[0],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[1]-b.start[1])+b.start[1],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[2]-b.start[2])+b.start[2],10),255),0)+")"}});var n={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0, -0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211, -211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},q=["add","remove","toggle"],t={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};f.effects.animateClass=function(c,a,b, -d){if(f.isFunction(b)){d=b;b=null}return this.queue(function(){var e=f(this),g=e.attr("style")||" ",h=p(o.call(this)),r,v=e.attr("class");f.each(q,function(w,i){c[i]&&e[i+"Class"](c[i])});r=p(o.call(this));e.attr("class",v);e.animate(u(h,r),{queue:false,duration:a,easing:b,complete:function(){f.each(q,function(w,i){c[i]&&e[i+"Class"](c[i])});if(typeof e.attr("style")=="object"){e.attr("style").cssText="";e.attr("style").cssText=g}else e.attr("style",g);d&&d.apply(this,arguments);f.dequeue(this)}})})}; -f.fn.extend({_addClass:f.fn.addClass,addClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{add:c},a,b,d]):this._addClass(c)},_removeClass:f.fn.removeClass,removeClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{remove:c},a,b,d]):this._removeClass(c)},_toggleClass:f.fn.toggleClass,toggleClass:function(c,a,b,d,e){return typeof a=="boolean"||a===j?b?f.effects.animateClass.apply(this,[a?{add:c}:{remove:c},b,d,e]):this._toggleClass(c,a):f.effects.animateClass.apply(this, -[{toggle:c},a,b,d])},switchClass:function(c,a,b,d,e){return f.effects.animateClass.apply(this,[{add:a,remove:c},b,d,e])}});f.extend(f.effects,{version:"1.8.14",save:function(c,a){for(var b=0;b").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}); -c.wrap(b);b=c.parent();if(c.css("position")=="static"){b.css({position:"relative"});c.css({position:"relative"})}else{f.extend(a,{position:c.css("position"),zIndex:c.css("z-index")});f.each(["top","left","bottom","right"],function(d,e){a[e]=c.css(e);if(isNaN(parseInt(a[e],10)))a[e]="auto"});c.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}return b.css(a).show()},removeWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent().replaceWith(c);return c},setTransition:function(c, -a,b,d){d=d||{};f.each(a,function(e,g){unit=c.cssUnit(g);if(unit[0]>0)d[g]=unit[0]*b+unit[1]});return d}});f.fn.extend({effect:function(c){var a=k.apply(this,arguments),b={options:a[1],duration:a[2],callback:a[3]};a=b.options.mode;var d=f.effects[c];if(f.fx.off||!d)return a?this[a](b.duration,b.callback):this.each(function(){b.callback&&b.callback.call(this)});return d.call(this,b)},_show:f.fn.show,show:function(c){if(l(c))return this._show.apply(this,arguments);else{var a=k.apply(this,arguments); -a[1].mode="show";return this.effect.apply(this,a)}},_hide:f.fn.hide,hide:function(c){if(l(c))return this._hide.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="hide";return this.effect.apply(this,a)}},__toggle:f.fn.toggle,toggle:function(c){if(l(c)||typeof c==="boolean"||f.isFunction(c))return this.__toggle.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="toggle";return this.effect.apply(this,a)}},cssUnit:function(c){var a=this.css(c),b=[];f.each(["em","px","%", -"pt"],function(d,e){if(a.indexOf(e)>0)b=[parseFloat(a),e]});return b}});f.easing.jswing=f.easing.swing;f.extend(f.easing,{def:"easeOutQuad",swing:function(c,a,b,d,e){return f.easing[f.easing.def](c,a,b,d,e)},easeInQuad:function(c,a,b,d,e){return d*(a/=e)*a+b},easeOutQuad:function(c,a,b,d,e){return-d*(a/=e)*(a-2)+b},easeInOutQuad:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a+b;return-d/2*(--a*(a-2)-1)+b},easeInCubic:function(c,a,b,d,e){return d*(a/=e)*a*a+b},easeOutCubic:function(c,a,b,d,e){return d* -((a=a/e-1)*a*a+1)+b},easeInOutCubic:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a+b;return d/2*((a-=2)*a*a+2)+b},easeInQuart:function(c,a,b,d,e){return d*(a/=e)*a*a*a+b},easeOutQuart:function(c,a,b,d,e){return-d*((a=a/e-1)*a*a*a-1)+b},easeInOutQuart:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a+b;return-d/2*((a-=2)*a*a*a-2)+b},easeInQuint:function(c,a,b,d,e){return d*(a/=e)*a*a*a*a+b},easeOutQuint:function(c,a,b,d,e){return d*((a=a/e-1)*a*a*a*a+1)+b},easeInOutQuint:function(c,a,b,d,e){if((a/= -e/2)<1)return d/2*a*a*a*a*a+b;return d/2*((a-=2)*a*a*a*a+2)+b},easeInSine:function(c,a,b,d,e){return-d*Math.cos(a/e*(Math.PI/2))+d+b},easeOutSine:function(c,a,b,d,e){return d*Math.sin(a/e*(Math.PI/2))+b},easeInOutSine:function(c,a,b,d,e){return-d/2*(Math.cos(Math.PI*a/e)-1)+b},easeInExpo:function(c,a,b,d,e){return a==0?b:d*Math.pow(2,10*(a/e-1))+b},easeOutExpo:function(c,a,b,d,e){return a==e?b+d:d*(-Math.pow(2,-10*a/e)+1)+b},easeInOutExpo:function(c,a,b,d,e){if(a==0)return b;if(a==e)return b+d;if((a/= -e/2)<1)return d/2*Math.pow(2,10*(a-1))+b;return d/2*(-Math.pow(2,-10*--a)+2)+b},easeInCirc:function(c,a,b,d,e){return-d*(Math.sqrt(1-(a/=e)*a)-1)+b},easeOutCirc:function(c,a,b,d,e){return d*Math.sqrt(1-(a=a/e-1)*a)+b},easeInOutCirc:function(c,a,b,d,e){if((a/=e/2)<1)return-d/2*(Math.sqrt(1-a*a)-1)+b;return d/2*(Math.sqrt(1-(a-=2)*a)+1)+b},easeInElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h Date: Tue, 19 Jul 2011 14:24:50 +0100 Subject: [PATCH 09/24] Change it to use jquery ui instwead of the jquery ui slide file --- node/minify.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/minify.js b/node/minify.js index d7890f5c..dd07b116 100644 --- a/node/minify.js +++ b/node/minify.js @@ -39,7 +39,7 @@ exports.padJS = function(req, res) { res.header("Content-Type","text/javascript"); - var jsFiles = ["jquery.min.js", "plugins.js", "undo-xpopup.js", "json2.js", "pad_utils.js", "pad_cookie.js", "pad_editor.js", "pad_editbar.js", "pad_docbar.js", "pad_modals.js", "ace.js", "collab_client.js", "pad_userlist.js", "pad_impexp.js", "pad_savedrevs.js", "pad_connectionstatus.js", "pad2.js", "jquery-ui-slide.js", "chat.js"]; + var jsFiles = ["jquery.min.js", "plugins.js", "undo-xpopup.js", "json2.js", "pad_utils.js", "pad_cookie.js", "pad_editor.js", "pad_editbar.js", "pad_docbar.js", "pad_modals.js", "ace.js", "collab_client.js", "pad_userlist.js", "pad_impexp.js", "pad_savedrevs.js", "pad_connectionstatus.js", "pad2.js", "jquery-ui.js", "chat.js"]; //minifying is enabled if(settings.minify) From 65baa26fca35628982f786869d57a615da9457fb Mon Sep 17 00:00:00 2001 From: John McLear Date: Tue, 19 Jul 2011 16:03:34 +0100 Subject: [PATCH 10/24] Resize chat --- static/css/pad_lite.css | 41 ++++++++++++++++++++++++++++++++++++++++- static/js/chat.js | 8 ++++++-- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/static/css/pad_lite.css b/static/css/pad_lite.css index d4c0b77b..6bdabb9c 100644 --- a/static/css/pad_lite.css +++ b/static/css/pad_lite.css @@ -785,8 +785,12 @@ ul#colorpickerswatches li:hover background-color: white; border: 1px solid white; overflow-y:scroll; - height: 165px; font-size: 12px; + position:absolute; + right:0px; + left:0px; + top:25px; + bottom:25px; } #chattext p @@ -798,6 +802,10 @@ ul#colorpickerswatches li:hover #chatinputbox { padding: 3px 2px; + position: absolute; + bottom:0px; + right:0px; + left:3px; } #chatlabel @@ -858,6 +866,8 @@ ul#colorpickerswatches li:hover #titlelabel { font-size:13px; + margin-left:20px; + padding-top:3px; } #titlecross @@ -879,3 +889,32 @@ ul#colorpickerswatches li:hover margin-right: 3px; margin-top:2px; } + + +/* resizable stuff for chat */ +.ui-resizable { +position: relative; +} +.ui-resizable-handle { + position: absolute; + font-size: 0.1px; + z-index: 99999; + display: block; + +} +/* +.ui-resizable-disabled .ui-resizable-handle, .ui-resizable- autohide .ui-resizable-handle { display: none; } +*/ + +.ui-resizable-nw { + cursor: nw-resize; + width: 22px; + height: 22px; + left: 0px; top: 0px; + background-size: 100% auto; + background-image: url("/static/img/nw-resize.png"); + background-repeat: no-repeat; +/* background-position: -5px -5px;*/ +} +.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: +-5px; top: -5px;} diff --git a/static/js/chat.js b/static/js/chat.js index facd3b1e..a823611d 100644 --- a/static/js/chat.js +++ b/static/js/chat.js @@ -6,7 +6,11 @@ var chat = (function() $("#chaticon").hide("slide", { direction: "down" }, 500, function() { $("#chatbox").show("slide", { direction: "down" }, 750, self.scrollDown); - $("#chatbox").resizable(); + $("#chatbox").resizable({ handles: 'nw', start: function(event,ui){ + $("#editorcontainer").hide(); + }, stop: function(event,ui){ + $("#editorcontainer").show(); + }}); }); }, hide: function () @@ -19,7 +23,7 @@ var chat = (function() }, scrollDown: function() { - console.log($('#chatbox').css("display")); + //console.log($('#chatbox').css("display")); if($('#chatbox').css("display") != "none") $('#chattext').animate({scrollTop: $('#chattext')[0].scrollHeight}, "slow"); From f245685c3a81f5acbdef30ee4a47ef7fffd06827 Mon Sep 17 00:00:00 2001 From: John McLear Date: Tue, 19 Jul 2011 16:32:06 +0100 Subject: [PATCH 11/24] Remove a line break.. heh --- static/js/pad2.js | 1 - 1 file changed, 1 deletion(-) diff --git a/static/js/pad2.js b/static/js/pad2.js index cb1f32d9..fddd9622 100644 --- a/static/js/pad2.js +++ b/static/js/pad2.js @@ -205,7 +205,6 @@ var pad = { //initialize the chat chat.init(); - pad.diagnosticInfo.uniqueId = padutils.uniqueId(); pad.initTime = +(new Date()); pad.padOptions = clientVars.initialOptions; From d6bae2697837109f646da7938426f9ece6e736c3 Mon Sep 17 00:00:00 2001 From: John McLear Date: Tue, 19 Jul 2011 16:34:38 +0100 Subject: [PATCH 12/24] rename broadcast.css to timeslider --- static/css/timeslider.css | 194 ++++++++++++++++++++++++++++++++++++++ static/timeslider.html | 2 +- 2 files changed, 195 insertions(+), 1 deletion(-) create mode 100644 static/css/timeslider.css diff --git a/static/css/timeslider.css b/static/css/timeslider.css new file mode 100644 index 00000000..be5390cb --- /dev/null +++ b/static/css/timeslider.css @@ -0,0 +1,194 @@ +#editorcontainerbox { + overflow: auto; +} + +#padcontent { + padding: 10px; + font-size: 12px; +} + +#timeslider-wrapper { + position: relative; + left: 0px; + right: 0px; + top: 0px; +} + +#timeslider-left { + position: absolute; + left:0px; + background-image: url(../../static/img/timeslider_left.png); + width: 134px; + height: 63px; +} + +#timeslider-right { + position: absolute; + top:0px; + right:0px; + background-image: url(../../static/img/timeslider_right.png); + width: 155px; + height: 63px; +} + + +#timeslider { +/* margin:7px;*/ + margin-bottom: 0px; + height: 63px; + margin-left: 9px; + margin-right: 9px; + background-image: url(../../static/img/timeslider_background.png); +} + +div#timeslider #timeslider-slider { + position: absolute; + left: 0px; + top: 1px; + height: 61px; + width: 100%; +} + +div#ui-slider-handle { + width: 13px; + height: 61px; + background-image: url(../../static/img/crushed_current_location.png); + cursor: pointer; + -moz-user-select: none; + -khtml-user-select: none; + user-select: none; + position: absolute; + top: 0; + left: 0; +} +* html div#ui-slider-handle { /* IE 6/7 */ + background-image: url(../../static/img/current_location.gif); +} + +div#ui-slider-bar { + position: relative; + margin-right: 148px; + height: 35px; + margin-left: 5px; + top: 20px; + cursor: pointer; + -moz-user-select: none; + -khtml-user-select: none; + user-select: none; + +} + +div#timeslider div#playpause_button { + background-image: url(../../static/img/crushed_button_undepressed.png); + width: 47px; + height: 47px; + position: absolute; + right: 77px; + top: 9px; +} + +div#timeslider div#playpause_button div#playpause_button_icon { + background-image: url(../../static/img/play.png); + width: 47px; + height: 47px; + position: absolute; + top :0px; + left:0px; +} +* html div#timeslider div#playpause_button div#playpause_button_icon { + background-image: url(../../static/img/play.gif); /* IE 6/7 */ +} + +div#timeslider div#playpause_button div.pause#playpause_button_icon { + background-image: url(../../static/img/pause.png); +} +* html div#timeslider div#playpause_button div.pause#playpause_button_icon { + background-image: url(../../static/img/pause.gif); /* IE 6/7 */ +} + +div #timeslider div#steppers div#leftstar { + position: absolute; + right: 34px; + top: 8px; + width:30px; + height:21px; + background: url(../../static/img/stepper_buttons.png) 0px 44px; + overflow:hidden; +} + +div #timeslider div#steppers div#rightstar { + position: absolute; + right: 5px; + top: 8px; + width:29px; + height:21px; + background: url(../../static/img/stepper_buttons.png) 29px 44px; + overflow:hidden; +} + +div #timeslider div#steppers div#leftstep { + position: absolute; + right: 34px; + top: 33px; + width:30px; + height:21px; + background: url(../../static/img/stepper_buttons.png) 0px 22px; + overflow:hidden; +} + +div #timeslider div#steppers div#rightstep { + position: absolute; + right: 5px; + top: 33px; + width:29px; + height:21px; + background: url(../../static/img/stepper_buttons.png) 29px 22px; + overflow:hidden; +} + +#timeslider div.star { + position: absolute; + top: 40px; + background-image: url(../../static/img/star.png); + width: 15px; + height: 16px; + cursor: pointer; +} +* html #timeslider div.star { + background-image: url(../../static/img/star.gif); /* IE 6/7 */ +} + +#timeslider div#timer { + position: absolute; + font-family: Arial, sans-serif; + left: 7px; + top: 9px; + width: 122px; + text-align: center; + color: white; + font-size: 11px; +} + +.topbarcenter{ +display:none; +} + +#docbar{ +display:none; +} + +#padmain{ +top:30px; +} + +#editbarright{ +float:right; +} + +#returnbutton +{ + font-size: 16px; + line-height: 29px; + margin-top: 0; + padding-right: 6pt; +} diff --git a/static/timeslider.html b/static/timeslider.html index 84f93681..00a815b4 100644 --- a/static/timeslider.html +++ b/static/timeslider.html @@ -9,7 +9,7 @@ Etherpad Lite Timeslider - +