@@ -420,7 +458,6 @@
Name
Progress
Queue Order
-
Size
State
Reverse Sort Order
diff --git a/web/javascript/common.js b/web/javascript/common.js
index 3461fa97c..1775c897c 100644
--- a/web/javascript/common.js
+++ b/web/javascript/common.js
@@ -7,6 +7,7 @@
*/
var transmission;
+var dialog;
var resizeTimer = null;
// Test for a Webkit build that supports box-shadow: 521+ (release Safari 3 is
// actually 523.10.3). We need 3.1 for CSS animation (dialog sheets) but as it
@@ -33,10 +34,20 @@ function testSafari3()
};
$(document).ready( function() {
+ // Initialise the dialog controller
+ dialog = new Dialog();
// Initialise the main Transmission controller
transmission = new Transmission();
+ // IE specific fixes here
+ if ($.browser.msie) {
+ try {
+ document.execCommand("BackgroundImageCache", false, true);
+ } catch(err) {}
+ $('.dialog_container').css('height',$(window).height()+'px');
+ }
+
if ($.browser.safari) {
// Move search field's margin down for the styled input
$('#torrent_search').css('margin-top', 3);
@@ -45,14 +56,20 @@ $(document).ready( function() {
// Fix for non-Safari-3 browsers: dark borders to replace shadows.
// Opera messes up the menu if we use a border on .trans_menu
// div.outerbox so use ul instead
- $('.trans_menu ul, div#jqContextMenu').css('border', '1px solid #777');
+ $('.trans_menu ul, div#jqContextMenu, div.dialog_container div.dialog_window').css('border', '1px solid #777');
// and this kills the border we used to have
$('.trans_menu div.outerbox').css('border', 'none');
} else if (!iPhone) {
// Used for Safari 3.1 CSS animation. Degrades gracefully (so Safari 3
// test is good enough) but we delay our hide/unhide to wait for the
// scrolling - no point making other browsers wait.
- $('div#upload_container').css('top', '-205px');
+ $('div#upload_container div.dialog_window').css('top', '-205px');
+ $('div#prefs_container div.dialog_window').css('top', '-425px');
+ $('div#dialog_container div.dialog_window').css('top', '-425px');
+ $('div.dialog_container div.dialog_window').css('-webkit-transition', 'top 0.3s');
+ // -webkit-appearance makes some links into buttons, but needs
+ // different padding.
+ $('div.dialog_container div.dialog_window a').css('padding', '2px 10px 3px');
}
if (iPhone){
window.onload = function(){ setTimeout(function() { window.scrollTo(0,1); },500); };
@@ -176,39 +193,6 @@ function changeTab(tab, id) {
}
}
-function tellUser( primaryText, secondaryText )
-{
- $("#dialog_body").html("
" + primaryText + "
" + secondaryText + "
" );
- $("#dialog" ).dialog( {
- title: primaryText,
- hide: 'blind',
- buttons: { 'Close': function() { $(this).dialog('close'); } }
- });
-}
-
-/**
- * @brief Show a confirmation dialog
- */
-function askUser(dialog_heading, dialog_message, confirm_button_label,
- callback_function, callback_data,
- cancel_button_label)
-{
- if( cancel_button_label == null )
- cancel_button_label = 'Cancel';
- $("#dialog_body").html("
" + dialog_heading + "
" + dialog_message + "
" );
- var myButtons = { };
- myButtons[cancel_button_label] = function() { $(this).dialog('close'); }
- myButtons[confirm_button_label] = function() {
- callback_function.call( null, callback_data );
- $(this).dialog('close');
- };
- $("#dialog" ).dialog( {
- title: dialog_heading,
- hide: 'blind',
- buttons: myButtons
- });
-}
-
/***
**** Preferences
***/
@@ -229,7 +213,6 @@ Prefs._FilterActive = 'active';
Prefs._FilterSeeding = 'seeding';
Prefs._FilterDownloading = 'downloading';
Prefs._FilterPaused = 'paused';
-Prefs._FilterFinished = 'finished';
Prefs._SortDirection = 'sort_direction';
Prefs._SortAscending = 'ascending';
@@ -241,10 +224,10 @@ Prefs._SortByActivity = 'activity';
Prefs._SortByQueue = 'queue_order';
Prefs._SortByName = 'name';
Prefs._SortByProgress = 'percent_completed';
-Prefs._SortBySize = 'size';
Prefs._SortByState = 'state';
Prefs._SortByTracker = 'tracker';
+Prefs._TurtleState = 'turtle-state';
Prefs._CompactDisplayState= 'compact_display_state';
Prefs._Defaults =
diff --git a/web/javascript/jquery/jquery.min.js b/web/javascript/jquery/jquery.min.js
new file mode 100644
index 000000000..7c2430802
--- /dev/null
+++ b/web/javascript/jquery/jquery.min.js
@@ -0,0 +1,154 @@
+/*!
+ * jQuery JavaScript Library v1.4.2
+ * http://jquery.com/
+ *
+ * Copyright 2010, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2010, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Sat Feb 13 22:33:48 2010 -0500
+ */
+(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o
)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/,
+Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&&
+(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this,
+a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b===
+"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,
+function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;ba -1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected=
+c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]||b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");
+a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)||cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\|`]/g,
+function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events||{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split(".");
+k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]||{};if(!u){u=i[k]=[];if(!z.setup||z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a),
+C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(r=C[e])if(d){n=c.event.special[e]||{};for(B=f||0;B=0){a.type=
+e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&&
+f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]||{};if((!k._default||k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a||A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;
+if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",
+e);if(!(f===w||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,
+"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a,
+d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
+e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l||[];var q=h=h||s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift();
+t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y||(y=t);y||k.error(D||
+g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},
+CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m,
+g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},
+text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},
+setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return hl[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h=
+h[3];l=0;for(m=h.length;l=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m===
+"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g,
+h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l
";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}();
+(function(){var g=s.createElement("div");g.innerHTML="
";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}:
+function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f0)for(var j=d;j0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j=
+{},i;if(f&&a.length){e=0;for(var o=a.length;e-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a===
+"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",
+d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?
+a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType===
+1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/"},F={option:[1,""," "],legend:[1,""," "],thead:[1,""],tr:[2,""],td:[3,""],col:[2,""],area:[1,""," "],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div","
"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=
+c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},
+wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},
+prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,
+this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild);
+return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja,
+""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]);
+return this}else{e=0;for(var j=d.length;e0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["",
+""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]===""&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e=
+c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]?
+c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja=
+function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter=
+Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a,
+"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f=
+a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=
+a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=//gi,ub=/select|textarea/i,vb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ka=/\?/,wb=/(\?|&)_=.*?(&|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!==
+"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"||o==="notmodified")j.html(e?c("
").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this},
+serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ub.test(this.nodeName)||vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),
+function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,
+global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"||!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&&
+e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context||e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)||(e.url+=(ka.test(e.url)?
+"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||N.test(e.url))){j=e.jsonpCallback||"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]||function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache===
+false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol||r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]||s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B=
+false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data||a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since",
+c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r||x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x||x.readyState===0||q==="abort"){E||
+d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4||q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"||i==="notmodified")j||b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x);
+g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"||n==="PUT"||n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async||g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===
+1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b===
+"json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b||/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"||c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional;
+if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle|show|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration===
+"number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||
+c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;
+this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=
+this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem,
+e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b
";
+a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b);
+c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)||0,i=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a,
+d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top-
+f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||s.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset":
+"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]||j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in
+e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window);
diff --git a/web/javascript/jquery/json.js b/web/javascript/jquery/json.js
new file mode 100644
index 000000000..78e843a36
--- /dev/null
+++ b/web/javascript/jquery/json.js
@@ -0,0 +1,96 @@
+(function ($) {
+ var m = {
+ '\b': '\\b',
+ '\t': '\\t',
+ '\n': '\\n',
+ '\f': '\\f',
+ '\r': '\\r',
+ '"' : '\\"',
+ '\\': '\\\\'
+ },
+ s = {
+ 'array': function (x) {
+ var a = ['['], b, f, i, l = x.length, v;
+ for (i = 0; i < l; i += 1) {
+ v = x[i];
+ f = s[typeof v];
+ if (f) {
+ v = f(v);
+ if (typeof v == 'string') {
+ if (b) {
+ a[a.length] = ',';
+ }
+ a[a.length] = v;
+ b = true;
+ }
+ }
+ }
+ a[a.length] = ']';
+ return a.join('');
+ },
+ 'boolean': function (x) {
+ return String(x);
+ },
+ 'null': function (x) {
+ return "null";
+ },
+ 'number': function (x) {
+ return isFinite(x) ? String(x) : 'null';
+ },
+ 'object': function (x) {
+ if (x) {
+ if (x instanceof Array) {
+ return s.array(x);
+ }
+ var a = ['{'], b, f, i, v;
+ for (i in x) {
+ v = x[i];
+ f = s[typeof v];
+ if (f) {
+ v = f(v);
+ if (typeof v == 'string') {
+ if (b) {
+ a[a.length] = ',';
+ }
+ a.push(s.string(i), ':', v);
+ b = true;
+ }
+ }
+ }
+ a[a.length] = '}';
+ return a.join('');
+ }
+ return 'null';
+ },
+ 'string': function (x) {
+ if (/["\\\x00-\x1f]/.test(x)) {
+ x = x.replace(/([\x00-\x1f\\"])/g, function(a, b) {
+ var c = m[b];
+ if (c) {
+ return c;
+ }
+ c = b.charCodeAt();
+ return '\\u00' +
+ Math.floor(c / 16).toString(16) +
+ (c % 16).toString(16);
+ });
+ }
+ return '"' + x + '"';
+ }
+ };
+
+ $.toJSON = function(v) {
+ var f = isNaN(v) ? s[typeof v] : s['number'];
+ if (f) return f(v);
+ };
+
+ $.parseJSON = function(v, safe) {
+ if (safe === undefined) safe = $.parseJSON.safe;
+ if (safe && !/^("(\\.|[^"\\\n\r])*?"|[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t])+?$/.test(v))
+ return undefined;
+ return eval('('+v+')');
+ };
+
+ $.parseJSON.safe = false;
+
+})(jQuery);
diff --git a/web/javascript/jquery/json.min.js b/web/javascript/jquery/json.min.js
new file mode 100644
index 000000000..67dae43ab
--- /dev/null
+++ b/web/javascript/jquery/json.min.js
@@ -0,0 +1,13 @@
+
+(function($){var m={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'},s={'array':function(x){var a=['['],b,f,i,l=x.length,v;for(i=0;iStatus unknown' );
-
- if( updateTurtle )
- this.updateTurtleButton();
+ this[Prefs._TurtleState] = prefs[RPC._TurtleState];
+ this.updateTurtleButton();
},
showStatsDialog: function( ) {
- var tr = this;
- tr.loadDaemonStats();
- tr.togglePeriodicStatsRefresh(true);
- $("#stats_dialog" ).dialog( {
- title: 'Statistics',
- hide: 'blind',
- width: 266,
- buttons: {
- 'Close': function() {
- tr.togglePeriodicStatsRefresh(false);
- $(this).dialog('close');
- }
- }
- });
+ this.loadDaemonStats();
+ $('body').addClass('stats_showing');
+ $('#stats_container').show();
+ this.hideiPhoneAddressbar();
+ if( Safari3 )
+ setTimeout("$('div#stats_container div.dialog_window').css('top', '0px');",10);
+ this.updateButtonStates( );
+ this.togglePeriodicStatsRefresh(true);
+ },
+
+ hideStatsDialog: function( ){
+ $('body.stats_showing').removeClass('stats_showing');
+ if (iPhone) {
+ this.hideiPhoneAddressbar();
+ $('#stats_container').hide();
+ } else if (Safari3) {
+ $('div#stats_container div.dialog_window').css('top', '-425px');
+ setTimeout("$('#stats_container').hide();",500);
+ } else {
+ $('#stats_container').hide();
+ }
+ this.updateButtonStates( );
+ this.togglePeriodicStatsRefresh(false);
},
/*
@@ -1099,7 +1057,7 @@ Transmission.prototype =
setInnerHTML( $('#stats_session_downloaded')[0], Transmission.fmt.size(session["downloadedBytes"]) );
setInnerHTML( $('#stats_session_ratio')[0], Transmission.fmt.ratioString(Math.ratio(session["uploadedBytes"],session["downloadedBytes"])));
setInnerHTML( $('#stats_session_duration')[0], Transmission.fmt.timeInterval(session["secondsActive"]) );
- setInnerHTML( $('#stats_total_count')[0], 'Started ' + total["sessionCount"] + " times" );
+ setInnerHTML( $('#stats_total_count')[0], total["sessionCount"] + " times" );
setInnerHTML( $('#stats_total_uploaded')[0], Transmission.fmt.size(total["uploadedBytes"]) );
setInnerHTML( $('#stats_total_downloaded')[0], Transmission.fmt.size(total["downloadedBytes"]) );
setInnerHTML( $('#stats_total_ratio')[0], Transmission.fmt.ratioString(Math.ratio(total["uploadedBytes"],total["downloadedBytes"])));
@@ -1155,18 +1113,21 @@ Transmission.prototype =
// Limit the download rate
case 'footer_download_rate_menu':
- //var args = { };
+ var args = { };
if ($element.is('#unlimited_download_rate')) {
$element.deselectMenuSiblings().selectMenuItem();
- tr.setPrefIfDifferent( RPC._DownSpeedLimited, false );
+ args[RPC._DownSpeedLimited] = false;
} else {
var rate_str = ($element[0].innerHTML).replace(/[^0-9]/ig, '');
var rate_val = parseInt( rate_str );
setInnerHTML( $('#limited_download_rate')[0], 'Limit (' + Transmission.fmt.speed(rate_val) + ')' );
$('#limited_download_rate').deselectMenuSiblings().selectMenuItem();
- tr.setPrefIfDifferent( RPC._DownSpeedLimit, rate_val );
- tr.setPrefIfDifferent( RPC._DownSpeedLimited, true );
+ $('div.preference input#download_rate')[0].value = rate_str;
+ args[RPC._DownSpeedLimit] = rate_val;
+ args[RPC._DownSpeedLimited] = true;
}
+ $('div.preference input#limit_download')[0].checked = args[RPC._DownSpeedLimited];
+ tr.remote.savePrefs( args );
break;
// Limit the upload rate
@@ -1174,15 +1135,18 @@ Transmission.prototype =
var args = { };
if ($element.is('#unlimited_upload_rate')) {
$element.deselectMenuSiblings().selectMenuItem();
- tr.setPrefIfDifferent( RPC._UpSpeedLimited, false );
+ args[RPC._UpSpeedLimited] = false;
} else {
var rate_str = ($element[0].innerHTML).replace(/[^0-9]/ig, '');
var rate_val = parseInt( rate_str );
setInnerHTML( $('#limited_upload_rate')[0], 'Limit (' + Transmission.fmt.speed(rate_val) + ')' );
$('#limited_upload_rate').deselectMenuSiblings().selectMenuItem();
- tr.setPrefIfDifferent( RPC._UpSpeedLimit, rate_val );
- tr.setPrefIfDifferent( RPC._UpSpeedLimited, true );
+ $('div.preference input#upload_rate')[0].value = rate_str;
+ args[RPC._UpSpeedLimit] = rate_val;
+ args[RPC._UpSpeedLimited] = true;
}
+ $('div.preference input#limit_upload')[0].checked = args[RPC._UpSpeedLimited];
+ tr.remote.savePrefs( args );
break;
// Sort the torrent list
@@ -1428,7 +1392,7 @@ Transmission.prototype =
html += '' + Math.floor(peer.progress*100) + '%' + ' ';
html += '' + peer.flagStr + ' ';
html += '' + peer.address + ' ';
- html += '' + peer.clientName + ' ';
+ html += '' + peer.clientName + ' ';
html += '';
}
html += '
';
@@ -1860,24 +1824,16 @@ Transmission.prototype =
var torrent = torrents[0];
var header = 'Remove ' + torrent.name() + '?';
var message = 'Once removed, continuing the transfer will require the torrent file. Are you sure you want to remove it?';
- askUser( header, message, 'Remove', transmission.removeTorrents, torrents );
+ dialog.confirm( header, message, 'Remove', 'transmission.removeTorrents', torrents );
}
else
{
var header = 'Remove ' + torrents.length + ' transfers?';
var message = 'Once removed, continuing the transfers will require the torrent files. Are you sure you want to remove them?';
- askUser( header, message, 'Remove', transmission.removeTorrents, torrents );
+ dialog.confirm( header, message, 'Remove', 'transmission.removeTorrents', torrents );
}
},
- removeTorrents: function( torrents ) {
- console.log( "in removeTorrents" );
- console.log( torrents );
- var torrent_ids = jQuery.map(torrents, function(t) { return t.id(); } );
- var tr = this;
- //this.remote.removeTorrents( torrent_ids, function(){ tr.refreshTorrents() } );
- },
-
promptToRemoveTorrentsAndData:function( torrents )
{
if( torrents.length == 1 )
@@ -1885,16 +1841,22 @@ Transmission.prototype =
var torrent = torrents[0],
header = 'Remove ' + torrent.name() + ' and delete data?',
message = 'All data downloaded for this torrent will be deleted. Are you sure you want to remove it?';
- askUser( header, message, 'Remove', transmission.removeTorrentsAndData, torrents );
+ dialog.confirm( header, message, 'Remove', 'transmission.removeTorrentsAndData', torrents );
}
else
{
var header = 'Remove ' + torrents.length + ' transfers and delete data?',
message = 'All data downloaded for these torrents will be deleted. Are you sure you want to remove them?';
- askUser( header, message, 'Remove', transmission.removeTorrentsAndData, torrents );
+ dialog.confirm( header, message, 'Remove', 'transmission.removeTorrentsAndData', torrents );
}
},
+ removeTorrents: function( torrents ) {
+ var torrent_ids = jQuery.map(torrents, function(t) { return t.id(); } );
+ var tr = this;
+ this.remote.removeTorrents( torrent_ids, function(){ tr.refreshTorrents() } );
+ },
+
removeTorrentsAndData: function( torrents ) {
this.remote.removeTorrentsAndData( torrents );
},
diff --git a/web/javascript/transmission.remote.js b/web/javascript/transmission.remote.js
index 341d56db9..7383b5625 100644
--- a/web/javascript/transmission.remote.js
+++ b/web/javascript/transmission.remote.js
@@ -67,8 +67,13 @@ TransmissionRemote.prototype =
: "";
if( !remote._error.length )
remote._error = 'Server not responding';
- tellUser( 'Connection failed',
- 'Could not connect to the server. You may need to reload the page to reconnect.' );
+
+ dialog.confirm('Connection Failed',
+ 'Could not connect to the server. You may need to reload the page to reconnect.',
+ 'Details',
+ 'alert(remote._error);',
+ null,
+ 'Dismiss');
remote._controller.togglePeriodicRefresh(false);
remote._controller.togglePeriodicSessionRefresh(false);
},
@@ -88,7 +93,7 @@ TransmissionRemote.prototype =
contentType: 'json',
dataType: 'json',
cache: false,
- data: JSON.stringify(data),
+ data: $.toJSON(data),
beforeSend: function(XHR){ remote.appendSessionId(XHR) },
error: function(request, error_string, exception){ remote.ajaxError(request, error_string, exception, ajaxSettings) },
success: success,
@@ -110,19 +115,6 @@ TransmissionRemote.prototype =
this.sendRequest( o, callback, async );
},
- blocklistUpdate: function( callback, async ) {
- var tr = this._controller;
- var o = { method: 'blocklist-update' };
- this.sendRequest( o, callback, async );
- },
-
- portTest: function( callback, async ) {
- var tr = this._controller;
- var o = { method: 'port-test' };
- this.sendRequest( o, callback, async );
- },
-
-
getInitialDataFor: function(torrent_ids, callback) {
var o = {
method: 'torrent-get',
diff --git a/web/stylesheets/common.css b/web/stylesheets/common.css
index d00e6792e..58d310411 100644
--- a/web/stylesheets/common.css
+++ b/web/stylesheets/common.css
@@ -309,15 +309,12 @@ div#torrent_filter_bar ul li.selected a {
}
div#torrent_filter_bar input#torrent_search {
+ float: right;
height: 15px;
width: 100px;
border: solid 0 #fff;
padding: 0 2px;
margin: 4px 5px 0 0;
- position:absolute;
- right: 0px;
- top: 0px;
- border-radius: 10px;
}
/* Safari-look filter input for Firefox */
@-moz-document url-prefix() {
@@ -581,7 +578,7 @@ div#torrent_inspector {
top: 97px;
bottom: 22px;
right: 0px;
- width: 480px;
+ width: 500px;
background-color: #ddd;
border-left: 1px solid #888;
z-index: 2;
@@ -674,7 +671,6 @@ table.peer_list {
text-align: left;
cursor: default;
clear: both;
- table-layout: fixed;
}
.peer_list .encryptedCol {
@@ -708,8 +704,6 @@ table.peer_list {
}
.peer_list .clientCol {
- white-space: nowrap;
- overflow: hidden;
text-overflow: ellipsis;
}
@@ -982,32 +976,127 @@ div.torrent_footer div#turtle_button {
*
*--------------------------------------*/
-div#upload_container label {
+div.dialog_container {
+ position: absolute;
+ top: 0;
+ left: 0px;
+ margin: 0px;
+ width: 100%;
+ height: 100%;
+ text-align: center;
+ color: black;
+ font-size: 1.1em;
+}
+
+div.dialog_container div.dialog_window {
+ background-color: #eee;
+ margin: 0 auto;
+ filter: alpha(opacity=95);
+ -moz-opacity: .95;
+ opacity: .95;
+ border-top: none;
+ text-align: left;
+ width: 420px;
+ z-index: 4;
+ overflow: hidden;
+ position: relative;
+ -webkit-box-shadow: 0 3px 6px rgba(0,0,0,0.7);
+ top: 80px;
+}
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+ div.dialog_container div.dialog_window {
+ top: 0;
+ margin-top: 71px;
+ z-index: 2
+ }
+}
+
+div#prefs_container div.dialog_window {
+ width: 410px;
+ padding: 0 15px;
+}
+
+div#stats_container div.dialog_window {
+ width: 255px;
+ padding: 0 15px;
+}
+
+div.dialog_container div.dialog_window img {
+ margin: 20px 20px 0 20px;
+ float: left;
+}
+
+div.dialog_container div.dialog_window h2.dialog_heading {
+ display: block;
+ float: left;
+ width: 305px;
+ font-size: 1.2em;
+ color: black;
+ margin-top: 20px;
+}
+
+div.dialog_container div.dialog_window div.dialog_message {
+ float: left;
+ padding-left: 3px;
+ margin-left: -3px;
+ width: 305px;
+ overflow: hidden;
+}
+
+div.dialog_container div.dialog_window a {
+ display: block;
+ float: right;
+ margin: 10px 20px 10px -8px;
+ padding: 5px;
+ background-color: #EEE;
+ border: 1px solid #787878;
+ width: 50px;
+ height: 15px;
+ text-align: center;
+ font-weight: bold;
+ text-decoration: none;
+ color: #323232;
+ -webkit-appearance: button;
+ font: -webkit-control;
+ cursor: default;
+}
+
+div.dialog_container div.dialog_window a:hover,
+div.dialog_container div.dialog_window a:active {
+ background: #C0C8D6 url('../images/graphics/filter_bar.png') bottom repeat-x;
+}
+
+div#upload_container div.dialog_window div.dialog_message label {
margin-top: 15px;
display: block;
}
-div#upload_container input {
+div#upload_container div.dialog_window div.dialog_message input {
width: 249px;
margin: 3px 0 0 0;
display: block;
}
-div#upload_container input[type=text] {
+div#upload_container div.dialog_window div.dialog_message input[type=text] {
width: 245px;
padding: 2px;
}
-div#upload_container input[type=checkbox] {
+div#upload_container div.dialog_window div.dialog_message input[type=checkbox] {
margin: 15px 3px 0 0;
display: inline;
width: auto;
}
-div#upload_container #auto_start_label {
+div#upload_container div.dialog_window div.dialog_message #auto_start_label {
display: inline;
}
+div.dialog_container div.dialog_window form {
+ margin: 0;
+ padding: 0px;
+}
+
iframe#torrent_upload_frame {
display: block; /* Don't change this : safari forms won't target hidden frames (they open a new window) */
position: absolute;
@@ -1020,28 +1109,187 @@ iframe#torrent_upload_frame {
margin: 0;
}
-#stats_dialog * {
- text-align: left;
-}
-.dialog_section_title {
- padding-top: 8px;
- font-weight: bold;
- text-align: left;
+div#prefs_container label {
+ display: block;
+ margin: 0 0 0 2px;
}
-.dialog_col_1 {
- width: 12px;
-}
-.dialog_col_3 {
- width: 8px;
+div#prefs_container label.category {
+ clear: both;
+ font-size: 1.2em;
}
-#prefs_dialog * {
- text-align: left;
+div#prefs_container label.item {
+ font-size: 11px !important;
+ margin: 0 5px 0 20px;
+ float: left;
+}
+
+div#prefs_container label.suffix {
+ margin: 0 5px 0 10px;
+ float: left;
+}
+
+div#prefs_container div.formdiv.checkbox label.item {
+ margin: 0 5px 0 2px;
+}
+
+div#prefs_container div.limit_total label.item {
+ width: 102px;
+}
+
+div#prefs_container div.limit_turtle label.item {
+ width: 120px;
+}
+
+div#prefs_container div.preference input[type=checkbox] {
+ float: left;
+ margin-left: 20px;
+ margin-top: 9px;
+}
+@-moz-document url-prefix() {
+ div#prefs_container div.preference input[type=checkbox] {
+ margin-top: 8px;
+ }
+}
+
+div#prefs_container div.preference input[type=text] {
+ width: 50px;
+ padding: 0px !important;
+ height: 18px;
+ margin-top: 2px;
+}
+
+div#prefs_container div.preference input {
+ float: left;
+}
+
+div#prefs_container div.download_location input {
+ width: 256px !important;
+}
+div#prefs_container div.download_location .checkbox input {
+ width: auto !important;
+}
+
+div#prefs_container div.formdiv {
+ clear: both;
+ line-height: 30px;
+}
+
+div#prefs_container a {
+ clear: left;
+ margin: 10px 5px 10px 7px;
+}
+
+div#prefs_container h2.dialog_heading {
+ display: none;
+}
+
+div#prefs_container div#prefs_tabs {
+ clear: both;
+}
+
+div#prefs_container div#prefs_tabs ul {
+ margin: 0;
+ padding: 0 0 0 10px;
+}
+div#prefs_container div#prefs_tabs ul li {
+ display: block;
+ float: left;
+ font-size: 1.2em;
+ color: #323232;
+ text-align: center;
+ padding: 2px 20px;
+ border-left: 1px solid #787878;
+ border-right: 1px solid #787878;
+ border-top: 1px solid #787878;
+ margin-bottom: -1px;
+}
+.prefs_tab_disabled {
+ background: #C0C8D6 url('../images/graphics/filter_bar.png') bottom repeat-x;
+ border-bottom: 1px solid #787878;
+}
+.prefs_tab_enabled {
+ background: none;
+ border-bottom: 1px solid #efefef;
+}
+div#stats_container h2.dialog_heading {
+ display: none;
+}
+div#stats_container div#stats_error {
+ display: none;
+ width: 395px;
+ margin: 6px auto 6px auto;
+ padding: 3px 0 3px 0;
+ border: 2px solid #cc3333;
+ color: #cc3333;
+ font-size: 1.2em;
vertical-align: middle;
+ text-align: center;
+ height: 20px;
+ line-height: 20px;
+ background-color: #FFEFEF;
}
-#prefs_tabs {
- border: 0px;
+.stats_info_container {
+ clear: both;
+ padding: 0px 7px 0px 7px;
+}
+.stats_group {
+ display: table;
+ margin: 5px 0px 0px 0px;
+ padding: 5px 0px 0px 0px;
+ width: 100%;
+}
+.stats_row {
+ display: table-row;
+}
+.stats_row > div {
+ padding-top: 4px;
+}
+div#stats_container label.category {
+ clear: both;
+ font-size: 1.2em;
+ margin: 5px 0px;
+}
+div#stats_container div.item {
+ font-size: 11px !important;
+ margin: 0 5px 0 20px;
+ float: left;
+ width: 100px;
+}
+div#stats_container div.item2 {
+ font-size: 11px !important;
+ margin: 0 5px 0 20px;
+ float: left;
+}
+div#stats_container a {
+ clear: left;
+ margin: 10px 5px 10px 7px;
+}
+
+div.dialog_container div#prefs_tabs ul li.prefs_tab_disabled:hover,
+div.dialog_container div#prefs_tabs ul li.prefs_tab_disabled:active {
+ background: none;
+}
+div#prefs_container div#prefs_tabs div.prefs_tab {
+ border-top: 1px solid #787878;
+ clear: both;
+ padding: 7px;
+}
+
+div#prefs_container div#pref_error {
+ display: none;
+ width: 395px;
+ margin: 6px auto 6px auto;
+ padding: 3px 0 3px 0;
+ border: 2px solid #cc3333;
+ color: #cc3333;
+ font-size: 1.2em;
+ vertical-align: middle;
+ text-align: center;
+ height: 20px;
+ line-height: 20px;
+ background-color: #FFEFEF;
}
#transmission_version{
diff --git a/web/stylesheets/ie7.css b/web/stylesheets/ie7.css
index 044061b86..58ed180d0 100644
--- a/web/stylesheets/ie7.css
+++ b/web/stylesheets/ie7.css
@@ -58,3 +58,6 @@ div.torrent_footer ul#settings_menu li#button:hover {
top: auto !important;
bottom: 0px !important;
}
+.dialog_container{
+ z-index: 4
+}
diff --git a/web/stylesheets/iphone.css b/web/stylesheets/iphone.css
index 9132da9d2..4c24dea46 100644
--- a/web/stylesheets/iphone.css
+++ b/web/stylesheets/iphone.css
@@ -26,22 +26,9 @@ body div#torrent_container {
min-height: 295px;
}
-.ui-dialog-titlebar {
- display: none;
+body div.dialog_container {
+ min-height: 291px;
}
-.ui-dialog .ui-dialog-content {
- padding: 0px;
-}
-.ui-tabs .ui-tabs-panel {
- padding: 0px;
-}
-.dialog_col_1 {
- width: 0px;
-}
-.dialog_col_3 {
- width: 5px;
-}
-
body div#torrent_inspector {
min-height: 323px;
@@ -51,11 +38,13 @@ body.landscape div#torrent_container {
min-height: 147px;
}
-body.landscape body.landscape div#torrent_inspector {
+body.landscape div#dialog_container, body.landscape div#torrent_inspector {
min-height: 143px;
}
body.inspector_showing #torrent_filter_bar, body.inspector_showing #torrent_container,
+body.dialog_showing #torrent_filter_bar, body.dialog_showing #torrent_container, body.dialog_showing #torrent_inspector, body.dialog_showing #prefs_container,
+body.prefs_showing #torrent_inspector, body.prefs_showing #torrent_filter_bar, body.prefs_showing #torrent_container,
body.open_showing #torrent_filter_bar, body.open_showing #torrent_container {
display: none !important;
}
@@ -208,7 +197,6 @@ div#torrent_filter_bar {
width: 100%;
z-index: 2;
text-align: center;
- overflow: hidden;
}
div#torrent_filter_bar ul {
@@ -255,10 +243,6 @@ div#torrent_filter_bar ul li.selected a {
background-position: right top;
}
-div#torrent_filter_bar ul li a.finished {
- display: none;
-}
-
div#torrent_filter_bar input#torrent_search {
position: absolute;
height: 20px;
@@ -387,10 +371,183 @@ ul.torrent_list li.torrent div.torrent_progress_bar.incomplete {
margin-right: -10px;
}
+div.dialog_container {
+ background: rgba(0,0,0,0.85);
+ color: white;
+ padding: 15px 10px;
+}
+
+div.dialog_container .dialog_window {
+ height: auto;
+ font-size: 13px;
+ text-shadow: black 1px 1px 1px !important;
+}
+
+div#dialog_message.dialog_message {
+ width: 280px;
+ margin: 10px auto 25px;
+ font-size: 13px;
+ line-height: 14px;
+ word-wrap: break-word;
+ overflow: hidden;
+ padding-bottom: 0;
+}
+
#torrent_upload_file, label[for="torrent_upload_file"]{
display:none;
}
+h2.dialog_heading {
+ text-align: center;
+ width: 300px;
+ margin: 0 auto;
+ font-size: 17px;
+}
+
+div.dialog_container a {
+ color: white;
+ padding: 7px 0;
+ background: #222;
+ text-decoration: none;
+ border: 2px solid white;
+ margin: 5px 5px 0;
+ font-weight: bold;
+ -webkit-border-radius: 16px;
+ display: inline-block;
+ width: 90px;
+ font-size: 12px;
+ text-align: center;
+}
+
+div.dialog_container a#dialog_cancel_button, div.dialog_container a#prefs_cancel_button {
+ left: 55px;
+}
+
+div.dialog_container a#dialog_confirm_button, div.dialog_container a#prefs_save_button {
+ right: 55px;
+ color: black;
+ text-shadow: none;
+ background: #fff;
+}
+
+#dialog_container div.dialog_window img {
+ margin: 5px auto 12px;
+}
+
+.landscape div.dialog_container a#dialog_cancel_button {
+ left: 155px;
+}
+
+.landscape div.dialog_container a#dialog_confirm_button {
+ right: 110px;
+}
+
+.landscape div.dialog_container img {
+ float: left !important;
+ margin: 0 0 0 50px;
+}
+
+.landscape h2#dialog_heading.dialog_heading {
+ margin: 5px auto 0;
+ margin-left: 150px;
+ text-align: left;
+}
+
+.landscape div#dialog_message.dialog_message {
+ width: 300px;
+ margin: 10px 0 20px 150px;
+ text-align: left;
+}
+
+/*--------------------------------------
+ *
+ * P R E F S C O N T A I N E R
+ *
+ *--------------------------------------*/
+
+div#prefs_container {
+ text-align: left;
+}
+
+div#prefs_container label.item {
+ margin: 0 5px 0 15px;
+ float: left;
+}
+
+form#prefs_form {
+ height: 365px;
+ padding: 0 5px;
+}
+
+div#prefs_container label.suffix {
+ margin: 0 5px 0 10px;
+ float: left;
+}
+
+div#prefs_container input {
+ float: left;
+}
+
+div#prefs_container div.preference input[type=checkbox] {
+ margin: 3px 7px 0 16px;
+ width: 18px;
+ height: 18px;
+ clear: left;
+}
+
+div#prefs_container label {
+ line-height: 25px;
+ display: block;
+}
+
+div#prefs_container div.download_location label.item,
+div#prefs_container div.port label.item,
+div#prefs_container div.web_gui label.item {
+ width: 127px;
+ clear: left;
+}
+
+div#prefs_container div.auto_start label.item,
+div#prefs_container div.encryption label.item,
+div#prefs_container div.limit_total label.item {
+ margin: 0 5px 0 0;
+}
+
+div#prefs_container div.limit_total label.item {
+ width: 101px;
+}
+
+div#prefs_container div.preference input[type=text] {
+ padding: 2px 2px 1px;
+ text-shadow: none !important;
+ font-size: 13px;
+ width: 50px;
+}
+
+div#prefs_container div.download_location input {
+ position: absolute;
+ right: 20px;
+ left: 160px;
+ width: auto !important;
+}
+
+div#prefs_container label.category {
+ clear: both;
+ font-weight: bold;
+}
+
+div#prefs_container a {
+ margin-top: 42px !important;
+}
+
+.landscape div.dialog_container a#prefs_cancel_button {
+ left: 135px;
+}
+
+.landscape div.dialog_container a#prefs_save_button {
+ right: 135px;
+}
+
/*--------------------------------------
*
* T O R R E N T I N S P E C T O R
@@ -676,7 +833,7 @@ div.torrent_footer a#preferences_link {
margin: 1px 0 0 6px;
}
-body.prefs_showing div.torrent_footer a#preferences_link, div.torrent_footer a#preferences_link {
+body.prefs_showing div.torrent_footer a#preferences_link, body.dialog_showing div.torrent_footer a#preferences_link {
display: none;
}