From c62a5f5846e3477044ebc93e96f98b878d3e7a59 Mon Sep 17 00:00:00 2001 From: Dedeco Date: Mon, 12 Sep 2011 21:53:15 +0200 Subject: pt-BR language update --- lib/plugins/acl/lang/pt-br/lang.php | 1 + lib/plugins/config/lang/pt-br/lang.php | 3 +++ lib/plugins/plugin/lang/pt-br/lang.php | 1 + lib/plugins/popularity/lang/pt-br/lang.php | 1 + lib/plugins/revert/lang/pt-br/lang.php | 1 + lib/plugins/usermanager/lang/pt-br/lang.php | 1 + 6 files changed, 8 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/pt-br/lang.php b/lib/plugins/acl/lang/pt-br/lang.php index 0ebcbf509..a0c997600 100644 --- a/lib/plugins/acl/lang/pt-br/lang.php +++ b/lib/plugins/acl/lang/pt-br/lang.php @@ -18,6 +18,7 @@ * @author Luis Dantas * @author Sergio Motta sergio@cisne.com.br * @author Isaias Masiero Filho + * @author Balaco Baco */ $lang['admin_acl'] = 'Administração da Lista de Controles de Acesso'; $lang['acl_group'] = 'Grupo'; diff --git a/lib/plugins/config/lang/pt-br/lang.php b/lib/plugins/config/lang/pt-br/lang.php index 9e5798e30..093e60ff8 100644 --- a/lib/plugins/config/lang/pt-br/lang.php +++ b/lib/plugins/config/lang/pt-br/lang.php @@ -15,6 +15,7 @@ * @author Luis Dantas * @author Sergio Motta sergio@cisne.com.br * @author Isaias Masiero Filho + * @author Balaco Baco */ $lang['menu'] = 'Configurações do DokuWiki'; $lang['error'] = 'As configurações não foram atualizadas devido a um valor inválido. Por favor, reveja suas alterações e reenvie-as.
O(s) valor(es) incorreto(s) serão exibidos contornados por uma borda vermelha.'; @@ -51,6 +52,7 @@ $lang['lang'] = 'Idioma'; $lang['basedir'] = 'Diretório base'; $lang['baseurl'] = 'URL base'; $lang['savedir'] = 'Diretório para salvar os dados'; +$lang['cookiedir'] = 'Caminhos dos cookies. Deixe em branco para usar a url base.'; $lang['start'] = 'Nome da página inicial'; $lang['title'] = 'Título do wiki'; $lang['template'] = 'Modelo'; @@ -121,6 +123,7 @@ $lang['jpg_quality'] = 'Qualidade de compressão do JPG (0-100)'; $lang['subscribers'] = 'Habilitar o suporte ao monitoramento de páginas'; $lang['subscribe_time'] = 'Tempo de espera antes do envio das listas e mensagens de monitoramento (segundos); este tempo deve ser menor que o especificado no parâmetro recent_days'; $lang['compress'] = 'Compactar as saídas de CSS e JavaScript'; +$lang['cssdatauri'] = 'Tamanho máximo em bytes para o qual as imagens referenciadas em arquivos CSS devam ser incorporadas na folha de estilos (o arquivo CSS) para reduzir o custo dos pedidos HTTP. Essa técnica não funcionará na versões do IE < 8! Valores de 400 a 600 são bons. Defina o valor 0 para desativar.'; $lang['hidepages'] = 'Esconder páginas correspondentes (expressão regular)'; $lang['send404'] = 'Enviar "HTTP 404/Página não encontrada" para páginas não existentes'; $lang['sitemap'] = 'Gerar Google Sitemap (dias)'; diff --git a/lib/plugins/plugin/lang/pt-br/lang.php b/lib/plugins/plugin/lang/pt-br/lang.php index bae962730..e8b23dae9 100644 --- a/lib/plugins/plugin/lang/pt-br/lang.php +++ b/lib/plugins/plugin/lang/pt-br/lang.php @@ -15,6 +15,7 @@ * @author Luis Dantas * @author Sergio Motta sergio@cisne.com.br * @author Isaias Masiero Filho + * @author Balaco Baco */ $lang['menu'] = 'Gerenciar Plug-ins'; $lang['download'] = 'Baixar e instalar um novo plug-in'; diff --git a/lib/plugins/popularity/lang/pt-br/lang.php b/lib/plugins/popularity/lang/pt-br/lang.php index 67a3abd7e..44d811d81 100644 --- a/lib/plugins/popularity/lang/pt-br/lang.php +++ b/lib/plugins/popularity/lang/pt-br/lang.php @@ -14,6 +14,7 @@ * @author Luis Dantas * @author Sergio Motta sergio@cisne.com.br * @author Isaias Masiero Filho + * @author Balaco Baco */ $lang['name'] = 'Retorno de popularidade (pode demorar um pouco para carregar)'; $lang['submit'] = 'Enviar dados'; diff --git a/lib/plugins/revert/lang/pt-br/lang.php b/lib/plugins/revert/lang/pt-br/lang.php index 6d8ca2de5..7bdde6675 100644 --- a/lib/plugins/revert/lang/pt-br/lang.php +++ b/lib/plugins/revert/lang/pt-br/lang.php @@ -15,6 +15,7 @@ * @author Luis Dantas * @author Sergio Motta sergio@cisne.com.br * @author Isaias Masiero Filho + * @author Balaco Baco */ $lang['menu'] = 'Gerenciador de reversões'; $lang['filter'] = 'Procura por páginas com spam'; diff --git a/lib/plugins/usermanager/lang/pt-br/lang.php b/lib/plugins/usermanager/lang/pt-br/lang.php index 4bc99fb0c..285231f35 100644 --- a/lib/plugins/usermanager/lang/pt-br/lang.php +++ b/lib/plugins/usermanager/lang/pt-br/lang.php @@ -15,6 +15,7 @@ * @author Luis Dantas * @author Sergio Motta sergio@cisne.com.br * @author Isaias Masiero Filho + * @author Balaco Baco */ $lang['menu'] = 'Gerenciamento de Usuários'; $lang['noauth'] = '(o gerenciamento de usuários não está disponível)'; -- cgit v1.2.3 From 5e7a292691951a0fa0a18f06c8b9bcfb509a032d Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Fri, 9 Sep 2011 22:26:16 +0200 Subject: Various JavaScript improvements, JSLint, jQuery --- lib/exe/js.php | 6 +- lib/plugins/acl/script.js | 2 +- lib/scripts/compatibility.js | 2 +- lib/scripts/cookie.js | 15 +-- lib/scripts/edit.js | 222 ++++++++++++++++++++----------------------- lib/scripts/editor.js | 101 ++++++++++---------- lib/scripts/index.js | 3 - lib/scripts/linkwiz.js | 199 +++++++++++++++++++------------------- lib/scripts/media.js | 3 - lib/scripts/qsearch.js | 3 - lib/scripts/script.js | 7 +- lib/scripts/textselection.js | 7 +- lib/scripts/toolbar.js | 146 ++++++++++++---------------- lib/scripts/tree.js | 3 - lib/styles/screen.css | 5 + 15 files changed, 337 insertions(+), 387 deletions(-) (limited to 'lib') diff --git a/lib/exe/js.php b/lib/exe/js.php index 33f8c695d..b7f2fd222 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -88,6 +88,7 @@ function js_out(){ // add some global variables print "var DOKU_BASE = '".DOKU_BASE."';"; print "var DOKU_TPL = '".DOKU_TPL."';"; + // FIXME: Move those to JSINFO print "var DOKU_UHN = ".((int) useHeading('navigation')).";"; print "var DOKU_UHC = ".((int) useHeading('content')).";"; @@ -106,10 +107,7 @@ function js_out(){ echo "\n\n/* XXXXXXXXXX end of " . str_replace(DOKU_INC, '', $file) . " XXXXXXXXXX */\n\n"; } - // init stuff - js_runonstart("addEvent(document,'click',closePopups)"); - js_runonstart("initToolbar('tool__bar','wiki__text',toolbar)"); if($conf['locktime'] != 0){ js_runonstart("dw_locktimer.init(".($conf['locktime'] - 60).",".$conf['usedraft'].")"); } @@ -220,7 +218,7 @@ function js_escape($string){ * @author Andreas Gohr */ function js_runonstart($func){ - echo "addInitEvent(function(){ $func; });".NL; + echo "jQuery(function(){ $func; });".NL; } /** diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js index 2598bcef8..d912a2407 100644 --- a/lib/plugins/acl/script.js +++ b/lib/plugins/acl/script.js @@ -33,7 +33,7 @@ var dw_acl = { show_sublist, 'html' ); - }, + }, toggle_display: function ($clicky, opening) { $clicky.attr('src', diff --git a/lib/scripts/compatibility.js b/lib/scripts/compatibility.js index 39f703c71..3b027f016 100644 --- a/lib/scripts/compatibility.js +++ b/lib/scripts/compatibility.js @@ -38,7 +38,7 @@ function DEPRECATED_WRAP(func, context) { return function () { DEPRECATED(); return func.apply(context || this, arguments); - } + }; } /** diff --git a/lib/scripts/cookie.js b/lib/scripts/cookie.js index 4dd77beea..c70d0bb56 100644 --- a/lib/scripts/cookie.js +++ b/lib/scripts/cookie.js @@ -9,7 +9,7 @@ * @author Andreas Gohr * @author Michal Rezler */ -DokuCookie = { +var DokuCookie = { data: {}, name: 'DOKU_PREFS', @@ -19,17 +19,18 @@ DokuCookie = { * @author Andreas Gohr */ setValue: function(key,val){ - var text = ''; + var text = [], + _this = this; this.init(); this.data[key] = val; //save the whole data array - jQuery.each(this.data, function (key, val) { - if (DokuCookie.data.hasOwnProperty(key)) { - text += '#'+encodeURIComponent(key)+'#'+encodeURIComponent(val); - } + jQuery.each(_this.data, function (key, val) { + if (_this.data.hasOwnProperty(key)) { + text.push(encodeURIComponent(key)+'#'+encodeURIComponent(val)); + } }); - jQuery.cookie(this.name,text.substr(1), {expires: 365, path: DOKU_BASE}); + jQuery.cookie(this.name, text.join('#'), {expires: 365, path: DOKU_BASE}); }, /** diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js index 816568e92..bfbd698f1 100644 --- a/lib/scripts/edit.js +++ b/lib/scripts/edit.js @@ -14,38 +14,36 @@ * @author Michal Rezler */ function createToolButton(icon,label,key,id,classname){ - var $ = jQuery; - var btn = $('').addClass(this._triggerClass).html(o==""?j:a("").attr({src:o,alt:j,title:j})));b[l?"before":"after"](f.trigger);f.trigger.click(function(){a.datepicker._datepickerShowing&&a.datepicker._lastInput==b[0]?a.datepicker._hideDatepicker():a.datepicker._showDatepicker(b[0]);return false})}},_autoSize:function(b){if(this._get(b, -"autoSize")&&!b.inline){var f=new Date(2009,11,20),j=this._get(b,"dateFormat");if(j.match(/[DM]/)){var l=function(o){for(var n=0,k=0,m=0;mn){n=o[m].length;k=m}return k};f.setMonth(l(this._get(b,j.match(/MM/)?"monthNames":"monthNamesShort")));f.setDate(l(this._get(b,j.match(/DD/)?"dayNames":"dayNamesShort"))+20-f.getDay())}b.input.attr("size",this._formatDate(b,f).length)}},_inlineDatepicker:function(b,f){var j=a(b);if(!j.hasClass(this.markerClassName)){j.addClass(this.markerClassName).append(f.dpDiv).bind("setData.datepicker", -function(l,o,n){f.settings[o]=n}).bind("getData.datepicker",function(l,o){return this._get(f,o)});a.data(b,"datepicker",f);this._setDate(f,this._getDefaultDate(f),true);this._updateDatepicker(f);this._updateAlternate(f);f.dpDiv.show()}},_dialogDatepicker:function(b,f,j,l,o){b=this._dialogInst;if(!b){this.uuid+=1;this._dialogInput=a('');this._dialogInput.keydown(this._doKeyDown);a("body").append(this._dialogInput); -b=this._dialogInst=this._newInst(this._dialogInput,false);b.settings={};a.data(this._dialogInput[0],"datepicker",b)}h(b.settings,l||{});f=f&&f.constructor==Date?this._formatDate(b,f):f;this._dialogInput.val(f);this._pos=o?o.length?o:[o.pageX,o.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left", -this._pos[0]+20+"px").css("top",this._pos[1]+"px");b.settings.onSelect=j;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);a.blockUI&&a.blockUI(this.dpDiv);a.data(this._dialogInput[0],"datepicker",b);return this},_destroyDatepicker:function(b){var f=a(b),j=a.data(b,"datepicker");if(f.hasClass(this.markerClassName)){var l=b.nodeName.toLowerCase();a.removeData(b,"datepicker");if(l=="input"){j.append.remove();j.trigger.remove();f.removeClass(this.markerClassName).unbind("focus", -this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)}else if(l=="div"||l=="span")f.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(b){var f=a(b),j=a.data(b,"datepicker");if(f.hasClass(this.markerClassName)){var l=b.nodeName.toLowerCase();if(l=="input"){b.disabled=false;j.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(l=="div"||l=="span"){f= -f.children("."+this._inlineClass);f.children().removeClass("ui-state-disabled");f.find("select.ui-datepicker-month, select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=a.map(this._disabledInputs,function(o){return o==b?null:o})}},_disableDatepicker:function(b){var f=a(b),j=a.data(b,"datepicker");if(f.hasClass(this.markerClassName)){var l=b.nodeName.toLowerCase();if(l=="input"){b.disabled=true;j.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5", -cursor:"default"})}else if(l=="div"||l=="span"){f=f.children("."+this._inlineClass);f.children().addClass("ui-state-disabled");f.find("select.ui-datepicker-month, select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=a.map(this._disabledInputs,function(o){return o==b?null:o});this._disabledInputs[this._disabledInputs.length]=b}},_isDisabledDatepicker:function(b){if(!b)return false;for(var f=0;f-1}},_doKeyUp:function(b){b=a.datepicker._getInst(b.target);if(b.input.val()!=b.lastVal)try{if(a.datepicker.parseDate(a.datepicker._get(b,"dateFormat"),b.input?b.input.val():null,a.datepicker._getFormatConfig(b))){a.datepicker._setDateFromField(b); -a.datepicker._updateAlternate(b);a.datepicker._updateDatepicker(b)}}catch(f){a.datepicker.log(f)}return true},_showDatepicker:function(b){b=b.target||b;if(b.nodeName.toLowerCase()!="input")b=a("input",b.parentNode)[0];if(!(a.datepicker._isDisabledDatepicker(b)||a.datepicker._lastInput==b)){var f=a.datepicker._getInst(b);if(a.datepicker._curInst&&a.datepicker._curInst!=f){a.datepicker._datepickerShowing&&a.datepicker._triggerOnClose(a.datepicker._curInst);a.datepicker._curInst.dpDiv.stop(true,true)}var j= -a.datepicker._get(f,"beforeShow");h(f.settings,j?j.apply(b,[b,f]):{});f.lastVal=null;a.datepicker._lastInput=b;a.datepicker._setDateFromField(f);if(a.datepicker._inDialog)b.value="";if(!a.datepicker._pos){a.datepicker._pos=a.datepicker._findPos(b);a.datepicker._pos[1]+=b.offsetHeight}var l=false;a(b).parents().each(function(){l|=a(this).css("position")=="fixed";return!l});if(l&&a.browser.opera){a.datepicker._pos[0]-=document.documentElement.scrollLeft;a.datepicker._pos[1]-=document.documentElement.scrollTop}j= -{left:a.datepicker._pos[0],top:a.datepicker._pos[1]};a.datepicker._pos=null;f.dpDiv.empty();f.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});a.datepicker._updateDatepicker(f);j=a.datepicker._checkOffset(f,j,l);f.dpDiv.css({position:a.datepicker._inDialog&&a.blockUI?"static":l?"fixed":"absolute",display:"none",left:j.left+"px",top:j.top+"px"});if(!f.inline){j=a.datepicker._get(f,"showAnim");var o=a.datepicker._get(f,"duration"),n=function(){var k=f.dpDiv.find("iframe.ui-datepicker-cover"); -if(k.length){var m=a.datepicker._getBorders(f.dpDiv);k.css({left:-m[0],top:-m[1],width:f.dpDiv.outerWidth(),height:f.dpDiv.outerHeight()})}};f.dpDiv.zIndex(a(b).zIndex()+1);a.datepicker._datepickerShowing=true;a.effects&&a.effects[j]?f.dpDiv.show(j,a.datepicker._get(f,"showOptions"),o,n):f.dpDiv[j||"show"](j?o:null,n);if(!j||!o)n();f.input.is(":visible")&&!f.input.is(":disabled")&&f.input.focus();a.datepicker._curInst=f}}},_updateDatepicker:function(b){this.maxRows=4;var f=a.datepicker._getBorders(b.dpDiv); -i=b;b.dpDiv.empty().append(this._generateHTML(b));var j=b.dpDiv.find("iframe.ui-datepicker-cover");j.length&&j.css({left:-f[0],top:-f[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()});b.dpDiv.find("."+this._dayOverClass+" a").mouseover();f=this._getNumberOfMonths(b);j=f[1];b.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");j>1&&b.dpDiv.addClass("ui-datepicker-multi-"+j).css("width",17*j+"em");b.dpDiv[(f[0]!=1||f[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi"); -b.dpDiv[(this._get(b,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");b==a.datepicker._curInst&&a.datepicker._datepickerShowing&&b.input&&b.input.is(":visible")&&!b.input.is(":disabled")&&b.input[0]!=document.activeElement&&b.input.focus();if(b.yearshtml){var l=b.yearshtml;setTimeout(function(){l===b.yearshtml&&b.yearshtml&&b.dpDiv.find("select.ui-datepicker-year:first").replaceWith(b.yearshtml);l=b.yearshtml=null},0)}},_getBorders:function(b){var f=function(j){return{thin:1,medium:2,thick:3}[j]|| -j};return[parseFloat(f(b.css("border-left-width"))),parseFloat(f(b.css("border-top-width")))]},_checkOffset:function(b,f,j){var l=b.dpDiv.outerWidth(),o=b.dpDiv.outerHeight(),n=b.input?b.input.outerWidth():0,k=b.input?b.input.outerHeight():0,m=document.documentElement.clientWidth+a(document).scrollLeft(),p=document.documentElement.clientHeight+a(document).scrollTop();f.left-=this._get(b,"isRTL")?l-n:0;f.left-=j&&f.left==b.input.offset().left?a(document).scrollLeft():0;f.top-=j&&f.top==b.input.offset().top+ -k?a(document).scrollTop():0;f.left-=Math.min(f.left,f.left+l>m&&m>l?Math.abs(f.left+l-m):0);f.top-=Math.min(f.top,f.top+o>p&&p>o?Math.abs(o+k):0);return f},_findPos:function(b){for(var f=this._get(this._getInst(b),"isRTL");b&&(b.type=="hidden"||b.nodeType!=1||a.expr.filters.hidden(b));)b=b[f?"previousSibling":"nextSibling"];b=a(b).offset();return[b.left,b.top]},_triggerOnClose:function(b){var f=this._get(b,"onClose");if(f)f.apply(b.input?b.input[0]:null,[b.input?b.input.val():"",b])},_hideDatepicker:function(b){var f= -this._curInst;if(!(!f||b&&f!=a.data(b,"datepicker")))if(this._datepickerShowing){b=this._get(f,"showAnim");var j=this._get(f,"duration"),l=function(){a.datepicker._tidyDialog(f);this._curInst=null};a.effects&&a.effects[b]?f.dpDiv.hide(b,a.datepicker._get(f,"showOptions"),j,l):f.dpDiv[b=="slideDown"?"slideUp":b=="fadeIn"?"fadeOut":"hide"](b?j:null,l);b||l();a.datepicker._triggerOnClose(f);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute", -left:"0",top:"-100px"});if(a.blockUI){a.unblockUI();a("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(b){b.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(b){if(a.datepicker._curInst){b=a(b.target);b[0].id!=a.datepicker._mainDivId&&b.parents("#"+a.datepicker._mainDivId).length==0&&!b.hasClass(a.datepicker.markerClassName)&&!b.hasClass(a.datepicker._triggerClass)&&a.datepicker._datepickerShowing&&!(a.datepicker._inDialog&& -a.blockUI)&&a.datepicker._hideDatepicker()}},_adjustDate:function(b,f,j){b=a(b);var l=this._getInst(b[0]);if(!this._isDisabledDatepicker(b[0])){this._adjustInstDate(l,f+(j=="M"?this._get(l,"showCurrentAtPos"):0),j);this._updateDatepicker(l)}},_gotoToday:function(b){b=a(b);var f=this._getInst(b[0]);if(this._get(f,"gotoCurrent")&&f.currentDay){f.selectedDay=f.currentDay;f.drawMonth=f.selectedMonth=f.currentMonth;f.drawYear=f.selectedYear=f.currentYear}else{var j=new Date;f.selectedDay=j.getDate();f.drawMonth= -f.selectedMonth=j.getMonth();f.drawYear=f.selectedYear=j.getFullYear()}this._notifyChange(f);this._adjustDate(b)},_selectMonthYear:function(b,f,j){b=a(b);var l=this._getInst(b[0]);l._selectingMonthYear=false;l["selected"+(j=="M"?"Month":"Year")]=l["draw"+(j=="M"?"Month":"Year")]=parseInt(f.options[f.selectedIndex].value,10);this._notifyChange(l);this._adjustDate(b)},_clickMonthYear:function(b){var f=this._getInst(a(b)[0]);f.input&&f._selectingMonthYear&&setTimeout(function(){f.input.focus()},0);f._selectingMonthYear= -!f._selectingMonthYear},_selectDay:function(b,f,j,l){var o=a(b);if(!(a(l).hasClass(this._unselectableClass)||this._isDisabledDatepicker(o[0]))){o=this._getInst(o[0]);o.selectedDay=o.currentDay=a("a",l).html();o.selectedMonth=o.currentMonth=f;o.selectedYear=o.currentYear=j;this._selectDate(b,this._formatDate(o,o.currentDay,o.currentMonth,o.currentYear))}},_clearDate:function(b){b=a(b);this._getInst(b[0]);this._selectDate(b,"")},_selectDate:function(b,f){b=this._getInst(a(b)[0]);f=f!=null?f:this._formatDate(b); -b.input&&b.input.val(f);this._updateAlternate(b);var j=this._get(b,"onSelect");if(j)j.apply(b.input?b.input[0]:null,[f,b]);else b.input&&b.input.trigger("change");if(b.inline)this._updateDatepicker(b);else{this._hideDatepicker();this._lastInput=b.input[0];typeof b.input[0]!="object"&&b.input.focus();this._lastInput=null}},_updateAlternate:function(b){var f=this._get(b,"altField");if(f){var j=this._get(b,"altFormat")||this._get(b,"dateFormat"),l=this._getDate(b),o=this.formatDate(j,l,this._getFormatConfig(b)); -a(f).each(function(){a(this).val(o)})}},noWeekends:function(b){b=b.getDay();return[b>0&&b<6,""]},iso8601Week:function(b){b=new Date(b.getTime());b.setDate(b.getDate()+4-(b.getDay()||7));var f=b.getTime();b.setMonth(0);b.setDate(1);return Math.floor(Math.round((f-b)/864E5)/7)+1},parseDate:function(b,f,j){if(b==null||f==null)throw"Invalid arguments";f=typeof f=="object"?f.toString():f+"";if(f=="")return null;var l=(j?j.shortYearCutoff:null)||this._defaults.shortYearCutoff;l=typeof l!="string"?l:(new Date).getFullYear()% -100+parseInt(l,10);for(var o=(j?j.dayNamesShort:null)||this._defaults.dayNamesShort,n=(j?j.dayNames:null)||this._defaults.dayNames,k=(j?j.monthNamesShort:null)||this._defaults.monthNamesShort,m=(j?j.monthNames:null)||this._defaults.monthNames,p=j=-1,q=-1,s=-1,r=false,u=function(z){(z=H+1-1){p=1;q=s;do{l=this._getDaysInMonth(j,p-1);if(q<=l)break;p++;q-=l}while(1)}C=this._daylightSavingAdjust(new Date(j,p-1,q));if(C.getFullYear()!=j||C.getMonth()+1!=p||C.getDate()!=q)throw"Invalid date";return C},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y", -TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(b,f,j){if(!f)return"";var l=(j?j.dayNamesShort:null)||this._defaults.dayNamesShort,o=(j?j.dayNames:null)||this._defaults.dayNames,n=(j?j.monthNamesShort:null)||this._defaults.monthNamesShort;j=(j?j.monthNames:null)||this._defaults.monthNames;var k=function(u){(u=r+112?b.getHours()+2:0);return b},_setDate:function(b,f,j){var l=!f,o=b.selectedMonth,n=b.selectedYear;f=this._restrictMinMax(b,this._determineDate(b,f,new Date));b.selectedDay= -b.currentDay=f.getDate();b.drawMonth=b.selectedMonth=b.currentMonth=f.getMonth();b.drawYear=b.selectedYear=b.currentYear=f.getFullYear();if((o!=b.selectedMonth||n!=b.selectedYear)&&!j)this._notifyChange(b);this._adjustInstDate(b);if(b.input)b.input.val(l?"":this._formatDate(b))},_getDate:function(b){return!b.currentYear||b.input&&b.input.val()==""?null:this._daylightSavingAdjust(new Date(b.currentYear,b.currentMonth,b.currentDay))},_generateHTML:function(b){var f=new Date;f=this._daylightSavingAdjust(new Date(f.getFullYear(), -f.getMonth(),f.getDate()));var j=this._get(b,"isRTL"),l=this._get(b,"showButtonPanel"),o=this._get(b,"hideIfNoPrevNext"),n=this._get(b,"navigationAsDateFormat"),k=this._getNumberOfMonths(b),m=this._get(b,"showCurrentAtPos"),p=this._get(b,"stepMonths"),q=k[0]!=1||k[1]!=1,s=this._daylightSavingAdjust(!b.currentDay?new Date(9999,9,9):new Date(b.currentYear,b.currentMonth,b.currentDay)),r=this._getMinMaxDate(b,"min"),u=this._getMinMaxDate(b,"max");m=b.drawMonth-m;var v=b.drawYear;if(m<0){m+=12;v--}if(u){var w= -this._daylightSavingAdjust(new Date(u.getFullYear(),u.getMonth()-k[0]*k[1]+1,u.getDate()));for(w=r&&ww;){m--;if(m<0){m=11;v--}}}b.drawMonth=m;b.drawYear=v;w=this._get(b,"prevText");w=!n?w:this.formatDate(w,this._daylightSavingAdjust(new Date(v,m-p,1)),this._getFormatConfig(b));w=this._canAdjustMonth(b,-1,v,m)?''+w+"":o?"":''+w+"";var x=this._get(b,"nextText");x=!n?x:this.formatDate(x,this._daylightSavingAdjust(new Date(v,m+p,1)),this._getFormatConfig(b));o=this._canAdjustMonth(b,+1,v,m)?''+x+"":o?"":''+x+"";p=this._get(b,"currentText");x=this._get(b,"gotoCurrent")&&b.currentDay?s:f;p=!n?p:this.formatDate(p,x,this._getFormatConfig(b));n=!b.inline?'":"";l=l?'
'+(j?n:"")+(this._isInRange(b,x)?'":"")+(j?"":n)+"
":"";n=parseInt(this._get(b,"firstDay"),10);n=isNaN(n)?0:n;p=this._get(b,"showWeek");x=this._get(b,"dayNames");this._get(b,"dayNamesShort");var y=this._get(b,"dayNamesMin"),H= -this._get(b,"monthNames"),C=this._get(b,"monthNamesShort"),z=this._get(b,"beforeShowDay"),I=this._get(b,"showOtherMonths"),N=this._get(b,"selectOtherMonths");this._get(b,"calculateWeek");for(var J=this._getDefaultDate(b),D="",E=0;E1)switch(L){case 0:F+=" ui-datepicker-group-first";B=" ui-corner-"+(j?"right": -"left");break;case k[1]-1:F+=" ui-datepicker-group-last";B=" ui-corner-"+(j?"left":"right");break;default:F+=" ui-datepicker-group-middle";B="";break}F+='">'}F+='
'+(/all|left/.test(B)&&E==0?j?o:w:"")+(/all|right/.test(B)&&E==0?j?w:o:"")+this._generateMonthYearHeader(b,m,v,r,u,E>0||L>0,H,C)+'
';var G=p?'": -"";for(B=0;B<7;B++){var A=(B+n)%7;G+="=5?' class="ui-datepicker-week-end"':"")+'>'+y[A]+""}F+=G+"";G=this._getDaysInMonth(v,m);if(v==b.selectedYear&&m==b.selectedMonth)b.selectedDay=Math.min(b.selectedDay,G);B=(this._getFirstDayOfMonth(v,m)-n+7)%7;G=Math.ceil((B+G)/7);this.maxRows=G=q?this.maxRows>G?this.maxRows:G:G;A=this._daylightSavingAdjust(new Date(v,m,1-B));for(var R=0;R";var S=!p?"":'";for(B=0;B<7;B++){var M=z?z.apply(b.input?b.input[0]:null,[A]):[true,""],K=A.getMonth()!=m,O=K&&!N||!M[0]||r&&Au;S+='";A.setDate(A.getDate()+1);A=this._daylightSavingAdjust(A)}F+=S+""}m++;if(m>11){m=0;v++}F+="
'+this._get(b,"weekHeader")+"
'+ -this._get(b,"calculateWeek")(A)+""+(K&&!I?" ":O?''+A.getDate()+"":''+ -A.getDate()+"")+"
"+(q?""+(k[0]>0&&L==k[1]-1?'
':""):"");P+=F}D+=P}D+=l+(a.browser.msie&&parseInt(a.browser.version,10)<7&&!b.inline?'':"");b._keyEvent=false;return D},_generateMonthYearHeader:function(b,f,j,l,o,n,k,m){var p=this._get(b,"changeMonth"), -q=this._get(b,"changeYear"),s=this._get(b,"showMonthAfterYear"),r='
',u="";if(n||!p)u+=''+k[f]+"";else{k=l&&l.getFullYear()==j;var v=o&&o.getFullYear()==j;u+='"}s||(r+=u+(n||!(p&&q)?" ":""));if(!b.yearshtml){b.yearshtml="";if(n||!q)r+=''+j+"";else{m=this._get(b,"yearRange").split(":");var x=(new Date).getFullYear();k=function(y){y=y.match(/c[+-].*/)?j+parseInt(y.substring(1),10):y.match(/[+-].*/)?x+parseInt(y,10):parseInt(y,10);return isNaN(y)?x:y};f=k(m[0]);m=Math.max(f,k(m[1]||""));f=l?Math.max(f,l.getFullYear()):f;m=o?Math.min(m,o.getFullYear()): -m;for(b.yearshtml+='";r+=b.yearshtml;b.yearshtml=null}}r+=this._get(b,"yearSuffix");if(s)r+=(n||!(p&&q)?" ":"")+u;r+="
";return r},_adjustInstDate:function(b,f,j){var l=b.drawYear+(j== -"Y"?f:0),o=b.drawMonth+(j=="M"?f:0);f=Math.min(b.selectedDay,this._getDaysInMonth(l,o))+(j=="D"?f:0);l=this._restrictMinMax(b,this._daylightSavingAdjust(new Date(l,o,f)));b.selectedDay=l.getDate();b.drawMonth=b.selectedMonth=l.getMonth();b.drawYear=b.selectedYear=l.getFullYear();if(j=="M"||j=="Y")this._notifyChange(b)},_restrictMinMax:function(b,f){var j=this._getMinMaxDate(b,"min");b=this._getMinMaxDate(b,"max");f=j&&fb?b:f},_notifyChange:function(b){var f=this._get(b,"onChangeMonthYear"); -if(f)f.apply(b.input?b.input[0]:null,[b.selectedYear,b.selectedMonth+1,b])},_getNumberOfMonths:function(b){b=this._get(b,"numberOfMonths");return b==null?[1,1]:typeof b=="number"?[1,b]:b},_getMinMaxDate:function(b,f){return this._determineDate(b,this._get(b,f+"Date"),null)},_getDaysInMonth:function(b,f){return 32-this._daylightSavingAdjust(new Date(b,f,32)).getDate()},_getFirstDayOfMonth:function(b,f){return(new Date(b,f,1)).getDay()},_canAdjustMonth:function(b,f,j,l){var o=this._getNumberOfMonths(b); -j=this._daylightSavingAdjust(new Date(j,l+(f<0?f:o[0]*o[1]),1));f<0&&j.setDate(this._getDaysInMonth(j.getFullYear(),j.getMonth()));return this._isInRange(b,j)},_isInRange:function(b,f){var j=this._getMinMaxDate(b,"min");b=this._getMinMaxDate(b,"max");return(!j||f.getTime()>=j.getTime())&&(!b||f.getTime()<=b.getTime())},_getFormatConfig:function(b){var f=this._get(b,"shortYearCutoff");f=typeof f!="string"?f:(new Date).getFullYear()%100+parseInt(f,10);return{shortYearCutoff:f,dayNamesShort:this._get(b, -"dayNamesShort"),dayNames:this._get(b,"dayNames"),monthNamesShort:this._get(b,"monthNamesShort"),monthNames:this._get(b,"monthNames")}},_formatDate:function(b,f,j,l){if(!f){b.currentDay=b.selectedDay;b.currentMonth=b.selectedMonth;b.currentYear=b.selectedYear}f=f?typeof f=="object"?f:this._daylightSavingAdjust(new Date(l,j,f)):this._daylightSavingAdjust(new Date(b.currentYear,b.currentMonth,b.currentDay));return this.formatDate(this._get(b,"dateFormat"),f,this._getFormatConfig(b))}});a.fn.datepicker= -function(b){if(!this.length)return this;if(!a.datepicker.initialized){a(document).mousedown(a.datepicker._checkExternalClick).find("body").append(a.datepicker.dpDiv);a.datepicker.initialized=true}var f=Array.prototype.slice.call(arguments,1);if(typeof b=="string"&&(b=="isDisabled"||b=="getDate"||b=="widget"))return a.datepicker["_"+b+"Datepicker"].apply(a.datepicker,[this[0]].concat(f));if(b=="option"&&arguments.length==2&&typeof arguments[1]=="string")return a.datepicker["_"+b+"Datepicker"].apply(a.datepicker, -[this[0]].concat(f));return this.each(function(){typeof b=="string"?a.datepicker["_"+b+"Datepicker"].apply(a.datepicker,[this].concat(f)):a.datepicker._attachDatepicker(this,b)})};a.datepicker=new c;a.datepicker.initialized=false;a.datepicker.uuid=(new Date).getTime();a.datepicker.version="1.8.14";window["DP_jQuery_"+g]=a})(jQuery); +minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false,disabled:false};a.extend(this._defaults,this.regional[""]);this.dpDiv=e(a('
'))}function e(b){return b.bind("mouseout", +function(f){f=a(f.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");f.length&&f.removeClass("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bind("mouseover",function(f){f=a(f.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");if(!(a.datepicker._isDisabledDatepicker(i.inline?b.parent()[0]:i.input[0])||!f.length)){f.parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"); +f.addClass("ui-state-hover");f.hasClass("ui-datepicker-prev")&&f.addClass("ui-datepicker-prev-hover");f.hasClass("ui-datepicker-next")&&f.addClass("ui-datepicker-next-hover")}})}function h(b,f){a.extend(b,f);for(var j in f)if(f[j]==null||f[j]==d)b[j]=f[j];return b}a.extend(a.ui,{datepicker:{version:"1.8.16"}});var g=(new Date).getTime(),i;a.extend(c.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv}, +setDefaults:function(b){h(this._defaults,b||{});return this},_attachDatepicker:function(b,f){var j=null;for(var l in this._defaults){var o=b.getAttribute("date:"+l);if(o){j=j||{};try{j[l]=eval(o)}catch(n){j[l]=o}}}l=b.nodeName.toLowerCase();o=l=="div"||l=="span";if(!b.id){this.uuid+=1;b.id="dp"+this.uuid}var k=this._newInst(a(b),o);k.settings=a.extend({},f||{},j||{});if(l=="input")this._connectDatepicker(b,k);else o&&this._inlineDatepicker(b,k)},_newInst:function(b,f){return{id:b[0].id.replace(/([^A-Za-z0-9_-])/g, +"\\\\$1"),input:b,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:f,dpDiv:!f?this.dpDiv:e(a('
'))}},_connectDatepicker:function(b,f){var j=a(b);f.append=a([]);f.trigger=a([]);if(!j.hasClass(this.markerClassName)){this._attachments(j,f);j.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker", +function(l,o,n){f.settings[o]=n}).bind("getData.datepicker",function(l,o){return this._get(f,o)});this._autoSize(f);a.data(b,"datepicker",f);f.settings.disabled&&this._disableDatepicker(b)}},_attachments:function(b,f){var j=this._get(f,"appendText"),l=this._get(f,"isRTL");f.append&&f.append.remove();if(j){f.append=a(''+j+"");b[l?"before":"after"](f.append)}b.unbind("focus",this._showDatepicker);f.trigger&&f.trigger.remove();j=this._get(f,"showOn");if(j== +"focus"||j=="both")b.focus(this._showDatepicker);if(j=="button"||j=="both"){j=this._get(f,"buttonText");var o=this._get(f,"buttonImage");f.trigger=a(this._get(f,"buttonImageOnly")?a("").addClass(this._triggerClass).attr({src:o,alt:j,title:j}):a('').addClass(this._triggerClass).html(o==""?j:a("").attr({src:o,alt:j,title:j})));b[l?"before":"after"](f.trigger);f.trigger.click(function(){a.datepicker._datepickerShowing&&a.datepicker._lastInput==b[0]?a.datepicker._hideDatepicker(): +a.datepicker._showDatepicker(b[0]);return false})}},_autoSize:function(b){if(this._get(b,"autoSize")&&!b.inline){var f=new Date(2009,11,20),j=this._get(b,"dateFormat");if(j.match(/[DM]/)){var l=function(o){for(var n=0,k=0,m=0;mn){n=o[m].length;k=m}return k};f.setMonth(l(this._get(b,j.match(/MM/)?"monthNames":"monthNamesShort")));f.setDate(l(this._get(b,j.match(/DD/)?"dayNames":"dayNamesShort"))+20-f.getDay())}b.input.attr("size",this._formatDate(b,f).length)}},_inlineDatepicker:function(b, +f){var j=a(b);if(!j.hasClass(this.markerClassName)){j.addClass(this.markerClassName).append(f.dpDiv).bind("setData.datepicker",function(l,o,n){f.settings[o]=n}).bind("getData.datepicker",function(l,o){return this._get(f,o)});a.data(b,"datepicker",f);this._setDate(f,this._getDefaultDate(f),true);this._updateDatepicker(f);this._updateAlternate(f);f.settings.disabled&&this._disableDatepicker(b);f.dpDiv.css("display","block")}},_dialogDatepicker:function(b,f,j,l,o){b=this._dialogInst;if(!b){this.uuid+= +1;this._dialogInput=a('');this._dialogInput.keydown(this._doKeyDown);a("body").append(this._dialogInput);b=this._dialogInst=this._newInst(this._dialogInput,false);b.settings={};a.data(this._dialogInput[0],"datepicker",b)}h(b.settings,l||{});f=f&&f.constructor==Date?this._formatDate(b,f):f;this._dialogInput.val(f);this._pos=o?o.length?o:[o.pageX,o.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/ +2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px");b.settings.onSelect=j;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);a.blockUI&&a.blockUI(this.dpDiv);a.data(this._dialogInput[0],"datepicker",b);return this},_destroyDatepicker:function(b){var f= +a(b),j=a.data(b,"datepicker");if(f.hasClass(this.markerClassName)){var l=b.nodeName.toLowerCase();a.removeData(b,"datepicker");if(l=="input"){j.append.remove();j.trigger.remove();f.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)}else if(l=="div"||l=="span")f.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(b){var f=a(b),j=a.data(b,"datepicker");if(f.hasClass(this.markerClassName)){var l= +b.nodeName.toLowerCase();if(l=="input"){b.disabled=false;j.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(l=="div"||l=="span"){f=f.children("."+this._inlineClass);f.children().removeClass("ui-state-disabled");f.find("select.ui-datepicker-month, select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=a.map(this._disabledInputs,function(o){return o==b?null:o})}},_disableDatepicker:function(b){var f=a(b),j=a.data(b, +"datepicker");if(f.hasClass(this.markerClassName)){var l=b.nodeName.toLowerCase();if(l=="input"){b.disabled=true;j.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else if(l=="div"||l=="span"){f=f.children("."+this._inlineClass);f.children().addClass("ui-state-disabled");f.find("select.ui-datepicker-month, select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=a.map(this._disabledInputs,function(o){return o== +b?null:o});this._disabledInputs[this._disabledInputs.length]=b}},_isDisabledDatepicker:function(b){if(!b)return false;for(var f=0;f-1}},_doKeyUp:function(b){b=a.datepicker._getInst(b.target);if(b.input.val()!=b.lastVal)try{if(a.datepicker.parseDate(a.datepicker._get(b,"dateFormat"),b.input?b.input.val():null,a.datepicker._getFormatConfig(b))){a.datepicker._setDateFromField(b);a.datepicker._updateAlternate(b);a.datepicker._updateDatepicker(b)}}catch(f){a.datepicker.log(f)}return true},_showDatepicker:function(b){b=b.target||b;if(b.nodeName.toLowerCase()!="input")b=a("input", +b.parentNode)[0];if(!(a.datepicker._isDisabledDatepicker(b)||a.datepicker._lastInput==b)){var f=a.datepicker._getInst(b);if(a.datepicker._curInst&&a.datepicker._curInst!=f){a.datepicker._datepickerShowing&&a.datepicker._triggerOnClose(a.datepicker._curInst);a.datepicker._curInst.dpDiv.stop(true,true)}var j=a.datepicker._get(f,"beforeShow");j=j?j.apply(b,[b,f]):{};if(j!==false){h(f.settings,j);f.lastVal=null;a.datepicker._lastInput=b;a.datepicker._setDateFromField(f);if(a.datepicker._inDialog)b.value= +"";if(!a.datepicker._pos){a.datepicker._pos=a.datepicker._findPos(b);a.datepicker._pos[1]+=b.offsetHeight}var l=false;a(b).parents().each(function(){l|=a(this).css("position")=="fixed";return!l});if(l&&a.browser.opera){a.datepicker._pos[0]-=document.documentElement.scrollLeft;a.datepicker._pos[1]-=document.documentElement.scrollTop}j={left:a.datepicker._pos[0],top:a.datepicker._pos[1]};a.datepicker._pos=null;f.dpDiv.empty();f.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});a.datepicker._updateDatepicker(f); +j=a.datepicker._checkOffset(f,j,l);f.dpDiv.css({position:a.datepicker._inDialog&&a.blockUI?"static":l?"fixed":"absolute",display:"none",left:j.left+"px",top:j.top+"px"});if(!f.inline){j=a.datepicker._get(f,"showAnim");var o=a.datepicker._get(f,"duration"),n=function(){var k=f.dpDiv.find("iframe.ui-datepicker-cover");if(k.length){var m=a.datepicker._getBorders(f.dpDiv);k.css({left:-m[0],top:-m[1],width:f.dpDiv.outerWidth(),height:f.dpDiv.outerHeight()})}};f.dpDiv.zIndex(a(b).zIndex()+1);a.datepicker._datepickerShowing= +true;a.effects&&a.effects[j]?f.dpDiv.show(j,a.datepicker._get(f,"showOptions"),o,n):f.dpDiv[j||"show"](j?o:null,n);if(!j||!o)n();f.input.is(":visible")&&!f.input.is(":disabled")&&f.input.focus();a.datepicker._curInst=f}}}},_updateDatepicker:function(b){this.maxRows=4;var f=a.datepicker._getBorders(b.dpDiv);i=b;b.dpDiv.empty().append(this._generateHTML(b));var j=b.dpDiv.find("iframe.ui-datepicker-cover");j.length&&j.css({left:-f[0],top:-f[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()}); +b.dpDiv.find("."+this._dayOverClass+" a").mouseover();f=this._getNumberOfMonths(b);j=f[1];b.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");j>1&&b.dpDiv.addClass("ui-datepicker-multi-"+j).css("width",17*j+"em");b.dpDiv[(f[0]!=1||f[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");b.dpDiv[(this._get(b,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");b==a.datepicker._curInst&&a.datepicker._datepickerShowing&&b.input&&b.input.is(":visible")&& +!b.input.is(":disabled")&&b.input[0]!=document.activeElement&&b.input.focus();if(b.yearshtml){var l=b.yearshtml;setTimeout(function(){l===b.yearshtml&&b.yearshtml&&b.dpDiv.find("select.ui-datepicker-year:first").replaceWith(b.yearshtml);l=b.yearshtml=null},0)}},_getBorders:function(b){var f=function(j){return{thin:1,medium:2,thick:3}[j]||j};return[parseFloat(f(b.css("border-left-width"))),parseFloat(f(b.css("border-top-width")))]},_checkOffset:function(b,f,j){var l=b.dpDiv.outerWidth(),o=b.dpDiv.outerHeight(), +n=b.input?b.input.outerWidth():0,k=b.input?b.input.outerHeight():0,m=document.documentElement.clientWidth+a(document).scrollLeft(),p=document.documentElement.clientHeight+a(document).scrollTop();f.left-=this._get(b,"isRTL")?l-n:0;f.left-=j&&f.left==b.input.offset().left?a(document).scrollLeft():0;f.top-=j&&f.top==b.input.offset().top+k?a(document).scrollTop():0;f.left-=Math.min(f.left,f.left+l>m&&m>l?Math.abs(f.left+l-m):0);f.top-=Math.min(f.top,f.top+o>p&&p>o?Math.abs(o+k):0);return f},_findPos:function(b){for(var f= +this._get(this._getInst(b),"isRTL");b&&(b.type=="hidden"||b.nodeType!=1||a.expr.filters.hidden(b));)b=b[f?"previousSibling":"nextSibling"];b=a(b).offset();return[b.left,b.top]},_triggerOnClose:function(b){var f=this._get(b,"onClose");if(f)f.apply(b.input?b.input[0]:null,[b.input?b.input.val():"",b])},_hideDatepicker:function(b){var f=this._curInst;if(!(!f||b&&f!=a.data(b,"datepicker")))if(this._datepickerShowing){b=this._get(f,"showAnim");var j=this._get(f,"duration"),l=function(){a.datepicker._tidyDialog(f); +this._curInst=null};a.effects&&a.effects[b]?f.dpDiv.hide(b,a.datepicker._get(f,"showOptions"),j,l):f.dpDiv[b=="slideDown"?"slideUp":b=="fadeIn"?"fadeOut":"hide"](b?j:null,l);b||l();a.datepicker._triggerOnClose(f);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if(a.blockUI){a.unblockUI();a("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(b){b.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")}, +_checkExternalClick:function(b){if(a.datepicker._curInst){b=a(b.target);b[0].id!=a.datepicker._mainDivId&&b.parents("#"+a.datepicker._mainDivId).length==0&&!b.hasClass(a.datepicker.markerClassName)&&!b.hasClass(a.datepicker._triggerClass)&&a.datepicker._datepickerShowing&&!(a.datepicker._inDialog&&a.blockUI)&&a.datepicker._hideDatepicker()}},_adjustDate:function(b,f,j){b=a(b);var l=this._getInst(b[0]);if(!this._isDisabledDatepicker(b[0])){this._adjustInstDate(l,f+(j=="M"?this._get(l,"showCurrentAtPos"): +0),j);this._updateDatepicker(l)}},_gotoToday:function(b){b=a(b);var f=this._getInst(b[0]);if(this._get(f,"gotoCurrent")&&f.currentDay){f.selectedDay=f.currentDay;f.drawMonth=f.selectedMonth=f.currentMonth;f.drawYear=f.selectedYear=f.currentYear}else{var j=new Date;f.selectedDay=j.getDate();f.drawMonth=f.selectedMonth=j.getMonth();f.drawYear=f.selectedYear=j.getFullYear()}this._notifyChange(f);this._adjustDate(b)},_selectMonthYear:function(b,f,j){b=a(b);var l=this._getInst(b[0]);l["selected"+(j=="M"? +"Month":"Year")]=l["draw"+(j=="M"?"Month":"Year")]=parseInt(f.options[f.selectedIndex].value,10);this._notifyChange(l);this._adjustDate(b)},_selectDay:function(b,f,j,l){var o=a(b);if(!(a(l).hasClass(this._unselectableClass)||this._isDisabledDatepicker(o[0]))){o=this._getInst(o[0]);o.selectedDay=o.currentDay=a("a",l).html();o.selectedMonth=o.currentMonth=f;o.selectedYear=o.currentYear=j;this._selectDate(b,this._formatDate(o,o.currentDay,o.currentMonth,o.currentYear))}},_clearDate:function(b){b=a(b); +this._getInst(b[0]);this._selectDate(b,"")},_selectDate:function(b,f){b=this._getInst(a(b)[0]);f=f!=null?f:this._formatDate(b);b.input&&b.input.val(f);this._updateAlternate(b);var j=this._get(b,"onSelect");if(j)j.apply(b.input?b.input[0]:null,[f,b]);else b.input&&b.input.trigger("change");if(b.inline)this._updateDatepicker(b);else{this._hideDatepicker();this._lastInput=b.input[0];typeof b.input[0]!="object"&&b.input.focus();this._lastInput=null}},_updateAlternate:function(b){var f=this._get(b,"altField"); +if(f){var j=this._get(b,"altFormat")||this._get(b,"dateFormat"),l=this._getDate(b),o=this.formatDate(j,l,this._getFormatConfig(b));a(f).each(function(){a(this).val(o)})}},noWeekends:function(b){b=b.getDay();return[b>0&&b<6,""]},iso8601Week:function(b){b=new Date(b.getTime());b.setDate(b.getDate()+4-(b.getDay()||7));var f=b.getTime();b.setMonth(0);b.setDate(1);return Math.floor(Math.round((f-b)/864E5)/7)+1},parseDate:function(b,f,j){if(b==null||f==null)throw"Invalid arguments";f=typeof f=="object"? +f.toString():f+"";if(f=="")return null;var l=(j?j.shortYearCutoff:null)||this._defaults.shortYearCutoff;l=typeof l!="string"?l:(new Date).getFullYear()%100+parseInt(l,10);for(var o=(j?j.dayNamesShort:null)||this._defaults.dayNamesShort,n=(j?j.dayNames:null)||this._defaults.dayNames,k=(j?j.monthNamesShort:null)||this._defaults.monthNamesShort,m=(j?j.monthNames:null)||this._defaults.monthNames,p=j=-1,q=-1,s=-1,r=false,u=function(z){(z=H+1-1){p=1;q=s;do{l=this._getDaysInMonth(j,p-1);if(q<=l)break;p++;q-=l}while(1)}C=this._daylightSavingAdjust(new Date(j,p-1,q));if(C.getFullYear()!=j||C.getMonth()+1!=p||C.getDate()!=q)throw"Invalid date";return C},ATOM:"yy-mm-dd", +COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(b,f,j){if(!f)return"";var l=(j?j.dayNamesShort:null)||this._defaults.dayNamesShort,o=(j?j.dayNames:null)||this._defaults.dayNames,n=(j?j.monthNamesShort:null)||this._defaults.monthNamesShort;j=(j?j.monthNames: +null)||this._defaults.monthNames;var k=function(u){(u=r+1 +12?b.getHours()+2:0);return b},_setDate:function(b,f,j){var l=!f,o=b.selectedMonth,n=b.selectedYear;f=this._restrictMinMax(b,this._determineDate(b,f,new Date));b.selectedDay=b.currentDay=f.getDate();b.drawMonth=b.selectedMonth=b.currentMonth=f.getMonth();b.drawYear=b.selectedYear=b.currentYear=f.getFullYear();if((o!=b.selectedMonth||n!=b.selectedYear)&&!j)this._notifyChange(b);this._adjustInstDate(b);if(b.input)b.input.val(l?"":this._formatDate(b))},_getDate:function(b){return!b.currentYear||b.input&& +b.input.val()==""?null:this._daylightSavingAdjust(new Date(b.currentYear,b.currentMonth,b.currentDay))},_generateHTML:function(b){var f=new Date;f=this._daylightSavingAdjust(new Date(f.getFullYear(),f.getMonth(),f.getDate()));var j=this._get(b,"isRTL"),l=this._get(b,"showButtonPanel"),o=this._get(b,"hideIfNoPrevNext"),n=this._get(b,"navigationAsDateFormat"),k=this._getNumberOfMonths(b),m=this._get(b,"showCurrentAtPos"),p=this._get(b,"stepMonths"),q=k[0]!=1||k[1]!=1,s=this._daylightSavingAdjust(!b.currentDay? +new Date(9999,9,9):new Date(b.currentYear,b.currentMonth,b.currentDay)),r=this._getMinMaxDate(b,"min"),u=this._getMinMaxDate(b,"max");m=b.drawMonth-m;var v=b.drawYear;if(m<0){m+=12;v--}if(u){var w=this._daylightSavingAdjust(new Date(u.getFullYear(),u.getMonth()-k[0]*k[1]+1,u.getDate()));for(w=r&&ww;){m--;if(m<0){m=11;v--}}}b.drawMonth=m;b.drawYear=v;w=this._get(b,"prevText");w=!n?w:this.formatDate(w,this._daylightSavingAdjust(new Date(v,m-p,1)),this._getFormatConfig(b)); +w=this._canAdjustMonth(b,-1,v,m)?''+w+"":o?"":''+w+"";var x=this._get(b,"nextText");x=!n?x:this.formatDate(x,this._daylightSavingAdjust(new Date(v, +m+p,1)),this._getFormatConfig(b));o=this._canAdjustMonth(b,+1,v,m)?''+x+"":o?"":''+x+"";p=this._get(b,"currentText");x=this._get(b,"gotoCurrent")&& +b.currentDay?s:f;p=!n?p:this.formatDate(p,x,this._getFormatConfig(b));n=!b.inline?'":"";l=l?'
'+(j?n:"")+(this._isInRange(b,x)?'":"")+(j?"":n)+"
":"";n=parseInt(this._get(b,"firstDay"),10);n=isNaN(n)?0:n;p=this._get(b,"showWeek");x=this._get(b,"dayNames");this._get(b,"dayNamesShort");var y=this._get(b,"dayNamesMin"),H=this._get(b,"monthNames"),C=this._get(b,"monthNamesShort"),z=this._get(b,"beforeShowDay"),I=this._get(b,"showOtherMonths"),N=this._get(b,"selectOtherMonths");this._get(b,"calculateWeek");for(var J=this._getDefaultDate(b),D="",E=0;E1)switch(L){case 0:F+=" ui-datepicker-group-first";B=" ui-corner-"+(j?"right":"left");break;case k[1]-1:F+=" ui-datepicker-group-last";B=" ui-corner-"+(j?"left":"right");break;default:F+=" ui-datepicker-group-middle";B="";break}F+='">'}F+='
'+(/all|left/.test(B)&& +E==0?j?o:w:"")+(/all|right/.test(B)&&E==0?j?w:o:"")+this._generateMonthYearHeader(b,m,v,r,u,E>0||L>0,H,C)+'
';var G=p?'":"";for(B=0;B<7;B++){var A=(B+n)%7;G+="=5?' class="ui-datepicker-week-end"':"")+'>'+y[A]+""}F+=G+"";G=this._getDaysInMonth(v,m);if(v==b.selectedYear&&m==b.selectedMonth)b.selectedDay=Math.min(b.selectedDay, +G);B=(this._getFirstDayOfMonth(v,m)-n+7)%7;G=Math.ceil((B+G)/7);this.maxRows=G=q?this.maxRows>G?this.maxRows:G:G;A=this._daylightSavingAdjust(new Date(v,m,1-B));for(var R=0;R";var S=!p?"":'";for(B=0;B<7;B++){var M=z?z.apply(b.input?b.input[0]:null,[A]):[true,""],K=A.getMonth()!=m,O=K&&!N||!M[0]||r&&Au;S+='";A.setDate(A.getDate()+1);A=this._daylightSavingAdjust(A)}F+=S+""}m++;if(m>11){m=0;v++}F+="
'+this._get(b,"weekHeader")+"
'+this._get(b,"calculateWeek")(A)+""+(K&&!I?" ":O?''+ +A.getDate()+"":''+A.getDate()+"")+"
"+(q?""+(k[0]>0&&L==k[1]-1?'
':""):"");P+=F}D+=P}D+=l+(a.browser.msie&&parseInt(a.browser.version,10)<7&&!b.inline?'': +"");b._keyEvent=false;return D},_generateMonthYearHeader:function(b,f,j,l,o,n,k,m){var p=this._get(b,"changeMonth"),q=this._get(b,"changeYear"),s=this._get(b,"showMonthAfterYear"),r='
',u="";if(n||!p)u+=''+k[f]+"";else{k=l&&l.getFullYear()==j;var v=o&&o.getFullYear()==j;u+='"}s||(r+=u+(n||!(p&&q)?" ":""));if(!b.yearshtml){b.yearshtml="";if(n||!q)r+=''+j+"";else{m=this._get(b,"yearRange").split(":");var x=(new Date).getFullYear();k=function(y){y=y.match(/c[+-].*/)?j+parseInt(y.substring(1),10):y.match(/[+-].*/)?x+parseInt(y,10):parseInt(y,10);return isNaN(y)?x:y};f=k(m[0]);m=Math.max(f,k(m[1]||""));f=l?Math.max(f, +l.getFullYear()):f;m=o?Math.min(m,o.getFullYear()):m;for(b.yearshtml+='";r+=b.yearshtml;b.yearshtml=null}}r+=this._get(b,"yearSuffix");if(s)r+=(n||!(p&&q)?" ":"")+u;r+="
";return r},_adjustInstDate:function(b,f,j){var l=b.drawYear+(j=="Y"?f:0),o=b.drawMonth+ +(j=="M"?f:0);f=Math.min(b.selectedDay,this._getDaysInMonth(l,o))+(j=="D"?f:0);l=this._restrictMinMax(b,this._daylightSavingAdjust(new Date(l,o,f)));b.selectedDay=l.getDate();b.drawMonth=b.selectedMonth=l.getMonth();b.drawYear=b.selectedYear=l.getFullYear();if(j=="M"||j=="Y")this._notifyChange(b)},_restrictMinMax:function(b,f){var j=this._getMinMaxDate(b,"min");b=this._getMinMaxDate(b,"max");f=j&&fb?b:f},_notifyChange:function(b){var f=this._get(b,"onChangeMonthYear");if(f)f.apply(b.input? +b.input[0]:null,[b.selectedYear,b.selectedMonth+1,b])},_getNumberOfMonths:function(b){b=this._get(b,"numberOfMonths");return b==null?[1,1]:typeof b=="number"?[1,b]:b},_getMinMaxDate:function(b,f){return this._determineDate(b,this._get(b,f+"Date"),null)},_getDaysInMonth:function(b,f){return 32-this._daylightSavingAdjust(new Date(b,f,32)).getDate()},_getFirstDayOfMonth:function(b,f){return(new Date(b,f,1)).getDay()},_canAdjustMonth:function(b,f,j,l){var o=this._getNumberOfMonths(b);j=this._daylightSavingAdjust(new Date(j, +l+(f<0?f:o[0]*o[1]),1));f<0&&j.setDate(this._getDaysInMonth(j.getFullYear(),j.getMonth()));return this._isInRange(b,j)},_isInRange:function(b,f){var j=this._getMinMaxDate(b,"min");b=this._getMinMaxDate(b,"max");return(!j||f.getTime()>=j.getTime())&&(!b||f.getTime()<=b.getTime())},_getFormatConfig:function(b){var f=this._get(b,"shortYearCutoff");f=typeof f!="string"?f:(new Date).getFullYear()%100+parseInt(f,10);return{shortYearCutoff:f,dayNamesShort:this._get(b,"dayNamesShort"),dayNames:this._get(b, +"dayNames"),monthNamesShort:this._get(b,"monthNamesShort"),monthNames:this._get(b,"monthNames")}},_formatDate:function(b,f,j,l){if(!f){b.currentDay=b.selectedDay;b.currentMonth=b.selectedMonth;b.currentYear=b.selectedYear}f=f?typeof f=="object"?f:this._daylightSavingAdjust(new Date(l,j,f)):this._daylightSavingAdjust(new Date(b.currentYear,b.currentMonth,b.currentDay));return this.formatDate(this._get(b,"dateFormat"),f,this._getFormatConfig(b))}});a.fn.datepicker=function(b){if(!this.length)return this; +if(!a.datepicker.initialized){a(document).mousedown(a.datepicker._checkExternalClick).find("body").append(a.datepicker.dpDiv);a.datepicker.initialized=true}var f=Array.prototype.slice.call(arguments,1);if(typeof b=="string"&&(b=="isDisabled"||b=="getDate"||b=="widget"))return a.datepicker["_"+b+"Datepicker"].apply(a.datepicker,[this[0]].concat(f));if(b=="option"&&arguments.length==2&&typeof arguments[1]=="string")return a.datepicker["_"+b+"Datepicker"].apply(a.datepicker,[this[0]].concat(f));return this.each(function(){typeof b== +"string"?a.datepicker["_"+b+"Datepicker"].apply(a.datepicker,[this].concat(f)):a.datepicker._attachDatepicker(this,b)})};a.datepicker=new c;a.datepicker.initialized=false;a.datepicker.uuid=(new Date).getTime();a.datepicker.version="1.8.16";window["DP_jQuery_"+g]=a})(jQuery); (function(a,d){var c={buttons:true,height:true,maxHeight:true,maxWidth:true,minHeight:true,minWidth:true,width:true},e={maxHeight:true,maxWidth:true,minHeight:true,minWidth:true},h=a.attrFn||{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true,click:true};a.widget("ui.dialog",{options:{autoOpen:true,buttons:{},closeOnEscape:true,closeText:"close",dialogClass:"",draggable:true,hide:null,height:"auto",maxHeight:false,maxWidth:false,minHeight:150,minWidth:150,modal:false, position:{my:"center",at:"center",collision:"fit",using:function(g){var i=a(this).css(g).offset().top;i<0&&a(this).css("top",g.top-i)}},resizable:true,show:null,stack:true,title:"",width:300,zIndex:1E3},_create:function(){this.originalTitle=this.element.attr("title");if(typeof this.originalTitle!=="string")this.originalTitle="";this.options.title=this.options.title||this.originalTitle;var g=this,i=g.options,b=i.title||" ",f=a.ui.dialog.getTitleId(g.element),j=(g.uiDialog=a("
")).appendTo(document.body).hide().addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+ -i.dialogClass).css({zIndex:i.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(n){if(i.closeOnEscape&&n.keyCode&&n.keyCode===a.ui.keyCode.ESCAPE){g.close(n);n.preventDefault()}}).attr({role:"dialog","aria-labelledby":f}).mousedown(function(n){g.moveToTop(false,n)});g.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(j);var l=(g.uiDialogTitlebar=a("
")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(j), +i.dialogClass).css({zIndex:i.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(n){if(i.closeOnEscape&&!n.isDefaultPrevented()&&n.keyCode&&n.keyCode===a.ui.keyCode.ESCAPE){g.close(n);n.preventDefault()}}).attr({role:"dialog","aria-labelledby":f}).mousedown(function(n){g.moveToTop(false,n)});g.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(j);var l=(g.uiDialogTitlebar=a("
")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(j), o=a('').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role","button").hover(function(){o.addClass("ui-state-hover")},function(){o.removeClass("ui-state-hover")}).focus(function(){o.addClass("ui-state-focus")}).blur(function(){o.removeClass("ui-state-focus")}).click(function(n){g.close(n);return false}).appendTo(l);(g.uiDialogTitlebarCloseText=a("")).addClass("ui-icon ui-icon-closethick").text(i.closeText).appendTo(o);a("").addClass("ui-dialog-title").attr("id", f).html(b).prependTo(l);if(a.isFunction(i.beforeclose)&&!a.isFunction(i.beforeClose))i.beforeClose=i.beforeclose;l.find("*").add(l).disableSelection();i.draggable&&a.fn.draggable&&g._makeDraggable();i.resizable&&a.fn.resizable&&g._makeResizable();g._createButtons(i.buttons);g._isOpen=false;a.fn.bgiframe&&j.bgiframe()},_init:function(){this.options.autoOpen&&this.open()},destroy:function(){var g=this;g.overlay&&g.overlay.destroy();g.uiDialog.hide();g.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body"); g.uiDialog.remove();g.originalTitle&&g.element.attr("title",g.originalTitle);return g},widget:function(){return this.uiDialog},close:function(g){var i=this,b,f;if(false!==i._trigger("beforeClose",g)){i.overlay&&i.overlay.destroy();i.uiDialog.unbind("keypress.ui-dialog");i._isOpen=false;if(i.options.hide)i.uiDialog.hide(i.options.hide,function(){i._trigger("close",g)});else{i.uiDialog.hide();i._trigger("close",g)}a.ui.dialog.overlay.resize();if(i.options.modal){b=0;a(".ui-dialog").each(function(){if(this!== -i.uiDialog[0]){f=a(this).css("z-index");isNaN(f)||(b=Math.max(b,f))}});a.ui.dialog.maxZ=b}return i}},isOpen:function(){return this._isOpen},moveToTop:function(g,i){var b=this,f=b.options;if(f.modal&&!g||!f.stack&&!f.modal)return b._trigger("focus",i);if(f.zIndex>a.ui.dialog.maxZ)a.ui.dialog.maxZ=f.zIndex;if(b.overlay){a.ui.dialog.maxZ+=1;b.overlay.$el.css("z-index",a.ui.dialog.overlay.maxZ=a.ui.dialog.maxZ)}g={scrollTop:b.element.attr("scrollTop"),scrollLeft:b.element.attr("scrollLeft")};a.ui.dialog.maxZ+= -1;b.uiDialog.css("z-index",a.ui.dialog.maxZ);b.element.attr(g);b._trigger("focus",i);return b},open:function(){if(!this._isOpen){var g=this,i=g.options,b=g.uiDialog;g.overlay=i.modal?new a.ui.dialog.overlay(g):null;g._size();g._position(i.position);b.show(i.show);g.moveToTop(true);i.modal&&b.bind("keypress.ui-dialog",function(f){if(f.keyCode===a.ui.keyCode.TAB){var j=a(":tabbable",this),l=j.filter(":first");j=j.filter(":last");if(f.target===j[0]&&!f.shiftKey){l.focus(1);return false}else if(f.target=== +i.uiDialog[0]){f=a(this).css("z-index");isNaN(f)||(b=Math.max(b,f))}});a.ui.dialog.maxZ=b}return i}},isOpen:function(){return this._isOpen},moveToTop:function(g,i){var b=this,f=b.options;if(f.modal&&!g||!f.stack&&!f.modal)return b._trigger("focus",i);if(f.zIndex>a.ui.dialog.maxZ)a.ui.dialog.maxZ=f.zIndex;if(b.overlay){a.ui.dialog.maxZ+=1;b.overlay.$el.css("z-index",a.ui.dialog.overlay.maxZ=a.ui.dialog.maxZ)}g={scrollTop:b.element.scrollTop(),scrollLeft:b.element.scrollLeft()};a.ui.dialog.maxZ+=1; +b.uiDialog.css("z-index",a.ui.dialog.maxZ);b.element.attr(g);b._trigger("focus",i);return b},open:function(){if(!this._isOpen){var g=this,i=g.options,b=g.uiDialog;g.overlay=i.modal?new a.ui.dialog.overlay(g):null;g._size();g._position(i.position);b.show(i.show);g.moveToTop(true);i.modal&&b.bind("keypress.ui-dialog",function(f){if(f.keyCode===a.ui.keyCode.TAB){var j=a(":tabbable",this),l=j.filter(":first");j=j.filter(":last");if(f.target===j[0]&&!f.shiftKey){l.focus(1);return false}else if(f.target=== l[0]&&f.shiftKey){j.focus(1);return false}}});a(g.element.find(":tabbable").get().concat(b.find(".ui-dialog-buttonpane :tabbable").get().concat(b.get()))).eq(0).focus();g._isOpen=true;g._trigger("open");return g}},_createButtons:function(g){var i=this,b=false,f=a("
").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),j=a("
").addClass("ui-dialog-buttonset").appendTo(f);i.uiDialog.find(".ui-dialog-buttonpane").remove();typeof g==="object"&&g!==null&&a.each(g, function(){return!(b=true)});if(b){a.each(g,function(l,o){o=a.isFunction(o)?{click:o,text:l}:o;var n=a('').click(function(){o.click.apply(i.element[0],arguments)}).appendTo(j);a.each(o,function(k,m){if(k!=="click")k in h?n[k](m):n.attr(k,m)});a.fn.button&&n.button()});f.appendTo(i.uiDialog)}},_makeDraggable:function(){function g(l){return{position:l.position,offset:l.offset}}var i=this,b=i.options,f=a(document),j;i.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close", handle:".ui-dialog-titlebar",containment:"document",start:function(l,o){j=b.height==="auto"?"auto":a(this).height();a(this).height(a(this).height()).addClass("ui-dialog-dragging");i._trigger("dragStart",l,g(o))},drag:function(l,o){i._trigger("drag",l,g(o))},stop:function(l,o){b.position=[o.position.left-f.scrollLeft(),o.position.top-f.scrollTop()];a(this).removeClass("ui-dialog-dragging").height(j);i._trigger("dragStop",l,g(o));a.ui.dialog.overlay.resize()}})},_makeResizable:function(g){function i(l){return{originalPosition:l.originalPosition, @@ -354,11 +356,11 @@ l,i(o))},stop:function(l,o){a(this).removeClass("ui-dialog-resizing");f.height=a if(j in c)f=true;if(j in e)b[j]=l});f&&this._size();this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option",b)},_setOption:function(g,i){var b=this,f=b.uiDialog;switch(g){case "beforeclose":g="beforeClose";break;case "buttons":b._createButtons(i);break;case "closeText":b.uiDialogTitlebarCloseText.text(""+i);break;case "dialogClass":f.removeClass(b.options.dialogClass).addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+i);break;case "disabled":i?f.addClass("ui-dialog-disabled"): f.removeClass("ui-dialog-disabled");break;case "draggable":var j=f.is(":data(draggable)");j&&!i&&f.draggable("destroy");!j&&i&&b._makeDraggable();break;case "position":b._position(i);break;case "resizable":(j=f.is(":data(resizable)"))&&!i&&f.resizable("destroy");j&&typeof i==="string"&&f.resizable("option","handles",i);!j&&i!==false&&b._makeResizable(i);break;case "title":a(".ui-dialog-title",b.uiDialogTitlebar).html(""+(i||" "));break}a.Widget.prototype._setOption.apply(b,arguments)},_size:function(){var g= this.options,i,b,f=this.uiDialog.is(":visible");this.element.show().css({width:"auto",minHeight:0,height:0});if(g.minWidth>g.width)g.width=g.minWidth;i=this.uiDialog.css({height:"auto",width:g.width}).height();b=Math.max(0,g.minHeight-i);if(g.height==="auto")if(a.support.minHeight)this.element.css({minHeight:b,height:"auto"});else{this.uiDialog.show();g=this.element.css("height","auto").height();f||this.uiDialog.hide();this.element.height(Math.max(g,b))}else this.element.height(Math.max(g.height- -i,0));this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())}});a.extend(a.ui.dialog,{version:"1.8.14",uuid:0,maxZ:0,getTitleId:function(g){g=g.attr("id");if(!g){this.uuid+=1;g=this.uuid}return"ui-dialog-title-"+g},overlay:function(g){this.$el=a.ui.dialog.overlay.create(g)}});a.extend(a.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:a.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(g){return g+".dialog-overlay"}).join(" "), -create:function(g){if(this.instances.length===0){setTimeout(function(){a.ui.dialog.overlay.instances.length&&a(document).bind(a.ui.dialog.overlay.events,function(b){if(a(b.target).zIndex()").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(), -height:this.height()});a.fn.bgiframe&&i.bgiframe();this.instances.push(i);return i},destroy:function(g){var i=a.inArray(g,this.instances);i!=-1&&this.oldInstances.push(this.instances.splice(i,1)[0]);this.instances.length===0&&a([document,window]).unbind(".dialog-overlay");g.remove();var b=0;a.each(this.instances,function(){b=Math.max(b,this.css("z-index"))});this.maxZ=b},height:function(){var g,i;if(a.browser.msie&&a.browser.version<7){g=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight); -i=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return g").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(),height:this.height()});a.fn.bgiframe&&i.bgiframe();this.instances.push(i);return i},destroy:function(g){var i=a.inArray(g,this.instances);i!=-1&&this.oldInstances.push(this.instances.splice(i,1)[0]);this.instances.length===0&&a([document,window]).unbind(".dialog-overlay");g.remove();var b=0;a.each(this.instances,function(){b=Math.max(b,this.css("z-index"))});this.maxZ=b},height:function(){var g,i;if(a.browser.msie&& +a.browser.version<7){g=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);i=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return g0?f+j+l:0}},top:function(g,i){if(i.at[1]!=="c f=b.offset(),j=parseInt(a.curCSS(g,"top",true),10)||0,l=parseInt(a.curCSS(g,"left",true),10)||0;f={top:i.top-f.top+j,left:i.left-f.left+l};"using"in i?i.using.call(g,f):b.css(f)};a.fn.offset=function(g){var i=this[0];if(!i||!i.ownerDocument)return null;if(g)return this.each(function(){a.offset.setOffset(this,g)});return h.call(this)}}})(jQuery); (function(a,d){a.widget("ui.progressbar",{options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()});this.valueDiv=a("
").appendTo(this.element);this.oldValue=this._value();this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"); this.valueDiv.remove();a.Widget.prototype.destroy.apply(this,arguments)},value:function(c){if(c===d)return this._value();this._setOption("value",c);return this},_setOption:function(c,e){if(c==="value"){this.options.value=e;this._refreshValue();this._value()===this.options.max&&this._trigger("complete")}a.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var c=this.options.value;if(typeof c!=="number")c=0;return Math.min(this.options.max,Math.max(this.min,c))},_percentage:function(){return 100* -this._value()/this.options.max},_refreshValue:function(){var c=this.value(),e=this._percentage();if(this.oldValue!==c){this.oldValue=c;this._trigger("change")}this.valueDiv.toggle(c>this.min).toggleClass("ui-corner-right",c===this.options.max).width(e.toFixed(0)+"%");this.element.attr("aria-valuenow",c)}});a.extend(a.ui.progressbar,{version:"1.8.14"})})(jQuery); +this._value()/this.options.max},_refreshValue:function(){var c=this.value(),e=this._percentage();if(this.oldValue!==c){this.oldValue=c;this._trigger("change")}this.valueDiv.toggle(c>this.min).toggleClass("ui-corner-right",c===this.options.max).width(e.toFixed(0)+"%");this.element.attr("aria-valuenow",c)}});a.extend(a.ui.progressbar,{version:"1.8.16"})})(jQuery); (function(a){a.widget("ui.slider",a.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var d=this,c=this.options,e=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),h=c.values&&c.values.length||1,g=[];this._mouseSliding=this._keySliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+ this.orientation+" ui-widget ui-widget-content ui-corner-all"+(c.disabled?" ui-slider-disabled ui-disabled":""));this.range=a([]);if(c.range){if(c.range===true){if(!c.values)c.values=[this._valueMin(),this._valueMin()];if(c.values.length&&c.values.length!==2)c.values=[c.values[0],c.values[0]]}this.range=a("
").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(c.range==="min"||c.range==="max"?" ui-slider-range-"+c.range:""))}for(var i=e.length;i"); this.handles=e.add(a(g.join("")).appendTo(d.element));this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(b){b.preventDefault()}).hover(function(){c.disabled||a(this).addClass("ui-state-hover")},function(){a(this).removeClass("ui-state-hover")}).focus(function(){if(c.disabled)a(this).blur();else{a(".ui-slider .ui-state-focus").removeClass("ui-state-focus");a(this).addClass("ui-state-focus")}}).blur(function(){a(this).removeClass("ui-state-focus")});this.handles.each(function(b){a(this).data("index.ui-slider-handle", @@ -382,12 +384,12 @@ this.elementSize.width;d=d.x-this.elementOffset.left-(this._clickOffset?this._cl e.values=this.values()}return this._trigger("start",d,e)},_slide:function(d,c,e){var h;if(this.options.values&&this.options.values.length){h=this.values(c?0:1);if(this.options.values.length===2&&this.options.range===true&&(c===0&&e>h||c===1&&e1){this.options.values[d]=this._trimAlignValue(c);this._refreshValue();this._change(null,d)}else if(arguments.length)if(a.isArray(arguments[0])){e=this.options.values;h=arguments[0];for(g=0;g=this._valueMax())return this._valueMax();var c=this.options.step>0?this.options.step:1,e=(d-this._valueMin())%c;alignValue=d-e;if(Math.abs(e)*2>=c)alignValue+=e>0?c:-c;return parseFloat(alignValue.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max}, -_refreshValue:function(){var d=this.options.range,c=this.options,e=this,h=!this._animateOff?c.animate:false,g,i={},b,f,j,l;if(this.options.values&&this.options.values.length)this.handles.each(function(o){g=(e.values(o)-e._valueMin())/(e._valueMax()-e._valueMin())*100;i[e.orientation==="horizontal"?"left":"bottom"]=g+"%";a(this).stop(1,1)[h?"animate":"css"](i,c.animate);if(e.options.range===true)if(e.orientation==="horizontal"){if(o===0)e.range.stop(1,1)[h?"animate":"css"]({left:g+"%"},c.animate); -if(o===1)e.range[h?"animate":"css"]({width:g-b+"%"},{queue:false,duration:c.animate})}else{if(o===0)e.range.stop(1,1)[h?"animate":"css"]({bottom:g+"%"},c.animate);if(o===1)e.range[h?"animate":"css"]({height:g-b+"%"},{queue:false,duration:c.animate})}b=g});else{f=this.value();j=this._valueMin();l=this._valueMax();g=l!==j?(f-j)/(l-j)*100:0;i[e.orientation==="horizontal"?"left":"bottom"]=g+"%";this.handle.stop(1,1)[h?"animate":"css"](i,c.animate);if(d==="min"&&this.orientation==="horizontal")this.range.stop(1, -1)[h?"animate":"css"]({width:g+"%"},c.animate);if(d==="max"&&this.orientation==="horizontal")this.range[h?"animate":"css"]({width:100-g+"%"},{queue:false,duration:c.animate});if(d==="min"&&this.orientation==="vertical")this.range.stop(1,1)[h?"animate":"css"]({height:g+"%"},c.animate);if(d==="max"&&this.orientation==="vertical")this.range[h?"animate":"css"]({height:100-g+"%"},{queue:false,duration:c.animate})}}});a.extend(a.ui.slider,{version:"1.8.14"})})(jQuery); +return c=this._trimAlignValue(c)}else{c=this.options.values.slice();for(e=0;e=this._valueMax())return this._valueMax();var c=this.options.step>0?this.options.step:1,e=(d-this._valueMin())%c;d=d-e;if(Math.abs(e)*2>=c)d+=e>0?c:-c;return parseFloat(d.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var d= +this.options.range,c=this.options,e=this,h=!this._animateOff?c.animate:false,g,i={},b,f,j,l;if(this.options.values&&this.options.values.length)this.handles.each(function(o){g=(e.values(o)-e._valueMin())/(e._valueMax()-e._valueMin())*100;i[e.orientation==="horizontal"?"left":"bottom"]=g+"%";a(this).stop(1,1)[h?"animate":"css"](i,c.animate);if(e.options.range===true)if(e.orientation==="horizontal"){if(o===0)e.range.stop(1,1)[h?"animate":"css"]({left:g+"%"},c.animate);if(o===1)e.range[h?"animate":"css"]({width:g- +b+"%"},{queue:false,duration:c.animate})}else{if(o===0)e.range.stop(1,1)[h?"animate":"css"]({bottom:g+"%"},c.animate);if(o===1)e.range[h?"animate":"css"]({height:g-b+"%"},{queue:false,duration:c.animate})}b=g});else{f=this.value();j=this._valueMin();l=this._valueMax();g=l!==j?(f-j)/(l-j)*100:0;i[e.orientation==="horizontal"?"left":"bottom"]=g+"%";this.handle.stop(1,1)[h?"animate":"css"](i,c.animate);if(d==="min"&&this.orientation==="horizontal")this.range.stop(1,1)[h?"animate":"css"]({width:g+"%"}, +c.animate);if(d==="max"&&this.orientation==="horizontal")this.range[h?"animate":"css"]({width:100-g+"%"},{queue:false,duration:c.animate});if(d==="min"&&this.orientation==="vertical")this.range.stop(1,1)[h?"animate":"css"]({height:g+"%"},c.animate);if(d==="max"&&this.orientation==="vertical")this.range[h?"animate":"css"]({height:100-g+"%"},{queue:false,duration:c.animate})}}});a.extend(a.ui.slider,{version:"1.8.16"})})(jQuery); (function(a,d){function c(){return++h}function e(){return++g}var h=0,g=0;a.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:false,cookie:null,collapsible:false,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"
",remove:null,select:null,show:null,spinner:"Loading…",tabTemplate:"
  • #{label}
  • "},_create:function(){this._tabify(true)},_setOption:function(i,b){if(i=="selected")this.options.collapsible&& b==this.options.selected||this.select(b);else{this.options[i]=b;this._tabify()}},_tabId:function(i){return i.title&&i.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+c()},_sanitizeSelector:function(i){return i.replace(/:/g,"\\:")},_cookie:function(){var i=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+e());return a.cookie.apply(null,[i].concat(a.makeArray(arguments)))},_ui:function(i,b){return{tab:i,panel:b,index:this.anchors.index(i)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var i= a(this);i.html(i.data("label.tabs")).removeData("label.tabs")})},_tabify:function(i){function b(r,u){r.css("display","");!a.support.opacity&&u.opacity&&r[0].style.removeAttribute("filter")}var f=this,j=this.options,l=/^#.+/;this.list=this.element.find("ol,ul").eq(0);this.lis=a(" > li:has(a[href])",this.list);this.anchors=this.lis.map(function(){return a("a",this)[0]});this.panels=a([]);this.anchors.each(function(r,u){var v=a(u).attr("href"),w=v.split("#")[0],x;if(w&&(w===location.toString().split("#")[0]|| @@ -408,5 +410,5 @@ if(f.hasClass("ui-tabs-selected")&&this.anchors.length>1)this.select(i+(i+1)[^>]*$|#([\w\-]*)$)/, + // Prioritize #id over to avoid XSS via location.hash (#9521) + quickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/, // Check if a string has a non-whitespace character in it rnotwhite = /\S/, @@ -66,11 +66,12 @@ var jQuery = function( selector, context ) { rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/, // Matches dashed string for camelizing - rdashAlpha = /-([a-z])/ig, + rdashAlpha = /-([a-z]|[0-9])/ig, + rmsPrefix = /^-ms-/, // Used by jQuery.camelCase as callback to replace() fcamelCase = function( all, letter ) { - return letter.toUpperCase(); + return ( letter + "" ).toUpperCase(); }, // Keep a UserAgent string for use with jQuery.browser @@ -212,7 +213,7 @@ jQuery.fn = jQuery.prototype = { selector: "", // The current version of jQuery being used - jquery: "1.6.2", + jquery: "1.6.4", // The default length of a jQuery object is 0 length: 0, @@ -521,10 +522,15 @@ jQuery.extend({ return false; } - // Not own constructor property must be Object - if ( obj.constructor && - !hasOwn.call(obj, "constructor") && - !hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) { + try { + // Not own constructor property must be Object + if ( obj.constructor && + !hasOwn.call(obj, "constructor") && + !hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) { + return false; + } + } catch ( e ) { + // IE8,9 Will throw exceptions on certain host objects #9897 return false; } @@ -574,24 +580,23 @@ jQuery.extend({ }, // Cross-browser xml parsing - // (xml & tmp used internally) - parseXML: function( data , xml , tmp ) { - - if ( window.DOMParser ) { // Standard - tmp = new DOMParser(); - xml = tmp.parseFromString( data , "text/xml" ); - } else { // IE - xml = new ActiveXObject( "Microsoft.XMLDOM" ); - xml.async = "false"; - xml.loadXML( data ); - } - - tmp = xml.documentElement; - - if ( ! tmp || ! tmp.nodeName || tmp.nodeName === "parsererror" ) { + parseXML: function( data ) { + var xml, tmp; + try { + if ( window.DOMParser ) { // Standard + tmp = new DOMParser(); + xml = tmp.parseFromString( data , "text/xml" ); + } else { // IE + xml = new ActiveXObject( "Microsoft.XMLDOM" ); + xml.async = "false"; + xml.loadXML( data ); + } + } catch( e ) { + xml = undefined; + } + if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) { jQuery.error( "Invalid XML: " + data ); } - return xml; }, @@ -611,10 +616,10 @@ jQuery.extend({ } }, - // Converts a dashed string to camelCased string; - // Used by both the css and data modules + // Convert dashed to camelCase; used by the css and data modules + // Microsoft forgot to hump their vendor prefix (#9572) camelCase: function( string ) { - return string.replace( rdashAlpha, fcamelCase ); + return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase ); }, nodeName: function( elem, name ) { @@ -699,6 +704,9 @@ jQuery.extend({ }, inArray: function( elem, array ) { + if ( !array ) { + return -1; + } if ( indexOf ) { return indexOf.call( array, elem ); @@ -1071,7 +1079,7 @@ jQuery.extend({ if ( returned && jQuery.isFunction( returned.promise ) ) { returned.promise().then( newDefer.resolve, newDefer.reject ); } else { - newDefer[ action ]( returned ); + newDefer[ action + "With" ]( this === deferred ? newDefer : this, [ returned ] ); } }); } else { @@ -1173,6 +1181,7 @@ jQuery.support = (function() { div.setAttribute("className", "t"); div.innerHTML = "
    a"; + all = div.getElementsByTagName( "*" ); a = div.getElementsByTagName( "a" )[ 0 ]; @@ -1293,13 +1302,14 @@ jQuery.support = (function() { width: 0, height: 0, border: 0, - margin: 0 + margin: 0, + background: "none" }; if ( body ) { jQuery.extend( testElementStyle, { position: "absolute", - left: -1000, - top: -1000 + left: "-1000px", + top: "-1000px" }); } for ( i in testElementStyle ) { @@ -1404,7 +1414,7 @@ jQuery.boxModel = jQuery.support.boxModel; var rbrace = /^(?:\{.*\}|\[.*\])$/, - rmultiDash = /([a-z])([A-Z])/g; + rmultiDash = /([A-Z])/g; jQuery.extend({ cache: {}, @@ -1436,7 +1446,9 @@ jQuery.extend({ return; } - var internalKey = jQuery.expando, getByName = typeof name === "string", thisCache, + var thisCache, ret, + internalKey = jQuery.expando, + getByName = typeof name === "string", // We have to handle DOM nodes and JS objects differently because IE6-7 // can't GC object references properly across the DOM-JS boundary @@ -1452,7 +1464,7 @@ jQuery.extend({ // Avoid doing any more work than we need to when trying to get data on an // object that has no data at all - if ( (!id || (pvt && id && !cache[ id ][ internalKey ])) && getByName && data === undefined ) { + if ( (!id || (pvt && id && (cache[ id ] && !cache[ id ][ internalKey ]))) && getByName && data === undefined ) { return; } @@ -1511,10 +1523,24 @@ jQuery.extend({ return thisCache[ internalKey ] && thisCache[ internalKey ].events; } - return getByName ? - // Check for both converted-to-camel and non-converted data property names - thisCache[ jQuery.camelCase( name ) ] || thisCache[ name ] : - thisCache; + // Check for both converted-to-camel and non-converted data property names + // If a data property was specified + if ( getByName ) { + + // First Try to find as-is property data + ret = thisCache[ name ]; + + // Test for null|undefined property data + if ( ret == null ) { + + // Try to find the camelCased property + ret = thisCache[ jQuery.camelCase( name ) ]; + } + } else { + ret = thisCache; + } + + return ret; }, removeData: function( elem, name, pvt /* Internal Use Only */ ) { @@ -1522,7 +1548,12 @@ jQuery.extend({ return; } - var internalKey = jQuery.expando, isNode = elem.nodeType, + var thisCache, + + // Reference to internal data cache key + internalKey = jQuery.expando, + + isNode = elem.nodeType, // See jQuery.data for more information cache = isNode ? jQuery.cache : elem, @@ -1537,9 +1568,16 @@ jQuery.extend({ } if ( name ) { - var thisCache = pvt ? cache[ id ][ internalKey ] : cache[ id ]; + + thisCache = pvt ? cache[ id ][ internalKey ] : cache[ id ]; if ( thisCache ) { + + // Support interoperable removal of hyphenated or camelcased keys + if ( !thisCache[ name ] ) { + name = jQuery.camelCase( name ); + } + delete thisCache[ name ]; // If there is no data left in the cache, we want to continue @@ -1566,7 +1604,8 @@ jQuery.extend({ // Browsers that fail expando deletion also refuse to delete expandos on // the window, but it will allow it on all other JS objects; other browsers // don't care - if ( jQuery.support.deleteExpando || cache != window ) { + // Ensure that `cache` is not a window object #10080 + if ( jQuery.support.deleteExpando || !cache.setInterval ) { delete cache[ id ]; } else { cache[ id ] = null; @@ -1690,7 +1729,8 @@ function dataAttr( elem, key, data ) { // If nothing was found internally, try to fetch any // data from the HTML5 data-* attribute if ( data === undefined && elem.nodeType === 1 ) { - var name = "data-" + key.replace( rmultiDash, "$1-$2" ).toLowerCase(); + + var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase(); data = elem.getAttribute( name ); @@ -1910,8 +1950,7 @@ var rclass = /[\n\t\r]/g, rfocusable = /^(?:button|input|object|select|textarea)$/i, rclickable = /^a(?:rea)?$/i, rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i, - rinvalidChar = /\:|^on/, - formHook, boolHook; + nodeHook, boolHook; jQuery.fn.extend({ attr: function( name, value ) { @@ -2049,7 +2088,7 @@ jQuery.fn.extend({ hasClass: function( selector ) { var className = " " + selector + " "; for ( var i = 0, l = this.length; i < l; i++ ) { - if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) { + if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) { return true; } } @@ -2229,14 +2268,11 @@ jQuery.extend({ if ( !hooks ) { // Use boolHook for boolean attributes if ( rboolean.test( name ) ) { - hooks = boolHook; - // Use formHook for forms and if the name contains certain characters - } else if ( formHook && name !== "className" && - (jQuery.nodeName( elem, "form" ) || rinvalidChar.test( name )) ) { - - hooks = formHook; + // Use nodeHook if available( IE6/7 ) + } else if ( nodeHook ) { + hooks = nodeHook; } } } @@ -2273,14 +2309,9 @@ jQuery.extend({ var propName; if ( elem.nodeType === 1 ) { name = jQuery.attrFix[ name ] || name; - - if ( jQuery.support.getSetAttribute ) { - // Use removeAttribute in browsers that support it - elem.removeAttribute( name ); - } else { - jQuery.attr( elem, name, "" ); - elem.removeAttributeNode( elem.getAttributeNode( name ) ); - } + + jQuery.attr( elem, name, "" ); + elem.removeAttribute( name ); // Set corresponding property to false for boolean attributes if ( rboolean.test( name ) && (propName = jQuery.propFix[ name ] || name) in elem ) { @@ -2308,33 +2339,20 @@ jQuery.extend({ } } }, - tabIndex: { - get: function( elem ) { - // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set - // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ - var attributeNode = elem.getAttributeNode("tabIndex"); - - return attributeNode && attributeNode.specified ? - parseInt( attributeNode.value, 10 ) : - rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? - 0 : - undefined; - } - }, // Use the value property for back compat - // Use the formHook for button elements in IE6/7 (#1954) + // Use the nodeHook for button elements in IE6/7 (#1954) value: { get: function( elem, name ) { - if ( formHook && jQuery.nodeName( elem, "button" ) ) { - return formHook.get( elem, name ); + if ( nodeHook && jQuery.nodeName( elem, "button" ) ) { + return nodeHook.get( elem, name ); } return name in elem ? elem.value : null; }, set: function( elem, value, name ) { - if ( formHook && jQuery.nodeName( elem, "button" ) ) { - return formHook.set( elem, value, name ); + if ( nodeHook && jQuery.nodeName( elem, "button" ) ) { + return nodeHook.set( elem, value, name ); } // Does not return so that setAttribute is also used elem.value = value; @@ -2383,7 +2401,7 @@ jQuery.extend({ } } else { - if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== undefined ) { + if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) { return ret; } else { @@ -2392,14 +2410,33 @@ jQuery.extend({ } }, - propHooks: {} + propHooks: { + tabIndex: { + get: function( elem ) { + // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set + // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ + var attributeNode = elem.getAttributeNode("tabindex"); + + return attributeNode && attributeNode.specified ? + parseInt( attributeNode.value, 10 ) : + rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? + 0 : + undefined; + } + } + } }); +// Add the tabindex propHook to attrHooks for back-compat +jQuery.attrHooks.tabIndex = jQuery.propHooks.tabIndex; + // Hook for boolean attributes boolHook = { get: function( elem, name ) { // Align boolean attributes with corresponding properties - return jQuery.prop( elem, name ) ? + // Fall back to attribute presence where some booleans are not supported + var attrNode; + return jQuery.prop( elem, name ) === true || ( attrNode = elem.getAttributeNode( name ) ) && attrNode.nodeValue !== false ? name.toLowerCase() : undefined; }, @@ -2425,12 +2462,10 @@ boolHook = { // IE6/7 do not support getting/setting some attributes with get/setAttribute if ( !jQuery.support.getSetAttribute ) { - - // propFix is more comprehensive and contains all fixes - jQuery.attrFix = jQuery.propFix; - // Use this for any attribute on a form in IE6/7 - formHook = jQuery.attrHooks.name = jQuery.attrHooks.title = jQuery.valHooks.button = { + // Use this for any attribute in IE6/7 + // This fixes almost every IE6/7 issue + nodeHook = jQuery.valHooks.button = { get: function( elem, name ) { var ret; ret = elem.getAttributeNode( name ); @@ -2440,13 +2475,13 @@ if ( !jQuery.support.getSetAttribute ) { undefined; }, set: function( elem, value, name ) { - // Check form objects in IE (multiple bugs related) - // Only use nodeValue if the attribute node exists on the form + // Set the existing or create a new attribute node var ret = elem.getAttributeNode( name ); - if ( ret ) { - ret.nodeValue = value; - return value; + if ( !ret ) { + ret = document.createAttribute( name ); + elem.setAttributeNode( ret ); } + return (ret.nodeValue = value + ""); } }; @@ -2505,6 +2540,7 @@ if ( !jQuery.support.optSelected ) { parent.parentNode.selectedIndex; } } + return null; } }); } @@ -3235,8 +3271,9 @@ if ( !jQuery.support.submitBubbles ) { setup: function( data, namespaces ) { if ( !jQuery.nodeName( this, "form" ) ) { jQuery.event.add(this, "click.specialSubmit", function( e ) { + // Avoid triggering error on non-existent type attribute in IE VML (#7071) var elem = e.target, - type = elem.type; + type = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.type : ""; if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) { trigger( "submit", this, arguments ); @@ -3245,7 +3282,7 @@ if ( !jQuery.support.submitBubbles ) { jQuery.event.add(this, "keypress.specialSubmit", function( e ) { var elem = e.target, - type = elem.type; + type = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.type : ""; if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) { trigger( "submit", this, arguments ); @@ -3270,7 +3307,8 @@ if ( !jQuery.support.changeBubbles ) { var changeFilters, getVal = function( elem ) { - var type = elem.type, val = elem.value; + var type = jQuery.nodeName( elem, "input" ) ? elem.type : "", + val = elem.value; if ( type === "radio" || type === "checkbox" ) { val = elem.checked; @@ -5295,12 +5333,17 @@ jQuery.fn.extend({ // Determine the position of an element within // the matched set of elements index: function( elem ) { - if ( !elem || typeof elem === "string" ) { - return jQuery.inArray( this[0], - // If it receives a string, the selector is used - // If it receives nothing, the siblings are used - elem ? jQuery( elem ) : this.parent().children() ); + + // No argument, return index in parent + if ( !elem ) { + return ( this[0] && this[0].parentNode ) ? this.prevAll().length : -1; } + + // index in selector + if ( typeof elem === "string" ) { + return jQuery.inArray( this[0], jQuery( elem ) ); + } + // Locate the position of the desired element return jQuery.inArray( // If it receives a jQuery object, the first element is used @@ -6048,7 +6091,10 @@ jQuery.extend({ // with an element if you are cloning the body and one of the // elements on the page has a name or id of "length" for ( i = 0; srcElements[i]; ++i ) { - cloneFixAttributes( srcElements[i], destElements[i] ); + // Ensure that the destination node is not null; Fixes #9587 + if ( destElements[i] ) { + cloneFixAttributes( srcElements[i], destElements[i] ); + } } } @@ -6248,14 +6294,14 @@ function evalScript( i, elem ) { + var ralpha = /alpha\([^)]*\)/i, ropacity = /opacity=([^)]*)/, // fixed for IE9, see #8346 rupper = /([A-Z]|^ms)/g, rnumpx = /^-?\d+(?:px)?$/i, rnum = /^-?\d/, - rrelNum = /^[+\-]=/, - rrelNumFilter = /[^+\-\.\de]+/g, + rrelNum = /^([\-+])=([\-+.\de]+)/, cssShow = { position: "absolute", visibility: "hidden", display: "block" }, cssWidth = [ "Left", "Right" ], @@ -6332,18 +6378,18 @@ jQuery.extend({ if ( value !== undefined ) { type = typeof value; - // Make sure that NaN and null values aren't set. See: #7116 - if ( type === "number" && isNaN( value ) || value == null ) { - return; - } - // convert relative number strings (+= or -=) to relative numbers. #7345 - if ( type === "string" && rrelNum.test( value ) ) { - value = +value.replace( rrelNumFilter, "" ) + parseFloat( jQuery.css( elem, name ) ); + if ( type === "string" && (ret = rrelNum.exec( value )) ) { + value = ( +( ret[1] + 1) * +ret[2] ) + parseFloat( jQuery.css( elem, name ) ); // Fixes bug #9237 type = "number"; } + // Make sure that NaN and null values aren't set. See: #7116 + if ( value == null || type === "number" && isNaN( value ) ) { + return; + } + // If a number was passed in, add 'px' to the (except for certain CSS properties) if ( type === "number" && !jQuery.cssNumber[ origName ] ) { value += "px"; @@ -6459,18 +6505,29 @@ if ( !jQuery.support.opacity ) { set: function( elem, value ) { var style = elem.style, - currentStyle = elem.currentStyle; + currentStyle = elem.currentStyle, + opacity = jQuery.isNaN( value ) ? "" : "alpha(opacity=" + value * 100 + ")", + filter = currentStyle && currentStyle.filter || style.filter || ""; // IE has trouble with opacity if it does not have layout // Force it by setting the zoom level style.zoom = 1; - // Set the alpha filter to set the opacity - var opacity = jQuery.isNaN( value ) ? - "" : - "alpha(opacity=" + value * 100 + ")", - filter = currentStyle && currentStyle.filter || style.filter || ""; + // if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652 + if ( value >= 1 && jQuery.trim( filter.replace( ralpha, "" ) ) === "" ) { + + // Setting style.filter to null, "" & " " still leave "filter:" in the cssText + // if "filter:" is present at all, clearType is disabled, we want to avoid this + // style.removeAttribute is IE Only, but so apparently is this code path... + style.removeAttribute( "filter" ); + // if there there is no filter style applied in a css rule, we are done + if ( currentStyle && !currentStyle.filter ) { + return; + } + } + + // otherwise, set new filter values style.filter = ralpha.test( filter ) ? filter.replace( ralpha, opacity ) : filter + " " + opacity; @@ -6625,9 +6682,9 @@ var r20 = /%20/g, rCRLF = /\r?\n/g, rhash = /#.*$/, rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL - rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i, + rinput = /^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i, // #7653, #8125, #8152: local protocol detection - rlocalProtocol = /^(?:about|app|app\-storage|.+\-extension|file|widget):$/, + rlocalProtocol = /^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/, rnoContent = /^(?:GET|HEAD)$/, rprotocol = /^\/\//, rquery = /\?/, @@ -6662,7 +6719,10 @@ var r20 = /%20/g, ajaxLocation, // Document location segments - ajaxLocParts; + ajaxLocParts, + + // Avoid comment-prolog char sequence (#10098); must appease lint and evade compression + allTypes = ["*/"] + ["*"]; // #8138, IE may throw an exception when accessing // a field from window.location if document.domain has been set @@ -6755,6 +6815,22 @@ function inspectPrefiltersOrTransports( structure, options, originalOptions, jqX return selection; } +// A special extend for ajax options +// that takes "flat" options (not to be deep extended) +// Fixes #9887 +function ajaxExtend( target, src ) { + var key, deep, + flatOptions = jQuery.ajaxSettings.flatOptions || {}; + for( key in src ) { + if ( src[ key ] !== undefined ) { + ( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ]; + } + } + if ( deep ) { + jQuery.extend( true, target, deep ); + } +} + jQuery.fn.extend({ load: function( url, params, callback ) { if ( typeof url !== "string" && _load ) { @@ -6898,23 +6974,16 @@ jQuery.extend({ // Creates a full fledged settings object into target // with both ajaxSettings and settings fields. // If target is omitted, writes into ajaxSettings. - ajaxSetup: function ( target, settings ) { - if ( !settings ) { - // Only one parameter, we extend ajaxSettings - settings = target; - target = jQuery.extend( true, jQuery.ajaxSettings, settings ); + ajaxSetup: function( target, settings ) { + if ( settings ) { + // Building a settings object + ajaxExtend( target, jQuery.ajaxSettings ); } else { - // target was provided, we extend into it - jQuery.extend( true, target, jQuery.ajaxSettings, settings ); - } - // Flatten fields we don't want deep extended - for( var field in { context: 1, url: 1 } ) { - if ( field in settings ) { - target[ field ] = settings[ field ]; - } else if( field in jQuery.ajaxSettings ) { - target[ field ] = jQuery.ajaxSettings[ field ]; - } + // Extending ajaxSettings + settings = target; + target = jQuery.ajaxSettings; } + ajaxExtend( target, settings ); return target; }, @@ -6942,7 +7011,7 @@ jQuery.extend({ html: "text/html", text: "text/plain", json: "application/json, text/javascript", - "*": "*/*" + "*": allTypes }, contents: { @@ -6972,6 +7041,15 @@ jQuery.extend({ // Parse text as xml "text xml": jQuery.parseXML + }, + + // For options that shouldn't be deep extended: + // you can add your own custom options here if + // and when you create one that shouldn't be + // deep extended (see ajaxExtend) + flatOptions: { + context: true, + url: true } }, @@ -7082,7 +7160,7 @@ jQuery.extend({ // Callback for when everything is done // It is defined here because jslint complains if it is declared // at the end of the function (which would be more logical and readable) - function done( status, statusText, responses, headers ) { + function done( status, nativeStatusText, responses, headers ) { // Called once if ( state === 2 ) { @@ -7105,11 +7183,12 @@ jQuery.extend({ responseHeadersString = headers || ""; // Set readyState - jqXHR.readyState = status ? 4 : 0; + jqXHR.readyState = status > 0 ? 4 : 0; var isSuccess, success, error, + statusText = nativeStatusText, response = responses ? ajaxHandleResponses( s, jqXHR, responses ) : undefined, lastModified, etag; @@ -7161,7 +7240,7 @@ jQuery.extend({ // Set data for the fake xhr object jqXHR.status = status; - jqXHR.statusText = statusText; + jqXHR.statusText = "" + ( nativeStatusText || statusText ); // Success/Error if ( isSuccess ) { @@ -7183,7 +7262,7 @@ jQuery.extend({ completeDeferred.resolveWith( callbackContext, [ jqXHR, statusText ] ); if ( fireGlobals ) { - globalEventContext.trigger( "ajaxComplete", [ jqXHR, s] ); + globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] ); // Handle the global AJAX counter if ( !( --jQuery.active ) ) { jQuery.event.trigger( "ajaxStop" ); @@ -7264,6 +7343,8 @@ jQuery.extend({ // If data is available, append data to url if ( s.data ) { s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data; + // #9682: remove data so that it's not used in an eventual retry + delete s.data; } // Get ifModifiedKey before adding the anti-cache parameter @@ -7301,7 +7382,7 @@ jQuery.extend({ jqXHR.setRequestHeader( "Accept", s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ? - s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", */*; q=0.01" : "" ) : + s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) : s.accepts[ "*" ] ); @@ -7347,7 +7428,7 @@ jQuery.extend({ transport.send( requestHeaders, done ); } catch (e) { // Propagate exception as error if not done - if ( status < 2 ) { + if ( state < 2 ) { done( -1, e ); // Simply rethrow otherwise } else { @@ -7995,10 +8076,7 @@ var elemdisplay = {}, // opacity animations [ "opacity" ] ], - fxNow, - requestAnimationFrame = window.webkitRequestAnimationFrame || - window.mozRequestAnimationFrame || - window.oRequestAnimationFrame; + fxNow; jQuery.fn.extend({ show: function( speed, easing, callback ) { @@ -8374,8 +8452,7 @@ jQuery.fx.prototype = { // Start an animation from one number to another custom: function( from, to, unit ) { var self = this, - fx = jQuery.fx, - raf; + fx = jQuery.fx; this.startTime = fxNow || createFxNow(); this.start = from; @@ -8391,20 +8468,7 @@ jQuery.fx.prototype = { t.elem = this.elem; if ( t() && jQuery.timers.push(t) && !timerId ) { - // Use requestAnimationFrame instead of setInterval if available - if ( requestAnimationFrame ) { - timerId = true; - raf = function() { - // When timerId gets set to null at any point, this stops - if ( timerId ) { - requestAnimationFrame( raf ); - fx.tick(); - } - }; - requestAnimationFrame( raf ); - } else { - timerId = setInterval( fx.tick, fx.interval ); - } + timerId = setInterval( fx.tick, fx.interval ); } }, @@ -8947,9 +9011,10 @@ jQuery.each([ "Height", "Width" ], function( i, name ) { if ( jQuery.isWindow( elem ) ) { // Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode // 3rd condition allows Nokia support, as it supports the docElem prop but not CSS1Compat - var docElemProp = elem.document.documentElement[ "client" + name ]; + var docElemProp = elem.document.documentElement[ "client" + name ], + body = elem.document.body; return elem.document.compatMode === "CSS1Compat" && docElemProp || - elem.document.body[ "client" + name ] || docElemProp; + body && body[ "client" + name ] || docElemProp; // Get document width or height } else if ( elem.nodeType === 9 ) { @@ -8978,4 +9043,4 @@ jQuery.each([ "Height", "Width" ], function( i, name ) { // Expose jQuery to the global object window.jQuery = window.$ = jQuery; -})(window); +})(window); \ No newline at end of file diff --git a/lib/scripts/jquery/jquery.min.js b/lib/scripts/jquery/jquery.min.js index 48590ecb9..3684c36b5 100644 --- a/lib/scripts/jquery/jquery.min.js +++ b/lib/scripts/jquery/jquery.min.js @@ -1,18 +1,4 @@ -/*! - * jQuery JavaScript Library v1.6.2 - * http://jquery.com/ - * - * Copyright 2011, John Resig - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * Includes Sizzle.js - * http://sizzlejs.com/ - * Copyright 2011, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * - * Date: Thu Jun 30 14:16:56 2011 -0400 - */ -(function(a,b){function cv(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cs(a){if(!cg[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ch||(ch=c.createElement("iframe"),ch.frameBorder=ch.width=ch.height=0),b.appendChild(ch);if(!ci||!ch.createElement)ci=(ch.contentWindow||ch.contentDocument).document,ci.write((c.compatMode==="CSS1Compat"?"":"")+""),ci.close();d=ci.createElement(a),ci.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ch)}cg[a]=e}return cg[a]}function cr(a,b){var c={};f.each(cm.concat.apply([],cm.slice(0,b)),function(){c[this]=a});return c}function cq(){cn=b}function cp(){setTimeout(cq,0);return cn=f.now()}function cf(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ce(){try{return new a.XMLHttpRequest}catch(b){}}function b$(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bx(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function bm(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(be,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bl(a){f.nodeName(a,"input")?bk(a):"getElementsByTagName"in a&&f.grep(a.getElementsByTagName("input"),bk)}function bk(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bj(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bi(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bh(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i=0===c})}function V(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function N(a,b){return(a&&a!=="*"?a+".":"")+b.replace(z,"`").replace(A,"&")}function M(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;ic)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function K(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function E(){return!0}function D(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"$1-$2").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z])/ig,x=function(a,b){return b.toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.done(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(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;A.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!A){A=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a);return c===b||D.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(b,c,d){a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),d=c.documentElement,(!d||!d.nodeName||d.nodeName==="parsererror")&&e.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c
    a",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.firstChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0},m&&f.extend(p,{position:"absolute",left:-1e3,top:-1e3});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="
    ",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="
    t
    ",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0),o.innerHTML="",n.removeChild(o);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([a-z])([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g=f.expando,h=typeof c=="string",i,j=a.nodeType,k=j?f.cache:a,l=j?a[f.expando]:a[f.expando]&&f.expando;if((!l||e&&l&&!k[l][g])&&h&&d===b)return;l||(j?a[f.expando]=l=++f.uuid:l=f.expando),k[l]||(k[l]={},j||(k[l].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?k[l][g]=f.extend(k[l][g],c):k[l]=f.extend(k[l],c);i=k[l],e&&(i[g]||(i[g]={}),i=i[g]),d!==b&&(i[f.camelCase(c)]=d);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[f.camelCase(c)]||i[c]:i}},removeData:function(b,c,d){if(!!f.acceptData(b)){var e=f.expando,g=b.nodeType,h=g?f.cache:b,i=g?b[f.expando]:f.expando;if(!h[i])return;if(c){var j=d?h[i][e]:h[i];if(j){delete j[c];if(!l(j))return}}if(d){delete h[i][e];if(!l(h[i]))return}var k=h[i][e];f.support.deleteExpando||h!=a?delete h[i]:h[i]=null,k?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=k):g&&(f.support.deleteExpando?delete b[f.expando]:b.removeAttribute?b.removeAttribute(f.expando):b[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;d=e.value;return typeof d=="string"?d.replace(p,""):d==null?"":d}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);j&&(c=f.attrFix[c]||c,i=f.attrHooks[c],i||(t.test(c)?i=w:v&&c!=="className"&&(f.nodeName(a,"form")||u.test(c))&&(i=v)));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j&&(h=i.get(a,c))!==null)return h;h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.support.getSetAttribute?a.removeAttribute(b):(f.attr(a,b,""),a.removeAttributeNode(a.getAttributeNode(b))),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},tabIndex:{get:function(a){var c=a.getAttributeNode("tabIndex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}},value:{get:function(a,b){if(v&&f.nodeName(a,"button"))return v.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(v&&f.nodeName(a,"button"))return v.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);i&&(c=f.propFix[c]||c,h=f.propHooks[c]);return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==b?g:a[c]},propHooks:{}}),w={get:function(a,c){return f.prop(a,c)?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},f.support.getSetAttribute||(f.attrFix=f.propFix,v=f.attrHooks.name=f.attrHooks.title=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,c){var d=a.getAttributeNode(c);if(d){d.nodeValue=b;return b}}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var x=/\.(.*)$/,y=/^(?:textarea|input|select)$/i,z=/\./g,A=/ /g,B=/[^\w\s.|`]/g,C=function(a){return a.replace(B,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=D;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=D);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),C).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i. -shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d!=null?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},J=function(c){var d=c.target,e,g;if(!!y.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=I(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:J,beforedeactivate:J,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&J.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&J.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",I(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in H)f.event.add(this,c+".specialChange",H[c]);return y.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return y.test(this.nodeName)}},H=f.event.special.change.filters,H.focus=H.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

    ";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
    ";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g0)for(h=g;h0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=T.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a=="string")return f.inArray(this[0],a?f(a):this.parent().children());return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(V(c[0])||V(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=S.call(arguments);O.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!U[a]?f.unique(e):e,(this.length>1||Q.test(d))&&P.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var X=/ jQuery\d+="(?:\d+|null)"/g,Y=/^\s+/,Z=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,$=/<([\w:]+)/,_=/",""],legend:[1,"
    ","
    "],thead:[1,"","
    "],tr:[2,"","
    "],td:[3,"","
    "],col:[2,"","
    "],area:[1,"",""],_default:[0,"",""]};bf.optgroup=bf.option,bf.tbody=bf.tfoot=bf.colgroup=bf.caption=bf.thead,bf.th=bf.td,f.support.htmlSerialize||(bf._default=[1,"div
    ","
    "]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(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,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(X,""):null;if(typeof a=="string"&&!bb.test(a)&&(f.support.leadingWhitespace||!Y.test(a))&&!bf[($.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Z,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j -)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bi(a,d),e=bj(a),g=bj(d);for(h=0;e[h];++h)bi(e[h],g[h])}if(b){bh(a,d);if(c){e=bj(a),g=bj(d);for(h=0;e[h];++h)bh(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!ba.test(k))k=b.createTextNode(k);else{k=k.replace(Z,"<$1>");var l=($.exec(k)||["",""])[1].toLowerCase(),m=bf[l]||bf._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=_.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&Y.test(k)&&o.insertBefore(b.createTextNode(Y.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bo.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle;c.zoom=1;var e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.filter=bn.test(g)?g.replace(bn,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bx(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(by=function(a,c){var d,e,g;c=c.replace(bp,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bz=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bq.test(d)&&br.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bx=by||bz,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bB=/%20/g,bC=/\[\]$/,bD=/\r?\n/g,bE=/#.*$/,bF=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bG=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bH=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,bI=/^(?:GET|HEAD)$/,bJ=/^\/\//,bK=/\?/,bL=/)<[^<]*)*<\/script>/gi,bM=/^(?:select|textarea)/i,bN=/\s+/,bO=/([?&])_=[^&]*/,bP=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bQ=f.fn.load,bR={},bS={},bT,bU;try{bT=e.href}catch(bV){bT=c.createElement("a"),bT.href="",bT=bT.href}bU=bP.exec(bT.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bQ)return bQ.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
    ").append(c.replace(bL,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bM.test(this.nodeName)||bG.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bD,"\r\n")}}):{name:b.name,value:c.replace(bD,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?f.extend(!0,a,f.ajaxSettings,b):(b=a,a=f.extend(!0,f.ajaxSettings,b));for(var c in{context:1,url:1})c in b?a[c]=b[c]:c in f.ajaxSettings&&(a[c]=f.ajaxSettings[c]);return a},ajaxSettings:{url:bT,isLocal:bH.test(bU[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML}},ajaxPrefilter:bW(bR),ajaxTransport:bW(bS),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a?4:0;var o,r,u,w=l?bZ(d,v,l):b,x,y;if(a>=200&&a<300||a===304){if(d.ifModified){if(x=v.getResponseHeader("Last-Modified"))f.lastModified[k]=x;if(y=v.getResponseHeader("Etag"))f.etag[k]=y}if(a===304)c="notmodified",o=!0;else try{r=b$(d,w),c="success",o=!0}catch(z){c="parsererror",u=z}}else{u=c;if(!c||a)c="error",a<0&&(a=0)}v.status=a,v.statusText=c,o?h.resolveWith(e,[r,c,v]):h.rejectWith(e,[v,c,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,c]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bF.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bE,"").replace(bJ,bU[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bN),d.crossDomain==null&&(r=bP.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bU[1]&&r[2]==bU[2]&&(r[3]||(r[1]==="http:"?80:443))==(bU[3]||(bU[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bX(bR,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bI.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bK.test(d.url)?"&":"?")+d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bO,"$1_="+x);d.url=y+(y===d.url?(bK.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", */*; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bX(bS,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){status<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)bY(g,a[g],c,e);return d.join("&").replace(bB,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var b_=f.now(),ca=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+b_++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ca.test(b.url)||e&&ca.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ca,l),b.url===j&&(e&&(k=k.replace(ca,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cb=a.ActiveXObject?function(){for(var a in cd)cd[a](0,1)}:!1,cc=0,cd;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ce()||cf()}:ce,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cb&&delete cd[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cc,cb&&(cd||(cd={},f(a).unload(cb)),cd[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cg={},ch,ci,cj=/^(?:toggle|show|hide)$/,ck=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cl,cm=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cn,co=a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cr("show",3),a,b,c);for(var g=0,h=this.length;g=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b
    ";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cu.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cu.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cv(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cv(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a&&a.style?parseFloat(f.css(a,d,"padding")):null},f.fn["outer"+c]=function(a){var b=this[0];return b&&b.style?parseFloat(f.css(b,d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c];return e.document.compatMode==="CSS1Compat"&&g||e.document.body["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var h=f.css(e,d),i=parseFloat(h);return f.isNaN(i)?h:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window); \ No newline at end of file +/*! jQuery v1.6.4 http://jquery.com/ | http://jquery.org/license */ +(function(a,b){function cu(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cr(a){if(!cg[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ch||(ch=c.createElement("iframe"),ch.frameBorder=ch.width=ch.height=0),b.appendChild(ch);if(!ci||!ch.createElement)ci=(ch.contentWindow||ch.contentDocument).document,ci.write((c.compatMode==="CSS1Compat"?"":"")+""),ci.close();d=ci.createElement(a),ci.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ch)}cg[a]=e}return cg[a]}function cq(a,b){var c={};f.each(cm.concat.apply([],cm.slice(0,b)),function(){c[this]=a});return c}function cp(){cn=b}function co(){setTimeout(cp,0);return cn=f.now()}function cf(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ce(){try{return new a.XMLHttpRequest}catch(b){}}function b$(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bv(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function bl(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bd,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bk(a){f.nodeName(a,"input")?bj(a):"getElementsByTagName"in a&&f.grep(a.getElementsByTagName("input"),bj)}function bj(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bi(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bh(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bg(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i=0===c})}function U(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function M(a,b){return(a&&a!=="*"?a+".":"")+b.replace(y,"`").replace(z,"&")}function L(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;ic)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function J(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function D(){return!0}function C(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function K(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(K,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z]|[0-9])/ig,x=/^-ms-/,y=function(a,b){return(b+"").toUpperCase()},z=d.userAgent,A,B,C,D=Object.prototype.toString,E=Object.prototype.hasOwnProperty,F=Array.prototype.push,G=Array.prototype.slice,H=String.prototype.trim,I=Array.prototype.indexOf,J={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.4",length:0,size:function(){return this.length},toArray:function(){return G.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?F.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),B.done(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(G.apply(this,arguments),"slice",G.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:F,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;B.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!B){B=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",C,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",C),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&K()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):J[D.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!E.call(a,"constructor")&&!E.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||E.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(x,"ms-").replace(w,y)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c
    a",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.firstChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},m&&f.extend(p,{position:"absolute",left:"-1000px",top:"-1000px"});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="
    ",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="
    t
    ",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0),o.innerHTML="",n.removeChild(o);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i=f.expando,j=typeof c=="string",k=a.nodeType,l=k?f.cache:a,m=k?a[f.expando]:a[f.expando]&&f.expando;if((!m||e&&m&&l[m]&&!l[m][i])&&j&&d===b)return;m||(k?a[f.expando]=m=++f.uuid:m=f.expando),l[m]||(l[m]={},k||(l[m].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?l[m][i]=f.extend(l[m][i],c):l[m]=f.extend(l[m],c);g=l[m],e&&(g[i]||(g[i]={}),g=g[i]),d!==b&&(g[f.camelCase(c)]=d);if(c==="events"&&!g[c])return g[i]&&g[i].events;j?(h=g[c],h==null&&(h=g[f.camelCase(c)])):h=g;return h}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e=f.expando,g=a.nodeType,h=g?f.cache:a,i=g?a[f.expando]:f.expando;if(!h[i])return;if(b){d=c?h[i][e]:h[i];if(d){d[b]||(b=f.camelCase(b)),delete d[b];if(!l(d))return}}if(c){delete h[i][e];if(!l(h[i]))return}var j=h[i][e];f.support.deleteExpando||!h.setInterval?delete h[i]:h[i]=null,j?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=j):g&&(f.support.deleteExpando?delete a[f.expando]:a.removeAttribute?a.removeAttribute(f.expando):a[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;d=e.value;return typeof d=="string"?d.replace(p,""):d==null?"":d}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);j&&(c=f.attrFix[c]||c,i=f.attrHooks[c],i||(t.test(c)?i=v:u&&(i=u)));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j&&(h=i.get(a,c))!==null)return h;h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.attr(a,b,""),a.removeAttribute(b),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(u&&f.nodeName(a,"button"))return u.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(u&&f.nodeName(a,"button"))return u.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);i&&(c=f.propFix[c]||c,h=f.propHooks[c]);return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==null?g:a[c]},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabIndex=f.propHooks.tabIndex,v={get:function(a,c){var d;return f.prop(a,c)===!0||(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},f.support.getSetAttribute||(u=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var w=/\.(.*)$/,x=/^(?:textarea|input|select)$/i,y=/\./g,z=/ /g,A=/[^\w\s.|`]/g,B=function(a){return a.replace(A,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=C;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=C);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),B).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d!=null?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},I=function(c){var d=c.target,e,g;if(!!x.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=H(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:I,beforedeactivate:I,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&I.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&I.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",H(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in G)f.event.add(this,c+".specialChange",G[c]);return x.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return x.test(this.nodeName)}},G=f.event.special.change.filters,G.focus=G.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

    ";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
    ";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g0)for(h=g;h0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=S.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(U(c[0])||U(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=R.call(arguments);N.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!T[a]?f.unique(e):e,(this.length>1||P.test(d))&&O.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/",""],legend:[1,"
    ","
    "],thead:[1,"","
    "],tr:[2,"","
    "],td:[3,"","
    "],col:[2,"","
    "],area:[1,"",""],_default:[0,"",""]};be.optgroup=be.option,be.tbody=be.tfoot=be.colgroup=be.caption=be.thead,be.th=be.td,f.support.htmlSerialize||(be._default=[1,"div
    ","
    "]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(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,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!be[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bh(a,d),e=bi(a),g=bi(d);for(h=0;e[h];++h)g[h]&&bh(e[h],g[h])}if(b){bg(a,d);if(c){e=bi(a),g=bi(d);for(h=0;e[h];++h)bg(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=be[l]||be._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bn.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bm,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bm.test(g)?g.replace(bm,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bv(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bw=function(a,c){var d,e,g;c=c.replace(bo,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bx=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bp.test(d)&&bq.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bv=bw||bx,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bz=/%20/g,bA=/\[\]$/,bB=/\r?\n/g,bC=/#.*$/,bD=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bE=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bF=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bG=/^(?:GET|HEAD)$/,bH=/^\/\//,bI=/\?/,bJ=/)<[^<]*)*<\/script>/gi,bK=/^(?:select|textarea)/i,bL=/\s+/,bM=/([?&])_=[^&]*/,bN=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bO=f.fn.load,bP={},bQ={},bR,bS,bT=["*/"]+["*"];try{bR=e.href}catch(bU){bR=c.createElement("a"),bR.href="",bR=bR.href}bS=bN.exec(bR.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bO)return bO.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
    ").append(c.replace(bJ,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bK.test(this.nodeName)||bE.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bB,"\r\n")}}):{name:b.name,value:c.replace(bB,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?bX(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),bX(a,b);return a},ajaxSettings:{url:bR,isLocal:bF.test(bS[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bT},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bV(bP),ajaxTransport:bV(bQ),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?bZ(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=b$(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bD.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bC,"").replace(bH,bS[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bL),d.crossDomain==null&&(r=bN.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bS[1]&&r[2]==bS[2]&&(r[3]||(r[1]==="http:"?80:443))==(bS[3]||(bS[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bW(bP,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bG.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bI.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bM,"$1_="+x);d.url=y+(y===d.url?(bI.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bT+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bW(bQ,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){s<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)bY(g,a[g],c,e);return d.join("&").replace(bz,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var b_=f.now(),ca=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+b_++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ca.test(b.url)||e&&ca.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ca,l),b.url===j&&(e&&(k=k.replace(ca,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cb=a.ActiveXObject?function(){for(var a in cd)cd[a](0,1)}:!1,cc=0,cd;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ce()||cf()}:ce,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cb&&delete cd[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cc,cb&&(cd||(cd={},f(a).unload(cb)),cd[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cg={},ch,ci,cj=/^(?:toggle|show|hide)$/,ck=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cl,cm=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cn;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cq("show",3),a,b,c);for(var g=0,h=this.length;g=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b
    ";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=ct.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!ct.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cu(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cu(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a&&a.style?parseFloat(f.css(a,d,"padding")):null},f.fn["outer"+c]=function(a){var b=this[0];return b&&b.style?parseFloat(f.css(b,d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNaN(j)?i:j}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window); \ No newline at end of file -- cgit v1.2.3 From 90f69556e88c39509172f5926ca29c1ae63e2103 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 18 Sep 2011 10:28:31 +0100 Subject: media manager: re-newed CSS roughly (more to come) --- lib/tpl/default/mediamanager.css | 223 ++++++++++++++++++++------------------- 1 file changed, 112 insertions(+), 111 deletions(-) (limited to 'lib') diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css index b1905f8a0..e25c0c9f4 100644 --- a/lib/tpl/default/mediamanager.css +++ b/lib/tpl/default/mediamanager.css @@ -1,4 +1,5 @@ -/* Layout */ + +/*____________ Layout ____________*/ #mediamanager__page h1 { margin: 0 0 .5em; @@ -8,19 +9,22 @@ min-width: 840px; width: 100%; overflow-x: auto; + text-align: left; } #mediamanager__page .panel { float: left; margin-right: 10px; } +#mediamanager__page .panel.file { + margin-right: 0; +} #mediamanager__page .panelContent { overflow-y: auto; overflow-x: hidden; padding: 0; margin: 0; - text-align: left; position: relative; } @@ -30,10 +34,7 @@ padding: 10px 10px 8px; text-align: left; min-height: 20px; -} - -#mediamanager__page .panelHeader .icon { - margin-right: 5px; + overflow: hidden; } #mediamanager__page .namespaces { @@ -46,8 +47,8 @@ min-width: 375px; } -#mediamanager__page_detail { - width: 35%; +#mediamanager__page .file { + /* width: 35%; @todo: needed? */ min-width: 290px; } @@ -65,107 +66,86 @@ background-color: __background_alt__; } -/* Namespaces tree */ +/*____________ Namespaces tree ____________*/ -#mediamanager__page .namespaces ul.idx { +#mediamanager__page .namespaces h2 { + font-size: 1em; + display: inline-block; + border-width: 0; + padding: .3em .8em; + margin: 0 .3em 0 0; + border-radius: .5em .5em 0 0; + font-weight: normal; + background-color: __background_alt__; + color: __text__; +} + +#mediamanager__page .namespaces ul { margin-left: .2em; + list-style: none; } -#mediamanager__page .namespaces ul.idx ul { +#mediamanager__page .namespaces ul ul { margin-left: 1em; } -#mediamanager__page .namespaces ul.idx .selected { +#mediamanager__page .namespaces ul .selected { background-color: __highlight__; font-weight: bold; } -/* Tabs */ +/*____________ Panel header ____________*/ -#mediamanager__page div.panel h2.a11y { - font-weight: bold; - display: block; +#mediamanager__page .panelHeader h3 { float: left; - padding: 10px; - padding-bottom: 5px; - padding-top: 5px; - margin-right: 2px; - -moz-border-radius-topright: 10px; - -webkit-border-top-right-radius: 10px; - -moz-border-radius-topleft: 10px; - -webkit-border-top-left-radius: 10px; - border-top-right-radius: 10px; - border-top-left-radius: 10px; -} - -#mediamanager__page div.panel h2.a11y .selected { - background-color: __background_alt__; + font-weight: normal; + font-size: 1em; + padding: 0; + margin: 0; } -#mediamanager__page div.panel h2.a11y a:hover { - background-color: __background_alt__; - opacity: 0.5; +#mediamanager__page .panelHeader form.options { + float: right; } -/* Title links */ - -#mediamanager__page .filelist .panelHeader h3 { - float: left; - font-weight: normal; +#mediamanager__page .panelHeader ul { + list-style: none; + margin: 0; + padding: 0; } -#mediamanager__tabs_list { - float: left; +#mediamanager__page .panelHeader form.options label span span { + display: none; /* @todo: hide accessibly */ } - -#mediamanager__link_thumbs, -#mediamanager__link_list { - padding-left: 30px; - display: inline-block; - width: 0; - overflow: hidden; +#mediamanager__page .panelHeader form.options label span { + padding-left: 27px; } - -#mediamanager__link_thumbs { +/* @todo: get different images */ +#mediamanager__page .panelHeader label.thumbs span { background: url('../../images/icon-thumb.png') 0 -4px no-repeat; - margin-left: 10px; } - -#mediamanager__link_list { +#mediamanager__page .panelHeader label.rows span { background: url('../../images/icon-list.png') 0 -4px no-repeat; } - -#mediamanager__link_thumbs:hover, -#mediamanager__link_list:hover { - width: auto; - margin-right: 10px; -} - -#mediamanager__sort { +#mediamanager__page .panelHeader label.name span { background: url('../../images/icon-sort.png') 0 -4px no-repeat; - padding-left: 30px; - display: block; - float: right; } - -* html #mediamanager__sort, -*+html #mediamanager__sort { - position: relative; - margin-top: -18px; +#mediamanager__page .panelHeader label.date span { + background: url('../../images/icon-sort.png') 0 -4px no-repeat; } -/* File list */ +/*____________ File list ____________*/ -#mediamanager__page .filelist .list { +#mediamanager__page .filelist ul { padding: 0; - margin: 0 !important; + margin: 0; } -#mediamanager__page .filelist .list li:hover { +#mediamanager__page .filelist .panelContent ul li:hover { background-color: __background_alt__; } -/* Files thumbs view */ +/* thumbs */ #mediamanager__page .filelist .thumbs li { width: 100px; @@ -204,8 +184,8 @@ display: none; } -#mediamanager__page .filelist .thumbs li .image span, -#mediamanager__page .filelist .thumbs li .image0 span { +#mediamanager__page .filelist .thumbs li .image, +#mediamanager__page .filelist .thumbs li .image0 { vertical-align: middle; display: table-cell; width: 100px; @@ -243,9 +223,13 @@ display: block; } -/* Files list view */ +/* rows */ -#mediamanager__page .filelist .list li { +#mediamanager__page .filelist .rows li { + overflow: hidden; +} + +#mediamanager__page .filelist .rows li { list-style: none; display: block; position: relative; @@ -256,12 +240,12 @@ color: __text__; } -#mediamanager__page .filelist .list li:nth-child(2n+1) { +#mediamanager__page .filelist .rows li:nth-child(2n+1) { background-color: __background_neu__; } -#mediamanager__page .filelist .list li .image, -#mediamanager__page .filelist .list li .image1 { +#mediamanager__page .filelist .rows li .image, +#mediamanager__page .filelist .rows li .image1 { width: 10%; display: block; overflow: hidden; @@ -270,46 +254,46 @@ text-align: center; } -#mediamanager__page .filelist .list li .image0 { +#mediamanager__page .filelist .rows li .image0 { display: none; } -#mediamanager__page .filelist .list li .name, -#mediamanager__page .filelist .list li .size, -#mediamanager__page .filelist .list li .filesize, -#mediamanager__page .filelist .list li .date { +#mediamanager__page .filelist .rows li .name, +#mediamanager__page .filelist .rows li .size, +#mediamanager__page .filelist .rows li .filesize, +#mediamanager__page .filelist .rows li .date { overflow: hidden; float: left; margin-left: 1%; white-space: nowrap; } -#mediamanager__page .filelist .list li .name { +#mediamanager__page .filelist .rows li .name { width: 30%; font-weight: bold; } -#mediamanager__page .filelist .list li .size, -#mediamanager__page .filelist .list li .filesize { +#mediamanager__page .filelist .rows li .size, +#mediamanager__page .filelist .rows li .filesize { width: 15%; } -#mediamanager__page .filelist .list li .date { +#mediamanager__page .filelist .rows li .date { width: 20%; } -#mediamanager__page .filelist .list li .date { +#mediamanager__page .filelist .rows li .date { font-style: italic; white-space: normal; } -#mediamanager__page .filelist .list .icon { +#mediamanager__page .filelist .rows .icon { max-width: 16px; max-height: 16px; } -#mediamanager__page .filelist .list li .image span, -#mediamanager__page .filelist .list li .image1 span { +#mediamanager__page .filelist .rows li .image span, +#mediamanager__page .filelist .rows li .image1 span { vertical-align: middle; text-align: center; display: table-cell; @@ -317,18 +301,18 @@ height: 40px; } -#mediamanager__page .filelist .list li input[type=checkbox] { +#mediamanager__page .filelist .rows li input[type=checkbox] { display: none; float: left; margin: 3px; } -#mediamanager__page .filelist .list li:hover input[type=checkbox], -#mediamanager__page .filelist .list li input[type=checkbox]:checked { +#mediamanager__page .filelist .rows li:hover input[type=checkbox], +#mediamanager__page .filelist .rows li input[type=checkbox]:checked { display: block; } -/* Upload panel */ +/*____________ Upload panel ____________*/ #mediamanager__page div.upload { padding-bottom: 0.5em; @@ -339,57 +323,74 @@ padding-bottom: 0.5em; } -/* File preview */ +/*____________ File preview ____________*/ -.mediamanager__preview, -.mediamanager__preview_buttons { +#mediamanager__page .file ul.actions { text-align: center; margin-bottom: 5px; + list-style: none; +} + +#mediamanager__page .file div.image { + margin-bottom: 5px; } -.mediamanager__preview img { +#mediamanager__page .file div.image img { width: 99%; } -/* Meta data edit form */ +#mediamanager__page .file dl { +} +#mediamanager__page .file dl dt { + font-weight: bold; + display: block; + background-color: __background_alt__; +} +#mediamanager__page .file dl dd { + display: block; + background-color: __background_neu__; +} + + +/*____________ Meta data edit form ____________*/ -#mediamanager__details div.metafield { +#mediamanager__page form.meta div.row { margin-bottom: 5px; } -#mediamanager__details label { +#mediamanager__page form.meta label { display: block; } -#mediamanager__details form.meta input { +#mediamanager__page form.meta input { width: 50%; } -#mediamanager__details form.meta input.button { +#mediamanager__page form.meta input.button { width: auto; } -#mediamanager__details form.meta textarea.edit { +#mediamanager__page form.meta textarea.edit { height: 6em; width: 95%; min-width: 95%; max-width: 95%; } -/* Revisions form */ +/*____________ Revisions form ____________*/ -#mediamanager__details #page__revisions ul { +#mediamanager__page #page__revisions ul { margin-left: 10px; list-style-type: none; } -#mediamanager__details #page__revisions ul li div.li div { +#mediamanager__page #page__revisions ul li div.li div { font-size: 90%; color: __text_neu__; padding-left: 18px; } -#mediamanager__details #page__revisions ul li div.li input { +#mediamanager__page #page__revisions ul li div.li input { position: relative; top: 1px; } -- cgit v1.2.3 From eaac63bb6c71253d7c2d4817c7ffc40cf4f13aeb Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Sun, 18 Sep 2011 20:31:08 +0200 Subject: Fix mediamanager JS (diffs not yet working) --- lib/scripts/media.js | 179 +++++++++++++++++++-------------------- lib/tpl/default/mediamanager.css | 24 +++--- 2 files changed, 97 insertions(+), 106 deletions(-) (limited to 'lib') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 798d42a30..54309640c 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -65,27 +65,26 @@ var dw_mediamanager = { $tree.delegate('a', 'click', dw_mediamanager.list); dw_mediamanager.set_filelist_view(dw_mediamanager.view, false); - jQuery('#mediamanager__form_sort').find('input[type=submit]').hide(); + + dw_mediamanager.init_options(); + dw_mediamanager.image_diff(); dw_mediamanager.init_ajax_uploader(); + console.log(jQuery('#mediamanager__page div.filelist').find('div.panelContent a')); // changing opened tab in the file list panel - jQuery('#mediamanager__layout_list').delegate('#mediamanager__tabs_files a', 'click', dw_mediamanager.list) - // changing type of the file list view - .delegate('#mediamanager__tabs_list a', 'click', dw_mediamanager.list_view) + jQuery('#mediamanager__page div.filelist').delegate('ul.tabs a', 'click', dw_mediamanager.list) // loading file details - .delegate('#mediamanager__file_list a', 'click', dw_mediamanager.details) + .delegate('div.panelContent a', 'click', dw_mediamanager.details) // search form .delegate('#dw__mediasearch', 'submit', dw_mediamanager.list) // "upload as" field autofill .delegate('#upload__file', 'change', dw_mediamanager.suggest) - // sort type selection - .delegate('#mediamanager__form_sort select', 'change', dw_mediamanager.list) // uploaded images .delegate('.qq-upload-file a', 'click', dw_mediamanager.details); // changing opened tab in the file details panel - jQuery('#mediamanager__layout_detail').delegate('#mediamanager__tabs_details a', 'click', dw_mediamanager.details) + jQuery('#mediamanager__page div.file').delegate('#mediamanager__tabs_details a', 'click', dw_mediamanager.details) // "update new version" button .delegate('#mediamanager__btn_update', 'submit', dw_mediamanager.list) // revisions form @@ -102,6 +101,37 @@ var dw_mediamanager = { }, + init_options: function () { + var $options = jQuery('div.filelist div.panelHeader form.options'), + $listType, $sortBy; + if ($options.length === 0) { + return; + } + + $listType = $options.find('li.listType'); + $sortBy = $options.find('li.sortBy'); + + // Remove the submit button + $options.find('input[type=submit]').parent().hide(); + + // Prepare HTML for jQuery UI buttonset + $listType.add($sortBy).find('label').each(function () { + var $this = jQuery(this); + $this.children('input').appendTo($this.parent()); + $this.find('span span').addClass('a11y'); + }); + + // Init buttonset + $listType.add($sortBy).buttonset(); + + // Change handlers + $listType.children('input').change(function (event) { + event.preventDefault(); + dw_mediamanager.set_filelist_view(this.value, true); + }); + $sortBy.children('input').change(dw_mediamanager.list); + }, + /** * build the popup window * @@ -273,14 +303,12 @@ var dw_mediamanager = { $content = jQuery('#media__content'); } else { //fullscreen media manager - $content = jQuery('#mediamanager__layout_list'); + $content = jQuery('div.filelist'); if ($link.hasClass('idx_dir')) { //changing namespace - jQuery('#mediamanager__layout_detail').empty(); - jQuery('#media__tree .selected').each(function(){ - jQuery(this).removeClass('selected'); - }); + jQuery('div.file').empty(); + jQuery('div.namespaces .selected').removeClass('selected'); $link.addClass('selected'); } } @@ -294,9 +322,9 @@ var dw_mediamanager = { } else if ($link.parents('form')) { params = dw_mediamanager.form_params($link.parents('form'))+'&call=medialist'; - if ($link.parents('form')[0].id == 'mediamanager__form_sort') { - DokuCookie.setValue('sort', $link[0].value); - params += '&q=' + jQuery('#mediamanager__sort_textfield').val(); + if ($link.parents('form').hasClass('options')) { + DokuCookie.setValue('sort', $link.val()); + params += '&q=' + $link.val(); params += '&mediado=searchlist'; } } @@ -310,7 +338,7 @@ var dw_mediamanager = { $content.html('...'); } else { //fullscreen media manager - jQuery('.scroll-container', $content).html('...'); + jQuery('div.panelContent', $content).html('...'); } }, @@ -328,43 +356,17 @@ var dw_mediamanager = { return elements+'&'+action; }, - /** - * Changes view of media files list - * - * @author Kate Arzamastseva - */ - list_view: function (event) { - var $link, $content; - $link = jQuery(this); - - event.preventDefault(); - - $content = jQuery('#mediamanager__file_list'); - - if ($link[0].id == 'mediamanager__link_thumbs') { - dw_mediamanager.set_filelist_view('thumbs', true); - - } else if ($link[0].id == 'mediamanager__link_list') { - dw_mediamanager.set_filelist_view('list', true); - } - }, - set_filelist_view: function (type, cookies) { - var $content = jQuery('#mediamanager__file_list'); - if (!type) type = DokuCookie.getValue('view'); + type = type || DokuCookie.getValue('view'); - if (type == 'thumbs') { - $content.removeClass('mediamanager-list'); - $content.addClass('mediamanager-thumbs'); - if (cookies) DokuCookie.setValue('view', 'thumbs'); - dw_mediamanager.view = 'thumbs'; + jQuery('div.filelist div.panelContent ul') + .toggleClass('rows', type === 'rows') + .toggleClass('thumbs', type === 'thumbs'); - } else if (type == 'list') { - $content.removeClass('mediamanager-thumbs'); - $content.addClass('mediamanager-list'); - if (cookies) DokuCookie.setValue('view', 'list'); - dw_mediamanager.view = 'list'; + if (cookies) { + DokuCookie.setValue('view', type); } + dw_mediamanager.view = type; }, /** @@ -375,7 +377,6 @@ var dw_mediamanager = { details: function (event) { var $link, $content, params, update_list; $link = jQuery(this); - event.preventDefault(); jQuery('div.success, div.info, div.error, div.notify').remove(); @@ -383,7 +384,7 @@ var dw_mediamanager = { if ($link[0].id == 'mediamanager__btn_delete' && !confirm(LANG['del_confirm'])) return false; if ($link[0].id == 'mediamanager__btn_restore' && !confirm(LANG['restore_confirm'])) return false; - $content = jQuery('#mediamanager__layout_detail'); + $content = jQuery('div.file'); params = ''; if ($link[0].search) { @@ -397,8 +398,8 @@ var dw_mediamanager = { update_list = ($link[0].id == 'mediamanager__btn_delete' || $link[0].id == 'mediamanager__btn_restore'); dw_mediamanager.update_content($content, params, update_list); - if (jQuery('.scroll-container', $content).length) { - jQuery('.scroll-container', $content).html('...'); + if (jQuery('div.panelContent', $content).length) { + jQuery('div.panelContent', $content).html('...'); } else { jQuery($content).html('...'); } @@ -420,18 +421,18 @@ var dw_mediamanager = { dw_mediamanager.update_resizable(); dw_behaviour.revisionBoxHandler(); - jQuery('#mediamanager__form_sort').find('input[type=submit]').hide(); dw_mediamanager.set_filelist_view(dw_mediamanager.view, false); dw_mediamanager.image_diff(); dw_mediamanager.init_ajax_uploader(); + dw_mediamanager.init_options(); if (update_list) { var $link1, $content1, params1; $link1 = jQuery('a.files'); params1 = $link1[0].search.substr(1)+'&call=medialist'; - $content1 = jQuery('#mediamanager__layout_list'); + $content1 = jQuery('div.filelist'); dw_mediamanager.update_content($content1, params1); - jQuery('.scroll-container', $content1).html('...'); + jQuery('div.panelContent', $content1).html('...'); } }, 'html' @@ -439,12 +440,12 @@ var dw_mediamanager = { }, window_resize: function () { - if (jQuery('#mediamanager__layout').width() == dw_mediamanager.layout_width) { + if (jQuery('#mediamanager__page').width() == dw_mediamanager.layout_width) { return; } - dw_mediamanager.layout_width = jQuery('#mediamanager__layout').width(); - $r = jQuery("#mediamanager__layout .layout-resizable, #mediamanager__layout .layout"); + dw_mediamanager.layout_width = jQuery('#mediamanager__page').width(); + $r = jQuery("#mediamanager__page div.panel"); var w = 0, wSum = 0, mCount = 0, mArray = []; $r.each(function() { @@ -458,7 +459,7 @@ var dw_mediamanager = { }); if (mCount > 0) { - var width = (0.95 * jQuery('#mediamanager__layout').width() - wSum - 30); + var width = (0.95 * jQuery('#mediamanager__page').width() - wSum - 30); wSum = 0; for(var i = 0; i < mArray.length; i++) { wSum += mArray[i].width(); @@ -472,7 +473,7 @@ var dw_mediamanager = { $r.each(function() { w = jQuery(this).width(); - w = (100 * w / jQuery('#mediamanager__layout').width()); + w = (100 * w / jQuery('#mediamanager__page').width()); w += "%"; jQuery(this).width(w); }); @@ -481,12 +482,8 @@ var dw_mediamanager = { var height = windowHeight - 300; if (layout_height < height) { layout_height = height; - jQuery('#mediamanager__layout .scroll-container').each(function (i) { - jQuery(this).height(height); - }); - $resizable.each(function() { - jQuery(this).height(height+100); - }); + jQuery('#mediamanager__page div.panelContent').height(height); + $resizable.height(height+100); } dw_mediamanager.opacity_slider(); @@ -499,7 +496,7 @@ var dw_mediamanager = { * @author Kate Arzamastseva */ update_resizable: function () { - $resizable = jQuery("#mediamanager__layout .layout-resizable"); + $resizable = jQuery("#mediamanager__page .layout-resizable"); $resizable.resizable({ handles: 'e' , resize: function(event, ui){ @@ -507,23 +504,23 @@ var dw_mediamanager = { $resizable.each(function() { w += jQuery(this).width(); }); - wSum = w + parseFloat(jQuery('#mediamanager__layout_detail').css("min-width")); + wSum = w + parseFloat(jQuery('#mediamanager__page div.file').css("min-width")); // max width of resizable column - var maxWidth = 0.95 * jQuery('#mediamanager__layout').width() - wSum + jQuery(this).width() - 30; + var maxWidth = 0.95 * jQuery('#mediamanager__page').width() - wSum + jQuery(this).width() - 30; $resizable.resizable( "option", "maxWidth", maxWidth ); // percentage width of the first two columns - var wLeft = ( 100*(w+30) / jQuery('#mediamanager__layout').width() ); + var wLeft = ( 100*(w+30) / jQuery('#mediamanager__page').width() ); // width of the third column var wRight = 95-wLeft; wRight += "%"; - jQuery('#mediamanager__layout_detail').width(wRight); + jQuery('#mediamanager__page div.file').width(wRight); $resizable.each(function() { w = jQuery(this).width(); - w = (100 * w / jQuery('#mediamanager__layout').width()); + w = (100 * w / jQuery('#mediamanager__page').width()); w += "%"; jQuery(this).width(w); }); @@ -536,12 +533,8 @@ var dw_mediamanager = { var windowHeight = jQuery(window).height(); var height = windowHeight - 300; layout_height = height; - jQuery('#mediamanager__layout .scroll-container').each(function (i) { - jQuery(this).height(height); - }); - $resizable.each(function() { - jQuery(this).height(height+100); - }); + jQuery('#mediamanager__page .panelContent').height(height); + $resizable.height(height+100); }, /** @@ -567,11 +560,11 @@ var dw_mediamanager = { $label.append($select); $form.append($label); - // for IE - var select = document.getElementById('mediamanager__difftype'); - select.options[0].text = LANG.media_diff_both; - select.options[1].text = LANG.media_diff_opacity; - select.options[2].text = LANG.media_diff_portions; + // for IE + var select = document.getElementById('mediamanager__difftype'); + select.options[0].text = LANG.media_diff_both; + select.options[1].text = LANG.media_diff_opacity; + select.options[2].text = LANG.media_diff_portions; }, /** @@ -602,10 +595,10 @@ var dw_mediamanager = { * @author Kate Arzamastseva */ opacity_slider: function () { - var $slider = jQuery( "#mediamanager__opacity_slider" ); + var $slider = jQuery( "#mediamanager__diff div.diff_slider" ); if (!$slider.length) return; - var $image = jQuery('#mediamanager__diff_opacity_image1 img'); + var $image = jQuery('#mediamanager__diff div.diff_opacity div.image1 img'); if (!$image.length) return; $slider.width($image.width()-20); @@ -615,7 +608,7 @@ var dw_mediamanager = { $slider.slider("option", "step", 0.001); $slider.slider("option", "value", 0.5); $slider.bind("slide", function(event, ui) { - jQuery('#mediamanager__diff_opacity_image2').css({ opacity: $slider.slider("option", "value")}); + jQuery('#mediamanager__diff div.diff_opacity div.image2 img').css({ opacity: $slider.slider("option", "value")}); }); }, @@ -625,8 +618,8 @@ var dw_mediamanager = { * @author Kate Arzamastseva */ portions_slider: function () { - var $image1 = jQuery('#mediamanager__diff_portions_image1 img'); - var $image2 = jQuery('#mediamanager__diff_portions_image2 img'); + var $image1 = jQuery('#mediamanager__diff div.diff_portions div.image1 img'); + var $image2 = jQuery('#mediamanager__diff div.diff_portions div.image2 img'); if (!$image1.length || !$image2.length) return; var $div = jQuery("#mediamanager__diff_layout"); @@ -645,7 +638,7 @@ var dw_mediamanager = { $image2.width($image1.width()); $image1.width($image1.width()); - var $slider = jQuery("#mediamanager__portions_slider"); + var $slider = jQuery("#mediamanager__diff div.diff_slider"); if (!$slider.length) return; $slider.width($image1.width()-20); @@ -655,7 +648,7 @@ var dw_mediamanager = { $slider.slider("option", "step", 1); $slider.slider("option", "value", 50); $slider.bind("slide", function(event, ui) { - jQuery('#mediamanager__diff_portions_image2').css({ width: $slider.slider("option", "value")+'%'}); + jQuery('#mediamanager__diff div.diff_portions div.image2').css({ width: $slider.slider("option", "value")+'%'}); }); }, @@ -964,7 +957,7 @@ function hasFlash(version){ jQuery(document).ready(function() { dw_mediamanager.update_resizable(); - dw_mediamanager.layout_width = jQuery("#mediamanager__layout").width(); + dw_mediamanager.layout_width = jQuery("#mediamanager__page").width(); jQuery(window).resize(dw_mediamanager.window_resize); }); diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css index e25c0c9f4..a9728f299 100644 --- a/lib/tpl/default/mediamanager.css +++ b/lib/tpl/default/mediamanager.css @@ -401,15 +401,14 @@ margin-top: 10px; } -#mediamanager__diff_table { +#mediamanager__diff table { padding: 0; margin: 0; margin-top: 10px; } -#mediamanager__diff_table li { +#mediamanager__diff table tr { width: 48%; - display: inline-block; margin: 0; margin-bottom: 10px; padding: 2px; @@ -418,23 +417,24 @@ color: __text__; } -* html #mediamanager__diff_table li { +* html #mediamanager__diff table tr { display: inline; } -*+html #mediamanager__diff_table li { +*+html #mediamanager__diff table tr { display: inline; } /* For IE7 */ -*:first-child+html #mediamanager__diff_table li { +*:first-child+html #mediamanager__diff table tr { width: 45%; } /* Image diff */ -#mediamanager__page dl.img_tags dd.highlighted{ +#mediamanager__page dl.img_tags dd strong { background-color: __highlight__; + font-weight: normal; } #mediamanager__form_diffview { @@ -451,8 +451,7 @@ left: 0; } -#mediamanager__diff_opacity_image1, -#mediamanager__diff_portions_image1 { +#mediamanager__diff div.image1 { width: 97%; } @@ -460,21 +459,20 @@ width: 100%; } -#mediamanager__diff_opacity_image2 { +#mediamanager__diff div.diff_opacity div.image2 { width: 97%; -moz-opacity: 0.5; -khtml-opacity: 0.5; opacity: 0.5; } -#mediamanager__diff_portions_image2 { +#mediamanager__diff div.diff_portions div.image2 { width: 97%; border-right: 1px solid red; overflow: hidden; } -#mediamanager__opacity_slider, -#mediamanager__portions_slider { +#mediamanager__diff div.diff_slider { margin: 10px; width: 95%; } -- cgit v1.2.3 From c57314fe779ba40a0d3d15fb315b7d6d9acfe730 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 18 Sep 2011 19:47:19 +0100 Subject: media manager: more CSS changes --- lib/tpl/default/mediamanager.css | 116 +++++++++++++++------------------------ 1 file changed, 44 insertions(+), 72 deletions(-) (limited to 'lib') diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css index e25c0c9f4..26f30fd3f 100644 --- a/lib/tpl/default/mediamanager.css +++ b/lib/tpl/default/mediamanager.css @@ -20,12 +20,17 @@ margin-right: 0; } -#mediamanager__page .panelContent { - overflow-y: auto; - overflow-x: hidden; - padding: 0; - margin: 0; - position: relative; +#mediamanager__page .namespaces { + width: 15%; + min-width: 125px; +} +#mediamanager__page .filelist { + width: 45%; + min-width: 375px; +} +#mediamanager__page .file { + width: 35%; + min-width: 290px; } #mediamanager__page .panelHeader { @@ -37,19 +42,12 @@ overflow: hidden; } -#mediamanager__page .namespaces { - width: 15%; - min-width: 125px; -} - -#mediamanager__page .filelist { - width: 45%; - min-width: 375px; -} - -#mediamanager__page .file { - /* width: 35%; @todo: needed? */ - min-width: 290px; +#mediamanager__page .panelContent { + overflow-y: auto; + overflow-x: hidden; + padding: 0; + margin: 0; + position: relative; } #mediamanager__page .ui-resizable-e { @@ -58,7 +56,6 @@ /* icon from Crystal Clear icon set (LGPL) */ background: transparent url(images/resizecol.png) 0 25px no-repeat; } - #mediamanager__page .ui-resizable-e:hover { width: 6px; right: -8px; @@ -84,7 +81,6 @@ margin-left: .2em; list-style: none; } - #mediamanager__page .namespaces ul ul { margin-left: 1em; } @@ -113,6 +109,10 @@ margin: 0; padding: 0; } +#mediamanager__page .panelHeader ul li { + color: __text__; + float: left; +} #mediamanager__page .panelHeader form.options label span span { display: none; /* @todo: hide accessibly */ @@ -212,17 +212,6 @@ white-space: normal; } -#mediamanager__page .filelist .thumbs li input[type=checkbox] { - display: none; - float: left; - margin: 3px; -} - -#mediamanager__page .filelist .thumbs li:hover input[type=checkbox], -#mediamanager__page .filelist .thumbs li input[type=checkbox]:checked { - display: block; -} - /* rows */ #mediamanager__page .filelist .rows li { @@ -280,16 +269,12 @@ #mediamanager__page .filelist .rows li .date { width: 20%; -} - -#mediamanager__page .filelist .rows li .date { font-style: italic; white-space: normal; } #mediamanager__page .filelist .rows .icon { - max-width: 16px; - max-height: 16px; + margin-top: 12px; } #mediamanager__page .filelist .rows li .image span, @@ -301,17 +286,6 @@ height: 40px; } -#mediamanager__page .filelist .rows li input[type=checkbox] { - display: none; - float: left; - margin: 3px; -} - -#mediamanager__page .filelist .rows li:hover input[type=checkbox], -#mediamanager__page .filelist .rows li input[type=checkbox]:checked { - display: block; -} - /*____________ Upload panel ____________*/ #mediamanager__page div.upload { @@ -330,6 +304,9 @@ margin-bottom: 5px; list-style: none; } +#mediamanager__page .file ul.actions li { + display: inline; +} #mediamanager__page .file div.image { margin-bottom: 5px; @@ -358,7 +335,7 @@ margin-bottom: 5px; } -#mediamanager__page form.meta label { +#mediamanager__page form.meta label span { display: block; } @@ -398,43 +375,38 @@ /* File diff */ #mediamanager__diff { - margin-top: 10px; -} - -#mediamanager__diff_table { - padding: 0; - margin: 0; - margin-top: 10px; } -#mediamanager__diff_table li { +#mediamanager__diff td, +#mediamanager__diff th { width: 48%; - display: inline-block; - margin: 0; - margin-bottom: 10px; - padding: 2px; + margin: 0 5px 10px 0; + padding: 0; vertical-align: top; - zoom: 1; - color: __text__; + text-align: left; } -* html #mediamanager__diff_table li { - display: inline; +/* For IE7 */ +*:first-child+html #mediamanager__diff td { + width: 45%; } -*+html #mediamanager__diff_table li { - display: inline; +#mediamanager__diff th { + font-weight: normal; } - -/* For IE7 */ -*:first-child+html #mediamanager__diff_table li { - width: 45%; +#mediamanager__diff th a { + font-weight: bold; +} +#mediamanager__diff th span { + font-size: 90%; } /* Image diff */ -#mediamanager__page dl.img_tags dd.highlighted{ +#mediamanager__diff dl dd strong{ background-color: __highlight__; + color: __text__; + font-weight: normal; } #mediamanager__form_diffview { -- cgit v1.2.3 From 359d5431e4665f7e2cae1e77e865a00b47f1b02c Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 18 Sep 2011 20:19:58 +0100 Subject: media manager: styled new option buttons --- lib/tpl/default/mediamanager.css | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'lib') diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css index ca1626f90..21167af05 100644 --- a/lib/tpl/default/mediamanager.css +++ b/lib/tpl/default/mediamanager.css @@ -102,6 +102,7 @@ #mediamanager__page .panelHeader form.options { float: right; + margin-top: -3px; } #mediamanager__page .panelHeader ul { @@ -112,26 +113,24 @@ #mediamanager__page .panelHeader ul li { color: __text__; float: left; + line-height: 1; } -#mediamanager__page .panelHeader form.options label span span { - display: none; /* @todo: hide accessibly */ -} -#mediamanager__page .panelHeader form.options label span { +#mediamanager__page .panelHeader ul li.listType { padding-left: 27px; + background: url('../../images/icon-list.png') 0 1px no-repeat; } -/* @todo: get different images */ -#mediamanager__page .panelHeader label.thumbs span { - background: url('../../images/icon-thumb.png') 0 -4px no-repeat; -} -#mediamanager__page .panelHeader label.rows span { - background: url('../../images/icon-list.png') 0 -4px no-repeat; +#mediamanager__page .panelHeader ul li.sortBy { + padding-left: 27px; + background: url('../../images/icon-sort.png') 0 1px no-repeat; } -#mediamanager__page .panelHeader label.name span { - background: url('../../images/icon-sort.png') 0 -4px no-repeat; + +#mediamanager__page .panelHeader form.options .ui-buttonset label{ + font-size: 90%; } -#mediamanager__page .panelHeader label.date span { - background: url('../../images/icon-sort.png') 0 -4px no-repeat; +#mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text { + padding: .4em .7em; + line-height: 1; } /*____________ File list ____________*/ -- cgit v1.2.3 From 699c5072ff1d0470c53299ab9a4dfbb4457e7843 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 19 Sep 2011 00:28:25 +0100 Subject: media manager: small functionality and css changes --- lib/tpl/default/mediamanager.css | 73 ++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 44 deletions(-) (limited to 'lib') diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css index 21167af05..d098686f0 100644 --- a/lib/tpl/default/mediamanager.css +++ b/lib/tpl/default/mediamanager.css @@ -75,6 +75,7 @@ font-weight: normal; background-color: __background_alt__; color: __text__; + line-height: 1.5em; } #mediamanager__page .namespaces ul { @@ -117,7 +118,7 @@ } #mediamanager__page .panelHeader ul li.listType { - padding-left: 27px; + padding: 0 3px 0 27px; background: url('../../images/icon-list.png') 0 1px no-repeat; } #mediamanager__page .panelHeader ul li.sortBy { @@ -127,6 +128,7 @@ #mediamanager__page .panelHeader form.options .ui-buttonset label{ font-size: 90%; + margin-right: -0.4em; } #mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text { padding: .4em .7em; @@ -158,37 +160,26 @@ padding: 5px; vertical-align: top; text-align: center; - zoom: 1; position: relative; line-height: 1.2; } - * html #mediamanager__page .filelist .thumbs li { display: inline; + zoom: 1; } - *+html #mediamanager__page .filelist .thumbs li { display: inline; } -#mediamanager__page .filelist .thumbs li .image, -#mediamanager__page .filelist .thumbs li .image0 { - width: 100%; - height: 90px; - display: block; - overflow: hidden; -} - -#mediamanager__page .filelist .thumbs li .image1 { - display: none; -} - -#mediamanager__page .filelist .thumbs li .image, -#mediamanager__page .filelist .thumbs li .image0 { +#mediamanager__page .filelist .thumbs li .image { vertical-align: middle; display: table-cell; width: 100px; height: 90px; + overflow: hidden; +} +#mediamanager__page .filelist .thumbs li .tiny { + display: none; } #mediamanager__page .filelist .thumbs li .name, @@ -200,12 +191,10 @@ width: 90px; white-space: nowrap; } - #mediamanager__page .filelist .thumbs li .name { padding: 5px 0; font-weight: bold; } - #mediamanager__page .filelist .thumbs li .date { font-style: italic; white-space: normal; @@ -213,10 +202,6 @@ /* rows */ -#mediamanager__page .filelist .rows li { - overflow: hidden; -} - #mediamanager__page .filelist .rows li { list-style: none; display: block; @@ -226,14 +211,14 @@ margin-bottom: 3px; background-color: __background__; color: __text__; + overflow: hidden; } #mediamanager__page .filelist .rows li:nth-child(2n+1) { background-color: __background_neu__; } -#mediamanager__page .filelist .rows li .image, -#mediamanager__page .filelist .rows li .image1 { +#mediamanager__page .filelist .rows li .image { width: 10%; display: block; overflow: hidden; @@ -241,11 +226,21 @@ height: 40px; text-align: center; } - -#mediamanager__page .filelist .rows li .image0 { +#mediamanager__page .filelist .rows li .thumb { display: none; } +#mediamanager__page .filelist .rows li .image span { + vertical-align: middle; + text-align: center; + display: table-cell; + width: 100px; + height: 40px; +} +#mediamanager__page .filelist .rows .icon { + margin-top: 12px; +} + #mediamanager__page .filelist .rows li .name, #mediamanager__page .filelist .rows li .size, #mediamanager__page .filelist .rows li .filesize, @@ -260,31 +255,16 @@ width: 30%; font-weight: bold; } - #mediamanager__page .filelist .rows li .size, #mediamanager__page .filelist .rows li .filesize { width: 15%; } - #mediamanager__page .filelist .rows li .date { width: 20%; font-style: italic; white-space: normal; } -#mediamanager__page .filelist .rows .icon { - margin-top: 12px; -} - -#mediamanager__page .filelist .rows li .image span, -#mediamanager__page .filelist .rows li .image1 span { - vertical-align: middle; - text-align: center; - display: table-cell; - width: 100px; - height: 40px; -} - /*____________ Upload panel ____________*/ #mediamanager__page div.upload { @@ -300,7 +280,7 @@ #mediamanager__page .file ul.actions { text-align: center; - margin-bottom: 5px; + margin: 0 0 5px; list-style: none; } #mediamanager__page .file ul.actions li { @@ -410,8 +390,13 @@ #mediamanager__form_diffview { margin-bottom: 10px; + display: block; } + + + + #mediamanager__diff_layout { position: relative; } -- cgit v1.2.3 From 94add30314d7c0ed51fa78304ca342d0273b366c Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 19 Sep 2011 01:22:32 +0100 Subject: media manager: added a few newlines to the output --- lib/tpl/default/mediamanager.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib') diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css index d098686f0..f21c936f8 100644 --- a/lib/tpl/default/mediamanager.css +++ b/lib/tpl/default/mediamanager.css @@ -130,6 +130,9 @@ font-size: 90%; margin-right: -0.4em; } +#mediamanager__page .panelHeader form.options label span span{ + display: none; +} #mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text { padding: .4em .7em; line-height: 1; -- cgit v1.2.3 From 1a4e6b1daf57352634e12ce4837b1738efaeed81 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 19 Sep 2011 10:28:41 +0100 Subject: media manager: fixed option buttons (broken with 94add30) --- lib/tpl/default/mediamanager.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib') diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css index f21c936f8..9f68fdb3e 100644 --- a/lib/tpl/default/mediamanager.css +++ b/lib/tpl/default/mediamanager.css @@ -130,9 +130,11 @@ font-size: 90%; margin-right: -0.4em; } +/* #mediamanager__page .panelHeader form.options label span span{ display: none; } +*/ #mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text { padding: .4em .7em; line-height: 1; -- cgit v1.2.3 From fba0b25db639efd576e78d9a4258de5c8ef916b6 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 19 Sep 2011 11:00:23 +0100 Subject: media manager: improved spacing around option buttons and changed lang strings for them --- lib/tpl/default/mediamanager.css | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css index 9f68fdb3e..e61d07842 100644 --- a/lib/tpl/default/mediamanager.css +++ b/lib/tpl/default/mediamanager.css @@ -98,7 +98,7 @@ font-weight: normal; font-size: 1em; padding: 0; - margin: 0; + margin: 0 0 3px; } #mediamanager__page .panelHeader form.options { @@ -115,26 +115,22 @@ color: __text__; float: left; line-height: 1; + padding-left: 3px; } #mediamanager__page .panelHeader ul li.listType { - padding: 0 3px 0 27px; - background: url('../../images/icon-list.png') 0 1px no-repeat; + padding-left: 30px; + background: url('../../images/icon-list.png') 3px 1px no-repeat; } #mediamanager__page .panelHeader ul li.sortBy { - padding-left: 27px; - background: url('../../images/icon-sort.png') 0 1px no-repeat; + padding-left: 30px; + background: url('../../images/icon-sort.png') 3px 1px no-repeat; } #mediamanager__page .panelHeader form.options .ui-buttonset label{ font-size: 90%; margin-right: -0.4em; } -/* -#mediamanager__page .panelHeader form.options label span span{ - display: none; -} -*/ #mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text { padding: .4em .7em; line-height: 1; -- cgit v1.2.3 From 8b8998596af1a9dd2d4fcfac9f6b4393fcf69d57 Mon Sep 17 00:00:00 2001 From: Petros Vidalis Date: Mon, 19 Sep 2011 13:16:25 +0200 Subject: Greek language update --- lib/plugins/acl/lang/el/lang.php | 1 + lib/plugins/config/lang/el/lang.php | 3 +++ lib/plugins/plugin/lang/el/lang.php | 2 ++ lib/plugins/popularity/lang/el/lang.php | 1 + lib/plugins/revert/lang/el/lang.php | 1 + lib/plugins/usermanager/lang/el/lang.php | 1 + 6 files changed, 9 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/el/lang.php b/lib/plugins/acl/lang/el/lang.php index e2f6c35dc..e1cd26755 100644 --- a/lib/plugins/acl/lang/el/lang.php +++ b/lib/plugins/acl/lang/el/lang.php @@ -13,6 +13,7 @@ * @author Αθανάσιος Νταής * @author Konstantinos Koryllos * @author George Petsagourakis + * @author Petros Vidalis */ $lang['admin_acl'] = 'Διαχείριση Δικαιωμάτων Πρόσβασης'; $lang['acl_group'] = 'Ομάδα'; diff --git a/lib/plugins/config/lang/el/lang.php b/lib/plugins/config/lang/el/lang.php index ed7af0ff4..9f5d121de 100644 --- a/lib/plugins/config/lang/el/lang.php +++ b/lib/plugins/config/lang/el/lang.php @@ -11,6 +11,7 @@ * @author Αθανάσιος Νταής * @author Konstantinos Koryllos * @author George Petsagourakis + * @author Petros Vidalis */ $lang['menu'] = 'Ρυθμίσεις'; $lang['error'] = 'Οι ρυθμίσεις σας δεν έγιναν δεκτές λόγω λανθασμένης τιμής κάποιας ρύθμισης. Διορθώστε την λάθος τιμή και προσπαθήστε ξανά. @@ -46,6 +47,7 @@ $lang['lang'] = 'Γλώσσα'; $lang['basedir'] = 'Αρχικός Φάκελος'; $lang['baseurl'] = 'Αρχικό URL'; $lang['savedir'] = 'Φάκελος για την αποθήκευση δεδομένων'; +$lang['cookiedir'] = 'Διαδρομή cookie. Αφήστε την κενή για την χρησιμοποίηση της αρχικής URL.'; $lang['start'] = 'Ονομασία αρχικής σελίδας'; $lang['title'] = 'Τίτλος Wiki'; $lang['template'] = 'Πρότυπο προβολής'; @@ -116,6 +118,7 @@ $lang['jpg_quality'] = 'Ποιότητα συμπίεσης JPG (0-100 $lang['subscribers'] = 'Να επιτρέπεται η εγγραφή στην ενημέρωση αλλαγών σελίδας'; $lang['subscribe_time'] = 'Χρόνος μετά τον οποίο οι λίστες ειδοποιήσεων και τα συνοπτικά θα αποστέλλονται (δευτερόλεπτα). Αυτό θα πρέπει να είναι μικρότερο από τον χρόνο που έχει η ρύθμιση recent_days.'; $lang['compress'] = 'Συμπίεση αρχείων CSS και javascript'; +$lang['cssdatauri'] = 'Το μέγεθος σε bytes στο οποίο οι εικόνες που αναφέρονται σε CSS αρχεία θα πρέπει να είναι ενσωματωμένες για τη μείωση των απαιτήσεων μιας κεφαλίδας αίτησης HTTP . Αυτή η τεχνική δεν θα λειτουργήσει σε IE <8! 400 με 600 bytes είναι μια καλή τιμή. Ορίστε την τιμή 0 για να το απενεργοποιήσετε.'; $lang['hidepages'] = 'Φίλτρο απόκρυψης σελίδων (regular expressions)'; $lang['send404'] = 'Αποστολή "HTTP 404/Page Not Found" για σελίδες που δεν υπάρχουν'; $lang['sitemap'] = 'Δημιουργία Google sitemap (ημέρες)'; diff --git a/lib/plugins/plugin/lang/el/lang.php b/lib/plugins/plugin/lang/el/lang.php index d28a04ae2..bd6dc2013 100644 --- a/lib/plugins/plugin/lang/el/lang.php +++ b/lib/plugins/plugin/lang/el/lang.php @@ -11,6 +11,7 @@ * @author Αθανάσιος Νταής * @author Konstantinos Koryllos * @author George Petsagourakis + * @author Petros Vidalis */ $lang['menu'] = 'Διαχείριση Επεκτάσεων'; $lang['download'] = 'Κατεβάστε και εγκαταστήστε μια νέα επέκταση (plugin)'; @@ -56,3 +57,4 @@ $lang['enabled'] = 'Η επέκταση %s ενεργοποιήθ $lang['notenabled'] = 'Η επέκταση %s δεν μπορεί να ενεργοποιηθεί. Ελέγξτε τα δικαιώματα πρόσβασης.'; $lang['disabled'] = 'Η επέκταση %s απενεργοποιήθηκε.'; $lang['notdisabled'] = 'Η επέκταση %s δεν μπορεί να απενεργοποιηθεί. Ελέγξτε τα δικαιώματα πρόσβασης.'; +$lang['packageinstalled'] = 'Το πακέτο της επέκτασης (%d επέκταση(εις): %s) εγκαστήθηκε επιτυχημένα.'; diff --git a/lib/plugins/popularity/lang/el/lang.php b/lib/plugins/popularity/lang/el/lang.php index 41704fa06..32558b060 100644 --- a/lib/plugins/popularity/lang/el/lang.php +++ b/lib/plugins/popularity/lang/el/lang.php @@ -4,6 +4,7 @@ * * @author Konstantinos Koryllos * @author George Petsagourakis + * @author Petros Vidalis */ $lang['name'] = 'Αναφορά Δημοτικότητας (ίσως αργήσει λίγο να εμφανιστεί)'; $lang['submit'] = 'Αποστολή Δεδομένων'; diff --git a/lib/plugins/revert/lang/el/lang.php b/lib/plugins/revert/lang/el/lang.php index a0c3bb4ff..63454e4e9 100644 --- a/lib/plugins/revert/lang/el/lang.php +++ b/lib/plugins/revert/lang/el/lang.php @@ -9,6 +9,7 @@ * @author Αθανάσιος Νταής * @author Konstantinos Koryllos * @author George Petsagourakis + * @author Petros Vidalis */ $lang['menu'] = 'Αποκατάσταση κακόβουλων αλλαγών σελίδων'; $lang['filter'] = 'Αναζήτηση σελίδων που περιέχουν spam'; diff --git a/lib/plugins/usermanager/lang/el/lang.php b/lib/plugins/usermanager/lang/el/lang.php index 8bfb1a380..4b4d95379 100644 --- a/lib/plugins/usermanager/lang/el/lang.php +++ b/lib/plugins/usermanager/lang/el/lang.php @@ -10,6 +10,7 @@ * @author Αθανάσιος Νταής * @author Konstantinos Koryllos * @author George Petsagourakis + * @author Petros Vidalis */ $lang['menu'] = 'Διαχείριση Χρηστών'; $lang['noauth'] = '(η είσοδος χρηστών δεν είναι δυνατή)'; -- cgit v1.2.3 From b1ba68599b1aaf3242332cfd97b167f999fd788c Mon Sep 17 00:00:00 2001 From: Robert Bogenschneider Date: Mon, 19 Sep 2011 13:17:43 +0200 Subject: Esperanto language update --- lib/plugins/acl/lang/eo/lang.php | 1 + lib/plugins/config/lang/eo/lang.php | 4 ++++ lib/plugins/plugin/lang/eo/lang.php | 2 ++ lib/plugins/popularity/lang/eo/lang.php | 1 + lib/plugins/popularity/lang/eo/submitted.txt | 3 +++ lib/plugins/revert/lang/eo/lang.php | 1 + lib/plugins/usermanager/lang/eo/lang.php | 1 + 7 files changed, 13 insertions(+) create mode 100644 lib/plugins/popularity/lang/eo/submitted.txt (limited to 'lib') diff --git a/lib/plugins/acl/lang/eo/lang.php b/lib/plugins/acl/lang/eo/lang.php index 85b262e8c..239578f57 100644 --- a/lib/plugins/acl/lang/eo/lang.php +++ b/lib/plugins/acl/lang/eo/lang.php @@ -10,6 +10,7 @@ * @author Erik Pedersen * @author Robert Bogenschneider * @author Robert BOGENSCHNEIDER + * @author Robert BOGENSCHNEIDER */ $lang['admin_acl'] = 'Administrado de Alirkontrola Listo (ACL)'; $lang['acl_group'] = 'Grupo'; diff --git a/lib/plugins/config/lang/eo/lang.php b/lib/plugins/config/lang/eo/lang.php index 8a9ee3840..ca98ca319 100644 --- a/lib/plugins/config/lang/eo/lang.php +++ b/lib/plugins/config/lang/eo/lang.php @@ -11,6 +11,7 @@ * @author Erik Pedersen * @author Robert Bogenschneider * @author Robert BOGENSCHNEIDER + * @author Robert BOGENSCHNEIDER */ $lang['menu'] = 'Agordaj Difinoj'; $lang['error'] = 'La difinoj ne estas ĝisdatigitaj pro malvalida valoro: kompleze reviziu viajn ŝanĝojn kaj resubmetu ilin. @@ -46,6 +47,7 @@ $lang['lang'] = 'Lingvo'; $lang['basedir'] = 'Baza dosierujo'; $lang['baseurl'] = 'Baza URL'; $lang['savedir'] = 'Dosierujo por konservi datenaron'; +$lang['cookiedir'] = 'KUketopado. Lasu malplena por uzi baseurl.'; $lang['start'] = 'Nomo de la hejmpaĝo'; $lang['title'] = 'Titolo de la vikio'; $lang['template'] = 'Ŝablono'; @@ -116,6 +118,8 @@ $lang['jpg_quality'] = 'Kompaktiga kvalito de JPG (0-100)'; $lang['subscribers'] = 'Ebligi subtenon de avizoj pri ŝanĝoj sur paĝoj'; $lang['subscribe_time'] = 'Tempo, post kiu abonlistoj kaj kolektaĵoj sendiĝas (sek); Tio estu pli malgranda ol la tempo indikita en recent_days.'; $lang['compress'] = 'Kompaktigi CSS-ajn kaj ĵavaskriptajn elmetojn'; +$lang['cssdatauri'] = 'Grandeco en bitokoj, ĝis kiom en CSS-dosieroj referencitaj bildoj estu enmetataj rekte en la stilfolion por malgrandigi vanan HTTP-kapan trafikon. Tiu tekniko ne funkcias en IE < 8! +400 ĝis 600 bitokoj estas bona grandeco. Indiku 0 por malebligi enmeton.'; $lang['hidepages'] = 'Kaŝi kongruantajn paĝojn (laŭ regulaj esprimoj)'; $lang['send404'] = 'Sendi la mesaĝon "HTTP 404/Ne Trovita Paĝo" por ne ekzistantaj paĝoj'; $lang['sitemap'] = 'Krei Guglan paĝarmapon "sitemap" (po kiom tagoj)'; diff --git a/lib/plugins/plugin/lang/eo/lang.php b/lib/plugins/plugin/lang/eo/lang.php index a70bea30c..327ee7578 100644 --- a/lib/plugins/plugin/lang/eo/lang.php +++ b/lib/plugins/plugin/lang/eo/lang.php @@ -11,6 +11,7 @@ * @author Erik Pedersen * @author Robert Bogenschneider * @author Robert BOGENSCHNEIDER + * @author Robert BOGENSCHNEIDER */ $lang['menu'] = 'Administri Kromaĵojn'; $lang['download'] = 'Elŝuti kaj instali novan kromaĵon'; @@ -56,3 +57,4 @@ $lang['enabled'] = 'La kromaĵo %s estas ebligita.'; $lang['notenabled'] = 'La kromaĵo %s ne povis esti ebligita, kontrolu dosier-permesojn.'; $lang['disabled'] = 'La kromaĵo %s estas malebligita.'; $lang['notdisabled'] = 'La kromaĵo %s ne povis esti malebligita, kontrolu dosier-permesojn.'; +$lang['packageinstalled'] = 'Kromaĵa pakaĵo (%d kromaĵo(j): %s) sukcese instalitaj.'; diff --git a/lib/plugins/popularity/lang/eo/lang.php b/lib/plugins/popularity/lang/eo/lang.php index a7c124f51..2cbb6072f 100644 --- a/lib/plugins/popularity/lang/eo/lang.php +++ b/lib/plugins/popularity/lang/eo/lang.php @@ -9,6 +9,7 @@ * @author Erik Pedersen * @author Robert Bogenschneider * @author Robert BOGENSCHNEIDER + * @author Robert BOGENSCHNEIDER */ $lang['name'] = 'Populareca enketo (eble la ŝargo prokrastos iomete)'; $lang['submit'] = 'Sendi datenaron'; diff --git a/lib/plugins/popularity/lang/eo/submitted.txt b/lib/plugins/popularity/lang/eo/submitted.txt new file mode 100644 index 000000000..c2bce4e9f --- /dev/null +++ b/lib/plugins/popularity/lang/eo/submitted.txt @@ -0,0 +1,3 @@ +====== Enketo pri Populareco ====== + +La datumoj estis senditaj sukcese. \ No newline at end of file diff --git a/lib/plugins/revert/lang/eo/lang.php b/lib/plugins/revert/lang/eo/lang.php index a46b0169e..8c7854847 100644 --- a/lib/plugins/revert/lang/eo/lang.php +++ b/lib/plugins/revert/lang/eo/lang.php @@ -11,6 +11,7 @@ * @author Erik Pedersen * @author Robert Bogenschneider * @author Robert BOGENSCHNEIDER + * @author Robert BOGENSCHNEIDER */ $lang['menu'] = 'Administrado de restarigo'; $lang['filter'] = 'Serĉi spamecajn paĝojn'; diff --git a/lib/plugins/usermanager/lang/eo/lang.php b/lib/plugins/usermanager/lang/eo/lang.php index a16b107c1..9a515dc9c 100644 --- a/lib/plugins/usermanager/lang/eo/lang.php +++ b/lib/plugins/usermanager/lang/eo/lang.php @@ -11,6 +11,7 @@ * @author Erik Pedersen * @author Robert Bogenschneider * @author Robert BOGENSCHNEIDER + * @author Robert BOGENSCHNEIDER */ $lang['menu'] = 'Administrado de Uzantoj'; $lang['noauth'] = '(identiĝo de uzantoj ne disponeblas)'; -- cgit v1.2.3 From 54a5505521ae2d30ec6348c5350c0adc7466379a Mon Sep 17 00:00:00 2001 From: Otto Vainio Date: Mon, 19 Sep 2011 13:19:11 +0200 Subject: Finnish language update --- lib/plugins/config/lang/fi/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/fi/lang.php b/lib/plugins/config/lang/fi/lang.php index 0e9bad030..9598a0d93 100644 --- a/lib/plugins/config/lang/fi/lang.php +++ b/lib/plugins/config/lang/fi/lang.php @@ -42,6 +42,7 @@ $lang['lang'] = 'Kieli'; $lang['basedir'] = 'Perushakemisto'; $lang['baseurl'] = 'Perus URL'; $lang['savedir'] = 'Hakemisto tietojen tallennukseen.'; +$lang['cookiedir'] = 'Cookien path. Jätä tyhjäksi käyttääksesi baseurl arvoa'; $lang['start'] = 'Alkusivun nimi'; $lang['title'] = 'Wikin nimi'; $lang['template'] = 'Sivumalli'; -- cgit v1.2.3 From f84d2dfd6f3df6ad2403af497075b0bb35393ffc Mon Sep 17 00:00:00 2001 From: Thomas Nygreen Date: Mon, 19 Sep 2011 13:20:27 +0200 Subject: Norwegian language update --- lib/plugins/acl/lang/no/lang.php | 2 +- lib/plugins/config/lang/no/lang.php | 7 +++++++ lib/plugins/plugin/lang/no/lang.php | 1 + lib/plugins/popularity/lang/no/lang.php | 6 ++++++ lib/plugins/popularity/lang/no/submitted.txt | 3 +++ 5 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 lib/plugins/popularity/lang/no/submitted.txt (limited to 'lib') diff --git a/lib/plugins/acl/lang/no/lang.php b/lib/plugins/acl/lang/no/lang.php index 71df0b382..f0c92453c 100644 --- a/lib/plugins/acl/lang/no/lang.php +++ b/lib/plugins/acl/lang/no/lang.php @@ -40,7 +40,7 @@ $lang['perm'] = 'Tillatelser'; $lang['acl_perm0'] = 'Ingen'; $lang['acl_perm1'] = 'Lese'; $lang['acl_perm2'] = 'Redigere'; -$lang['acl_perm4'] = 'Lage'; +$lang['acl_perm4'] = 'Opprette'; $lang['acl_perm8'] = 'Laste opp'; $lang['acl_perm16'] = 'Slette'; $lang['acl_new'] = 'Legg til ny oppføring'; diff --git a/lib/plugins/config/lang/no/lang.php b/lib/plugins/config/lang/no/lang.php index 6ac765cbf..ea76616d2 100644 --- a/lib/plugins/config/lang/no/lang.php +++ b/lib/plugins/config/lang/no/lang.php @@ -52,6 +52,7 @@ $lang['lang'] = 'Språk'; $lang['basedir'] = 'Grunnkatalog'; $lang['baseurl'] = 'Grunn-nettadresse'; $lang['savedir'] = 'Mappe for lagring av data'; +$lang['cookiedir'] = 'Sti for informasjonskapsler. La stå blankt for å bruke grunn-nettadressa.'; $lang['start'] = 'Sidenavn på forsiden'; $lang['title'] = 'Navn på Wikien'; $lang['template'] = 'Mal'; @@ -106,6 +107,7 @@ $lang['useslash'] = 'Bruk / som skilletegn mellom navnerom i URLer' $lang['usedraft'] = 'Lagre kladd automatisk under redigering'; $lang['sepchar'] = 'Skilletegn mellom ord i sidenavn'; $lang['canonical'] = 'Bruk fulle URLer (i stedet for relative)'; +$lang['fnencode'] = 'Metode for å kode ikke-ASCII-filnavn'; $lang['autoplural'] = 'Se etter flertallsformer i lenker'; $lang['compression'] = 'Metode for komprimering av gamle filer'; $lang['cachetime'] = 'Maksimal alder på hurtiglager (sekunder)'; @@ -114,12 +116,15 @@ $lang['fetchsize'] = 'Maksimal størrelse (byter) fetch.php kan last $lang['notify'] = 'Send meldinger om endringer denne e-postadressen'; $lang['registernotify'] = 'Send info om nylig registrerte brukere til denne e-postadressen'; $lang['mailfrom'] = 'Avsenderadresse for automatiske e-poster'; +$lang['mailprefix'] = 'Prefiks for emne i automatiske e-poster '; $lang['gzip_output'] = 'Bruk gzip Content-Encoding for XHTML'; $lang['gdlib'] = 'Versjon av libGD'; $lang['im_convert'] = 'Sti til ImageMagicks konverteringsverktøy'; $lang['jpg_quality'] = 'JPEG-kvalitet (0-100)'; $lang['subscribers'] = 'Åpne for abonnement på endringer av en side'; +$lang['subscribe_time'] = 'Hvor lenge det skal gå mellom utsending av e-poster med endringer (i sekunder). Denne verdien bør være mindre enn verdien i recent_days.'; $lang['compress'] = 'Kompakt CSS og JavaScript'; +$lang['cssdatauri'] = 'Opp til denne størrelsen (i bytes) skal bilder som er vist til i CSS-filer kodes direkte inn i fila for å redusere antall HTTP-forespørsler. Denne teknikken fungerer ikke i IE < 8! Mellom 400 og 600 bytes er fornuftige verdier. Bruk 0 for å skru av funksjonen.'; $lang['hidepages'] = 'Skjul sider fra automatiske lister (regulære uttrykk)'; $lang['send404'] = 'Send "HTTP 404/Page Not Found" for ikke-eksisterende sider'; $lang['sitemap'] = 'Lag Google-sidekart (dager)'; @@ -145,6 +150,7 @@ $lang['proxy____port'] = 'Proxyport'; $lang['proxy____user'] = 'Brukernavn på proxyserver'; $lang['proxy____pass'] = 'Passord på proxyserver'; $lang['proxy____ssl'] = 'Bruk SSL for å koble til proxyserver'; +$lang['proxy____except'] = 'Regulært uttrykk for URLer som ikke trenger en proxy.'; $lang['safemodehack'] = 'Bruk safemode-hack'; $lang['ftp____host'] = 'FTP-server for safemode-hack'; $lang['ftp____port'] = 'FTP-port for safemode-hack'; @@ -192,3 +198,4 @@ $lang['useheading_o_0'] = 'Aldri'; $lang['useheading_o_navigation'] = 'Kun navigering'; $lang['useheading_o_content'] = 'Kun wiki-innhold'; $lang['useheading_o_1'] = 'Alltid'; +$lang['readdircache'] = 'Maksimal alder for mellomlagring av mappa med søkeindekser (sekunder)'; diff --git a/lib/plugins/plugin/lang/no/lang.php b/lib/plugins/plugin/lang/no/lang.php index a95ea0085..8f0ec2039 100644 --- a/lib/plugins/plugin/lang/no/lang.php +++ b/lib/plugins/plugin/lang/no/lang.php @@ -58,3 +58,4 @@ $lang['enabled'] = 'Tillegget %s aktivert'; $lang['notenabled'] = 'Plugin %s kunne ikke aktiveres, sjekk filrettighetene.'; $lang['disabled'] = 'Plugin %s deaktivert'; $lang['notdisabled'] = 'Plugin %s kunne ikke deaktiveres, sjekk filrettighetene.'; +$lang['packageinstalled'] = 'Installasjonen av tilleggspakka (%d tillegg: %s) var vellykka'; diff --git a/lib/plugins/popularity/lang/no/lang.php b/lib/plugins/popularity/lang/no/lang.php index e80016f92..3c6dfee9e 100644 --- a/lib/plugins/popularity/lang/no/lang.php +++ b/lib/plugins/popularity/lang/no/lang.php @@ -10,6 +10,12 @@ * @author Erik Pedersen * @author Erik Bjørn Pedersen * @author Rune Rasmussen syntaxerror.no@gmail.com + * @author Thomas Nygreen */ $lang['name'] = 'Popularitetsfeedback (kan ta litt tid å laste)'; $lang['submit'] = 'Send data'; +$lang['autosubmit'] = 'Send data automatisk en gang i måneden'; +$lang['submissionFailed'] = 'Kunne ikke sende dataene på grunn av følgende feil:'; +$lang['submitDirectly'] = 'Du kan sende dataene manuelt ved å sende inn dette skjemaet.'; +$lang['autosubmitError'] = 'Den siste automatiske innsendinga feilet på grunn av følgende feil:'; +$lang['lastSent'] = 'Dataene er sendt'; diff --git a/lib/plugins/popularity/lang/no/submitted.txt b/lib/plugins/popularity/lang/no/submitted.txt new file mode 100644 index 000000000..239676a9d --- /dev/null +++ b/lib/plugins/popularity/lang/no/submitted.txt @@ -0,0 +1,3 @@ +====== Tilbakemelding om popularitet ====== + +Innsending av dataene var vellykka. \ No newline at end of file -- cgit v1.2.3 From 86e64c1709dfad1edceb5b0b2acdaade3b248d96 Mon Sep 17 00:00:00 2001 From: lainme Date: Mon, 19 Sep 2011 13:41:40 +0200 Subject: Simplified Chinese language update --- lib/plugins/acl/lang/zh/lang.php | 1 + lib/plugins/config/lang/zh/lang.php | 3 +++ lib/plugins/plugin/lang/zh/lang.php | 1 + lib/plugins/popularity/lang/zh/lang.php | 1 + lib/plugins/revert/lang/zh/lang.php | 1 + lib/plugins/usermanager/lang/zh/lang.php | 1 + 6 files changed, 8 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/zh/lang.php b/lib/plugins/acl/lang/zh/lang.php index 581d08539..986fa769a 100644 --- a/lib/plugins/acl/lang/zh/lang.php +++ b/lib/plugins/acl/lang/zh/lang.php @@ -13,6 +13,7 @@ * @author caii * @author Hiphen Lee * @author caii, patent agent in China + * @author lainme993@gmail.com */ $lang['admin_acl'] = '访问控制列表(ACL)管理器'; $lang['acl_group'] = '组'; diff --git a/lib/plugins/config/lang/zh/lang.php b/lib/plugins/config/lang/zh/lang.php index 0aeb977e7..7a7f0f504 100644 --- a/lib/plugins/config/lang/zh/lang.php +++ b/lib/plugins/config/lang/zh/lang.php @@ -13,6 +13,7 @@ * @author caii * @author Hiphen Lee * @author caii, patent agent in China + * @author lainme993@gmail.com */ $lang['menu'] = '配置设置'; $lang['error'] = '由于非法参数,设置没有更新。请检查您做的改动并重新提交。 @@ -49,6 +50,7 @@ $lang['lang'] = '语言'; $lang['basedir'] = '根目录'; $lang['baseurl'] = '根路径(URL)'; $lang['savedir'] = '保存数据的目录'; +$lang['cookiedir'] = 'Cookie 路径。留空以使用 baseurl。'; $lang['start'] = '开始页面的名称'; $lang['title'] = '维基站点的标题'; $lang['template'] = '模版'; @@ -120,6 +122,7 @@ $lang['subscribers'] = '启用页面订阅支持'; $lang['subscribe_time'] = '订阅列表和摘要发送的时间间隔(秒);这应当小于指定的最近更改保留时间(recent_days)。 '; $lang['compress'] = '使 CSS 和 javascript 的输出更紧密'; +$lang['cssdatauri'] = '字节数。CSS 文件引用的图片若小于该字节,则被直接嵌入样式表中来减少 HTTP 请求头的开销。这个技术在 IE 中不起作用。400600 字节是不错的值。设置为 0 则禁用。'; $lang['hidepages'] = '隐藏匹配的界面(正则表达式)'; $lang['send404'] = '发送 "HTTP 404/页面没有找到" 错误信息给不存在的页面'; $lang['sitemap'] = '生成 Google sitemap(天)'; diff --git a/lib/plugins/plugin/lang/zh/lang.php b/lib/plugins/plugin/lang/zh/lang.php index 6fc1f4d7d..f8e0b5568 100644 --- a/lib/plugins/plugin/lang/zh/lang.php +++ b/lib/plugins/plugin/lang/zh/lang.php @@ -13,6 +13,7 @@ * @author caii * @author Hiphen Lee * @author caii, patent agent in China + * @author lainme993@gmail.com */ $lang['menu'] = '插件管理器'; $lang['download'] = '下载并安装新的插件'; diff --git a/lib/plugins/popularity/lang/zh/lang.php b/lib/plugins/popularity/lang/zh/lang.php index a2464762d..f45aaf4ff 100644 --- a/lib/plugins/popularity/lang/zh/lang.php +++ b/lib/plugins/popularity/lang/zh/lang.php @@ -12,6 +12,7 @@ * @author caii * @author Hiphen Lee * @author caii, patent agent in China + * @author lainme993@gmail.com */ $lang['name'] = '人气反馈(载入可能需要一些时间)'; $lang['submit'] = '发送数据'; diff --git a/lib/plugins/revert/lang/zh/lang.php b/lib/plugins/revert/lang/zh/lang.php index eb8733618..c3d1639ff 100644 --- a/lib/plugins/revert/lang/zh/lang.php +++ b/lib/plugins/revert/lang/zh/lang.php @@ -13,6 +13,7 @@ * @author caii * @author Hiphen Lee * @author caii, patent agent in China + * @author lainme993@gmail.com */ $lang['menu'] = '还原管理器'; $lang['filter'] = '搜索包含垃圾信息的页面'; diff --git a/lib/plugins/usermanager/lang/zh/lang.php b/lib/plugins/usermanager/lang/zh/lang.php index 9bfa496c2..c1cb0c91a 100644 --- a/lib/plugins/usermanager/lang/zh/lang.php +++ b/lib/plugins/usermanager/lang/zh/lang.php @@ -12,6 +12,7 @@ * @author caii * @author Hiphen Lee * @author caii, patent agent in China + * @author lainme993@gmail.com */ $lang['menu'] = '用户管理器'; $lang['noauth'] = '(用户认证不可用)'; -- cgit v1.2.3 From ca19d8eda91766ccb74c075e1baebdec19c0be95 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Mon, 19 Sep 2011 21:02:33 +0200 Subject: Fix resizing and file panel AJAX-based tabs --- lib/scripts/media.js | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 54309640c..5e254fe84 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -84,7 +84,7 @@ var dw_mediamanager = { .delegate('.qq-upload-file a', 'click', dw_mediamanager.details); // changing opened tab in the file details panel - jQuery('#mediamanager__page div.file').delegate('#mediamanager__tabs_details a', 'click', dw_mediamanager.details) + jQuery('#mediamanager__page div.file').delegate('ul.tabs a', 'click', dw_mediamanager.details) // "update new version" button .delegate('#mediamanager__btn_update', 'submit', dw_mediamanager.list) // revisions form @@ -410,9 +410,7 @@ var dw_mediamanager = { DOKU_BASE + 'lib/exe/ajax.php', params, function (data) { - jQuery('.ui-resizable').each(function(){ - jQuery(this).resizable('destroy'); - }); + dw_mediamanager.$resizables().resizable('destroy'); $content.html(data); @@ -483,32 +481,36 @@ var dw_mediamanager = { if (layout_height < height) { layout_height = height; jQuery('#mediamanager__page div.panelContent').height(height); - $resizable.height(height+100); + dw_mediamanager.$resizables().height(height+100); } dw_mediamanager.opacity_slider(); dw_mediamanager.portions_slider(); }, + $resizables: function () { + return jQuery('#mediamanager__page').find('div.namespaces, div.filelist'); + }, + /** * Updates mediamanager layout * * @author Kate Arzamastseva */ update_resizable: function () { - $resizable = jQuery("#mediamanager__page .layout-resizable"); + $resizables = dw_mediamanager.$resizables(); - $resizable.resizable({ handles: 'e' , + $resizables.resizable({ handles: 'e' , resize: function(event, ui){ var w = 0; - $resizable.each(function() { + $resizables.each(function() { w += jQuery(this).width(); }); wSum = w + parseFloat(jQuery('#mediamanager__page div.file').css("min-width")); // max width of resizable column var maxWidth = 0.95 * jQuery('#mediamanager__page').width() - wSum + jQuery(this).width() - 30; - $resizable.resizable( "option", "maxWidth", maxWidth ); + $resizables.resizable( "option", "maxWidth", maxWidth ); // percentage width of the first two columns var wLeft = ( 100*(w+30) / jQuery('#mediamanager__page').width() ); @@ -518,7 +520,7 @@ var dw_mediamanager = { wRight += "%"; jQuery('#mediamanager__page div.file').width(wRight); - $resizable.each(function() { + $resizables.each(function() { w = jQuery(this).width(); w = (100 * w / jQuery('#mediamanager__page').width()); w += "%"; @@ -534,7 +536,7 @@ var dw_mediamanager = { var height = windowHeight - 300; layout_height = height; jQuery('#mediamanager__page .panelContent').height(height); - $resizable.height(height+100); + $resizables.height(height+100); }, /** -- cgit v1.2.3 From bc314c5832351325feac48564dae39a93321d99a Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Tue, 20 Sep 2011 10:47:46 +0100 Subject: media manager: improved the panel widths --- lib/tpl/default/mediamanager.css | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'lib') diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css index e61d07842..a83bb19cc 100644 --- a/lib/tpl/default/mediamanager.css +++ b/lib/tpl/default/mediamanager.css @@ -6,36 +6,31 @@ } #mediamanager__page { - min-width: 840px; + min-width: 800px; width: 100%; - overflow-x: auto; text-align: left; } #mediamanager__page .panel { float: left; - margin-right: 10px; -} -#mediamanager__page .panel.file { - margin-right: 0; } #mediamanager__page .namespaces { width: 15%; - min-width: 125px; + min-width: 120px; } #mediamanager__page .filelist { - width: 45%; - min-width: 375px; + width: 50%; + min-width: 400px; } #mediamanager__page .file { width: 35%; - min-width: 290px; + min-width: 280px; } #mediamanager__page .panelHeader { background-color: __background_alt__; - margin-bottom: 10px; + margin: 0 10px 10px 0; padding: 10px 10px 8px; text-align: left; min-height: 20px; @@ -46,19 +41,24 @@ overflow-y: auto; overflow-x: hidden; padding: 0; - margin: 0; + margin: 0 10px 10px 0; position: relative; } +#mediamanager__page .file .panelHeader, +#mediamanager__page .file .panelContent { + margin-right: 0; +} + #mediamanager__page .ui-resizable-e { width: 16px; - right: -13px; + right: -3px; /* icon from Crystal Clear icon set (LGPL) */ background: transparent url(images/resizecol.png) 0 25px no-repeat; } #mediamanager__page .ui-resizable-e:hover { width: 6px; - right: -8px; + right: 2px; background-image: none; background-color: __background_alt__; } @@ -290,10 +290,11 @@ #mediamanager__page .file div.image { margin-bottom: 5px; + text-align: center; } #mediamanager__page .file div.image img { - width: 99%; + width: 100%; } #mediamanager__page .file dl { -- cgit v1.2.3 From f0aec085b4f30f98db19b1e59400356013f14c4e Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Tue, 13 Sep 2011 12:02:09 +0200 Subject: Only resize to fullscreen if screen is big enough --- lib/scripts/media.js | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) (limited to 'lib') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 5e254fe84..8200de730 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -23,7 +23,9 @@ var dw_mediamanager = { view: false, layout_width: 0, - layout_height: 0, + + // The minimum height of the full-screen mediamanager in px + minHeights: {thumbs: 200, rows: 100}, init: function () { var $content, $tree; @@ -71,7 +73,6 @@ var dw_mediamanager = { dw_mediamanager.image_diff(); dw_mediamanager.init_ajax_uploader(); - console.log(jQuery('#mediamanager__page div.filelist').find('div.panelContent a')); // changing opened tab in the file list panel jQuery('#mediamanager__page div.filelist').delegate('ul.tabs a', 'click', dw_mediamanager.list) // loading file details @@ -367,6 +368,8 @@ var dw_mediamanager = { DokuCookie.setValue('view', type); } dw_mediamanager.view = type; + + dw_mediamanager.resize(); }, /** @@ -476,13 +479,7 @@ var dw_mediamanager = { jQuery(this).width(w); }); - var windowHeight = jQuery(window).height(); - var height = windowHeight - 300; - if (layout_height < height) { - layout_height = height; - jQuery('#mediamanager__page div.panelContent').height(height); - dw_mediamanager.$resizables().height(height+100); - } + dw_mediamanager.resize(); dw_mediamanager.opacity_slider(); dw_mediamanager.portions_slider(); @@ -532,11 +529,27 @@ var dw_mediamanager = { } }); - var windowHeight = jQuery(window).height(); - var height = windowHeight - 300; - layout_height = height; - jQuery('#mediamanager__page .panelContent').height(height); - $resizables.height(height+100); + dw_mediamanager.resize(); + }, + + resize: function () { + var $contents = jQuery('#mediamanager__page div.panelContent'), + height = jQuery(window).height() - jQuery(document).height() + + Math.max.apply(null, jQuery.map($contents, function (v) { + return jQuery(v).height(); + })); + + // If the screen is too small, don’t try to resize + if (height < dw_mediamanager.minHeights[dw_mediamanager.view]) { + $contents.add(dw_mediamanager.$resizables()).height('auto'); + } else { + $contents.height(height); + dw_mediamanager.$resizables().each(function () { + var $this = jQuery(this); + $this.height(height + $this.find('div.panelContent').offset().top - + $this.offset().top); + }); + } }, /** -- cgit v1.2.3 From 33e91473c28e8f1c8542459bb4d755beb620305e Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Thu, 22 Sep 2011 21:37:33 +0200 Subject: Resize images in fullscreen mediamanager using CSS --- lib/tpl/default/mediamanager.css | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css index 9d2930af6..619ca9929 100644 --- a/lib/tpl/default/mediamanager.css +++ b/lib/tpl/default/mediamanager.css @@ -175,8 +175,10 @@ height: 90px; overflow: hidden; } -#mediamanager__page .filelist .thumbs li .tiny { - display: none; + +#mediamanager__page .filelist .thumbs li .thumb img { + max-width: 90px; + max-height: 90px; } #mediamanager__page .filelist .thumbs li .name, @@ -223,8 +225,10 @@ height: 40px; text-align: center; } -#mediamanager__page .filelist .rows li .thumb { - display: none; + +#mediamanager__page .filelist .rows li .thumb img { + max-width: 40px; + max-height: 40px; } #mediamanager__page .filelist .rows li .image span { -- cgit v1.2.3 From 554a8c9ffe7dc256ff10fdb49a144ca7dc510989 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Sat, 24 Sep 2011 16:34:32 +0200 Subject: More mediamanager reworking --- lib/scripts/media.js | 164 +++++++++++++++++++++++++++------------------------ 1 file changed, 87 insertions(+), 77 deletions(-) (limited to 'lib') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 8200de730..b3768b9db 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -19,8 +19,8 @@ var dw_mediamanager = { size: false, forbidden_opts: {}, - // File list view type - view: false, + // File list options + view_opts: {list: false, sort: false}, layout_width: 0, @@ -66,7 +66,8 @@ var dw_mediamanager = { }}); $tree.delegate('a', 'click', dw_mediamanager.list); - dw_mediamanager.set_filelist_view(dw_mediamanager.view, false); + // Init view property + dw_mediamanager.set_fileview_list(); dw_mediamanager.init_options(); @@ -100,37 +101,43 @@ var dw_mediamanager = { // less/more recent buttons in media revisions form .delegate('.btn_newer, .btn_older', 'submit', dw_mediamanager.details); + dw_mediamanager.update_resizable(); + dw_mediamanager.layout_width = jQuery("#mediamanager__page").width(); + jQuery(window).resize(dw_mediamanager.window_resize); }, init_options: function () { var $options = jQuery('div.filelist div.panelHeader form.options'), - $listType, $sortBy; + $listType, $sortBy, $both; if ($options.length === 0) { return; } $listType = $options.find('li.listType'); $sortBy = $options.find('li.sortBy'); + $both = $listType.add($sortBy); // Remove the submit button $options.find('input[type=submit]').parent().hide(); // Prepare HTML for jQuery UI buttonset - $listType.add($sortBy).find('label').each(function () { + $both.find('label').each(function () { var $this = jQuery(this); $this.children('input').appendTo($this.parent()); $this.find('span span').addClass('a11y'); }); // Init buttonset - $listType.add($sortBy).buttonset(); + $both.buttonset(); // Change handlers $listType.children('input').change(function (event) { - event.preventDefault(); - dw_mediamanager.set_filelist_view(this.value, true); + dw_mediamanager.set_fileview_list(); + }); + $sortBy.children('input').change(function (event) { + dw_mediamanager.set_fileview_sort(); + dw_mediamanager.list.call(this, event); }); - $sortBy.children('input').change(dw_mediamanager.list); }, /** @@ -293,16 +300,19 @@ var dw_mediamanager = { */ list: function (event) { var $link, $content, params; - $link = jQuery(this); - event.preventDefault(); + if (event) { + event.preventDefault(); + } jQuery('div.success, div.info, div.error, div.notify').remove(); - if (document.getElementById('media__content')) { - //popup - $content = jQuery('#media__content'); - } else { + $link = jQuery(this); + + //popup + $content = jQuery('#media__content'); + + if ($content.length === 0) { //fullscreen media manager $content = jQuery('div.filelist'); @@ -314,33 +324,18 @@ var dw_mediamanager = { } } - params = ''; + params = 'call=medialist&'; if ($link[0].search) { - params = $link[0].search.substr(1)+'&call=medialist'; - } else if ($link[0].action) { - params = dw_mediamanager.form_params($link)+'&call=medialist'; - } else if ($link.parents('form')) { - params = dw_mediamanager.form_params($link.parents('form'))+'&call=medialist'; - - if ($link.parents('form').hasClass('options')) { - DokuCookie.setValue('sort', $link.val()); - params += '&q=' + $link.val(); - params += '&mediado=searchlist'; - } + params += $link[0].search.substr(1); + } else if ($link.is('form')) { + params += dw_mediamanager.form_params($link); + } else if ($link.closest('form').length > 0) { + params += dw_mediamanager.form_params($link.closest('form')); } // fetch the subtree dw_mediamanager.update_content($content, params); - - if (document.getElementById('media__content')) { - //popup - $content = jQuery('#media__content'); - $content.html('...'); - } else { - //fullscreen media manager - jQuery('div.panelContent', $content).html('...'); - } }, /** @@ -350,26 +345,42 @@ var dw_mediamanager = { */ form_params: function ($form) { if (!$form.length) return; - var elements = $form.serialize(); var action = ''; var i = $form[0].action.indexOf('?'); if (i >= 0) action = $form[0].action.substr(i+1); - return elements+'&'+action; + return action+'&'+$form.serialize(); }, - set_filelist_view: function (type, cookies) { - type = type || DokuCookie.getValue('view'); + set_fileview_list: function (new_type) { + dw_mediamanager.set_fileview_opt(['list', 'listType', function (new_type) { + jQuery('div.filelist div.panelContent ul') + .toggleClass('rows', new_type === 'rows') + .toggleClass('thumbs', new_type === 'thumbs'); + }], new_type); - jQuery('div.filelist div.panelContent ul') - .toggleClass('rows', type === 'rows') - .toggleClass('thumbs', type === 'thumbs'); + // FIXME: Move to onchange handler (opt[2])? + dw_mediamanager.resize(); + }, - if (cookies) { - DokuCookie.setValue('view', type); + set_fileview_sort: function (new_sort) { + dw_mediamanager.set_fileview_opt(['sort', 'sortBy', function (new_sort) { + // FIXME + }], new_sort); + }, + + set_fileview_opt: function (opt, new_val) { + if (typeof new_val === 'undefined') { + new_val = jQuery('form.options li.' + opt[1] + ' input') + .filter(':checked').val(); } - dw_mediamanager.view = type; - dw_mediamanager.resize(); + if (new_val !== dw_mediamanager.view_opts[opt[0]]) { + opt[2](new_val); + + DokuCookie.setValue(opt[0], new_val); + + dw_mediamanager.view_opts[opt[0]] = new_val; + } }, /** @@ -384,31 +395,33 @@ var dw_mediamanager = { jQuery('div.success, div.info, div.error, div.notify').remove(); - if ($link[0].id == 'mediamanager__btn_delete' && !confirm(LANG['del_confirm'])) return false; - if ($link[0].id == 'mediamanager__btn_restore' && !confirm(LANG['restore_confirm'])) return false; + if ($link[0].id == 'mediamanager__btn_delete' && !confirm(LANG.del_confirm)) { + return false; + } + if ($link[0].id == 'mediamanager__btn_restore' && !confirm(LANG.restore_confirm)) { + return false; + } $content = jQuery('div.file'); - params = ''; + params = 'call=mediadetails&'; if ($link[0].search) { - params = $link[0].search.substr(1)+'&call=mediadetails'; - } else if ($link[0].action) { - params = dw_mediamanager.form_params($link)+'&call=mediadetails'; - } else if ($link.parents('form')) { - params = dw_mediamanager.form_params($link.parents('form'))+'&call=mediadetails'; + params += $link[0].search.substr(1); + } else if ($link.is('form')) { + params += dw_mediamanager.form_params($link); + } else if ($link.closest('form').length > 0) { + params += dw_mediamanager.form_params($link.closest('form')); } - update_list = ($link[0].id == 'mediamanager__btn_delete' || $link[0].id == 'mediamanager__btn_restore'); - dw_mediamanager.update_content($content, params, update_list); + update_list = ($link[0].id == 'mediamanager__btn_delete' || + $link[0].id == 'mediamanager__btn_restore'); - if (jQuery('div.panelContent', $content).length) { - jQuery('div.panelContent', $content).html('...'); - } else { - jQuery($content).html('...'); - } + dw_mediamanager.update_content($content, params, update_list); }, update_content: function ($content, params, update_list) { + var $container; + jQuery.post( DOKU_BASE + 'lib/exe/ajax.php', params, @@ -422,22 +435,25 @@ var dw_mediamanager = { dw_mediamanager.update_resizable(); dw_behaviour.revisionBoxHandler(); - dw_mediamanager.set_filelist_view(dw_mediamanager.view, false); + + // Make sure that the list view style stays the same + dw_mediamanager.set_fileview_list(dw_mediamanager.view_opts.list); + dw_mediamanager.image_diff(); dw_mediamanager.init_ajax_uploader(); dw_mediamanager.init_options(); if (update_list) { - var $link1, $content1, params1; - $link1 = jQuery('a.files'); - params1 = $link1[0].search.substr(1)+'&call=medialist'; - $content1 = jQuery('div.filelist'); - dw_mediamanager.update_content($content1, params1); - jQuery('div.panelContent', $content1).html('...'); + dw_mediamanager.list.call(jQuery('a.files')[0]); } }, 'html' ); + $container = $content.find('div.panelContent'); + if ($container.length === 0) { + $container = $content; + } + $container.html('...'); }, window_resize: function () { @@ -540,7 +556,7 @@ var dw_mediamanager = { })); // If the screen is too small, don’t try to resize - if (height < dw_mediamanager.minHeights[dw_mediamanager.view]) { + if (height < dw_mediamanager.minHeights[dw_mediamanager.view_opts.list]) { $contents.add(dw_mediamanager.$resizables()).height('auto'); } else { $contents.height(height); @@ -591,7 +607,7 @@ var dw_mediamanager = { $select = jQuery('#mediamanager__difftype'); $content = jQuery('#mediamanager__diff'); - params = dw_mediamanager.form_params($select.parents('form'))+'&call=mediadiff'; + params = dw_mediamanager.form_params($select.closest('form'))+'&call=mediadiff'; jQuery.post( DOKU_BASE + 'lib/exe/ajax.php', params, @@ -970,10 +986,4 @@ function hasFlash(version){ return ver >= version; } -jQuery(document).ready(function() { - dw_mediamanager.update_resizable(); - dw_mediamanager.layout_width = jQuery("#mediamanager__page").width(); - jQuery(window).resize(dw_mediamanager.window_resize); -}); - jQuery(dw_mediamanager.init); -- cgit v1.2.3 From 7e3fa88e8ff41d364b6ce5c500c22d685716974b Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Sat, 24 Sep 2011 16:42:55 +0200 Subject: Fix swipe diff JS --- lib/scripts/media.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index b3768b9db..8e4cb64a0 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -653,7 +653,7 @@ var dw_mediamanager = { var $image2 = jQuery('#mediamanager__diff div.diff_portions div.image2 img'); if (!$image1.length || !$image2.length) return; - var $div = jQuery("#mediamanager__diff_layout"); + var $div = jQuery("#mediamanager__diff"); if (!$div.length) return; $div.width('100%'); -- cgit v1.2.3 From ba18c46681e5a6b3de65bc71a29aa2d04b54870b Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Sat, 24 Sep 2011 16:43:15 +0200 Subject: Small JavaScript improvements --- lib/scripts/behaviour.js | 4 +--- lib/scripts/cookie.js | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/scripts/behaviour.js b/lib/scripts/behaviour.js index cfdc89157..fc32d4ed9 100644 --- a/lib/scripts/behaviour.js +++ b/lib/scripts/behaviour.js @@ -63,9 +63,7 @@ var dw_behaviour = { quickSelect: function(){ jQuery('select.quickselect') .change(function(e){ e.target.form.submit(); }) - .parents('form').find('input[type=submit]').each(function(){ - if (!jQuery(this).hasClass('show')) jQuery(this).hide(); - }); + .closest('form').find('input[type=submit]').not('.show').hide(); }, /** diff --git a/lib/scripts/cookie.js b/lib/scripts/cookie.js index c70d0bb56..3ad67bfa4 100644 --- a/lib/scripts/cookie.js +++ b/lib/scripts/cookie.js @@ -60,5 +60,5 @@ var DokuCookie = { this.data[decodeURIComponent(parts[i])] = decodeURIComponent(parts[i+1]); } } - } + } }; -- cgit v1.2.3 From 7e4e38eb0a22e35382c5ef897d7351323e4f4887 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 25 Sep 2011 09:27:40 +0200 Subject: Fixed the Windows share warning (related to #2274) --- lib/scripts/behaviour.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/scripts/behaviour.js b/lib/scripts/behaviour.js index fc32d4ed9..20b408322 100644 --- a/lib/scripts/behaviour.js +++ b/lib/scripts/behaviour.js @@ -72,13 +72,13 @@ var dw_behaviour = { * @author Michael Klier */ checkWindowsShares: function() { - if(!LANG.nosmblinks || document.all !== null) { + if(!LANG.nosmblinks || typeof(document.all) !== 'undefined') { // No warning requested or none necessary return; } jQuery('a.windows').live('click', function(){ - alert(LANG.nosmblinks); + alert(LANG.nosmblinks.replace(/\\n/,"\n")); }); }, -- cgit v1.2.3 From 9a71fb5c963f2943a45bc4d0c77a84dd788e17b3 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 25 Sep 2011 11:47:53 +0100 Subject: media manager: fixed and improved diff views --- lib/scripts/media.js | 16 ++++++++-------- lib/tpl/default/mediamanager.css | 38 +++++++++++++++----------------------- 2 files changed, 23 insertions(+), 31 deletions(-) (limited to 'lib') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 8e4cb64a0..76274c868 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -580,7 +580,7 @@ var dw_mediamanager = { if (!$form.length) return; $label = jQuery(document.createElement('label')); - $label.append(''+LANG.media_diff+''); + $label.append(''+LANG.media_diff+' '); $select = jQuery(document.createElement('select')) .attr('id', 'mediamanager__difftype') .attr('name', 'difftype') @@ -626,10 +626,10 @@ var dw_mediamanager = { * @author Kate Arzamastseva */ opacity_slider: function () { - var $slider = jQuery( "#mediamanager__diff div.diff_slider" ); + var $slider = jQuery( "#mediamanager__diff div.slider" ); if (!$slider.length) return; - var $image = jQuery('#mediamanager__diff div.diff_opacity div.image1 img'); + var $image = jQuery('#mediamanager__diff div.imageDiff.opacity div.image1 img'); if (!$image.length) return; $slider.width($image.width()-20); @@ -639,7 +639,7 @@ var dw_mediamanager = { $slider.slider("option", "step", 0.001); $slider.slider("option", "value", 0.5); $slider.bind("slide", function(event, ui) { - jQuery('#mediamanager__diff div.diff_opacity div.image2 img').css({ opacity: $slider.slider("option", "value")}); + jQuery('#mediamanager__diff div.imageDiff.opacity div.image2 img').css({ opacity: $slider.slider("option", "value")}); }); }, @@ -649,8 +649,8 @@ var dw_mediamanager = { * @author Kate Arzamastseva */ portions_slider: function () { - var $image1 = jQuery('#mediamanager__diff div.diff_portions div.image1 img'); - var $image2 = jQuery('#mediamanager__diff div.diff_portions div.image2 img'); + var $image1 = jQuery('#mediamanager__diff div.imageDiff.portions div.image1 img'); + var $image2 = jQuery('#mediamanager__diff div.imageDiff.portions div.image2 img'); if (!$image1.length || !$image2.length) return; var $div = jQuery("#mediamanager__diff"); @@ -669,7 +669,7 @@ var dw_mediamanager = { $image2.width($image1.width()); $image1.width($image1.width()); - var $slider = jQuery("#mediamanager__diff div.diff_slider"); + var $slider = jQuery("#mediamanager__diff div.slider"); if (!$slider.length) return; $slider.width($image1.width()-20); @@ -679,7 +679,7 @@ var dw_mediamanager = { $slider.slider("option", "step", 1); $slider.slider("option", "value", 50); $slider.bind("slide", function(event, ui) { - jQuery('#mediamanager__diff div.diff_portions div.image2').css({ width: $slider.slider("option", "value")+'%'}); + jQuery('#mediamanager__diff div.imageDiff.portions div.image2').css({ width: $slider.slider("option", "value")+'%'}); }); }, diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css index 619ca9929..03c2cb9ce 100644 --- a/lib/tpl/default/mediamanager.css +++ b/lib/tpl/default/mediamanager.css @@ -382,55 +382,47 @@ font-size: 90%; } -/* Image diff */ - #mediamanager__diff dl dd strong{ background-color: __highlight__; color: __text__; font-weight: normal; } -#mediamanager__form_diffview { +/* Image diff */ + +#mediamanager__page .file form.diffView { margin-bottom: 10px; display: block; } +#mediamanager__diff div.slider { + margin: 10px; + width: 95%; +} - - - -#mediamanager__diff_layout { +#mediamanager__diff .imageDiff { position: relative; } - -#mediamanager__diff_layout div { +#mediamanager__diff .imageDiff .image1, +#mediamanager__diff .imageDiff .image2 { position: absolute; top: 0; left: 0; -} - -#mediamanager__diff div.image1 { width: 97%; } -#mediamanager__diff_layout div img { - width: 100%; -} - -#mediamanager__diff div.diff_opacity div.image2 { - width: 97%; +#mediamanager__diff .imageDiff.opacity .image2 { -moz-opacity: 0.5; -khtml-opacity: 0.5; opacity: 0.5; } -#mediamanager__diff div.diff_portions div.image2 { - width: 97%; +#mediamanager__diff .imageDiff.portions .image2 { border-right: 1px solid red; overflow: hidden; } -#mediamanager__diff div.diff_slider { - margin: 10px; - width: 95%; +#mediamanager__diff .imageDiff img { + width: 100%; } + -- cgit v1.2.3 From 6087dde90bed311b68f1999f55ac81fe78c63c2b Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 25 Sep 2011 16:56:43 +0100 Subject: renamed mediamanager.css to start with underscore --- lib/tpl/default/_mediamanager.css | 428 ++++++++++++++++++++++++++++++++++++++ lib/tpl/default/mediamanager.css | 428 -------------------------------------- lib/tpl/default/style.ini | 2 +- 3 files changed, 429 insertions(+), 429 deletions(-) create mode 100644 lib/tpl/default/_mediamanager.css delete mode 100644 lib/tpl/default/mediamanager.css (limited to 'lib') diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css new file mode 100644 index 000000000..03c2cb9ce --- /dev/null +++ b/lib/tpl/default/_mediamanager.css @@ -0,0 +1,428 @@ + +/*____________ Layout ____________*/ + +#mediamanager__page h1 { + margin: 0 0 .5em; +} + +#mediamanager__page { + min-width: 800px; + width: 100%; + text-align: left; +} + +#mediamanager__page .panel { + float: left; +} + +#mediamanager__page .namespaces { + width: 15%; + min-width: 120px; +} +#mediamanager__page .filelist { + width: 50%; + min-width: 400px; +} +#mediamanager__page .file { + width: 35%; + min-width: 280px; +} + +#mediamanager__page .panelHeader { + background-color: __background_alt__; + margin: 0 10px 10px 0; + padding: 10px 10px 8px; + text-align: left; + min-height: 20px; + overflow: hidden; +} + +#mediamanager__page .panelContent { + overflow-y: auto; + overflow-x: hidden; + padding: 0; + margin: 0 10px 10px 0; + position: relative; +} + +#mediamanager__page .file .panelHeader, +#mediamanager__page .file .panelContent { + margin-right: 0; +} + +#mediamanager__page .ui-resizable-e { + width: 6px; + right: 2px; + background: transparent url(images/resizecol.png) center center no-repeat; +} +#mediamanager__page .ui-resizable-e:hover { + background-color: __background_alt__; +} + +/*____________ Namespaces tree ____________*/ + +#mediamanager__page .namespaces h2 { + font-size: 1em; + display: inline-block; + border-width: 0; + padding: .3em .8em; + margin: 0 .3em 0 0; + border-radius: .5em .5em 0 0; + font-weight: normal; + background-color: __background_alt__; + color: __text__; + line-height: 1.5em; +} + +#mediamanager__page .namespaces ul { + margin-left: .2em; + list-style: none; +} +#mediamanager__page .namespaces ul ul { + margin-left: 1em; +} + +#mediamanager__page .namespaces ul .selected { + background-color: __highlight__; + font-weight: bold; +} + +/*____________ Panel header ____________*/ + +#mediamanager__page .panelHeader h3 { + float: left; + font-weight: normal; + font-size: 1em; + padding: 0; + margin: 0 0 3px; +} + +#mediamanager__page .panelHeader form.options { + float: right; + margin-top: -3px; +} + +#mediamanager__page .panelHeader ul { + list-style: none; + margin: 0; + padding: 0; +} +#mediamanager__page .panelHeader ul li { + color: __text__; + float: left; + line-height: 1; + padding-left: 3px; +} + +#mediamanager__page .panelHeader ul li.listType { + padding-left: 30px; + background: url('../../images/icon-list.png') 3px 1px no-repeat; +} +#mediamanager__page .panelHeader ul li.sortBy { + padding-left: 30px; + background: url('../../images/icon-sort.png') 3px 1px no-repeat; +} + +#mediamanager__page .panelHeader form.options .ui-buttonset label{ + font-size: 90%; + margin-right: -0.4em; +} +#mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text { + padding: .4em .7em; + line-height: 1; +} + +/*____________ File list ____________*/ + +#mediamanager__page .filelist ul { + padding: 0; + margin: 0; +} + +#mediamanager__page .filelist .panelContent ul li:hover { + background-color: __background_alt__; +} + +/* thumbs */ + +#mediamanager__page .filelist .thumbs li { + width: 100px; + min-height: 130px; + display: inline-block; + display: -moz-inline-stack; + /* the right margin should visually be 10px, but because of its inline-block nature the whitespace inbetween is about 4px more */ + margin: 0 6px 10px 0; + background-color: __background_neu__; + color: __text__; + padding: 5px; + vertical-align: top; + text-align: center; + position: relative; + line-height: 1.2; +} +* html #mediamanager__page .filelist .thumbs li { + display: inline; + zoom: 1; +} +*+html #mediamanager__page .filelist .thumbs li { + display: inline; +} + +#mediamanager__page .filelist .thumbs li .image { + vertical-align: middle; + display: table-cell; + width: 100px; + height: 90px; + overflow: hidden; +} + +#mediamanager__page .filelist .thumbs li .thumb img { + max-width: 90px; + max-height: 90px; +} + +#mediamanager__page .filelist .thumbs li .name, +#mediamanager__page .filelist .thumbs li .size, +#mediamanager__page .filelist .thumbs li .filesize, +#mediamanager__page .filelist .thumbs li .date { + display: block; + overflow: hidden; + width: 90px; + white-space: nowrap; +} +#mediamanager__page .filelist .thumbs li .name { + padding: 5px 0; + font-weight: bold; +} +#mediamanager__page .filelist .thumbs li .date { + font-style: italic; + white-space: normal; +} + +/* rows */ + +#mediamanager__page .filelist .rows li { + list-style: none; + display: block; + position: relative; + max-height: 50px; + margin: 0; + margin-bottom: 3px; + background-color: __background__; + color: __text__; + overflow: hidden; +} + +#mediamanager__page .filelist .rows li:nth-child(2n+1) { + background-color: __background_neu__; +} + +#mediamanager__page .filelist .rows li .image { + width: 10%; + display: block; + overflow: hidden; + float: left; + height: 40px; + text-align: center; +} + +#mediamanager__page .filelist .rows li .thumb img { + max-width: 40px; + max-height: 40px; +} + +#mediamanager__page .filelist .rows li .image span { + vertical-align: middle; + text-align: center; + display: table-cell; + width: 100px; + height: 40px; +} +#mediamanager__page .filelist .rows .icon { + margin-top: 12px; +} + +#mediamanager__page .filelist .rows li .name, +#mediamanager__page .filelist .rows li .size, +#mediamanager__page .filelist .rows li .filesize, +#mediamanager__page .filelist .rows li .date { + overflow: hidden; + float: left; + margin-left: 1%; + white-space: nowrap; +} + +#mediamanager__page .filelist .rows li .name { + width: 30%; + font-weight: bold; +} +#mediamanager__page .filelist .rows li .size, +#mediamanager__page .filelist .rows li .filesize { + width: 15%; +} +#mediamanager__page .filelist .rows li .date { + width: 20%; + font-style: italic; + white-space: normal; +} + +/*____________ Upload panel ____________*/ + +#mediamanager__page div.upload { + padding-bottom: 0.5em; +} + +#media__content #mediamanager__uploader { + border-bottom: 1px solid __border__; + padding-bottom: 0.5em; +} + +/*____________ File preview ____________*/ + +#mediamanager__page .file ul.actions { + text-align: center; + margin: 0 0 5px; + list-style: none; +} +#mediamanager__page .file ul.actions li { + display: inline; +} + +#mediamanager__page .file div.image { + margin-bottom: 5px; + text-align: center; +} + +#mediamanager__page .file div.image img { + width: 100%; +} + +#mediamanager__page .file dl { +} +#mediamanager__page .file dl dt { + font-weight: bold; + display: block; + background-color: __background_alt__; +} +#mediamanager__page .file dl dd { + display: block; + background-color: __background_neu__; +} + + +/*____________ Meta data edit form ____________*/ + +#mediamanager__page form.meta div.row { + margin-bottom: 5px; +} + +#mediamanager__page form.meta label span { + display: block; +} + +#mediamanager__page form.meta input { + width: 50%; +} + +#mediamanager__page form.meta input.button { + width: auto; +} + +#mediamanager__page form.meta textarea.edit { + height: 6em; + width: 95%; + min-width: 95%; + max-width: 95%; +} + +/*____________ Revisions form ____________*/ + +#mediamanager__page #page__revisions ul { + margin-left: 10px; + list-style-type: none; +} + +#mediamanager__page #page__revisions ul li div.li div { + font-size: 90%; + color: __text_neu__; + padding-left: 18px; +} + +#mediamanager__page #page__revisions ul li div.li input { + position: relative; + top: 1px; +} + +/* File diff */ + +#mediamanager__diff { +} + +#mediamanager__diff td, +#mediamanager__diff th { + width: 48%; + margin: 0 5px 10px 0; + padding: 0; + vertical-align: top; + text-align: left; +} + +/* For IE7 */ +*:first-child+html #mediamanager__diff td { + width: 45%; +} + +#mediamanager__diff th { + font-weight: normal; +} +#mediamanager__diff th a { + font-weight: bold; +} +#mediamanager__diff th span { + font-size: 90%; +} + +#mediamanager__diff dl dd strong{ + background-color: __highlight__; + color: __text__; + font-weight: normal; +} + +/* Image diff */ + +#mediamanager__page .file form.diffView { + margin-bottom: 10px; + display: block; +} + +#mediamanager__diff div.slider { + margin: 10px; + width: 95%; +} + +#mediamanager__diff .imageDiff { + position: relative; +} +#mediamanager__diff .imageDiff .image1, +#mediamanager__diff .imageDiff .image2 { + position: absolute; + top: 0; + left: 0; + width: 97%; +} + +#mediamanager__diff .imageDiff.opacity .image2 { + -moz-opacity: 0.5; + -khtml-opacity: 0.5; + opacity: 0.5; +} + +#mediamanager__diff .imageDiff.portions .image2 { + border-right: 1px solid red; + overflow: hidden; +} + +#mediamanager__diff .imageDiff img { + width: 100%; +} + diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css deleted file mode 100644 index 03c2cb9ce..000000000 --- a/lib/tpl/default/mediamanager.css +++ /dev/null @@ -1,428 +0,0 @@ - -/*____________ Layout ____________*/ - -#mediamanager__page h1 { - margin: 0 0 .5em; -} - -#mediamanager__page { - min-width: 800px; - width: 100%; - text-align: left; -} - -#mediamanager__page .panel { - float: left; -} - -#mediamanager__page .namespaces { - width: 15%; - min-width: 120px; -} -#mediamanager__page .filelist { - width: 50%; - min-width: 400px; -} -#mediamanager__page .file { - width: 35%; - min-width: 280px; -} - -#mediamanager__page .panelHeader { - background-color: __background_alt__; - margin: 0 10px 10px 0; - padding: 10px 10px 8px; - text-align: left; - min-height: 20px; - overflow: hidden; -} - -#mediamanager__page .panelContent { - overflow-y: auto; - overflow-x: hidden; - padding: 0; - margin: 0 10px 10px 0; - position: relative; -} - -#mediamanager__page .file .panelHeader, -#mediamanager__page .file .panelContent { - margin-right: 0; -} - -#mediamanager__page .ui-resizable-e { - width: 6px; - right: 2px; - background: transparent url(images/resizecol.png) center center no-repeat; -} -#mediamanager__page .ui-resizable-e:hover { - background-color: __background_alt__; -} - -/*____________ Namespaces tree ____________*/ - -#mediamanager__page .namespaces h2 { - font-size: 1em; - display: inline-block; - border-width: 0; - padding: .3em .8em; - margin: 0 .3em 0 0; - border-radius: .5em .5em 0 0; - font-weight: normal; - background-color: __background_alt__; - color: __text__; - line-height: 1.5em; -} - -#mediamanager__page .namespaces ul { - margin-left: .2em; - list-style: none; -} -#mediamanager__page .namespaces ul ul { - margin-left: 1em; -} - -#mediamanager__page .namespaces ul .selected { - background-color: __highlight__; - font-weight: bold; -} - -/*____________ Panel header ____________*/ - -#mediamanager__page .panelHeader h3 { - float: left; - font-weight: normal; - font-size: 1em; - padding: 0; - margin: 0 0 3px; -} - -#mediamanager__page .panelHeader form.options { - float: right; - margin-top: -3px; -} - -#mediamanager__page .panelHeader ul { - list-style: none; - margin: 0; - padding: 0; -} -#mediamanager__page .panelHeader ul li { - color: __text__; - float: left; - line-height: 1; - padding-left: 3px; -} - -#mediamanager__page .panelHeader ul li.listType { - padding-left: 30px; - background: url('../../images/icon-list.png') 3px 1px no-repeat; -} -#mediamanager__page .panelHeader ul li.sortBy { - padding-left: 30px; - background: url('../../images/icon-sort.png') 3px 1px no-repeat; -} - -#mediamanager__page .panelHeader form.options .ui-buttonset label{ - font-size: 90%; - margin-right: -0.4em; -} -#mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text { - padding: .4em .7em; - line-height: 1; -} - -/*____________ File list ____________*/ - -#mediamanager__page .filelist ul { - padding: 0; - margin: 0; -} - -#mediamanager__page .filelist .panelContent ul li:hover { - background-color: __background_alt__; -} - -/* thumbs */ - -#mediamanager__page .filelist .thumbs li { - width: 100px; - min-height: 130px; - display: inline-block; - display: -moz-inline-stack; - /* the right margin should visually be 10px, but because of its inline-block nature the whitespace inbetween is about 4px more */ - margin: 0 6px 10px 0; - background-color: __background_neu__; - color: __text__; - padding: 5px; - vertical-align: top; - text-align: center; - position: relative; - line-height: 1.2; -} -* html #mediamanager__page .filelist .thumbs li { - display: inline; - zoom: 1; -} -*+html #mediamanager__page .filelist .thumbs li { - display: inline; -} - -#mediamanager__page .filelist .thumbs li .image { - vertical-align: middle; - display: table-cell; - width: 100px; - height: 90px; - overflow: hidden; -} - -#mediamanager__page .filelist .thumbs li .thumb img { - max-width: 90px; - max-height: 90px; -} - -#mediamanager__page .filelist .thumbs li .name, -#mediamanager__page .filelist .thumbs li .size, -#mediamanager__page .filelist .thumbs li .filesize, -#mediamanager__page .filelist .thumbs li .date { - display: block; - overflow: hidden; - width: 90px; - white-space: nowrap; -} -#mediamanager__page .filelist .thumbs li .name { - padding: 5px 0; - font-weight: bold; -} -#mediamanager__page .filelist .thumbs li .date { - font-style: italic; - white-space: normal; -} - -/* rows */ - -#mediamanager__page .filelist .rows li { - list-style: none; - display: block; - position: relative; - max-height: 50px; - margin: 0; - margin-bottom: 3px; - background-color: __background__; - color: __text__; - overflow: hidden; -} - -#mediamanager__page .filelist .rows li:nth-child(2n+1) { - background-color: __background_neu__; -} - -#mediamanager__page .filelist .rows li .image { - width: 10%; - display: block; - overflow: hidden; - float: left; - height: 40px; - text-align: center; -} - -#mediamanager__page .filelist .rows li .thumb img { - max-width: 40px; - max-height: 40px; -} - -#mediamanager__page .filelist .rows li .image span { - vertical-align: middle; - text-align: center; - display: table-cell; - width: 100px; - height: 40px; -} -#mediamanager__page .filelist .rows .icon { - margin-top: 12px; -} - -#mediamanager__page .filelist .rows li .name, -#mediamanager__page .filelist .rows li .size, -#mediamanager__page .filelist .rows li .filesize, -#mediamanager__page .filelist .rows li .date { - overflow: hidden; - float: left; - margin-left: 1%; - white-space: nowrap; -} - -#mediamanager__page .filelist .rows li .name { - width: 30%; - font-weight: bold; -} -#mediamanager__page .filelist .rows li .size, -#mediamanager__page .filelist .rows li .filesize { - width: 15%; -} -#mediamanager__page .filelist .rows li .date { - width: 20%; - font-style: italic; - white-space: normal; -} - -/*____________ Upload panel ____________*/ - -#mediamanager__page div.upload { - padding-bottom: 0.5em; -} - -#media__content #mediamanager__uploader { - border-bottom: 1px solid __border__; - padding-bottom: 0.5em; -} - -/*____________ File preview ____________*/ - -#mediamanager__page .file ul.actions { - text-align: center; - margin: 0 0 5px; - list-style: none; -} -#mediamanager__page .file ul.actions li { - display: inline; -} - -#mediamanager__page .file div.image { - margin-bottom: 5px; - text-align: center; -} - -#mediamanager__page .file div.image img { - width: 100%; -} - -#mediamanager__page .file dl { -} -#mediamanager__page .file dl dt { - font-weight: bold; - display: block; - background-color: __background_alt__; -} -#mediamanager__page .file dl dd { - display: block; - background-color: __background_neu__; -} - - -/*____________ Meta data edit form ____________*/ - -#mediamanager__page form.meta div.row { - margin-bottom: 5px; -} - -#mediamanager__page form.meta label span { - display: block; -} - -#mediamanager__page form.meta input { - width: 50%; -} - -#mediamanager__page form.meta input.button { - width: auto; -} - -#mediamanager__page form.meta textarea.edit { - height: 6em; - width: 95%; - min-width: 95%; - max-width: 95%; -} - -/*____________ Revisions form ____________*/ - -#mediamanager__page #page__revisions ul { - margin-left: 10px; - list-style-type: none; -} - -#mediamanager__page #page__revisions ul li div.li div { - font-size: 90%; - color: __text_neu__; - padding-left: 18px; -} - -#mediamanager__page #page__revisions ul li div.li input { - position: relative; - top: 1px; -} - -/* File diff */ - -#mediamanager__diff { -} - -#mediamanager__diff td, -#mediamanager__diff th { - width: 48%; - margin: 0 5px 10px 0; - padding: 0; - vertical-align: top; - text-align: left; -} - -/* For IE7 */ -*:first-child+html #mediamanager__diff td { - width: 45%; -} - -#mediamanager__diff th { - font-weight: normal; -} -#mediamanager__diff th a { - font-weight: bold; -} -#mediamanager__diff th span { - font-size: 90%; -} - -#mediamanager__diff dl dd strong{ - background-color: __highlight__; - color: __text__; - font-weight: normal; -} - -/* Image diff */ - -#mediamanager__page .file form.diffView { - margin-bottom: 10px; - display: block; -} - -#mediamanager__diff div.slider { - margin: 10px; - width: 95%; -} - -#mediamanager__diff .imageDiff { - position: relative; -} -#mediamanager__diff .imageDiff .image1, -#mediamanager__diff .imageDiff .image2 { - position: absolute; - top: 0; - left: 0; - width: 97%; -} - -#mediamanager__diff .imageDiff.opacity .image2 { - -moz-opacity: 0.5; - -khtml-opacity: 0.5; - opacity: 0.5; -} - -#mediamanager__diff .imageDiff.portions .image2 { - border-right: 1px solid red; - overflow: hidden; -} - -#mediamanager__diff .imageDiff img { - width: 100%; -} - diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini index d301869f2..7d27381c9 100644 --- a/lib/tpl/default/style.ini +++ b/lib/tpl/default/style.ini @@ -15,7 +15,7 @@ _mediaoptions.css = screen _admin.css = screen _linkwiz.css = screen _subscription.css = screen -mediamanager.css = screen +_mediamanager.css = screen _tabs.css = screen _fileuploader.css = screen -- cgit v1.2.3 From 4ce531577ce9aaf635a80849d5b195e5c88eef41 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 25 Sep 2011 21:07:55 +0100 Subject: media manager: file uploader improvements --- lib/scripts/fileuploaderextended.js | 45 ++++++++++---------- lib/tpl/default/_fileuploader.css | 82 ++++++++++++++++++------------------- 2 files changed, 65 insertions(+), 62 deletions(-) (limited to 'lib') diff --git a/lib/scripts/fileuploaderextended.js b/lib/scripts/fileuploaderextended.js index ed631a9ea..f92d50754 100644 --- a/lib/scripts/fileuploaderextended.js +++ b/lib/scripts/fileuploaderextended.js @@ -76,23 +76,24 @@ qq.FileUploaderExtended = function(o){ listElement: null, template: '
    ' + - '
    ' + LANG.media_drop + '
    ' + - '
    ' + LANG.media_select + '
    ' + - '
    ' + - '
    ' + - '' + - '
    ' + - '
    ', + '
    ' + LANG.media_drop + '
    ' + + '
    ' + LANG.media_select + '
    ' + + '
      ' + + '
      ' + + ' ' + + ' ' + + '
      ' + + '', // template for one item in file list - fileTemplate: '
      ' + - '' + - '' + - '' + - '' + - '' + LANG.media_cancel + '' + - 'Failed' + - '
      ', + fileTemplate: '
    • ' + + '' + + ' ' + + ' ' +// @todo: use "qq-upload-spinner hidden" instead + ' ' + + ' ' + LANG.media_cancel + '' + + ' Failed' + + '
    • ', classes: { // used to get elements from templates @@ -101,6 +102,8 @@ qq.FileUploaderExtended = function(o){ dropActive: 'qq-upload-drop-area-active', list: 'qq-upload-list', nameInput: 'qq-upload-name-input', + overwriteInput: 'qq-overwrite-check', + uploadButton: 'qq-upload-action', file: 'qq-upload-file', spinner: 'qq-upload-spinner', @@ -111,7 +114,7 @@ qq.FileUploaderExtended = function(o){ // used in css to hide progress spinner success: 'qq-upload-success', fail: 'qq-upload-fail', - failedText : 'qq-upload-failed-text' + failedText: 'qq-upload-failed-text' } }); @@ -160,7 +163,7 @@ qq.extend(qq.FileUploaderExtended.prototype, { var nameInput = this._find(item, 'nameInput'); var fileElement = this._find(item, 'file'); qq.setText(fileElement, nameInput.value); - qq.removeClass(fileElement, 'qq-upload-file-hidden'); + qq.removeClass(fileElement, 'hidden'); qq.remove(nameInput); jQuery('.qq-upload-button, #mediamanager__upload_button').remove(); jQuery('.dw__ow').parent().hide(); @@ -211,8 +214,8 @@ qq.extend(qq.UploadHandlerForm.prototype, { }, _uploadAll: function(params){ - jQuery(".qq-upload-spinner-hidden").each(function (i) { - jQuery(this).addClass('qq-upload-spinner'); + jQuery(".qq-upload-spinner").each(function (i) { + jQuery(this).removeClass('hidden'); }); for (key in this._inputs) { this.upload(key, params); @@ -328,8 +331,8 @@ qq.extend(qq.UploadHandlerXhr.prototype, { }, _uploadAll: function(params){ - jQuery(".qq-upload-spinner-hidden").each(function (i) { - jQuery(this).addClass('qq-upload-spinner'); + jQuery(".qq-upload-spinner").each(function (i) { + jQuery(this).removeClass('hidden'); }); for (key in this._files) { this.upload(key, params); diff --git a/lib/tpl/default/_fileuploader.css b/lib/tpl/default/_fileuploader.css index 9e60393a0..458267be0 100644 --- a/lib/tpl/default/_fileuploader.css +++ b/lib/tpl/default/_fileuploader.css @@ -1,20 +1,26 @@ + .qq-uploader { position: relative; width: 100%; } +.qq-uploader .error { + color: #f00; + background-color: #fff; +} + +/* select file button */ + .qq-upload-button { display: inline-block; border: 1px solid __border__; color: __text__; - background-color: __background__; + background: __background__ url(images/buttonshadow.png) repeat-x bottom; text-decoration: none; font-size: 100%; cursor: pointer; - margin: 1px; - margin-bottom: 5px; + margin: 1px 1px 5px; padding: 0.125em 0.4em; - background: __background__ url(images/buttonshadow.png) repeat-x bottom; } * html .qq-upload-button, @@ -23,9 +29,11 @@ } .qq-upload-button-focus { - outline: 1px dotted black; + outline: 1px dotted; } +/* drop area */ + .qq-upload-drop-area { position: absolute; top: 0; @@ -35,15 +43,16 @@ min-height: 70px; z-index: 2; background: __background_neu__; + color: __text__; text-align: center; } .qq-upload-drop-area span { - display:block; - position:absolute; + display: block; + position: absolute; top: 50%; - width:100%; - margin-top:-8px; + width: 100%; + margin-top: -8px; font-size: 120%; } @@ -51,8 +60,22 @@ background: __background_alt__; } -.qq-upload-file, .qq-upload-spinner, .qq-upload-size, .qq-upload-cancel, .qq-upload-failed-text { - margin-right: 7px; +/* list of files to upload */ + +.qq-uploader li { + margin-bottom: 5px; + color: __text__; +} + +.qq-uploader li span, +.qq-uploader li input, +.qq-uploader li a { + margin-right: 5px; +} + +.qq-upload-file { + display: block; + font-weight: bold; } .qq-upload-spinner { @@ -63,44 +86,21 @@ vertical-align: text-bottom; } -.qq-upload-size,.qq-upload-cancel { +.qq-upload-size, +.qq-upload-cancel { font-size: 85%; } .qq-upload-failed-text { - display:none; + display: none; } - .qq-upload-fail .qq-upload-failed-text { - display:inline; -} - -.qq-upload-file { - display: block; - font-weight: bold; -} - -.qq-upload-file-hidden { - display:none; + display: inline; } -.qq-upload-cancel { - padding-left: 10px; +.qq-action-container * { + vertical-align: middle; } - -.qq-uploader .dw__ow { +.qq-overwrite-check input { margin-left: 10px; - margin-right: 3px; -} - -.qq-uploader .check { - line-height: 18px; -} - -.qq-uploader #mediamanager__upload_button { - margin-bottom: 10px; } - -.qq-uploader div.li { - margin-bottom: 5px; -} \ No newline at end of file -- cgit v1.2.3 From 15fe2b5cbdd778e50daf2e733891ceb2ff7441b9 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 25 Sep 2011 21:11:36 +0100 Subject: removed obsolete todo --- lib/scripts/fileuploaderextended.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/fileuploaderextended.js b/lib/scripts/fileuploaderextended.js index f92d50754..3481bbc3e 100644 --- a/lib/scripts/fileuploaderextended.js +++ b/lib/scripts/fileuploaderextended.js @@ -89,7 +89,7 @@ qq.FileUploaderExtended = function(o){ fileTemplate: '
    • ' + '' + ' ' + - ' ' +// @todo: use "qq-upload-spinner hidden" instead + ' ' + ' ' + ' ' + LANG.media_cancel + '' + ' Failed' + -- cgit v1.2.3 From edf35c4242c97d4f25032f5c295f5a8e60e83c15 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 25 Sep 2011 21:22:15 +0100 Subject: whitespace fixes: tabs to spaces --- lib/scripts/fileuploaderextended.js | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'lib') diff --git a/lib/scripts/fileuploaderextended.js b/lib/scripts/fileuploaderextended.js index 3481bbc3e..f92bdbc49 100644 --- a/lib/scripts/fileuploaderextended.js +++ b/lib/scripts/fileuploaderextended.js @@ -76,24 +76,24 @@ qq.FileUploaderExtended = function(o){ listElement: null, template: '
      ' + - '
      ' + LANG.media_drop + '
      ' + - '
      ' + LANG.media_select + '
      ' + - '
        ' + - '
        ' + - ' ' + - ' ' + - '
        ' + - '
        ', + '
        ' + LANG.media_drop + '
        ' + + '
        ' + LANG.media_select + '
        ' + + '
          ' + + '
          ' + + ' ' + + ' ' + + '
          ' + + '', // template for one item in file list fileTemplate: '
        • ' + - '' + - ' ' + - ' ' + - ' ' + - ' ' + LANG.media_cancel + '' + - ' Failed' + - '
        • ', + '' + + ' ' + + ' ' + + ' ' + + ' ' + LANG.media_cancel + '' + + ' Failed' + + '', classes: { // used to get elements from templates @@ -239,9 +239,9 @@ qq.extend(qq.UploadHandlerForm.prototype, { var nameInput = qq.toElement(''); form.appendChild(nameInput); - var checked = jQuery('.dw__ow').attr('checked'); + var checked = jQuery('.dw__ow').attr('checked'); var owCheckbox = jQuery('.dw__ow').clone(); - owCheckbox.attr('checked', checked); + owCheckbox.attr('checked', checked); jQuery(form).append(owCheckbox); var self = this; -- cgit v1.2.3 From d7a1eb30d5212b37c852debf8de6818c18bd407e Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 25 Sep 2011 22:14:51 +0100 Subject: media manager: adjusted file uploader styles in media popup to recent changes --- lib/tpl/default/_fileuploader.css | 5 +++++ lib/tpl/default/media.css | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/tpl/default/_fileuploader.css b/lib/tpl/default/_fileuploader.css index 458267be0..d06bfd519 100644 --- a/lib/tpl/default/_fileuploader.css +++ b/lib/tpl/default/_fileuploader.css @@ -62,6 +62,11 @@ /* list of files to upload */ +div.qq-uploader ul { + margin: 0; + list-style: none; +} + .qq-uploader li { margin-bottom: 5px; color: __text__; diff --git a/lib/tpl/default/media.css b/lib/tpl/default/media.css index b325a1ef6..37369fe2f 100644 --- a/lib/tpl/default/media.css +++ b/lib/tpl/default/media.css @@ -145,8 +145,7 @@ it's dirty, so any "real" fixes are welcome */ padding: 0 0.5em 0.5em 0.5em; } -#media__content form#dw__upload, -#media__content div#dw__flashupload { +#media__content #mediamanager__uploader { display: block; border-bottom: solid 1px __border__; padding: 0 0.5em 1em 0.5em; -- cgit v1.2.3 From 8032624921fc54dae6c6f44f55b8209738876113 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Tue, 27 Sep 2011 14:59:16 +0100 Subject: media manager: IE7 fixes (and other small improvements) --- lib/scripts/linkwiz.js | 12 +++++--- lib/tpl/default/_mediamanager.css | 61 ++++++++++++++++++++------------------- 2 files changed, 39 insertions(+), 34 deletions(-) (limited to 'lib') diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js index a9d517306..cc4c19e0d 100644 --- a/lib/scripts/linkwiz.js +++ b/lib/scripts/linkwiz.js @@ -23,9 +23,12 @@ var dw_linkwiz = { // create HTML Structure dw_linkwiz.$wiz = jQuery(document.createElement('div')) - .dialog({autoOpen: false, draggable: true, title: LANG.linkwiz, - resizable: false, - }) + .dialog({ + autoOpen: false, + draggable: true, + title: LANG.linkwiz, + resizable: false + }) .html( '
          '+LANG.linkto+'
          '+ '' @@ -38,7 +41,8 @@ var dw_linkwiz = { 'top': (pos.top+20)+'px', 'left': (pos.left+80)+'px' }) - .show().appendTo('div.dokuwiki'); + .show() + .appendTo('div.dokuwiki'); dw_linkwiz.textArea = $editor[0]; dw_linkwiz.result = jQuery('#link__wiz_result')[0]; diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css index 03c2cb9ce..383a1597c 100644 --- a/lib/tpl/default/_mediamanager.css +++ b/lib/tpl/default/_mediamanager.css @@ -73,6 +73,10 @@ color: __text__; line-height: 1.5em; } +* html #mediamanager__page .namespaces h2, +*+html #mediamanager__page .namespaces h2 { + display: inline; +} #mediamanager__page .namespaces ul { margin-left: .2em; @@ -143,6 +147,20 @@ background-color: __background_alt__; } +#mediamanager__page .filelist li dt a { + vertical-align: middle; + display: table-cell; + overflow: hidden; +} +* html #mediamanager__page .filelist .thumbs li dt a, +*+html #mediamanager__page .filelist .thumbs li dt a { + display: block; +} +* html #mediamanager__page .filelist .rows li dt a, +*+html #mediamanager__page .filelist .rows li dt a { + display: inline; +} + /* thumbs */ #mediamanager__page .filelist .thumbs li { @@ -160,23 +178,18 @@ position: relative; line-height: 1.2; } -* html #mediamanager__page .filelist .thumbs li { - display: inline; - zoom: 1; -} +* html #mediamanager__page .filelist .thumbs li, *+html #mediamanager__page .filelist .thumbs li { display: inline; + zoom: 1; } -#mediamanager__page .filelist .thumbs li .image { - vertical-align: middle; - display: table-cell; +#mediamanager__page .filelist .thumbs li dt a { width: 100px; height: 90px; - overflow: hidden; } -#mediamanager__page .filelist .thumbs li .thumb img { +#mediamanager__page .filelist .thumbs li dt a img { max-width: 90px; max-height: 90px; } @@ -217,29 +230,21 @@ background-color: __background_neu__; } -#mediamanager__page .filelist .rows li .image { - width: 10%; - display: block; - overflow: hidden; +#mediamanager__page .filelist .rows li dt { float: left; + width: 10%; height: 40px; text-align: center; } -#mediamanager__page .filelist .rows li .thumb img { - max-width: 40px; - max-height: 40px; -} - -#mediamanager__page .filelist .rows li .image span { - vertical-align: middle; - text-align: center; - display: table-cell; +#mediamanager__page .filelist .rows li dt a { width: 100px; height: 40px; } -#mediamanager__page .filelist .rows .icon { - margin-top: 12px; + +#mediamanager__page .filelist .rows li dt a img { + max-width: 40px; + max-height: 40px; } #mediamanager__page .filelist .rows li .name, @@ -355,7 +360,8 @@ /* File diff */ -#mediamanager__diff { +#mediamanager__diff table { + table-layout: fixed; } #mediamanager__diff td, @@ -367,11 +373,6 @@ text-align: left; } -/* For IE7 */ -*:first-child+html #mediamanager__diff td { - width: 45%; -} - #mediamanager__diff th { font-weight: normal; } -- cgit v1.2.3 From bc64186ea372e1a6fde4a99f6a914e80357b95c4 Mon Sep 17 00:00:00 2001 From: Marius-Alex Olar Date: Mon, 10 Oct 2011 20:40:41 +0200 Subject: Romanian language update --- lib/plugins/acl/lang/ro/lang.php | 1 + lib/plugins/config/lang/ro/lang.php | 3 +++ lib/plugins/plugin/lang/ro/lang.php | 2 ++ lib/plugins/popularity/lang/ro/lang.php | 1 + lib/plugins/revert/lang/ro/lang.php | 1 + lib/plugins/usermanager/lang/ro/lang.php | 1 + 6 files changed, 9 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/ro/lang.php b/lib/plugins/acl/lang/ro/lang.php index 296baa291..0c13d7223 100644 --- a/lib/plugins/acl/lang/ro/lang.php +++ b/lib/plugins/acl/lang/ro/lang.php @@ -8,6 +8,7 @@ * @author Emanuel-Emeric Andrași * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi + * @author Marius OLAR */ $lang['admin_acl'] = 'Managementul Listei de Control a Accesului'; $lang['acl_group'] = 'Grup'; diff --git a/lib/plugins/config/lang/ro/lang.php b/lib/plugins/config/lang/ro/lang.php index 8ea923913..6b0a0e91a 100644 --- a/lib/plugins/config/lang/ro/lang.php +++ b/lib/plugins/config/lang/ro/lang.php @@ -8,6 +8,7 @@ * @author Emanuel-Emeric Andrași * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi + * @author Marius OLAR */ $lang['menu'] = 'Setări de Configurare'; $lang['error'] = 'Setări nu au fost actualizate datorită unei valori incorecte; verificaţi modificările şi încercaţi din nou.
          Valorile incorecte vor apărea într-un chenar roşu.'; @@ -42,6 +43,7 @@ $lang['lang'] = 'Limbă'; $lang['basedir'] = 'Director bază'; $lang['baseurl'] = 'URL bază '; $lang['savedir'] = 'Director pentru salvarea datelor'; +$lang['cookiedir'] = 'Cale Cookie. Lăsați gol pentru a utiliza baseurl.'; $lang['start'] = 'Numele paginii de start'; $lang['title'] = 'Titlul wiki'; $lang['template'] = 'Şablon'; @@ -112,6 +114,7 @@ $lang['jpg_quality'] = 'Calitatea compresiei JPG (0-100)'; $lang['subscribers'] = 'Activează suportul pentru subscrierea paginii'; $lang['subscribe_time'] = 'Timpul după care lista de abonare şi digestie sunt trimise (sec); Aceasta ar trebui să fie mai mic decât timpul specificat în recent_days.'; $lang['compress'] = 'Compactează codul CSS şi javascript produs'; +$lang['cssdatauri'] = 'Dimensiunea în octeți până la care imaginile regasite în fișierele CSS ar trebui să fie incluse direct în stylesheet pentru a reduce supraîncărcarea antetului cererii HTTP. Această tehnică nu va funcționa în IE < 8! 400 până la 600 octeți sunt suficienți. Introduceți 0 pentru a dezactiva această opțiune.'; $lang['hidepages'] = 'Ascunde paginile pereche (expresii regulate)'; $lang['send404'] = 'Trimite mesajul "HTTP 404/Page Not Found" pentru paginile inexistente'; $lang['sitemap'] = 'Generează Google sitemap (zile)'; diff --git a/lib/plugins/plugin/lang/ro/lang.php b/lib/plugins/plugin/lang/ro/lang.php index 5f37ed455..9c90f77a3 100644 --- a/lib/plugins/plugin/lang/ro/lang.php +++ b/lib/plugins/plugin/lang/ro/lang.php @@ -8,6 +8,7 @@ * @author Emanuel-Emeric Andrași * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi + * @author Marius OLAR */ $lang['menu'] = 'Administrează plugin-uri'; $lang['download'] = 'Descarcă şi instalează un nou plugin'; @@ -53,3 +54,4 @@ $lang['enabled'] = 'Plugin %s activat.'; $lang['notenabled'] = 'Plugin-ul %s nu poate fi activat, verificaţi permisiunile fişierului.'; $lang['disabled'] = 'Plugin %s dezactivat.'; $lang['notdisabled'] = 'Plugin-ul %s nu poate fi dezactivat, verificaţi permisiunile fişierului.'; +$lang['packageinstalled'] = 'Pachet modul (%d modul(e): %s) instalat cu succes.'; diff --git a/lib/plugins/popularity/lang/ro/lang.php b/lib/plugins/popularity/lang/ro/lang.php index 1644ea574..7f3508362 100644 --- a/lib/plugins/popularity/lang/ro/lang.php +++ b/lib/plugins/popularity/lang/ro/lang.php @@ -6,6 +6,7 @@ * @author Emanuel-Emeric Andrași * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi + * @author Marius OLAR */ $lang['name'] = 'Feedback de popularitate (încărcarea poate dura mai mult)'; $lang['submit'] = 'Trimite datele'; diff --git a/lib/plugins/revert/lang/ro/lang.php b/lib/plugins/revert/lang/ro/lang.php index 6e534fd37..7397a1d74 100644 --- a/lib/plugins/revert/lang/ro/lang.php +++ b/lib/plugins/revert/lang/ro/lang.php @@ -8,6 +8,7 @@ * @author Emanuel-Emeric Andrași * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi + * @author Marius OLAR */ $lang['menu'] = 'Manager Reveniri'; $lang['filter'] = 'Caută pagini cu posibil spam'; diff --git a/lib/plugins/usermanager/lang/ro/lang.php b/lib/plugins/usermanager/lang/ro/lang.php index 260814aed..4c0afc896 100644 --- a/lib/plugins/usermanager/lang/ro/lang.php +++ b/lib/plugins/usermanager/lang/ro/lang.php @@ -8,6 +8,7 @@ * @author Emanuel-Emeric Andrași * @author Emanuel-Emeric Andraşi * @author Emanuel-Emeric Andrasi + * @author Marius OLAR */ $lang['menu'] = 'Manager Utilizatori'; $lang['noauth'] = '(autentificarea utilizatorilor nu este disponibilă)'; -- cgit v1.2.3 From f4aabe763b3ae83161819c991d4c7820523c3524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Figols?= Date: Mon, 10 Oct 2011 20:42:02 +0200 Subject: Spanish language update --- lib/plugins/acl/lang/es/lang.php | 1 + lib/plugins/config/lang/es/lang.php | 2 ++ lib/plugins/plugin/lang/es/lang.php | 1 + lib/plugins/popularity/lang/es/lang.php | 1 + lib/plugins/revert/lang/es/lang.php | 1 + lib/plugins/usermanager/lang/es/lang.php | 1 + 6 files changed, 7 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/es/lang.php b/lib/plugins/acl/lang/es/lang.php index 91a4ca1a1..ee50a7530 100644 --- a/lib/plugins/acl/lang/es/lang.php +++ b/lib/plugins/acl/lang/es/lang.php @@ -21,6 +21,7 @@ * @author Mauro Javier Giamberardino * @author emezeta * @author Oscar Ciudad + * @author Ruben Figols */ $lang['admin_acl'] = 'Administración de lista de control de acceso'; $lang['acl_group'] = 'Grupo'; diff --git a/lib/plugins/config/lang/es/lang.php b/lib/plugins/config/lang/es/lang.php index ccb963ff1..1189a6781 100644 --- a/lib/plugins/config/lang/es/lang.php +++ b/lib/plugins/config/lang/es/lang.php @@ -21,6 +21,7 @@ * @author Mauro Javier Giamberardino * @author emezeta * @author Oscar Ciudad + * @author Ruben Figols */ $lang['menu'] = 'Parámetros de configuración'; $lang['error'] = 'Los parámetros no han sido actualizados a causa de un valor inválido, por favor revise los cambios y re-envíe el formulario.
          Los valores incorrectos se mostrarán con un marco rojo alrededor.'; @@ -55,6 +56,7 @@ $lang['lang'] = 'Idioma'; $lang['basedir'] = 'Directorio de base'; $lang['baseurl'] = 'URL de base'; $lang['savedir'] = 'Directorio para guardar los datos'; +$lang['cookiedir'] = 'Ruta para las Cookie. Dejar en blanco para usar la ruta básica.'; $lang['start'] = 'Nombre de la página inicial'; $lang['title'] = 'Título del wiki'; $lang['template'] = 'Plantilla'; diff --git a/lib/plugins/plugin/lang/es/lang.php b/lib/plugins/plugin/lang/es/lang.php index 2726a5ffa..53d6d63fd 100644 --- a/lib/plugins/plugin/lang/es/lang.php +++ b/lib/plugins/plugin/lang/es/lang.php @@ -21,6 +21,7 @@ * @author Mauro Javier Giamberardino * @author emezeta * @author Oscar Ciudad + * @author Ruben Figols */ $lang['menu'] = 'Administración de Plugins'; $lang['download'] = 'Descargar e instalar un nuevo plugin'; diff --git a/lib/plugins/popularity/lang/es/lang.php b/lib/plugins/popularity/lang/es/lang.php index d78343a36..752fb7da4 100644 --- a/lib/plugins/popularity/lang/es/lang.php +++ b/lib/plugins/popularity/lang/es/lang.php @@ -18,6 +18,7 @@ * @author Oscar M. Lage * @author emezeta * @author Oscar Ciudad + * @author Ruben Figols */ $lang['name'] = 'Retroinformación (Feedback) plugin Popularity'; $lang['submit'] = 'Enviar datos'; diff --git a/lib/plugins/revert/lang/es/lang.php b/lib/plugins/revert/lang/es/lang.php index f793eb06d..e235015d4 100644 --- a/lib/plugins/revert/lang/es/lang.php +++ b/lib/plugins/revert/lang/es/lang.php @@ -19,6 +19,7 @@ * @author Mauro Javier Giamberardino * @author emezeta * @author Oscar Ciudad + * @author Ruben Figols */ $lang['menu'] = 'Restaurador'; $lang['filter'] = 'Buscar páginas con spam'; diff --git a/lib/plugins/usermanager/lang/es/lang.php b/lib/plugins/usermanager/lang/es/lang.php index 50138bf2b..804df2a4b 100644 --- a/lib/plugins/usermanager/lang/es/lang.php +++ b/lib/plugins/usermanager/lang/es/lang.php @@ -20,6 +20,7 @@ * @author Mauro Javier Giamberardino * @author emezeta * @author Oscar Ciudad + * @author Ruben Figols */ $lang['menu'] = 'Administración de usuarios'; $lang['noauth'] = '(la autenticación de usuarios no está disponible)'; -- cgit v1.2.3 From a17cd808475d1303cecfd340b2effc84541bc5d4 Mon Sep 17 00:00:00 2001 From: Kaeptn Haddock Date: Mon, 10 Oct 2011 20:43:38 +0200 Subject: German language update --- lib/plugins/acl/lang/de/lang.php | 1 + lib/plugins/config/lang/de/lang.php | 10 +++++++++- lib/plugins/plugin/lang/de/lang.php | 1 + lib/plugins/popularity/lang/de/lang.php | 1 + lib/plugins/revert/lang/de/lang.php | 1 + lib/plugins/usermanager/lang/de/lang.php | 1 + 6 files changed, 14 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/de/lang.php b/lib/plugins/acl/lang/de/lang.php index 3c6bf8cf0..19bfcb0eb 100644 --- a/lib/plugins/acl/lang/de/lang.php +++ b/lib/plugins/acl/lang/de/lang.php @@ -19,6 +19,7 @@ * @author Robert Bogenschneider * @author Niels Lange * @author Christian Wichmann + * @author Paul Lachewsky */ $lang['admin_acl'] = 'Zugangsverwaltung'; $lang['acl_group'] = 'Gruppe'; diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php index b4746d757..7a9922d32 100644 --- a/lib/plugins/config/lang/de/lang.php +++ b/lib/plugins/config/lang/de/lang.php @@ -15,6 +15,7 @@ * @author Robert Bogenschneider * @author Niels Lange * @author Christian Wichmann + * @author Paul Lachewsky */ $lang['menu'] = 'Konfiguration'; $lang['error'] = 'Die Einstellungen wurden wegen einer fehlerhaften Eingabe nicht gespeichert. @@ -50,8 +51,8 @@ $lang['dmode'] = 'Rechte für neue Verzeichnisse'; $lang['lang'] = 'Sprache'; $lang['basedir'] = 'Installationsverzeichnis'; $lang['baseurl'] = 'Installationspfad (URL)'; -$lang['cookiedir'] = 'Cookiepfad. Frei lassen, um den gleichen Pfad wie "baseurl" zu benutzen.'; $lang['savedir'] = 'Speicherverzeichnis'; +$lang['cookiedir'] = 'Cookiepfad. Frei lassen, um den gleichen Pfad wie "baseurl" zu benutzen.'; $lang['start'] = 'Startseitenname'; $lang['title'] = 'Titel des Wikis'; $lang['template'] = 'Designvorlage (Template)'; @@ -122,6 +123,13 @@ $lang['jpg_quality'] = 'JPEG Kompressionsqualität (0-100)'; $lang['subscribers'] = 'E-Mail-Abos zulassen'; $lang['subscribe_time'] = 'Zeit nach der Zusammenfassungs- und Änderungslisten-E-Mails verschickt werden; Dieser Wert sollte kleiner als die in recent_days konfigurierte Zeit sein.'; $lang['compress'] = 'JavaScript und Stylesheets komprimieren'; +$lang['cssdatauri'] = 'Oberer Grenzwert in Bytes für Dateigrössen. Im CSS referenzierte Bilddateien unter diesem Grenzwert werden direkt ins Stylesheet eingebettet um den "HTTP request header overload" zu reduzieren. +Diese Technik funktioniert nicht in Internet Explorer <8! + +Empfohlene Einstellung: 400 to 600 Bytes. +Setze die Einstellung auf 0 um die Funktion zu deaktivieren. + + '; $lang['hidepages'] = 'Seiten verstecken (Regulärer Ausdruck)'; $lang['send404'] = 'Bei nicht vorhandenen Seiten mit 404 Fehlercode antworten'; $lang['sitemap'] = 'Google Sitemap erzeugen (Tage)'; diff --git a/lib/plugins/plugin/lang/de/lang.php b/lib/plugins/plugin/lang/de/lang.php index 6c1bd033c..2c606e670 100644 --- a/lib/plugins/plugin/lang/de/lang.php +++ b/lib/plugins/plugin/lang/de/lang.php @@ -16,6 +16,7 @@ * @author Robert Bogenschneider * @author Niels Lange * @author Christian Wichmann + * @author Paul Lachewsky */ $lang['menu'] = 'Plugins verwalten'; $lang['download'] = 'Neues Plugin herunterladen und installieren'; diff --git a/lib/plugins/popularity/lang/de/lang.php b/lib/plugins/popularity/lang/de/lang.php index 4649062f7..b0e915b91 100644 --- a/lib/plugins/popularity/lang/de/lang.php +++ b/lib/plugins/popularity/lang/de/lang.php @@ -13,6 +13,7 @@ * @author Robert Bogenschneider * @author Niels Lange * @author Christian Wichmann + * @author Paul Lachewsky */ $lang['name'] = 'Popularitäts-Feedback (Eventuell längere Ladezeit)'; $lang['submit'] = 'Daten senden'; diff --git a/lib/plugins/revert/lang/de/lang.php b/lib/plugins/revert/lang/de/lang.php index 0bc8e2ce0..3763dff75 100644 --- a/lib/plugins/revert/lang/de/lang.php +++ b/lib/plugins/revert/lang/de/lang.php @@ -14,6 +14,7 @@ * @author Robert Bogenschneider * @author Niels Lange * @author Christian Wichmann + * @author Paul Lachewsky */ $lang['menu'] = 'Seiten wieder herstellen'; $lang['filter'] = 'Nach betroffenen Seiten suchen'; diff --git a/lib/plugins/usermanager/lang/de/lang.php b/lib/plugins/usermanager/lang/de/lang.php index 090d1d1d9..daffab9b7 100644 --- a/lib/plugins/usermanager/lang/de/lang.php +++ b/lib/plugins/usermanager/lang/de/lang.php @@ -15,6 +15,7 @@ * @author Robert Bogenschneider * @author Niels Lange * @author Christian Wichmann + * @author Paul Lachewsky */ $lang['menu'] = 'Benutzerverwaltung'; $lang['noauth'] = '(Authentifizierungssystem nicht verfügbar)'; -- cgit v1.2.3 From a76231726379ab65af1ce994b8d74e2ac814f8db Mon Sep 17 00:00:00 2001 From: Jeroen Roeterd Date: Mon, 10 Oct 2011 20:55:34 +0200 Subject: Dutch language update --- lib/plugins/acl/lang/nl/lang.php | 1 + lib/plugins/config/lang/nl/lang.php | 2 ++ lib/plugins/plugin/lang/nl/lang.php | 1 + lib/plugins/popularity/lang/nl/lang.php | 1 + lib/plugins/revert/lang/nl/lang.php | 1 + lib/plugins/usermanager/lang/nl/lang.php | 1 + 6 files changed, 7 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/nl/lang.php b/lib/plugins/acl/lang/nl/lang.php index f9adb5f04..686909644 100644 --- a/lib/plugins/acl/lang/nl/lang.php +++ b/lib/plugins/acl/lang/nl/lang.php @@ -16,6 +16,7 @@ * @author Matthias Carchon webmaster@c-mattic.be * @author Marijn Hofstra * @author Timon Van Overveldt + * @author Jeroen */ $lang['admin_acl'] = 'Toegangsrechten'; $lang['acl_group'] = 'Groep'; diff --git a/lib/plugins/config/lang/nl/lang.php b/lib/plugins/config/lang/nl/lang.php index bf1ce46c1..f6574ee2c 100644 --- a/lib/plugins/config/lang/nl/lang.php +++ b/lib/plugins/config/lang/nl/lang.php @@ -13,6 +13,7 @@ * @author Matthias Carchon webmaster@c-mattic.be * @author Marijn Hofstra * @author Timon Van Overveldt + * @author Jeroen */ $lang['menu'] = 'Configuratie-instellingen'; $lang['error'] = 'De instellingen zijn niet gewijzigd wegens een incorrecte waarde, kijk je wijzigingen na en sla dan opnieuw op.
          Je kunt de incorrecte waarde(s) herkennen aan de rode rand.'; @@ -47,6 +48,7 @@ $lang['lang'] = 'Taal'; $lang['basedir'] = 'Basisdirectory'; $lang['baseurl'] = 'Basis-URL'; $lang['savedir'] = 'Directory om data op te slaan'; +$lang['cookiedir'] = 'Cookie pad. Laat leeg om de basis URL te gebruiken.'; $lang['start'] = 'Naam startpagina'; $lang['title'] = 'Titel van de wiki'; $lang['template'] = 'Sjabloon'; diff --git a/lib/plugins/plugin/lang/nl/lang.php b/lib/plugins/plugin/lang/nl/lang.php index 66cd7c0a2..d13e46ff8 100644 --- a/lib/plugins/plugin/lang/nl/lang.php +++ b/lib/plugins/plugin/lang/nl/lang.php @@ -11,6 +11,7 @@ * @author Matthias Carchon webmaster@c-mattic.be * @author Marijn Hofstra * @author Timon Van Overveldt + * @author Jeroen */ $lang['menu'] = 'Plugins beheren'; $lang['download'] = 'Download en installeer een nieuwe plugin'; diff --git a/lib/plugins/popularity/lang/nl/lang.php b/lib/plugins/popularity/lang/nl/lang.php index 0a8386f42..75c13013b 100644 --- a/lib/plugins/popularity/lang/nl/lang.php +++ b/lib/plugins/popularity/lang/nl/lang.php @@ -10,6 +10,7 @@ * @author Matthias Carchon webmaster@c-mattic.be * @author Marijn Hofstra * @author Timon Van Overveldt + * @author Jeroen */ $lang['name'] = 'Populariteitsfeedback (kan even duren om in te laden)'; $lang['submit'] = 'Verstuur'; diff --git a/lib/plugins/revert/lang/nl/lang.php b/lib/plugins/revert/lang/nl/lang.php index 21f8c2971..954bf1068 100644 --- a/lib/plugins/revert/lang/nl/lang.php +++ b/lib/plugins/revert/lang/nl/lang.php @@ -11,6 +11,7 @@ * @author Matthias Carchon webmaster@c-mattic.be * @author Marijn Hofstra * @author Timon Van Overveldt + * @author Jeroen */ $lang['menu'] = 'Herstelmanager'; $lang['filter'] = 'Zoek naar bekladde pagina\'s'; diff --git a/lib/plugins/usermanager/lang/nl/lang.php b/lib/plugins/usermanager/lang/nl/lang.php index a6ae402d8..cac793386 100644 --- a/lib/plugins/usermanager/lang/nl/lang.php +++ b/lib/plugins/usermanager/lang/nl/lang.php @@ -11,6 +11,7 @@ * @author Matthias Carchon webmaster@c-mattic.be * @author Marijn Hofstra * @author Timon Van Overveldt + * @author Jeroen */ $lang['menu'] = 'Gebruikersmanager'; $lang['noauth'] = '(gebruikersauthenticatie niet beschikbaar)'; -- cgit v1.2.3 From 6f0b0dd1609f2a253b48f1b9347168dd2d5a61d7 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 15 Oct 2011 10:35:25 +0100 Subject: removed remnants of old flash uploader (FS#2335) --- lib/_fla/.htaccess | 4 - lib/_fla/MultipleUpload.as | 330 -------------------------------------------- lib/_fla/README | 4 - lib/_fla/index.html | 12 -- lib/_fla/multipleUpload.fla | Bin 1812480 -> 0 bytes lib/exe/multipleUpload.swf | Bin 64561 -> 0 bytes lib/images/multiupload.png | Bin 581 -> 0 bytes lib/scripts/media.js | 27 ---- 8 files changed, 377 deletions(-) delete mode 100644 lib/_fla/.htaccess delete mode 100644 lib/_fla/MultipleUpload.as delete mode 100644 lib/_fla/README delete mode 100644 lib/_fla/index.html delete mode 100644 lib/_fla/multipleUpload.fla delete mode 100644 lib/exe/multipleUpload.swf delete mode 100644 lib/images/multiupload.png (limited to 'lib') diff --git a/lib/_fla/.htaccess b/lib/_fla/.htaccess deleted file mode 100644 index 055d099c7..000000000 --- a/lib/_fla/.htaccess +++ /dev/null @@ -1,4 +0,0 @@ -## no access to the fla directory -order allow,deny -deny from all -Satisfy All diff --git a/lib/_fla/MultipleUpload.as b/lib/_fla/MultipleUpload.as deleted file mode 100644 index 259441656..000000000 --- a/lib/_fla/MultipleUpload.as +++ /dev/null @@ -1,330 +0,0 @@ -/** - * Flash Multi Upload - * - * Based on a example from Alastair Dawson - * - * @link http://blog.vixiom.com/2006/09/08/multiple-file-upload-with-flash-and-ruby-on-rails/ - * @author Alastair Dawson - * @author Andreas Gohr - * @license MIT - */ - -// delegate -import mx.utils.Delegate; -// ui components -import mx.controls.DataGrid; -import mx.controls.gridclasses.DataGridColumn -import mx.controls.Button; -import mx.controls.TextInput; -import mx.controls.CheckBox; -import mx.controls.Label; -// file reference -import flash.net.FileReferenceList; -import flash.net.FileReference; - -class MultipleUpload { - - private var fileRef:FileReferenceList; - private var fileRefListener:Object; - private var list:Array; - private var dp:Array; - - private var files_dg:DataGrid; - private var browse_btn:Button; - private var upload_btn:Button; - private var ns_input:TextInput; - private var ns_label:Label; - private var overwrite_cb:CheckBox; - - private var url:String; - private var upurl:String; - private var current:Number; - private var done:Number; - private var lasterror:String; - - /** - * Constructor. - * - * Initializes the needed objects and stage objects - */ - public function MultipleUpload(fdg:DataGrid, bb:Button, ub:Button, nsi:TextInput, nsl:Label, ob:CheckBox) { - // references for objects on the stage - files_dg = fdg; - browse_btn = bb; - upload_btn = ub; - ns_input = nsi; - ns_label = nsl; - overwrite_cb = ob; - - // file list references & listener - fileRef = new FileReferenceList(); - fileRefListener = new Object(); - fileRef.addListener(fileRefListener); - - // setup - iniUI(); - inifileRefListener(); - } - - /** - * Initializes the User Interface - * - * Uses flashvars to access possibly localized names - */ - private function iniUI() { - // register button handlers - browse_btn.onRelease = Delegate.create(this, this.browse); - upload_btn.onRelease = Delegate.create(this, this.upload); - - // columns for dataGrid - var col:DataGridColumn; - col = new DataGridColumn('name'); - col.headerText = ( _root.L_gridname ? _root.L_gridname : 'Filename' ); - col.sortable = false; - files_dg.addColumn(col); - col = new DataGridColumn('size'); - col.headerText = ( _root.L_gridsize ? _root.L_gridsize : 'Size' ); - col.sortable = false; - files_dg.addColumn(col); - col = new DataGridColumn('status'); - col.headerText = ( _root.L_gridstat ? _root.L_gridstat : 'Status' ); - col.sortable = false; - files_dg.addColumn(col); - - // label translations - if(_root.L_overwrite) overwrite_cb.label = _root.L_overwrite; - if(_root.L_browse) browse_btn.label = _root.L_browse; - if(_root.L_upload) upload_btn.label = _root.L_upload; - if(_root.L_namespace) ns_label.text = _root.L_namespace; - - // prefill input field - if(_root.O_ns) ns_input.text = _root.O_ns; - - // disable buttons - upload_btn.enabled = false; - if(!_root.O_overwrite) overwrite_cb.visible = false; - - // initalize the data provider list - dp = new Array(); - list = new Array(); - files_dg.spaceColumnsEqually(); - } - - /** - * Open files selection dialog - * - * Adds the allowed file types - */ - private function browse() { - if(_root.O_extensions){ - var exts:Array = _root.O_extensions.split('|'); - var filter:Object = new Object(); - filter.description = (_root.L_filetypes ? _root.L_filetypes : 'Allowed filetypes'); - filter.extension = ''; - for(var i:Number = 0; i= this.list.length){ - return this.uploadDone(); - } - - var file = this.list[this.current]; - - if(_root.O_maxsize && (file.size > _root.O_maxsize)){ - this.lasterror = (_root.L_toobig ? _root.L_toobig : 'too big'); - _global.setTimeout(this,'uploadNext',100); - nextFrame(); - }else{ - file.addListener(fileRefListener); - file.upload(upurl); - // continues in the handlers - } - } - - /** - * Redirect to the namespace and set a success/error message - * - * Called when all files in the list where processed - */ - private function uploadDone(){ - var info = (_root.L_info ? _root.L_info : 'files uploaded'); - if(this.done == this.list.length){ - this.url += '&msg1='+escape(this.done+'/'+this.list.length+' '+info); - }else{ - var lasterr = (_root.L_lasterr ? _root.L_lasterr : 'Last error:'); - this.url += '&err='+escape(this.done+'/'+this.list.length+' '+info+' '+lasterr+' '+this.lasterror); - } - - // when done redirect - getURL(this.url,'_self'); - } - - /** - * Set the status of a given file in the data grid - */ - private function setStatus(file,msg){ - for(var i:Number = 0; i < list.length; i++) { - if (list[i].name == file.name) { - files_dg.editField(i, 'status', msg); - nextFrame(); - return; - } - } - } - - /** - * Initialize the file reference listener - */ - private function inifileRefListener() { - fileRefListener.onSelect = Delegate.create(this, this.onSelect); - fileRefListener.onCancel = Delegate.create(this, this.onCancel); - fileRefListener.onOpen = Delegate.create(this, this.onOpen); - fileRefListener.onProgress = Delegate.create(this, this.onProgress); - fileRefListener.onComplete = Delegate.create(this, this.onComplete); - fileRefListener.onHTTPError = Delegate.create(this, this.onHTTPError); - fileRefListener.onIOError = Delegate.create(this, this.onIOError); - fileRefListener.onSecurityError = Delegate.create(this, this.onSecurityError); - } - - /** - * Handle file selection - * - * Files are added as in a list of references and beautified into the data grid dataprovider array - * - * Multiple browses will add to the list - */ - private function onSelect(fileRefList:FileReferenceList) { - var sel = fileRefList.fileList; - for(var i:Number = 0; i < sel.length; i++) { - // check size - var stat:String; - if(_root.O_maxsize && sel[i].size > _root.O_maxsize){ - stat = (_root.L_toobig ? _root.L_toobig : 'too big'); - }else{ - stat = (_root.L_ready ? _root.L_ready : 'ready for upload'); - } - // add to grid - dp.push({name:sel[i].name, size:Math.round(sel[i].size / 1000) + " kb", status:stat}); - // add to reference list - list.push(sel[i]); - } - // update dataGrid - files_dg.dataProvider = dp; - files_dg.spaceColumnsEqually(); - - if(list.length > 0) upload_btn.enabled = true; - } - - /** - * Does nothing - */ - private function onCancel() { - } - - /** - * Does nothing - */ - private function onOpen(file:FileReference) { - } - - /** - * Set the upload progress - */ - private function onProgress(file:FileReference, bytesLoaded:Number, bytesTotal:Number) { - var percentDone = Math.round((bytesLoaded / bytesTotal) * 100); - var msg:String = 'uploading @PCT@%'; - if(_root.L_progress) msg = _root.L_progress; - msg = msg.split('@PCT@').join(percentDone); - this.setStatus(file,msg); - } - - /** - * Handle upload completion - */ - private function onComplete(file:FileReference) { - this.setStatus(file,(_root.L_done ? _root.L_done : 'complete')); - this.done++; - uploadNext(); - } - - /** - * Handle upload errors - */ - private function onHTTPError(file:FileReference, httpError:Number) { - var error; - if(httpError == 400){ - error = (_root.L_fail ? _root.L_fail : 'failed'); - }else if(httpError == 401){ - error = (_root.L_authfail ? _root.L_authfail : 'auth failed'); - }else{ - error = "HTTP Error " + httpError - } - this.setStatus(file,error); - this.lasterror = error; - uploadNext(); - } - - /** - * Handle IO errors - */ - private function onIOError(file:FileReference) { - this.setStatus(file,"IO Error"); - this.lasterror = "IO Error"; - uploadNext(); - } - - /** - * Handle Security errors - */ - private function onSecurityError(file:FileReference, errorString:String) { - this.setStatus(file,"SecurityError: " + errorString); - this.lasterror = "SecurityError: " + errorString; - uploadNext(); - } - - -} diff --git a/lib/_fla/README b/lib/_fla/README deleted file mode 100644 index 6ecc72ac1..000000000 --- a/lib/_fla/README +++ /dev/null @@ -1,4 +0,0 @@ -This directory contains the sources for the Flash Multiuploader. Its based on -a example from Alastair Dawson given at -http://blog.vixiom.com/2006/09/08/multiple-file-upload-with-flash-and-ruby-on-rails/ - diff --git a/lib/_fla/index.html b/lib/_fla/index.html deleted file mode 100644 index d614603ac..000000000 --- a/lib/_fla/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - - -nothing here... - - - - - diff --git a/lib/_fla/multipleUpload.fla b/lib/_fla/multipleUpload.fla deleted file mode 100644 index 220616960..000000000 Binary files a/lib/_fla/multipleUpload.fla and /dev/null differ diff --git a/lib/exe/multipleUpload.swf b/lib/exe/multipleUpload.swf deleted file mode 100644 index 888aab045..000000000 Binary files a/lib/exe/multipleUpload.swf and /dev/null differ diff --git a/lib/images/multiupload.png b/lib/images/multiupload.png deleted file mode 100644 index bc16c76d6..000000000 Binary files a/lib/images/multiupload.png and /dev/null differ diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 76274c868..2d7c8feb2 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -848,33 +848,6 @@ var dw_mediamanager = { } }, - initFlashUpload: function () { - var $oform, $oflash; - if(!hasFlash(8)) { - return; - } - - $oform = jQuery('#dw__upload'); - $oflash = jQuery('#dw__flashupload'); - - if(!$oform.length || !$oflash.length) { - return; - } - - jQuery(document.createElement('img')) - .attr('src', DOKU_BASE+'lib/images/multiupload.png') - .attr('title', LANG.mu_btn) - .attr('alt', LANG.mu_btn) - .css('cursor', 'pointer') - .click( - function () { - $oform.hide(); - $oflash.show(); - } - ) - .appendTo($oform); - }, - /** * Sets the visibility of the image details accordingly to the * chosen hide state -- cgit v1.2.3 From 6ed8c51115355a80e8364d924183b53011f3f1bb Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 15 Oct 2011 11:56:11 +0200 Subject: fixed German translation informal -> formal --- lib/plugins/config/lang/de/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php index 7a9922d32..e8b21e613 100644 --- a/lib/plugins/config/lang/de/lang.php +++ b/lib/plugins/config/lang/de/lang.php @@ -127,7 +127,7 @@ $lang['cssdatauri'] = 'Oberer Grenzwert in Bytes für Dateigrössen. Diese Technik funktioniert nicht in Internet Explorer <8! Empfohlene Einstellung: 400 to 600 Bytes. -Setze die Einstellung auf 0 um die Funktion zu deaktivieren. +Setzen Sie die Einstellung auf 0 um die Funktion zu deaktivieren. '; $lang['hidepages'] = 'Seiten verstecken (Regulärer Ausdruck)'; -- cgit v1.2.3 From b760af946cf29d1bee05a5cb33cfc6e357df441f Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Sat, 15 Oct 2011 14:54:10 +0200 Subject: Send a 401 Unauthorized header in XML-RPC when access is denied This is far from perfect but should solve most issues in the recommended configuration where only authorized users have access. Sending proper status codes should be implemented when the API implementation refactoring is done. --- lib/exe/xmlrpc.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 8b572d213..93d7c70ba 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -53,6 +53,7 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { */ function call($methodname, $args){ if(!in_array($methodname,$this->public_methods) && !$this->checkAuth()){ + header('HTTP/1.1 401 Unauthorized'); return new IXR_Error(-32603, 'server error. not authorized to call method "'.$methodname.'".'); } return parent::call($methodname, $args); -- cgit v1.2.3 From 794fc9db8fe6b243f202c740cea5a677b683341b Mon Sep 17 00:00:00 2001 From: Michael Hamann Date: Sat, 15 Oct 2011 15:06:35 +0200 Subject: Only send 401 if user is not logged in in XML-RPC FS#2133 If the user is already logged in, a 403 is sent instead now. --- lib/exe/xmlrpc.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 93d7c70ba..6553d043f 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -53,7 +53,11 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { */ function call($methodname, $args){ if(!in_array($methodname,$this->public_methods) && !$this->checkAuth()){ - header('HTTP/1.1 401 Unauthorized'); + if (!isset($_SERVER['REMOTE_USER'])) { + header('HTTP/1.1 401 Unauthorized'); + } else { + header('HTTP/1.1 403 Forbidden'); + } return new IXR_Error(-32603, 'server error. not authorized to call method "'.$methodname.'".'); } return parent::call($methodname, $args); -- cgit v1.2.3 From a533b44005d06c89ade74ca46d199327eacfeaf7 Mon Sep 17 00:00:00 2001 From: Hakan Sandell Date: Sat, 15 Oct 2011 16:51:42 +0200 Subject: Fixes FS#2323 Symbolic link to template doesn't work patch by Chris Green --- lib/plugins/config/settings/config.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index 54fe2ad9c..adf7d217a 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -774,8 +774,8 @@ if (!class_exists('setting_dirchoice')) { if ($entry == '.' || $entry == '..') continue; if ($this->_pattern && !preg_match($this->_pattern,$entry)) continue; - $file = (is_link($this->_dir.$entry)) ? readlink($this->_dir.$entry) : $entry; - if (is_dir($this->_dir.$file)) $list[] = $entry; + $file = (is_link($this->_dir.$entry)) ? readlink($this->_dir.$entry) : $this->_dir.$entry; + if (is_dir($file)) $list[] = $entry; } closedir($dh); } -- cgit v1.2.3 From fe13bd81bd93d84c12b23f8daa1f60c8a003d30b Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 15 Oct 2011 16:30:15 +0200 Subject: Fix XML-RPC login method FS#2324 The login wasn't able to modify the session as it was already closed earlier. This patch also executes the correct event when logins via XMLRPC are done. --- lib/exe/xmlrpc.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 6553d043f..8e4141d4e 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -858,11 +858,22 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { global $auth; if(!$conf['useacl']) return 0; if(!$auth) return 0; + + @session_start(); // reopen session for login if($auth->canDo('external')){ - return $auth->trustExternal($user,$pass,false); + $ok = $auth->trustExternal($user,$pass,false); }else{ - return auth_login($user,$pass,false,true); + $evdata = array( + 'user' => $user, + 'password' => $pass, + 'sticky' => false, + 'silent' => true, + ); + $ok = trigger_event('AUTH_LOGIN_CHECK', $evdata, 'auth_login_wrapper'); } + session_write_close(); // we're done with the session + + return $ok; } -- cgit v1.2.3 From f53795891c8f08acc7ad03adf236f82d6e108c38 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Sat, 15 Oct 2011 16:09:02 +0100 Subject: FS#2317 fix CSS compress for generic pseudo classes/pseudo elements --- lib/exe/css.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/css.php b/lib/exe/css.php index 81f47d8fa..d54e2e46c 100644 --- a/lib/exe/css.php +++ b/lib/exe/css.php @@ -319,7 +319,8 @@ function css_compress($css){ // strip whitespaces $css = preg_replace('![\r\n\t ]+!',' ',$css); - $css = preg_replace('/ ?([:;,{}\/]) ?/','\\1',$css); + $css = preg_replace('/ ?([;,{}\/]) ?/','\\1',$css); + $css = preg_replace('/ ?: /',':',$css); // shorten colors $css = preg_replace("/#([0-9a-fA-F]{1})\\1([0-9a-fA-F]{1})\\2([0-9a-fA-F]{1})\\3/", "#\\1\\2\\3",$css); -- cgit v1.2.3 From ee7ed651b17756c390ab007be9ba96886e2b146d Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 15 Oct 2011 17:46:19 +0100 Subject: media manager: removed obsolete and broken hiding of parts of the option labels --- lib/scripts/media.js | 1 - 1 file changed, 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 2d7c8feb2..aa369657d 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -124,7 +124,6 @@ var dw_mediamanager = { $both.find('label').each(function () { var $this = jQuery(this); $this.children('input').appendTo($this.parent()); - $this.find('span span').addClass('a11y'); }); // Init buttonset -- cgit v1.2.3 From 335d098af63b77a0c6e9147978a631965d07f3bd Mon Sep 17 00:00:00 2001 From: Johan Guilbaud Date: Sat, 15 Oct 2011 18:52:46 +0200 Subject: French language update --- lib/plugins/config/lang/fr/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php index 1de255b40..2ff1eb72c 100644 --- a/lib/plugins/config/lang/fr/lang.php +++ b/lib/plugins/config/lang/fr/lang.php @@ -51,6 +51,7 @@ $lang['lang'] = 'Langue'; $lang['basedir'] = 'Répertoire de base (ex. : /dokuwiki/). Laisser vide pour une détection automatique.'; $lang['baseurl'] = 'URL de base. Laisser vide pour une détection automatique.'; $lang['savedir'] = 'Répertoire de stockage'; +$lang['cookiedir'] = 'Chemin des cookies. Laissez vide pour utiliser l\'URL de base.'; $lang['start'] = 'Nom de la page d\'accueil'; $lang['title'] = 'Titre du wiki'; $lang['template'] = 'Modèle'; -- cgit v1.2.3 From f20ead66bf5f9c5e4f7deef3cc2af9954973cc16 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 15 Oct 2011 19:20:43 +0200 Subject: readded delete in popup and link to full mediamanager FS#2347 --- lib/images/mediamanager.png | Bin 0 -> 507 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 lib/images/mediamanager.png (limited to 'lib') diff --git a/lib/images/mediamanager.png b/lib/images/mediamanager.png new file mode 100644 index 000000000..822b8458a Binary files /dev/null and b/lib/images/mediamanager.png differ -- cgit v1.2.3 From e409148d11080ca05d6c93b8fb2f33f96ce74b25 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 23 Oct 2011 06:25:34 +0200 Subject: Fix upload to deeper namespaces with new AJAX uploader Now params_toarray() correctly decodes parameters on parsing query strings --- lib/scripts/media.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index aa369657d..f76fd4065 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -682,12 +682,17 @@ var dw_mediamanager = { }); }, + /** + * Parse a URI query string to an associative array + * + * @author Kate Arzamastseva + */ params_toarray: function (str) { var vars = [], hash; var hashes = str.split('&'); for(var i = 0; i < hashes.length; i++) { hash = hashes[i].split('='); - vars[hash[0]] = hash[1]; + vars[decodeURIComponent(hash[0])] = decodeURIComponent(hash[1]); } return vars; }, -- cgit v1.2.3 From 71861ac4c5e2038488f9b59a3767a8877dec4a02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Magne=20B=C3=B8e?= Date: Sun, 23 Oct 2011 06:53:57 +0200 Subject: Norwegian language update --- lib/plugins/acl/lang/no/lang.php | 1 + lib/plugins/config/lang/no/lang.php | 1 + lib/plugins/plugin/lang/no/lang.php | 1 + lib/plugins/popularity/lang/no/lang.php | 1 + lib/plugins/revert/lang/no/lang.php | 1 + lib/plugins/usermanager/lang/no/lang.php | 1 + 6 files changed, 6 insertions(+) (limited to 'lib') diff --git a/lib/plugins/acl/lang/no/lang.php b/lib/plugins/acl/lang/no/lang.php index f0c92453c..587f9c2fc 100644 --- a/lib/plugins/acl/lang/no/lang.php +++ b/lib/plugins/acl/lang/no/lang.php @@ -16,6 +16,7 @@ * @author Erik Pedersen * @author Erik Bjørn Pedersen * @author Rune Rasmussen syntaxerror.no@gmail.com + * @author Jon Bøe */ $lang['admin_acl'] = 'Administrasjon av lister for adgangskontroll (ACL)'; $lang['acl_group'] = 'Gruppe'; diff --git a/lib/plugins/config/lang/no/lang.php b/lib/plugins/config/lang/no/lang.php index ea76616d2..3c4890149 100644 --- a/lib/plugins/config/lang/no/lang.php +++ b/lib/plugins/config/lang/no/lang.php @@ -13,6 +13,7 @@ * @author Erik Pedersen * @author Erik Bjørn Pedersen * @author Rune Rasmussen syntaxerror.no@gmail.com + * @author Jon Bøe */ $lang['menu'] = 'Konfigurasjonsinnstillinger'; $lang['error'] = 'Innstillingene ble ikke oppdatert på grunn av en eller flere ugyldig verdier. Vennligst se gjennom endringene og prøv på nytt. diff --git a/lib/plugins/plugin/lang/no/lang.php b/lib/plugins/plugin/lang/no/lang.php index 8f0ec2039..41f6d1153 100644 --- a/lib/plugins/plugin/lang/no/lang.php +++ b/lib/plugins/plugin/lang/no/lang.php @@ -13,6 +13,7 @@ * @author Erik Pedersen * @author Erik Bjørn Pedersen * @author Rune Rasmussen syntaxerror.no@gmail.com + * @author Jon Bøe */ $lang['menu'] = 'Behandle tillegg'; $lang['download'] = 'Last ned og installer et tillegg'; diff --git a/lib/plugins/popularity/lang/no/lang.php b/lib/plugins/popularity/lang/no/lang.php index 3c6dfee9e..e283fc371 100644 --- a/lib/plugins/popularity/lang/no/lang.php +++ b/lib/plugins/popularity/lang/no/lang.php @@ -11,6 +11,7 @@ * @author Erik Bjørn Pedersen * @author Rune Rasmussen syntaxerror.no@gmail.com * @author Thomas Nygreen + * @author Jon Bøe */ $lang['name'] = 'Popularitetsfeedback (kan ta litt tid å laste)'; $lang['submit'] = 'Send data'; diff --git a/lib/plugins/revert/lang/no/lang.php b/lib/plugins/revert/lang/no/lang.php index 6f9ba2555..2a6a2abd3 100644 --- a/lib/plugins/revert/lang/no/lang.php +++ b/lib/plugins/revert/lang/no/lang.php @@ -13,6 +13,7 @@ * @author Erik Pedersen * @author Erik Bjørn Pedersen * @author Rune Rasmussen syntaxerror.no@gmail.com + * @author Jon Bøe */ $lang['menu'] = 'Tilbakestillingsbehandler'; $lang['filter'] = 'Søk etter søppelmeldinger'; diff --git a/lib/plugins/usermanager/lang/no/lang.php b/lib/plugins/usermanager/lang/no/lang.php index 31e27747d..668863ec2 100644 --- a/lib/plugins/usermanager/lang/no/lang.php +++ b/lib/plugins/usermanager/lang/no/lang.php @@ -13,6 +13,7 @@ * @author Erik Pedersen * @author Erik Bjørn Pedersen * @author Rune Rasmussen syntaxerror.no@gmail.com + * @author Jon Bøe */ $lang['menu'] = 'Behandle brukere'; $lang['noauth'] = '(autentisering av brukere ikke tilgjengelig)'; -- cgit v1.2.3 From 3bc1b86f57f47cd1dc0d9443137e12fc325e304b Mon Sep 17 00:00:00 2001 From: Martin Michalek Date: Sun, 23 Oct 2011 06:56:18 +0200 Subject: Slovak language update --- lib/plugins/config/lang/sk/lang.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/sk/lang.php b/lib/plugins/config/lang/sk/lang.php index 79f54dc4d..5a94c510e 100644 --- a/lib/plugins/config/lang/sk/lang.php +++ b/lib/plugins/config/lang/sk/lang.php @@ -37,9 +37,10 @@ $lang['_msg_setting_no_default'] = 'Žiadna predvolená hodnota.'; $lang['fmode'] = 'Spôsob vytvárania súborov'; $lang['dmode'] = 'Spôsob vytvárania adresárov'; $lang['lang'] = 'Jazyk'; -$lang['basedir'] = 'Základný adresár'; -$lang['baseurl'] = 'Základná URL'; +$lang['basedir'] = 'Hlavný adresár (napr. /dokuwiki/). Prázdna hodnota znamená použitie autodetekcie.'; +$lang['baseurl'] = 'Adresa servera (napr. http://www.yourserver.com). Prázdna hodnota znamená použitie autodetekcie.'; $lang['savedir'] = 'Adresár pre ukladanie dát'; +$lang['cookiedir'] = 'Cesta k cookies. Prázdna hodnota znamená použitie adresy servera.'; $lang['start'] = 'Názov štartovacej stránky'; $lang['title'] = 'Názov wiki'; $lang['template'] = 'Šablóna'; @@ -110,6 +111,7 @@ $lang['jpg_quality'] = 'Kvalita JPG kompresie (0-100)'; $lang['subscribers'] = 'Povoliť podporu informovania o zmenách stránky'; $lang['subscribe_time'] = 'Časový inteval, po uplynutí ktorého sú zasielané informácie o zmenách stránky alebo menného priestoru (sek); hodnota by mala byť menšia ako čas zadaný pri položke recent_days.'; $lang['compress'] = 'Komprimovať CSS a javascript výstup'; +$lang['cssdatauri'] = 'Veľkosť v bytoch, do ktorej by mali byť obrázky s odkazom v CSS vložené priamo do štýlu z dôvodu obmedzenia HTTP požiadaviek. Tento postup nefunguje v IE < 8! Vhodná hodnota je od 400 do 600 bytov. Hodnota 0 deaktivuje túto metódu.'; $lang['hidepages'] = 'Skryť zodpovedajúce stránky (regulárne výrazy)'; $lang['send404'] = 'Poslať "HTTP 404/Page Not Found" pre neexistujúce stránky'; $lang['sitemap'] = 'Generovať Google sitemap (dni)'; -- cgit v1.2.3 From 6fd41509f28290d217a2c9995341215944d31916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?schplurtz=20le=20d=C3=A9boulonn=C3=A9?= Date: Thu, 27 Oct 2011 14:14:19 +0200 Subject: Use JSON wrapper in image upload (FS#2345) --- lib/exe/ajax.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php index d4ef8dc11..f8d62cb57 100644 --- a/lib/exe/ajax.php +++ b/lib/exe/ajax.php @@ -281,7 +281,8 @@ function ajax_mediaupload(){ } $result = array('error' => $msg['msg'], 'ns' => $NS); } - echo htmlspecialchars(json_encode($result), ENT_NOQUOTES); + $json = new JSON; + echo htmlspecialchars($json->encode($result), ENT_NOQUOTES); } function dir_delete($path) { -- cgit v1.2.3 From 12e233d35a8c74cd22af40fedac47511c00d3d97 Mon Sep 17 00:00:00 2001 From: Pierre Corell Date: Thu, 27 Oct 2011 23:44:00 +0200 Subject: German language updates --- lib/plugins/acl/lang/de-informal/lang.php | 1 + lib/plugins/acl/lang/de/lang.php | 1 + lib/plugins/config/lang/de-informal/lang.php | 5 ++++- lib/plugins/config/lang/de/lang.php | 1 + lib/plugins/plugin/lang/de-informal/lang.php | 1 + lib/plugins/plugin/lang/de/lang.php | 1 + lib/plugins/popularity/lang/de-informal/lang.php | 1 + lib/plugins/popularity/lang/de/lang.php | 1 + lib/plugins/revert/lang/de-informal/lang.php | 1 + lib/plugins/revert/lang/de/lang.php | 1 + lib/plugins/usermanager/lang/de-informal/lang.php | 1 + lib/plugins/usermanager/lang/de/lang.php | 1 + 12 files changed, 15 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/de-informal/lang.php b/lib/plugins/acl/lang/de-informal/lang.php index e24584a55..3f4b08c2a 100644 --- a/lib/plugins/acl/lang/de-informal/lang.php +++ b/lib/plugins/acl/lang/de-informal/lang.php @@ -7,6 +7,7 @@ * @author Marcel Metz * @author Matthias Schulte * @author Christian Wichmann + * @author Pierre Corell */ $lang['admin_acl'] = 'Zugriffskontrollsystem Management'; $lang['acl_group'] = 'Gruppe'; diff --git a/lib/plugins/acl/lang/de/lang.php b/lib/plugins/acl/lang/de/lang.php index 19bfcb0eb..eb23636c4 100644 --- a/lib/plugins/acl/lang/de/lang.php +++ b/lib/plugins/acl/lang/de/lang.php @@ -20,6 +20,7 @@ * @author Niels Lange * @author Christian Wichmann * @author Paul Lachewsky + * @author Pierre Corell */ $lang['admin_acl'] = 'Zugangsverwaltung'; $lang['acl_group'] = 'Gruppe'; diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php index ab7f59eac..a5c9d8834 100644 --- a/lib/plugins/config/lang/de-informal/lang.php +++ b/lib/plugins/config/lang/de-informal/lang.php @@ -7,6 +7,7 @@ * @author Marcel Metz * @author Matthias Schulte * @author Christian Wichmann + * @author Pierre Corell */ $lang['menu'] = 'Einstellungen'; $lang['error'] = 'Einstellungen wurden nicht aktualisiert auf Grund eines ungültigen Wertes. Bitte überprüfe deine Änderungen und versuche es erneut.
          Die/der ungültige(n) Wert(e) werden durch eine rote Umrandung hervorgehoben.'; @@ -41,6 +42,7 @@ $lang['lang'] = 'Sprache'; $lang['basedir'] = 'Installationsverzeichnis'; $lang['baseurl'] = 'Installationspfad (URL)'; $lang['savedir'] = 'Ordner zum Speichern von Daten'; +$lang['cookiedir'] = 'Cookie Pfad. Leer lassen, um die Standard-Url zu belassen.'; $lang['start'] = 'Name der Startseite'; $lang['title'] = 'Wiki Titel'; $lang['template'] = 'Vorlage'; @@ -111,9 +113,10 @@ $lang['jpg_quality'] = 'JPEG Kompressionsqualität (0-100)'; $lang['subscribers'] = 'E-Mail-Abos zulassen'; $lang['subscribe_time'] = 'Zeit nach der Zusammenfassungs- und Änderungslisten-E-Mails verschickt werden; Dieser Wert sollte kleiner als die in recent_days konfigurierte Zeit sein.'; $lang['compress'] = 'JavaScript und Stylesheets komprimieren'; +$lang['cssdatauri'] = 'Größe in Bytes, bis zu der Bilder in css-Dateien referenziert werden können, um HTTP-Anfragen zu minimieren. Diese Technik funktioniert nicht im IE. < 8! 400 bis 600 Bytes sind gute Werte. Setze 0 für inaktive Funktion.'; $lang['hidepages'] = 'Seiten verstecken (Regulärer Ausdruck)'; $lang['send404'] = 'Sende "HTTP 404/Seite nicht gefunden" für nicht existierende Seiten'; -$lang['sitemap'] = 'Erzeugte Google Sitemaps (Tage)'; +$lang['sitemap'] = 'Erzeuge Google Sitemaps (Tage)'; $lang['broken_iua'] = 'Falls die Funktion ignore_user_abort auf deinem System nicht funktioniert, könnte der Such-Index nicht funktionieren. IIS+PHP/CGI ist bekannt dafür. Siehe auch Bug 852.'; $lang['xsendfile'] = 'Den X-Sendfile-Header nutzen, um Dateien direkt vom Webserver ausliefern zu lassen? Dein Webserver muss dies unterstützen!'; $lang['renderer_xhtml'] = 'Standard-Renderer für die normale (XHTML) Wiki-Ausgabe.'; diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php index e8b21e613..66f3b179f 100644 --- a/lib/plugins/config/lang/de/lang.php +++ b/lib/plugins/config/lang/de/lang.php @@ -16,6 +16,7 @@ * @author Niels Lange * @author Christian Wichmann * @author Paul Lachewsky + * @author Pierre Corell */ $lang['menu'] = 'Konfiguration'; $lang['error'] = 'Die Einstellungen wurden wegen einer fehlerhaften Eingabe nicht gespeichert. diff --git a/lib/plugins/plugin/lang/de-informal/lang.php b/lib/plugins/plugin/lang/de-informal/lang.php index 0bd142e23..0c7fb5cdf 100644 --- a/lib/plugins/plugin/lang/de-informal/lang.php +++ b/lib/plugins/plugin/lang/de-informal/lang.php @@ -7,6 +7,7 @@ * @author Marcel Metz * @author Matthias Schulte * @author Christian Wichmann + * @author Pierre Corell */ $lang['menu'] = 'Plugins verwalten'; $lang['download'] = 'Herunterladen und installieren einer neuen Erweiterung'; diff --git a/lib/plugins/plugin/lang/de/lang.php b/lib/plugins/plugin/lang/de/lang.php index 2c606e670..db39b89d4 100644 --- a/lib/plugins/plugin/lang/de/lang.php +++ b/lib/plugins/plugin/lang/de/lang.php @@ -17,6 +17,7 @@ * @author Niels Lange * @author Christian Wichmann * @author Paul Lachewsky + * @author Pierre Corell */ $lang['menu'] = 'Plugins verwalten'; $lang['download'] = 'Neues Plugin herunterladen und installieren'; diff --git a/lib/plugins/popularity/lang/de-informal/lang.php b/lib/plugins/popularity/lang/de-informal/lang.php index f884ed690..40e6c4343 100644 --- a/lib/plugins/popularity/lang/de-informal/lang.php +++ b/lib/plugins/popularity/lang/de-informal/lang.php @@ -7,6 +7,7 @@ * @author Marcel Metz * @author Matthias Schulte * @author Christian Wichmann + * @author Pierre Corell */ $lang['name'] = 'Popularitätsrückmeldung (kann eine Weile dauern, bis es fertig geladen wurde)'; $lang['submit'] = 'Sende Daten'; diff --git a/lib/plugins/popularity/lang/de/lang.php b/lib/plugins/popularity/lang/de/lang.php index b0e915b91..42bdc14d5 100644 --- a/lib/plugins/popularity/lang/de/lang.php +++ b/lib/plugins/popularity/lang/de/lang.php @@ -14,6 +14,7 @@ * @author Niels Lange * @author Christian Wichmann * @author Paul Lachewsky + * @author Pierre Corell */ $lang['name'] = 'Popularitäts-Feedback (Eventuell längere Ladezeit)'; $lang['submit'] = 'Daten senden'; diff --git a/lib/plugins/revert/lang/de-informal/lang.php b/lib/plugins/revert/lang/de-informal/lang.php index b6709d2fa..c199bb55b 100644 --- a/lib/plugins/revert/lang/de-informal/lang.php +++ b/lib/plugins/revert/lang/de-informal/lang.php @@ -7,6 +7,7 @@ * @author Marcel Metz * @author Matthias Schulte * @author Christian Wichmann + * @author Pierre Corell */ $lang['menu'] = 'Zurückstellungsmanager'; $lang['filter'] = 'Durchsuche als Spam markierte Seiten'; diff --git a/lib/plugins/revert/lang/de/lang.php b/lib/plugins/revert/lang/de/lang.php index 3763dff75..b430ce876 100644 --- a/lib/plugins/revert/lang/de/lang.php +++ b/lib/plugins/revert/lang/de/lang.php @@ -15,6 +15,7 @@ * @author Niels Lange * @author Christian Wichmann * @author Paul Lachewsky + * @author Pierre Corell */ $lang['menu'] = 'Seiten wieder herstellen'; $lang['filter'] = 'Nach betroffenen Seiten suchen'; diff --git a/lib/plugins/usermanager/lang/de-informal/lang.php b/lib/plugins/usermanager/lang/de-informal/lang.php index 95b36c60f..63ccdd6e4 100644 --- a/lib/plugins/usermanager/lang/de-informal/lang.php +++ b/lib/plugins/usermanager/lang/de-informal/lang.php @@ -7,6 +7,7 @@ * @author Marcel Metz * @author Matthias Schulte * @author Christian Wichmann + * @author Pierre Corell */ $lang['menu'] = 'Benutzerverwalter'; $lang['noauth'] = '(Benutzeranmeldung ist nicht verfügbar)'; diff --git a/lib/plugins/usermanager/lang/de/lang.php b/lib/plugins/usermanager/lang/de/lang.php index daffab9b7..585c70a76 100644 --- a/lib/plugins/usermanager/lang/de/lang.php +++ b/lib/plugins/usermanager/lang/de/lang.php @@ -16,6 +16,7 @@ * @author Niels Lange * @author Christian Wichmann * @author Paul Lachewsky + * @author Pierre Corell */ $lang['menu'] = 'Benutzerverwaltung'; $lang['noauth'] = '(Authentifizierungssystem nicht verfügbar)'; -- cgit v1.2.3 From d9edf3516f5fb365c74220223e36698a092f63b1 Mon Sep 17 00:00:00 2001 From: Kiril Velikov Date: Thu, 27 Oct 2011 23:45:17 +0200 Subject: Bulgarian language update --- lib/plugins/acl/lang/bg/lang.php | 2 +- lib/plugins/config/lang/bg/lang.php | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/bg/lang.php b/lib/plugins/acl/lang/bg/lang.php index 0746e32c9..e260be918 100644 --- a/lib/plugins/acl/lang/bg/lang.php +++ b/lib/plugins/acl/lang/bg/lang.php @@ -21,7 +21,7 @@ $lang['p_group_ns'] = 'Членовете на групата Date: Sat, 29 Oct 2011 11:17:16 +0200 Subject: Let mediamanager screen expand on window resize (FS#2351) --- lib/scripts/media.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index f76fd4065..23a1fe5d8 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -549,7 +549,7 @@ var dw_mediamanager = { resize: function () { var $contents = jQuery('#mediamanager__page div.panelContent'), - height = jQuery(window).height() - jQuery(document).height() + + height = jQuery(window).height() - jQuery(document.body).height() + Math.max.apply(null, jQuery.map($contents, function (v) { return jQuery(v).height(); })); -- cgit v1.2.3 From 4ad1b4ca9301f5a3c8421d51956166683d1057e1 Mon Sep 17 00:00:00 2001 From: Hakan Sandell Date: Sat, 29 Oct 2011 22:22:35 +0200 Subject: Full screen media manager, file list is now updated on delete (FS#2346) --- lib/scripts/media.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 23a1fe5d8..4eefe8d57 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -427,6 +427,10 @@ var dw_mediamanager = { function (data) { dw_mediamanager.$resizables().resizable('destroy'); + if (update_list) { + dw_mediamanager.list.call(jQuery('a.selected')[0]); + } + $content.html(data); dw_mediamanager.prepare_content($content); @@ -442,9 +446,6 @@ var dw_mediamanager = { dw_mediamanager.init_ajax_uploader(); dw_mediamanager.init_options(); - if (update_list) { - dw_mediamanager.list.call(jQuery('a.files')[0]); - } }, 'html' ); -- cgit v1.2.3 From 80d6fbc300b7e423fe0d2373cf3888c80ac94a41 Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Sun, 30 Oct 2011 11:02:44 +0100 Subject: Fix double-decoding in XMLRPC putAttachment --- lib/exe/xmlrpc.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php index 8e4141d4e..e5e3298ae 100644 --- a/lib/exe/xmlrpc.php +++ b/lib/exe/xmlrpc.php @@ -7,7 +7,7 @@ if(isset($HTTP_RAW_POST_DATA)) $HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA); /** * Increased whenever the API is changed */ -define('DOKU_XMLRPC_API_VERSION',5); +define('DOKU_XMLRPC_API_VERSION', 6); require_once(DOKU_INC.'inc/init.php'); session_write_close(); //close session @@ -584,8 +584,12 @@ class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer { // save temporary file @unlink($ftmp); - $buff = base64_decode($file); - io_saveFile($ftmp, $buff); + if (preg_match('/^[A-Za-z0-9\+\/]*={0,2}$/', $file) === 1) { + // DEPRECATED: Double-decode file if it still looks like base64 + // after first decoding (which is done by the library) + $file = base64_decode($file); + } + io_saveFile($ftmp, $file); $res = media_save(array('name' => $ftmp), $id, $params['ow'], $auth, 'rename'); if (is_array($res)) { -- cgit v1.2.3 From ed993c3be49e5048c5a8582d94415a1e74e9ec00 Mon Sep 17 00:00:00 2001 From: Hakan Sandell Date: Sun, 30 Oct 2011 12:40:19 +0100 Subject: Better solution for updating files list in media manager on delete --- lib/scripts/media.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 4eefe8d57..48bfdbbe8 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -428,7 +428,7 @@ var dw_mediamanager = { dw_mediamanager.$resizables().resizable('destroy'); if (update_list) { - dw_mediamanager.list.call(jQuery('a.selected')[0]); + dw_mediamanager.list.call(jQuery('input[value="Apply"]')[0]); } $content.html(data); -- cgit v1.2.3 From 48c5eff7672d7e6fcfc3f64194e03253d8e2fd0f Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 3 Nov 2011 19:22:34 +0000 Subject: fix widths of panels in fullscreen mediamanager to be 100% when resizing (FS#2351) -- please test in different screen sizes, etc --- lib/scripts/media.js | 68 +++++++++++++--------------------------------------- 1 file changed, 16 insertions(+), 52 deletions(-) (limited to 'lib') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 48bfdbbe8..253720324 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -457,44 +457,6 @@ var dw_mediamanager = { }, window_resize: function () { - if (jQuery('#mediamanager__page').width() == dw_mediamanager.layout_width) { - return; - } - - dw_mediamanager.layout_width = jQuery('#mediamanager__page').width(); - $r = jQuery("#mediamanager__page div.panel"); - - var w = 0, wSum = 0, mCount = 0, mArray = []; - $r.each(function() { - w = jQuery(this).width(); - if (w == parseFloat(jQuery(this).css("min-width"))) { - wSum += w; - } else { - mArray[mCount] = jQuery(this); - mCount++; - } - }); - - if (mCount > 0) { - var width = (0.95 * jQuery('#mediamanager__page').width() - wSum - 30); - wSum = 0; - for(var i = 0; i < mArray.length; i++) { - wSum += mArray[i].width(); - } - for(var i = 0; i < mArray.length; i++) { - w = mArray[i].width(); - w = 100*w / wSum; - mArray[i].width(width*w/100); - } - } - - $r.each(function() { - w = jQuery(this).width(); - w = (100 * w / jQuery('#mediamanager__page').width()); - w += "%"; - jQuery(this).width(w); - }); - dw_mediamanager.resize(); dw_mediamanager.opacity_slider(); @@ -513,29 +475,31 @@ var dw_mediamanager = { update_resizable: function () { $resizables = dw_mediamanager.$resizables(); - $resizables.resizable({ handles: 'e' , + $resizables.resizable({ + handles: 'e', resize: function(event, ui){ - var w = 0; + var widthFull = jQuery('#mediamanager__page').width(); + var widthResizables = 0; $resizables.each(function() { - w += jQuery(this).width(); + widthResizables += jQuery(this).width(); }); - wSum = w + parseFloat(jQuery('#mediamanager__page div.file').css("min-width")); + var $filePanel = jQuery('#mediamanager__page div.panel.file'); - // max width of resizable column - var maxWidth = 0.95 * jQuery('#mediamanager__page').width() - wSum + jQuery(this).width() - 30; + // set max width of resizable column + var widthOtherResizable = widthResizables - jQuery(this).width(); + var minWidthNonResizable = parseFloat($filePanel.css("min-width")); + var maxWidth = widthFull - (widthOtherResizable + minWidthNonResizable); $resizables.resizable( "option", "maxWidth", maxWidth ); - // percentage width of the first two columns - var wLeft = ( 100*(w+30) / jQuery('#mediamanager__page').width() ); - - // width of the third column - var wRight = 95-wLeft; - wRight += "%"; - jQuery('#mediamanager__page div.file').width(wRight); + // width of file panel in % = 100% - width of resizables in % + // this calculates with 99.99 and not 100 to overcome rounding errors + var relWidthNonResizable = 99.99 - (100 * widthResizables / widthFull); + // set width of file panel + $filePanel.width(relWidthNonResizable+'%'); $resizables.each(function() { w = jQuery(this).width(); - w = (100 * w / jQuery('#mediamanager__page').width()); + w = (99.99 * w / widthFull); w += "%"; jQuery(this).width(w); }); -- cgit v1.2.3 From c81eb1329d8ce142828486267004f746a785e085 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 5 Nov 2011 01:23:47 +0000 Subject: removed font declarations from jquery-ui theme --- lib/scripts/jquery/jquery-ui-theme/smoothness.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/scripts/jquery/jquery-ui-theme/smoothness.css b/lib/scripts/jquery/jquery-ui-theme/smoothness.css index 0f1a7e770..44883417d 100644 --- a/lib/scripts/jquery/jquery-ui-theme/smoothness.css +++ b/lib/scripts/jquery/jquery-ui-theme/smoothness.css @@ -56,9 +56,8 @@ /* Component containers ----------------------------------*/ -.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; } .ui-widget .ui-widget { font-size: 1em; } -.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; } +.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-size: 1em; } .ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; } .ui-widget-content a { color: #222222; } .ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; } -- cgit v1.2.3 From 1811609e717748b047e83bde4d98069b9830aba5 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 5 Nov 2011 10:52:56 +0000 Subject: re-added font-size to .ui-widget of jqueryui theme to make programmatical removing of font-family easier --- lib/scripts/jquery/jquery-ui-theme/smoothness.css | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/scripts/jquery/jquery-ui-theme/smoothness.css b/lib/scripts/jquery/jquery-ui-theme/smoothness.css index 44883417d..910d24b95 100644 --- a/lib/scripts/jquery/jquery-ui-theme/smoothness.css +++ b/lib/scripts/jquery/jquery-ui-theme/smoothness.css @@ -56,6 +56,7 @@ /* Component containers ----------------------------------*/ +.ui-widget { font-size: 1.1em; } .ui-widget .ui-widget { font-size: 1em; } .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-size: 1em; } .ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; } -- cgit v1.2.3 From 67fd10d7d6376d0033f3bee5b62b5ec2b80b5a9a Mon Sep 17 00:00:00 2001 From: Guy Brand Date: Sat, 5 Nov 2011 12:05:34 +0100 Subject: Remove font family declarations from css in the jquery update script --- lib/scripts/jquery/update.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib') diff --git a/lib/scripts/jquery/update.sh b/lib/scripts/jquery/update.sh index 38f38bece..fde46f4d7 100755 --- a/lib/scripts/jquery/update.sh +++ b/lib/scripts/jquery/update.sh @@ -23,3 +23,6 @@ for img in $images do wget -nv https://ajax.googleapis.com/ajax/libs/jqueryui/1/themes/smoothness/$img -O jquery-ui-theme/$img done + +# remove font family declarations from smoothness CSS +sed -i "s/font-family:[^;]*; \?//" jquery-ui-theme/smoothness.css -- cgit v1.2.3 From 34bc7405a09b0c63ed7eef338853e13d377c36e6 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 5 Nov 2011 12:38:31 +0000 Subject: paraphrased '<' character in some language files (en, de, de-informal) to avoid XML errors -- please fix other languages --- lib/plugins/config/lang/de-informal/lang.php | 2 +- lib/plugins/config/lang/de/lang.php | 4 ++-- lib/plugins/config/lang/en/lang.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/de-informal/lang.php b/lib/plugins/config/lang/de-informal/lang.php index a5c9d8834..1de388214 100644 --- a/lib/plugins/config/lang/de-informal/lang.php +++ b/lib/plugins/config/lang/de-informal/lang.php @@ -113,7 +113,7 @@ $lang['jpg_quality'] = 'JPEG Kompressionsqualität (0-100)'; $lang['subscribers'] = 'E-Mail-Abos zulassen'; $lang['subscribe_time'] = 'Zeit nach der Zusammenfassungs- und Änderungslisten-E-Mails verschickt werden; Dieser Wert sollte kleiner als die in recent_days konfigurierte Zeit sein.'; $lang['compress'] = 'JavaScript und Stylesheets komprimieren'; -$lang['cssdatauri'] = 'Größe in Bytes, bis zu der Bilder in css-Dateien referenziert werden können, um HTTP-Anfragen zu minimieren. Diese Technik funktioniert nicht im IE. < 8! 400 bis 600 Bytes sind gute Werte. Setze 0 für inaktive Funktion.'; +$lang['cssdatauri'] = 'Größe in Bytes, bis zu der Bilder in css-Dateien referenziert werden können, um HTTP-Anfragen zu minimieren. Diese Technik funktioniert nicht im IE 7 und älter! 400 bis 600 Bytes sind gute Werte. Setze 0 für inaktive Funktion.'; $lang['hidepages'] = 'Seiten verstecken (Regulärer Ausdruck)'; $lang['send404'] = 'Sende "HTTP 404/Seite nicht gefunden" für nicht existierende Seiten'; $lang['sitemap'] = 'Erzeuge Google Sitemaps (Tage)'; diff --git a/lib/plugins/config/lang/de/lang.php b/lib/plugins/config/lang/de/lang.php index 66f3b179f..09e3f76f9 100644 --- a/lib/plugins/config/lang/de/lang.php +++ b/lib/plugins/config/lang/de/lang.php @@ -124,8 +124,8 @@ $lang['jpg_quality'] = 'JPEG Kompressionsqualität (0-100)'; $lang['subscribers'] = 'E-Mail-Abos zulassen'; $lang['subscribe_time'] = 'Zeit nach der Zusammenfassungs- und Änderungslisten-E-Mails verschickt werden; Dieser Wert sollte kleiner als die in recent_days konfigurierte Zeit sein.'; $lang['compress'] = 'JavaScript und Stylesheets komprimieren'; -$lang['cssdatauri'] = 'Oberer Grenzwert in Bytes für Dateigrössen. Im CSS referenzierte Bilddateien unter diesem Grenzwert werden direkt ins Stylesheet eingebettet um den "HTTP request header overload" zu reduzieren. -Diese Technik funktioniert nicht in Internet Explorer <8! +$lang['cssdatauri'] = 'Oberer Grenzwert in Bytes für Dateigrössen. Im CSS referenzierte Bilddateien unter diesem Grenzwert werden direkt ins Stylesheet eingebettet um den "HTTP request header overload" zu reduzieren. +Diese Technik funktioniert nicht im Internet Explorer 7 und älter! Empfohlene Einstellung: 400 to 600 Bytes. Setzen Sie die Einstellung auf 0 um die Funktion zu deaktivieren. diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 8609e278f..380f2fd1d 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -134,7 +134,7 @@ $lang['jpg_quality'] = 'JPG compression quality (0-100)'; $lang['subscribers'] = 'Enable page subscription support'; $lang['subscribe_time'] = 'Time after which subscription lists and digests are sent (sec); This should be smaller than the time specified in recent_days.'; $lang['compress'] = 'Compact CSS and javascript output'; -$lang['cssdatauri'] = 'Size in bytes up to which images referenced in CSS files should be embedded right into the stylesheet to reduce HTTP request header overhead. This technique won\'t work in IE < 8! 400 to 600 bytes is a good value. Set 0 to disable.'; +$lang['cssdatauri'] = 'Size in bytes up to which images referenced in CSS files should be embedded right into the stylesheet to reduce HTTP request header overhead. This technique won\'t work in IE 7 and below! 400 to 600 bytes is a good value. Set 0 to disable.'; $lang['hidepages'] = 'Hide matching pages (regular expressions)'; $lang['send404'] = 'Send "HTTP 404/Page Not Found" for non existing pages'; $lang['sitemap'] = 'Generate Google sitemap (days)'; -- cgit v1.2.3 From 14b217abd656ce14de2e40246fd982b96ade5b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Neves?= Date: Sat, 5 Nov 2011 15:58:04 +0100 Subject: pt: paraphrased '<' character in some language files to avoid XML errors as per commit 34bc7405a09b0c63ed7eef338853e13d377c36e6 --- lib/plugins/config/lang/pt/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/pt/lang.php b/lib/plugins/config/lang/pt/lang.php index f4382aa94..fe05bd281 100644 --- a/lib/plugins/config/lang/pt/lang.php +++ b/lib/plugins/config/lang/pt/lang.php @@ -112,7 +112,7 @@ $lang['jpg_quality'] = 'Compressão/Qualidade JPG (0-100)'; $lang['subscribers'] = 'Habilitar o suporte a subscrição de páginas '; $lang['subscribe_time'] = 'Tempo após o qual as listas de subscrição e "digests" são enviados (seg.); Isto deve ser inferior ao tempo especificado em recent_days.'; $lang['compress'] = 'Compactar as saídas de CSS e JavaScript'; -$lang['cssdatauri'] = 'Tamanho em bytes até ao qual as imagens referenciadas em ficheiros CSS devem ser embutidas diretamente no CSS para reduzir a carga de pedidos HTTP extra. Esta técnica não funciona em IE < 8! 400 a 600 bytes é um bom valor. Escolher 0 para desativar.'; +$lang['cssdatauri'] = 'Tamanho em bytes até ao qual as imagens referenciadas em ficheiros CSS devem ser embutidas diretamente no CSS para reduzir a carga de pedidos HTTP extra. Esta técnica não funciona em IE 7 e abaixo! 400 a 600 bytes é um bom valor. Escolher 0 para desativar.'; $lang['hidepages'] = 'Esconder páginas correspondentes (expressões regulares)'; $lang['send404'] = 'Enviar "HTTP 404/Página não encontrada" para páginas não existentes'; $lang['sitemap'] = 'Gerar Sitemap Google (dias)'; -- cgit v1.2.3 From 8707b67124d73a0df1b88c2f0da037aa0fa5ba16 Mon Sep 17 00:00:00 2001 From: Guy Brand Date: Sat, 5 Nov 2011 22:07:39 +0100 Subject: French strings minor fix and obsolete email address update --- lib/plugins/acl/lang/fr/lang.php | 3 +-- lib/plugins/config/lang/fr/lang.php | 3 +-- lib/plugins/plugin/lang/fr/lang.php | 3 +-- lib/plugins/popularity/lang/fr/lang.php | 3 +-- lib/plugins/revert/lang/fr/lang.php | 3 +-- lib/plugins/usermanager/lang/fr/lang.php | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php index fd3f40dfc..86f493b52 100644 --- a/lib/plugins/acl/lang/fr/lang.php +++ b/lib/plugins/acl/lang/fr/lang.php @@ -7,11 +7,10 @@ * @author Antoine Fixary * @author cumulus * @author Gwenn Gueguen - * @author Guy Brand + * @author Guy Brand * @author Fabien Chabreuil * @author Stéphane Chamberland * @author Maurice A. LeBlanc - * @author gb@isis.u-strasbg.fr * @author stephane.gully@gmail.com * @author Guillaume Turri * @author Erik Pedersen diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php index 2ff1eb72c..8f669a629 100644 --- a/lib/plugins/config/lang/fr/lang.php +++ b/lib/plugins/config/lang/fr/lang.php @@ -3,10 +3,9 @@ * french language file * * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * @author Guy Brand + * @author Guy Brand * @author Delassaux Julien * @author Maurice A. LeBlanc - * @author gb@isis.u-strasbg.fr * @author stephane.gully@gmail.com * @author Guillaume Turri * @author Erik Pedersen diff --git a/lib/plugins/plugin/lang/fr/lang.php b/lib/plugins/plugin/lang/fr/lang.php index 0ff26da19..b86c57b53 100644 --- a/lib/plugins/plugin/lang/fr/lang.php +++ b/lib/plugins/plugin/lang/fr/lang.php @@ -3,10 +3,9 @@ * french language file * * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * @author Guy Brand + * @author Guy Brand * @author Delassaux Julien * @author Maurice A. LeBlanc - * @author gb@isis.u-strasbg.fr * @author stephane.gully@gmail.com * @author Guillaume Turri * @author Erik Pedersen diff --git a/lib/plugins/popularity/lang/fr/lang.php b/lib/plugins/popularity/lang/fr/lang.php index 3ccc4cb5f..ae12c6683 100644 --- a/lib/plugins/popularity/lang/fr/lang.php +++ b/lib/plugins/popularity/lang/fr/lang.php @@ -2,8 +2,7 @@ /** * French language file * - * @author gb@isis.u-strasbg.fr - * @author Guy Brand + * @author Guy Brand * @author stephane.gully@gmail.com * @author Guillaume Turri * @author Erik Pedersen diff --git a/lib/plugins/revert/lang/fr/lang.php b/lib/plugins/revert/lang/fr/lang.php index 17a2c3a01..15d4d39c3 100644 --- a/lib/plugins/revert/lang/fr/lang.php +++ b/lib/plugins/revert/lang/fr/lang.php @@ -3,8 +3,7 @@ * french language file * @author Delassaux Julien * @author Maurice A. LeBlanc - * @author Guy Brand - * @author gb@isis.u-strasbg.fr + * @author Guy Brand * @author stephane.gully@gmail.com * @author Guillaume Turri * @author Erik Pedersen diff --git a/lib/plugins/usermanager/lang/fr/lang.php b/lib/plugins/usermanager/lang/fr/lang.php index b6910663c..875b6d1a6 100644 --- a/lib/plugins/usermanager/lang/fr/lang.php +++ b/lib/plugins/usermanager/lang/fr/lang.php @@ -2,10 +2,9 @@ /** * french language file * - * @author Guy Brand + * @author Guy Brand * @author Delassaux Julien * @author Maurice A. LeBlanc - * @author gb@isis.u-strasbg.fr * @author stephane.gully@gmail.com * @author Guillaume Turri * @author Erik Pedersen -- cgit v1.2.3 From 84b1efdd1c75618a7bd713e8d3b0c9eba6bff2d0 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 6 Nov 2011 15:25:38 +0000 Subject: fixed resizing mediamanager panels in Chrome using browser sniffing (FS#2351) - any better solution welcome --- lib/scripts/media.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 253720324..b1a175c26 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -497,12 +497,15 @@ var dw_mediamanager = { // set width of file panel $filePanel.width(relWidthNonResizable+'%'); - $resizables.each(function() { - w = jQuery(this).width(); - w = (99.99 * w / widthFull); - w += "%"; - jQuery(this).width(w); - }); + // FIXME: please fix without browser sniffing + if (jQuery.browser != 'webkit') { + $resizables.each(function() { + w = jQuery(this).width(); + w = (99.99 * w / widthFull); + w += "%"; + jQuery(this).width(w); + }); + } dw_mediamanager.opacity_slider(); dw_mediamanager.portions_slider(); -- cgit v1.2.3 From 410bfddd85883e6582b3b0ccaa41738b84037169 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 6 Nov 2011 15:31:37 +0000 Subject: improved $.browser usage in media panel fix --- lib/scripts/media.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index b1a175c26..7f5514f56 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -498,7 +498,7 @@ var dw_mediamanager = { $filePanel.width(relWidthNonResizable+'%'); // FIXME: please fix without browser sniffing - if (jQuery.browser != 'webkit') { + if (!jQuery.browser.webkit) { $resizables.each(function() { w = jQuery(this).width(); w = (99.99 * w / widthFull); -- cgit v1.2.3 From 84d1837d15d5774d4d35829cba41288b8a05a9c2 Mon Sep 17 00:00:00 2001 From: Martin Michalek Date: Thu, 10 Nov 2011 21:46:13 +0100 Subject: Slovak language update --- lib/plugins/config/lang/sk/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/plugins/config/lang/sk/lang.php b/lib/plugins/config/lang/sk/lang.php index 5a94c510e..72ce10775 100644 --- a/lib/plugins/config/lang/sk/lang.php +++ b/lib/plugins/config/lang/sk/lang.php @@ -111,7 +111,7 @@ $lang['jpg_quality'] = 'Kvalita JPG kompresie (0-100)'; $lang['subscribers'] = 'Povoliť podporu informovania o zmenách stránky'; $lang['subscribe_time'] = 'Časový inteval, po uplynutí ktorého sú zasielané informácie o zmenách stránky alebo menného priestoru (sek); hodnota by mala byť menšia ako čas zadaný pri položke recent_days.'; $lang['compress'] = 'Komprimovať CSS a javascript výstup'; -$lang['cssdatauri'] = 'Veľkosť v bytoch, do ktorej by mali byť obrázky s odkazom v CSS vložené priamo do štýlu z dôvodu obmedzenia HTTP požiadaviek. Tento postup nefunguje v IE < 8! Vhodná hodnota je od 400 do 600 bytov. Hodnota 0 deaktivuje túto metódu.'; +$lang['cssdatauri'] = 'Veľkosť v bytoch, do ktorej by mali byť obrázky s odkazom v CSS vložené priamo do štýlu z dôvodu obmedzenia HTTP požiadaviek. Tento postup nefunguje v IE verzie 7 a nižšie! Vhodná hodnota je od 400 do 600 bytov. Hodnota 0 deaktivuje túto metódu.'; $lang['hidepages'] = 'Skryť zodpovedajúce stránky (regulárne výrazy)'; $lang['send404'] = 'Poslať "HTTP 404/Page Not Found" pre neexistujúce stránky'; $lang['sitemap'] = 'Generovať Google sitemap (dni)'; -- cgit v1.2.3 From 2c961e6163b23ef3f1d93b1b0c23b214f3aeb358 Mon Sep 17 00:00:00 2001 From: Robert Bogenschneider Date: Thu, 10 Nov 2011 21:47:17 +0100 Subject: Esperanto language update --- lib/plugins/acl/lang/eo/help.txt | 2 +- lib/plugins/acl/lang/eo/lang.php | 12 ++--- lib/plugins/config/lang/eo/intro.txt | 2 +- lib/plugins/config/lang/eo/lang.php | 72 ++++++++++++++--------------- lib/plugins/plugin/lang/eo/admin_plugin.txt | 2 +- lib/plugins/plugin/lang/eo/lang.php | 4 +- lib/plugins/popularity/lang/eo/intro.txt | 2 +- lib/plugins/popularity/lang/eo/lang.php | 2 +- lib/plugins/revert/lang/eo/lang.php | 2 +- lib/plugins/usermanager/lang/eo/lang.php | 2 +- 10 files changed, 51 insertions(+), 51 deletions(-) (limited to 'lib') diff --git a/lib/plugins/acl/lang/eo/help.txt b/lib/plugins/acl/lang/eo/help.txt index 0c03b8605..cc3f63e5a 100644 --- a/lib/plugins/acl/lang/eo/help.txt +++ b/lib/plugins/acl/lang/eo/help.txt @@ -8,4 +8,4 @@ La suba agordilo permesas al vi rigardi kaj modifi la rajtojn de elektita uzanto En la suba tabelo ĉiuj aktuale difinitaj alirkontrolaj reguloj estas montritaj. Vi povas uzi ĝin por rapide forigi aŭ ŝanĝi multoblajn regulojn. -Legado de la [[doku>acl|oficiala dokumentaro pri ACL]] povus helpi vin bone kompreni kiel alirkontrolo funkcias en DokuWiki. \ No newline at end of file +Legado de la [[doku>acl|oficiala dokumentaro pri ACL]] povus helpi vin bone kompreni kiel alirkontrolo funkcias en DokuWiki. \ No newline at end of file diff --git a/lib/plugins/acl/lang/eo/lang.php b/lib/plugins/acl/lang/eo/lang.php index 239578f57..72ce576ee 100644 --- a/lib/plugins/acl/lang/eo/lang.php +++ b/lib/plugins/acl/lang/eo/lang.php @@ -19,12 +19,12 @@ $lang['acl_perms'] = 'Rajtoj por'; $lang['page'] = 'Paĝo'; $lang['namespace'] = 'Nomspaco'; $lang['btn_select'] = 'Elekti'; -$lang['p_user_id'] = 'Uzanto %s aktuale havas la jenajn rajtojn en la paĝo %s: %s.'; -$lang['p_user_ns'] = 'Uzanto %s aktuale havas la jenajn rajtojn en la nomspaco %s: %s.'; -$lang['p_group_id'] = 'Anoj de la grupo %s aktuale havas la jenajn rajtojn en la paĝo %s: %s.'; -$lang['p_group_ns'] = 'Anoj de la grupo %s aktuale havas la jenajn rajtojn en la nomspaco %s: %s.'; -$lang['p_choose_id'] = 'Bonvole enmeti uzanton aŭ grupon en la suba agordilo por rigardi aŭ redakti la aron da rajtoj por la paĝo %s.'; -$lang['p_choose_ns'] = 'Bonvole enmeti uzanton aŭ grupon en la suba agordilo por rigardi aŭ redakti la aron da rajtoj por la nomspaco %s.'; +$lang['p_user_id'] = 'Uzanto <b class="acluser">%s</b> aktuale havas la jenajn rajtojn en la paĝo <b class="aclpage">%s</b>: <i>%s</i>.'; +$lang['p_user_ns'] = 'Uzanto <b class="acluser">%s</b> aktuale havas la jenajn rajtojn en la nomspaco <b class="aclns">%s</b>: <i>%s</i>.'; +$lang['p_group_id'] = 'Anoj de la grupo <b class="aclgroup">%s</b> aktuale havas la jenajn rajtojn en la paĝo <b class="aclpage">%s</b>: <i>%s</i>.'; +$lang['p_group_ns'] = 'Anoj de la grupo <b class="aclgroup">%s</b> aktuale havas la jenajn rajtojn en la nomspaco <b class="aclns">%s</b>: <i>%s</i>.'; +$lang['p_choose_id'] = 'Bonvolu <b>enmeti uzanton aŭ grupon</b> en la suba agordilo por rigardi aŭ redakti la aron da rajtoj por la paĝo <b class="aclpage">%s</b>.'; +$lang['p_choose_ns'] = 'Bonvolu <b>enmeti uzanton aŭ grupon</b> en la suba agordilo por rigardi aŭ redakti la aron da rajtoj por la nomspaco <b class="aclns">%s</b>.'; $lang['p_inherited'] = 'Rimarko: tiuj rajtoj ne estis rekte difinitaj, sed ili estis hereditaj el aliaj pli superaj grupoj aŭ nomspacoj.'; $lang['p_isadmin'] = 'Rimarko: la elektita grupo aŭ uzanto ĉiam havas plenan rajtaron ĉar ĝi estas difinita kiel superuzanto.'; $lang['p_include'] = 'Plialtaj permesoj inkluzivas malpli altajn. La permesoj por Krei, Alŝuti kaj Forigi nur aplikeblas al nomspacoj, ne al paĝoj.'; diff --git a/lib/plugins/config/lang/eo/intro.txt b/lib/plugins/config/lang/eo/intro.txt index 641f68d9f..c717d9a4d 100644 --- a/lib/plugins/config/lang/eo/intro.txt +++ b/lib/plugins/config/lang/eo/intro.txt @@ -1,6 +1,6 @@ ====== Administrilo de Agordoj ====== -Uzu tiun ĉi paĝon por kontroli la difinojn de via DokuWiki-instalo. Por helpo pri specifaj difinoj aliru al [[doku>config]]. Por pli detaloj pri tiu ĉi kromaĵo, vidu [[doku>plugin:config]]. +Uzu tiun ĉi paĝon por kontroli la difinojn de via DokuWiki-instalo. Por helpo pri specifaj difinoj aliru al [[doku>config]]. Por pli detaloj pri tiu ĉi kromaĵo, vidu [[doku>plugin:config]]. Difinoj montrataj kun hela ruĝa fono estas protektitaj kaj ne povas esti modifataj per tiu ĉi kromaĵo. Difinoj kun blua fono estas aprioraj valoroj kaj difinoj montrataj kun blanka fono estis iam difinataj por tiu ĉi specifa instalo. Ambaŭ blua kaj blanka difinoj povas esti modifataj. diff --git a/lib/plugins/config/lang/eo/lang.php b/lib/plugins/config/lang/eo/lang.php index ca98ca319..b0411ec14 100644 --- a/lib/plugins/config/lang/eo/lang.php +++ b/lib/plugins/config/lang/eo/lang.php @@ -14,11 +14,11 @@ * @author Robert BOGENSCHNEIDER */ $lang['menu'] = 'Agordaj Difinoj'; -$lang['error'] = 'La difinoj ne estas ĝisdatigitaj pro malvalida valoro: kompleze reviziu viajn ŝanĝojn kaj resubmetu ilin. -
          La malkorekta(j) valoro(j) estas ĉirkaŭita(j) de ruĝa kadro.'; +$lang['error'] = 'La difinoj ne estas ĝisdatigitaj pro malvalida valoro: bonvolu revizii viajn ŝanĝojn kaj resubmeti ilin. +<br />La malkorekta(j) valoro(j) estas ĉirkaŭita(j) de ruĝa kadro.'; $lang['updated'] = 'La difinoj estis sukcese ĝisdatigitaj.'; $lang['nochoice'] = '(neniu alia elekto disponeblas)'; -$lang['locked'] = 'La difin-dosiero ne povas esti ĝisdatigita; se tio ne estas intenca,
          certiĝu, ke la dosieroj de lokaj difinoj havas korektajn nomojn kaj permesojn.'; +$lang['locked'] = 'La difin-dosiero ne povas esti ĝisdatigita; se tio ne estas intenca, <br /> certiĝu, ke la dosieroj de lokaj difinoj havas korektajn nomojn kaj permesojn.'; $lang['danger'] = 'Danĝero: ŝanĝo tiun opcion povus igi vian vikion kaj la agordan menuon neatingebla.'; $lang['warning'] = 'Averto: ŝanĝi tiun opcion povus rezulti en neatendita konduto.'; $lang['security'] = 'Sekureca averto: ŝanĝi tiun opcion povus krei sekurecan riskon.'; @@ -47,7 +47,7 @@ $lang['lang'] = 'Lingvo'; $lang['basedir'] = 'Baza dosierujo'; $lang['baseurl'] = 'Baza URL'; $lang['savedir'] = 'Dosierujo por konservi datenaron'; -$lang['cookiedir'] = 'KUketopado. Lasu malplena por uzi baseurl.'; +$lang['cookiedir'] = 'Kuketopado. Lasu malplena por uzi baseurl.'; $lang['start'] = 'Nomo de la hejmpaĝo'; $lang['title'] = 'Titolo de la vikio'; $lang['template'] = 'Ŝablono'; @@ -59,7 +59,7 @@ $lang['youarehere'] = 'Hierarkiaj paderoj'; $lang['typography'] = 'Fari tipografiajn anstataŭigojn'; $lang['htmlok'] = 'Ebligi enmeton de HTML-aĵoj'; $lang['phpok'] = 'Ebligi enmeton de PHP-aĵoj'; -$lang['dformat'] = 'Formato de datoj (vidu la PHP-an funkcion strftime)'; +$lang['dformat'] = 'Formato de datoj (vidu la PHP-an funkcion <a href="http://www.php.net/strftime">strftime</a>)'; $lang['signature'] = 'Subskribo'; $lang['toptoclevel'] = 'Supera nivelo por la enhavtabelo'; $lang['tocminheads'] = 'Minimuma kvanto da ĉeftitoloj, kiu difinas ĉu la TOC estas kreita.'; @@ -70,10 +70,10 @@ $lang['deaccent'] = 'Netaj paĝnomoj'; $lang['useheading'] = 'Uzi unuan titolon por paĝnomoj'; $lang['refcheck'] = 'Kontrolo por referencoj al aŭdvidaĵoj'; $lang['refshow'] = 'Nombro da referencoj al aŭdvidaĵoj por montri'; -$lang['allowdebug'] = 'Ebligi kodumpurigadon malebligu se ne necese!'; +$lang['allowdebug'] = 'Ebligi kodumpurigadon <b>malebligu se ne necese!</b>'; $lang['usewordblock'] = 'Bloki spamon surbaze de vortlisto'; -$lang['indexdelay'] = 'Prokrasto antaŭ ol indeksi (sek.)'; -$lang['relnofollow'] = 'Uzi rel="nofollow" kun eksteraj ligiloj'; +$lang['indexdelay'] = 'Prokrasto antaŭ ol indeksi (en sekundoj)'; +$lang['relnofollow'] = 'Uzi rel="nofollow" kun eksteraj ligiloj'; $lang['mailguard'] = 'Nebuligi retadresojn'; $lang['iexssprotect'] = 'Ekzameni elŝutaĵojn kontraŭ eblaj malicaj ĴavaSkripto aŭ HTML-a kodumaĵo'; $lang['showuseras'] = 'Kion montrigi dum indiko al la uzanto kiu laste redaktis paĝon.'; @@ -105,28 +105,28 @@ $lang['fnencode'] = 'Kodiga metodo por ne-ASCII-aj dosiernomoj.'; $lang['autoplural'] = 'Kontroli pluralajn formojn en ligiloj'; $lang['compression'] = 'Kompaktigmetodo por arkivaj dosieroj'; $lang['cachetime'] = 'Maksimuma aĝo por provizmemoro (sek.)'; -$lang['locktime'] = 'Maksimuma aĝo por serurdosierojn (sek.)'; -$lang['fetchsize'] = 'Maksimuma grandeco (bitokoj) permesita al "fetch.php" elŝuti el ekstere'; +$lang['locktime'] = 'Maksimuma aĝo por serurdosieroj (sek.)'; +$lang['fetchsize'] = 'Maksimuma grandeco (bitokoj), kiun fetch.php rajtas elŝuti el ekstere'; $lang['notify'] = 'Sendi avizojn pri ŝanĝoj al tiu ĉi retadreso'; -$lang['registernotify'] = 'Sendi informon pri ĵus aliĝintoj al tiu ĉi retadreso'; +$lang['registernotify'] = 'Sendi informon pri ĵusaj aliĝintoj al tiu ĉi retadreso'; $lang['mailfrom'] = 'Retadreso uzota por aŭtomataj retmesaĝoj '; $lang['mailprefix'] = 'Retpoŝta temo-prefikso por uzi en aŭtomataj mesaĝoj'; -$lang['gzip_output'] = 'Uzi gzip-a enhav-enkodigo por XHTML'; -$lang['gdlib'] = 'Versio de GD Lib'; +$lang['gzip_output'] = 'Uzi gzip-an enhav-enkodigon por XHTML'; +$lang['gdlib'] = 'Versio de GD-Lib'; $lang['im_convert'] = 'Pado al la konvertilo de ImageMagick'; $lang['jpg_quality'] = 'Kompaktiga kvalito de JPG (0-100)'; $lang['subscribers'] = 'Ebligi subtenon de avizoj pri ŝanĝoj sur paĝoj'; $lang['subscribe_time'] = 'Tempo, post kiu abonlistoj kaj kolektaĵoj sendiĝas (sek); Tio estu pli malgranda ol la tempo indikita en recent_days.'; $lang['compress'] = 'Kompaktigi CSS-ajn kaj ĵavaskriptajn elmetojn'; -$lang['cssdatauri'] = 'Grandeco en bitokoj, ĝis kiom en CSS-dosieroj referencitaj bildoj estu enmetataj rekte en la stilfolion por malgrandigi vanan HTTP-kapan trafikon. Tiu tekniko ne funkcias en IE < 8! -400 ĝis 600 bitokoj estas bona grandeco. Indiku 0 por malebligi enmeton.'; +$lang['cssdatauri'] = 'Grandeco en bitokoj, ĝis kiom en CSS-dosieroj referencitaj bildoj estu enmetataj rekte en la stilfolion por malgrandigi vanan HTTP-kapan trafikon. Tiu tekniko ne funkcias en IE 7 aŭ pli frua! +<code>400</code> ĝis <code>600</code> bitokoj estas bona grandeco. Indiku <code>0</code> por malebligi enmeton.'; $lang['hidepages'] = 'Kaŝi kongruantajn paĝojn (laŭ regulaj esprimoj)'; -$lang['send404'] = 'Sendi la mesaĝon "HTTP 404/Ne Trovita Paĝo" por ne ekzistantaj paĝoj'; -$lang['sitemap'] = 'Krei Guglan paĝarmapon "sitemap" (po kiom tagoj)'; -$lang['broken_iua'] = 'Ĉu la funkcio "ignore_user_abort" difektas en via sistemo? Tio povus misfunkciigi la serĉindekson. IIS+PHP/CGI estas konata kiel fuŝaĵo. Vidu Cimon 852 por pli da informoj.'; -$lang['xsendfile'] = 'Ĉu oni uzu la kaplinion X-Sendfile por ebligi al la retservilo liveri fiksajn dosierojn? Via retservilo bezonus subteni tion.'; +$lang['send404'] = 'Sendi la mesaĝon "HTTP 404/Paĝo ne trovita" por ne ekzistantaj paĝoj'; +$lang['sitemap'] = 'Krei Guglan paĝarmapon "sitemap" (po kiom tagoj)'; +$lang['broken_iua'] = 'Ĉu la funkcio "ignore_user_abort" difektas en via sistemo? Tio povus misfunkciigi la serĉindekson. IIS+PHP/CGI estas konata kiel fuŝaĵo. Vidu <a href="http://bugs.splitbrain.org/?do=details&task_id=852">Cimon 852</a> por pli da informoj.'; +$lang['xsendfile'] = 'Ĉu uzi la kaplinion X-Sendfile por ebligi al la retservilo liveri fiksajn dosierojn? Via retservilo bezonus subteni tion.'; $lang['renderer_xhtml'] = 'Prezentilo por la ĉefa vikia rezulto (xhtml)'; -$lang['renderer__core'] = '%s (DokuWiki-a nukleo)'; +$lang['renderer__core'] = '%s (DokuWiki-a kerno)'; $lang['renderer__plugin'] = '%s (kromaĵo)'; $lang['rememberme'] = 'Permesi longdaŭran ensalutajn kuketojn (rememoru min)'; $lang['rss_type'] = 'XML-a tipo de novaĵ-fluo'; @@ -135,16 +135,16 @@ $lang['rss_content'] = 'Kion montri en la XML-aj novaĵ-flueroj?'; $lang['rss_update'] = 'Intertempo por ĝisdatigi XML-an novaĵ-fluon (sek.)'; $lang['recent_days'] = 'Kiom da freŝaj ŝanĝoj por teni (tagoj)'; $lang['rss_show_summary'] = 'XML-a novaĵ-fluo montras resumon en la titolo'; -$lang['target____wiki'] = 'Parametro "target" (celo) por internaj ligiloj'; -$lang['target____interwiki'] = 'Parametro "target" (celo) por intervikiaj ligiloj'; -$lang['target____extern'] = 'Parametro "target" (celo) por eksteraj ligiloj'; -$lang['target____media'] = 'Parametro "target" (celo) por aŭdvidaĵaj ligiloj'; -$lang['target____windows'] = 'Parametro "target" (celo) por Vindozaj ligiloj'; -$lang['proxy____host'] = 'Retservilnomo de la "Proxy"'; -$lang['proxy____port'] = 'Pordo ĉe la "Proxy"'; -$lang['proxy____user'] = 'Uzantonomo ĉe la "Proxy"'; -$lang['proxy____pass'] = 'Pasvorto ĉe la "Proxy"'; -$lang['proxy____ssl'] = 'Uzi SSL por konekti al la "Proxy"'; +$lang['target____wiki'] = 'Parametro "target" (celo) por internaj ligiloj'; +$lang['target____interwiki'] = 'Parametro "target" (celo) por intervikiaj ligiloj'; +$lang['target____extern'] = 'Parametro "target" (celo) por eksteraj ligiloj'; +$lang['target____media'] = 'Parametro "target" (celo) por aŭdvidaĵaj ligiloj'; +$lang['target____windows'] = 'Parametro "target" (celo) por Vindozaj ligiloj'; +$lang['proxy____host'] = 'Retservilnomo de la "Proxy"'; +$lang['proxy____port'] = 'Pordo ĉe la "Proxy"'; +$lang['proxy____user'] = 'Uzantonomo ĉe la "Proxy"'; +$lang['proxy____pass'] = 'Pasvorto ĉe la "Proxy"'; +$lang['proxy____ssl'] = 'Uzi SSL por konekti al la "Proxy"'; $lang['proxy____except'] = 'Regula esprimo por URL-oj, kiujn la servilo preterrigardu.'; $lang['safemodehack'] = 'Ebligi sekuran modon'; $lang['ftp____host'] = 'FTP-a servilo por sekura modo'; @@ -162,7 +162,7 @@ $lang['userewrite_o_2'] = 'Interne de DokuWiki'; $lang['deaccent_o_0'] = 'ne'; $lang['deaccent_o_1'] = 'forigi supersignojn'; $lang['deaccent_o_2'] = 'latinigi'; -$lang['gdlib_o_0'] = 'GD Lib ne disponiĝas'; +$lang['gdlib_o_0'] = 'GD-Lib ne disponeblas'; $lang['gdlib_o_1'] = 'Versio 1.x'; $lang['gdlib_o_2'] = 'Aŭtomata detekto'; $lang['rss_type_o_rss'] = 'RSS 0.91'; @@ -171,8 +171,8 @@ $lang['rss_type_o_rss2'] = 'RSS 2.0'; $lang['rss_type_o_atom'] = 'Atom 0.3'; $lang['rss_type_o_atom1'] = 'Atom 1.0'; $lang['rss_content_o_abstract'] = 'Resumo'; -$lang['rss_content_o_diff'] = 'Unuigita "Diff"'; -$lang['rss_content_o_htmldiff'] = '"Diff" tabelo formatita laŭ HTML'; +$lang['rss_content_o_diff'] = 'Unuigita "Diff"'; +$lang['rss_content_o_htmldiff'] = '"Diff"-tabelo formatita laŭ HTML'; $lang['rss_content_o_html'] = 'Enhavo laŭ kompleta HTML-paĝo'; $lang['rss_linkto_o_diff'] = 'diferenca rigardo'; $lang['rss_linkto_o_page'] = 'la reviziita paĝo'; @@ -182,13 +182,13 @@ $lang['compression_o_0'] = 'nenio'; $lang['compression_o_gz'] = 'gzip'; $lang['compression_o_bz2'] = 'bz2'; $lang['xsendfile_o_0'] = 'ne uzi'; -$lang['xsendfile_o_1'] = 'Propra kaplinio "lighttpd" (antaŭ lanĉo 1.5)'; +$lang['xsendfile_o_1'] = 'Propra kaplinio "lighttpd" (antaŭ versio 1.5)'; $lang['xsendfile_o_2'] = 'Ordinara kaplinio X-Sendfile'; $lang['xsendfile_o_3'] = 'Propra kaplinio Nginx X-Accel-Redirect'; $lang['showuseras_o_loginname'] = 'Ensalut-nomo'; $lang['showuseras_o_username'] = 'Kompleta nomo de uzanto'; -$lang['showuseras_o_email'] = 'Retadreso de uzanto (sekur-montrita laŭ agordo de \'mailguard\')'; -$lang['showuseras_o_email_link'] = 'Retadreso de uzanto kiel ligilo \'mailto:\''; +$lang['showuseras_o_email'] = 'Retadreso de uzanto (sekur-montrita laŭ agordo de mailguard)'; +$lang['showuseras_o_email_link'] = 'Retadreso de uzanto kiel mailto:-ligilo'; $lang['useheading_o_0'] = 'Neniam'; $lang['useheading_o_navigation'] = 'Nur foliumado'; $lang['useheading_o_content'] = 'Nur vikia enhavo'; diff --git a/lib/plugins/plugin/lang/eo/admin_plugin.txt b/lib/plugins/plugin/lang/eo/admin_plugin.txt index c97dddf56..8cc59843b 100644 --- a/lib/plugins/plugin/lang/eo/admin_plugin.txt +++ b/lib/plugins/plugin/lang/eo/admin_plugin.txt @@ -1,3 +1,3 @@ ====== Administrado de Kromaĵoj ====== -En tiu ĉi paĝo vi povas administri ĉion pri DokuWiki-aj [[doku>plugins|kromaĵoj]]. Por sukcesi elŝuti kaj instali kromaĵon, via dosierujo de kromaĵoj devas esti konservebla por la retservilo. +En tiu ĉi paĝo vi povas administri ĉion pri DokuWiki-aj [[doku>plugins|kromaĵoj]]. Por sukcesi elŝuti kaj instali kromaĵon, via dosierujo de kromaĵoj devas esti konservebla por la retservilo. diff --git a/lib/plugins/plugin/lang/eo/lang.php b/lib/plugins/plugin/lang/eo/lang.php index 327ee7578..ab9af73e1 100644 --- a/lib/plugins/plugin/lang/eo/lang.php +++ b/lib/plugins/plugin/lang/eo/lang.php @@ -51,8 +51,8 @@ $lang['error_download'] = 'Maleblas elŝuti la kromaĵan dosieron: %s'; $lang['error_badurl'] = 'Suspektinda malbona URL - maleblas difini la dosieran nomon el la URL'; $lang['error_dircreate'] = 'Maleblas krei provizoran dosierujon por ricevi elŝutaĵon'; $lang['error_decompress'] = 'La administrilo de kromaĵoj ne kapablis malkompakti la elŝutitan dosieron. Tio povas esti pro malkompleta elŝuto, tiaokaze vi devus provi refoje; aŭ eble la kompakta formato ne estas konata, tiaokaze vi bezonos elŝuti kaj instali la kromaĵon permane.'; -$lang['error_copy'] = 'Okazis eraro de dosierkopio dum provo instali dosierojn por la kromaĵo %s: la disko povus esti plenplena aŭ aliro-rajtoj povus esti misdifinitaj. Tio povus rezulti en malkomplete instalita kromaĵo kaj igi vian vikion malstabila.'; -$lang['error_delete'] = 'Okazis eraro dum provo forigi la kromaĵon %s. Plejprobable tio sekvas de nesufiĉa rajto por aliri la dosieron aŭ ties ujon.'; +$lang['error_copy'] = 'Okazis eraro de dosierkopio dum provo instali dosierojn por la kromaĵo <em>%s</em>: la disko povus esti plenplena aŭ aliro-rajtoj povus esti misdifinitaj. Tio povus rezulti en malkomplete instalita kromaĵo kaj igi vian vikion malstabila.'; +$lang['error_delete'] = 'Okazis eraro dum provo forigi la kromaĵon <em>%s</em>. Plejprobable tio sekvas de nesufiĉa rajto por aliri la dosieron aŭ ties ujon.'; $lang['enabled'] = 'La kromaĵo %s estas ebligita.'; $lang['notenabled'] = 'La kromaĵo %s ne povis esti ebligita, kontrolu dosier-permesojn.'; $lang['disabled'] = 'La kromaĵo %s estas malebligita.'; diff --git a/lib/plugins/popularity/lang/eo/intro.txt b/lib/plugins/popularity/lang/eo/intro.txt index 434f811b5..8d9b3dde8 100644 --- a/lib/plugins/popularity/lang/eo/intro.txt +++ b/lib/plugins/popularity/lang/eo/intro.txt @@ -6,4 +6,4 @@ Ni instigas vin ripeti tiun agon iam kaj tiam por teni la disvolvigantojn inform La kolektita datenaro enhavas informon pri versio de la instalita DokuWiki, nombro kaj grandeco de la paĝoj kaj dosieroj, instalitaj kromaĵoj kaj informoj pri via PHP-sistemo. -La kruda datenaro sendota estas montrita sube. Bonvole uzu la butonon "Sendi datenaron" por transŝuti tiun informaron. \ No newline at end of file +La kruda datenaro sendota estas montrita sube. Bonvole uzu la butonon "Sendi datumaron" por transŝuti tiun informaron. \ No newline at end of file diff --git a/lib/plugins/popularity/lang/eo/lang.php b/lib/plugins/popularity/lang/eo/lang.php index 2cbb6072f..e992e12ce 100644 --- a/lib/plugins/popularity/lang/eo/lang.php +++ b/lib/plugins/popularity/lang/eo/lang.php @@ -12,7 +12,7 @@ * @author Robert BOGENSCHNEIDER */ $lang['name'] = 'Populareca enketo (eble la ŝargo prokrastos iomete)'; -$lang['submit'] = 'Sendi datenaron'; +$lang['submit'] = 'Sendi datumaron'; $lang['autosubmit'] = 'Aŭtomate sendi datumaron monate'; $lang['submissionFailed'] = 'La datumaro ne povis esti sendata pro la jena eraro:'; $lang['submitDirectly'] = 'Vi povas sendi vi mem la datumaron per la sekva informilo.'; diff --git a/lib/plugins/revert/lang/eo/lang.php b/lib/plugins/revert/lang/eo/lang.php index 8c7854847..a893fb145 100644 --- a/lib/plugins/revert/lang/eo/lang.php +++ b/lib/plugins/revert/lang/eo/lang.php @@ -21,4 +21,4 @@ $lang['removed'] = '%s estas forigita'; $lang['revstart'] = 'Restariga procezo estas ekigita. Tio povas daŭri longan tempon. Se la skripto tro prokrastos antaŭ plenumo, vi bezonos restarigi po pli etaj blokoj.'; $lang['revstop'] = 'Restariga procezo plenumiĝis sukcese.'; $lang['note1'] = 'Rimarko: tiu ĉi serĉo distingas usklecon'; -$lang['note2'] = 'Rimarko: la paĝo restariĝos al la lasta versio ne enhavanta la menditan spaman terminon %s.'; +$lang['note2'] = 'Rimarko: la paĝo restariĝos al la lasta versio ne enhavanta la menditan spaman terminon <i>%s</i>.'; diff --git a/lib/plugins/usermanager/lang/eo/lang.php b/lib/plugins/usermanager/lang/eo/lang.php index 9a515dc9c..b5f1abc0e 100644 --- a/lib/plugins/usermanager/lang/eo/lang.php +++ b/lib/plugins/usermanager/lang/eo/lang.php @@ -13,7 +13,7 @@ * @author Robert BOGENSCHNEIDER * @author Robert BOGENSCHNEIDER */ -$lang['menu'] = 'Administrado de Uzantoj'; +$lang['menu'] = 'Administrado de uzantoj'; $lang['noauth'] = '(identiĝo de uzantoj ne disponeblas)'; $lang['nosupport'] = '(administro de uzantoj ne estas subtenata)'; $lang['badauth'] = 'tiu identiĝa procezo ne validas'; -- cgit v1.2.3