| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/EditWarning/EditWarning.i18n.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1 | 1 | Merged /trunk/extensions/UsabilityInitiative/EditWarning/EditWarning.i18n.php:r55247,55251 |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/PrefStats/PrefStats.i18n.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2 | 2 | Merged /trunk/extensions/UsabilityInitiative/PrefStats/PrefStats.i18n.php:r55247,55251 |
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins.combined.js |
| — | — | @@ -576,7 +576,8 @@ |
| 577 | 577 | .wrap( $( '<div></div>' ).addClass( 'wikiEditor-ui' ) )
|
| 578 | 578 | .wrap( $( '<div></div>' ).addClass( 'wikiEditor-ui-bottom' ) )
|
| 579 | 579 | .wrap( $( '<div></div>' ).addClass( 'wikiEditor-ui-text' ) );
|
| 580 | | -// Get a refrence to the outter container
|
| | 580 | +
|
| | 581 | +// Get a reference to the outer container
|
| 581 | 582 | context.$ui = $(this).parent().parent().parent();
|
| 582 | 583 | context.$ui.after( $( '<div style="clear:both;"></div>' ) );
|
| 583 | 584 | // Attach a container in the top
|
| — | — | @@ -878,18 +879,39 @@ |
| 879 | 880 | // |
| 880 | 881 | }, |
| 881 | 882 | modifyToolbar: function( context, data ) { |
| 882 | | - // |
| | 883 | + // |
| 883 | 884 | }, |
| 884 | 885 | removeFromToolbar: function( context, data ) { |
| 885 | 886 | if ( typeof data.section == 'string' ) { |
| 886 | | - var selector = 'div[rel=' + data.section + '].section'; |
| | 887 | + // Section |
| | 888 | + var tab = 'div.tabs span[rel=' + data.section + '].tab'; |
| | 889 | + var target = 'div[rel=' + data.section + '].section'; |
| 887 | 890 | if ( typeof data.group == 'string' ) { |
| 888 | | - selector += ' div[rel=' + data.group + '].group'; |
| | 891 | + // Toolbar group |
| | 892 | + target += ' div[rel=' + data.group + '].group'; |
| 889 | 893 | if ( typeof data.tool == 'string' ) { |
| 890 | | - selector += ' div[rel=' + data.tool + '].tool'; |
| | 894 | + // Tool |
| | 895 | + target += ' div[rel=' + data.tool + '].tool'; |
| 891 | 896 | } |
| | 897 | + } else if ( typeof data.page == 'string' ) { |
| | 898 | + // Booklet page |
| | 899 | + var index = target + ' div.index div[rel=' + data.page + ']'; |
| | 900 | + target += ' div.pages div[rel=' + data.page + '].page'; |
| | 901 | + if ( typeof data.character == 'string' ) { |
| | 902 | + // Character |
| | 903 | + target += ' a[rel=' + data.character + ']'; |
| | 904 | + } else if ( typeof data.row == 'number' ) { |
| | 905 | + // Table row |
| | 906 | + target += ' table tr:not(:has(th)):eq(' + data.row + ')'; |
| | 907 | + } else { |
| | 908 | + // Just a page, remove the index too! |
| | 909 | + context.modules.$toolbar.find( index ).remove(); |
| | 910 | + } |
| | 911 | + } else { |
| | 912 | + // Just a section, remove the tab too! |
| | 913 | + context.modules.$toolbar.find( tab ).remove(); |
| 892 | 914 | } |
| 893 | | - context.modules.$toolbar.find( selector ).remove(); |
| | 915 | + context.modules.$toolbar.find( target ).remove(); |
| 894 | 916 | } |
| 895 | 917 | } |
| 896 | 918 | }, |
| — | — | @@ -1012,12 +1034,18 @@ |
| 1013 | 1035 | var label = $.wikiEditor.modules.toolbar.fn.autoMsg( tool, 'label' ); |
| 1014 | 1036 | switch ( tool.type ) { |
| 1015 | 1037 | case 'button': |
| | 1038 | + var src = tool.icon; |
| | 1039 | + if ( src.indexOf( 'http://' ) !== 0 && src.indexOf( 'https://' ) !== 0 ) { |
| | 1040 | + src = $.wikiEditor.modules.toolbar.imgPath + src; |
| | 1041 | + } |
| 1016 | 1042 | $button = $( '<img />' ).attr( { |
| 1017 | | - 'src': $.wikiEditor.modules.toolbar.imgPath + tool.icon, |
| 1018 | | - 'alt': label, |
| 1019 | | - 'title': label, |
| 1020 | | - 'rel': id, |
| 1021 | | - 'class': 'tool tool-' + id |
| | 1043 | + 'src' : src, |
| | 1044 | + 'width' : 22, |
| | 1045 | + 'height' : 22, |
| | 1046 | + 'alt' : label, |
| | 1047 | + 'title' : label, |
| | 1048 | + 'rel' : id, |
| | 1049 | + 'class' : 'tool tool-button' |
| 1022 | 1050 | } ); |
| 1023 | 1051 | if ( 'action' in tool ) { |
| 1024 | 1052 | $button |
| — | — | @@ -1033,40 +1061,33 @@ |
| 1034 | 1062 | } |
| 1035 | 1063 | return $button; |
| 1036 | 1064 | case 'select': |
| 1037 | | - var $select = $( '<select></select>' ).attr( { |
| 1038 | | - 'rel': id, |
| 1039 | | - 'class': 'tool tool-' + id |
| 1040 | | - } ); |
| 1041 | | - $select.append( $( '<option></option>' ).text( label ) ) |
| | 1065 | + var $select = $( '<div />' ) |
| | 1066 | + .attr( { 'rel' : id, 'class' : 'tool tool-select' } ) |
| | 1067 | + .click( function() { |
| | 1068 | + var $options = $(this).find( '.options' ); |
| | 1069 | + $options.animate( { 'opacity': 'toggle' }, 'fast' ); |
| | 1070 | + } ); |
| | 1071 | + $options = $( '<div />' ).addClass( 'options' ); |
| 1042 | 1072 | if ( 'list' in tool ) { |
| 1043 | | - $select |
| 1044 | | - .data( 'list', tool.list ) |
| 1045 | | - .data( 'context', context ) |
| 1046 | | - .click( function() { |
| 1047 | | - var list = $(this).data( 'list' ); |
| 1048 | | - var val = $(this).val(); |
| 1049 | | - if ( val in list && 'action' in list[val] ) { |
| 1050 | | - $.wikiEditor.modules.toolbar.fn.doAction( |
| 1051 | | - $(this).data( 'context' ), list[val].action |
| 1052 | | - ); |
| 1053 | | - } |
| 1054 | | - $(this) |
| 1055 | | - .find(":selected").attr( 'selected', false ) |
| 1056 | | - .find(":first").attr( 'selected', true ); |
| 1057 | | - return false; |
| 1058 | | - } ); |
| 1059 | 1073 | for ( option in tool.list ) { |
| 1060 | | - var optionLabel = |
| 1061 | | - $.wikiEditor.modules.toolbar.fn.autoMsg( |
| 1062 | | - tool.list[option], 'label' |
| 1063 | | - ); |
| 1064 | | - $select.append( |
| 1065 | | - $( '<option></option>' ) |
| | 1074 | + var optionLabel = $.wikiEditor.modules.toolbar.fn.autoMsg( tool.list[option], 'label' ); |
| | 1075 | + $options.append( |
| | 1076 | + $( '<a />' ) |
| | 1077 | + .data( 'action', tool.list[option].action ) |
| | 1078 | + .data( 'context', context ) |
| | 1079 | + .click( function() { |
| | 1080 | + $.wikiEditor.modules.toolbar.fn.doAction( |
| | 1081 | + $(this).data( 'context' ), $(this).data( 'action' ) |
| | 1082 | + ); |
| | 1083 | + } ) |
| 1066 | 1084 | .text( optionLabel ) |
| 1067 | | - .attr( 'value', option ) |
| | 1085 | + .addClass( 'option' ) |
| | 1086 | + .attr( 'rel', option ) |
| 1068 | 1087 | ); |
| 1069 | 1088 | } |
| 1070 | 1089 | } |
| | 1090 | + $select.append( $( '<div />' ).addClass( 'menu' ).append( $options ) ); |
| | 1091 | + $select.append( $( '<div />' ).addClass( 'label' ).text( label ) ); |
| 1071 | 1092 | return $select; |
| 1072 | 1093 | default: return null; |
| 1073 | 1094 | } |
| — | — | @@ -1207,6 +1228,7 @@ |
| 1208 | 1229 | } |
| 1209 | 1230 | if ( 'action' in tool && 'label' in tool ) { |
| 1210 | 1231 | var $character = $( '<a></a>' ) |
| | 1232 | + .attr( 'rel', tool.label ) |
| 1211 | 1233 | .attr( 'href', '#' ) |
| 1212 | 1234 | .text( tool.label ) |
| 1213 | 1235 | .data( 'context', context ) |
| — | — | @@ -1325,4 +1347,4 @@ |
| 1326 | 1348 | } |
| 1327 | 1349 | } |
| 1328 | 1350 | |
| 1329 | | -};})(jQuery); |
| \ No newline at end of file |
| | 1351 | +};})(jQuery); |
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins.combined.min.js |
| — | — | @@ -62,18 +62,17 @@ |
| 63 | 63 | var lastLevel=0;var nLevel=0;for(var i=0;i<outline.length;i++){if(outline[i].level>lastLevel){nLevel++;}
|
| 64 | 64 | else if(outline[i].level<lastLevel){nLevel-=Math.max(1,lastLevel-outline[i].level);}
|
| 65 | 65 | outline[i].nLevel=nLevel;lastLevel=nLevel;}
|
| 66 | | -var structure=buildStructure(outline);structure.unshift({'text':wgTitle,'level':1,'index':0,'position':0});context.modules.$toc.html(buildList(structure));context.data.outline=outline;}}};})(jQuery);(function($){$.wikiEditor.modules.toolbar={imgPath:wgScriptPath+'/extensions/UsabilityInitiative/images/wikiEditor/toolbar/',api:{addToToolbar:function(context,data){},modifyToolbar:function(context,data){},removeFromToolbar:function(context,data){if(typeof data.section=='string'){var selector='div[rel='+data.section+'].section';if(typeof data.group=='string'){selector+=' div[rel='+data.group+'].group';if(typeof data.tool=='string'){selector+=' div[rel='+data.tool+'].tool';}}
|
| 67 | | -context.modules.$toolbar.find(selector).remove();}}},fn:{autoMsg:function(object,property){if(property in object){return object[property];}else if(property+'Msg'in object){return gM(object[property+'Msg']);}else{return'';}},create:function(context,config){if('$toolbar'in context.modules){return;}
|
| | 66 | +var structure=buildStructure(outline);structure.unshift({'text':wgTitle,'level':1,'index':0,'position':0});context.modules.$toc.html(buildList(structure));context.data.outline=outline;}}};})(jQuery);(function($){$.wikiEditor.modules.toolbar={imgPath:wgScriptPath+'/extensions/UsabilityInitiative/images/wikiEditor/toolbar/',api:{addToToolbar:function(context,data){},modifyToolbar:function(context,data){},removeFromToolbar:function(context,data){if(typeof data.section=='string'){var tab='div.tabs span[rel='+data.section+'].tab';var target='div[rel='+data.section+'].section';if(typeof data.group=='string'){target+=' div[rel='+data.group+'].group';if(typeof data.tool=='string'){target+=' div[rel='+data.tool+'].tool';}}else if(typeof data.page=='string'){var index=target+' div.index div[rel='+data.page+']';target+=' div.pages div[rel='+data.page+'].page';if(typeof data.character=='string'){target+=' a[rel='+data.character+']';}else if(typeof data.row=='number'){target+=' table tr:not(:has(th)):eq('+data.row+')';}else{context.modules.$toolbar.find(index).remove();}}else{context.modules.$toolbar.find(tab).remove();}
|
| | 67 | +context.modules.$toolbar.find(target).remove();}}},fn:{autoMsg:function(object,property){if(property in object){return object[property];}else if(property+'Msg'in object){return gM(object[property+'Msg']);}else{return'';}},create:function(context,config){if('$toolbar'in context.modules){return;}
|
| 68 | 68 | context.modules.$toolbar=$('<div></div>').addClass('wikiEditor-ui-toolbar');$.wikiEditor.modules.toolbar.fn.build(context,config);context.$ui.find('.wikiEditor-ui-top').append(context.modules.$toolbar);},doAction:function(context,action){switch(action.type){case'encapsulate':var parts={'pre':'','peri':'','post':''};for(part in parts){if(part+'Msg'in action.options){parts[part]=gM(action.options[part+'Msg'],(action.options[part]||null));}else{parts[part]=(action.options[part]||'')}}
|
| 69 | 69 | context.$textarea.encapsulateSelection(parts.pre,parts.peri,parts.post);break;default:break;}},buildSection:function(context,id,section){switch(section.type){case'toolbar':return $.wikiEditor.modules.toolbar.fn.buildToolbar(context,id,section);case'booklet':return $.wikiEditor.modules.toolbar.fn.buildBooklet(context,id,section);default:return null;}},buildToolbar:function(context,id,toolbar){var $toolbar=$('<div></div>').attr({'class':'toolbar section section-'+id,'rel':id});if('groups'in toolbar){for(group in toolbar.groups){$toolbar.append($.wikiEditor.modules.toolbar.fn.buildGroup(context,group,toolbar.groups[group]));}}
|
| 70 | 70 | return $toolbar;},buildGroup:function(context,id,group){var $group=$('<div></div>').attr({'class':'group group-'+id,'rel':id});var label=$.wikiEditor.modules.toolbar.fn.autoMsg(group,'label');if(label){$group.append($('<div></div>').text(label).addClass('label'))}
|
| 71 | 71 | if('tools'in group){for(tool in group.tools){$group.append($.wikiEditor.modules.toolbar.fn.buildTool(context,tool,group.tools[tool]));}}
|
| 72 | 72 | return $group;},buildTool:function(context,id,tool){if('filters'in tool){for(filter in tool.filters){if($(tool.filters[filter]).size()==0){return null;}}}
|
| 73 | | -var label=$.wikiEditor.modules.toolbar.fn.autoMsg(tool,'label');switch(tool.type){case'button':$button=$('<img />').attr({'src':$.wikiEditor.modules.toolbar.imgPath+tool.icon,'alt':label,'title':label,'rel':id,'class':'tool tool-'+id});if('action'in tool){$button.data('action',tool.action).data('context',context).click(function(){$.wikiEditor.modules.toolbar.fn.doAction($(this).data('context'),$(this).data('action'));return false;});}
|
| 74 | | -return $button;case'select':var $select=$('<select></select>').attr({'rel':id,'class':'tool tool-'+id});$select.append($('<option></option>').text(label))
|
| 75 | | -if('list'in tool){$select.data('list',tool.list).data('context',context).click(function(){var list=$(this).data('list');var val=$(this).val();if(val in list&&'action'in list[val]){$.wikiEditor.modules.toolbar.fn.doAction($(this).data('context'),list[val].action);}
|
| 76 | | -$(this).find(":selected").attr('selected',false).find(":first").attr('selected',true);return false;});for(option in tool.list){var optionLabel=$.wikiEditor.modules.toolbar.fn.autoMsg(tool.list[option],'label');$select.append($('<option></option>').text(optionLabel).attr('value',option));}}
|
| 77 | | -return $select;default:return null;}},buildBooklet:function(context,id,booklet){var selected=$.cookie('wikiEditor-'+context.instance+'-booklet-'+id+'-page');var $booklet=$('<div></div>').attr({'class':'booklet section section-'+id,'rel':id});var $pages=$('<div></div>').attr('class','pages');var $index=$('<div></div>').attr('class','index');if('pages'in booklet){if(!(selected in booklet.pages)){selected=null;}
|
| | 73 | +var label=$.wikiEditor.modules.toolbar.fn.autoMsg(tool,'label');switch(tool.type){case'button':var src=tool.icon;if(src.indexOf('http://')!==0&&src.indexOf('https://')!==0){src=$.wikiEditor.modules.toolbar.imgPath+src;}
|
| | 74 | +$button=$('<img />').attr({'src':src,'width':22,'height':22,'alt':label,'title':label,'rel':id,'class':'tool tool-button'});if('action'in tool){$button.data('action',tool.action).data('context',context).click(function(){$.wikiEditor.modules.toolbar.fn.doAction($(this).data('context'),$(this).data('action'));return false;});}
|
| | 75 | +return $button;case'select':var $select=$('<div />').attr({'rel':id,'class':'tool tool-select'}).click(function(){var $options=$(this).find('.options');$options.animate({'opacity':'toggle'},'fast');});$options=$('<div />').addClass('options');if('list'in tool){for(option in tool.list){var optionLabel=$.wikiEditor.modules.toolbar.fn.autoMsg(tool.list[option],'label');$options.append($('<a />').data('action',tool.list[option].action).data('context',context).click(function(){$.wikiEditor.modules.toolbar.fn.doAction($(this).data('context'),$(this).data('action'));}).text(optionLabel).addClass('option').attr('rel',option));}}
|
| | 76 | +$select.append($('<div />').addClass('menu').append($options));$select.append($('<div />').addClass('label').text(label));return $select;default:return null;}},buildBooklet:function(context,id,booklet){var selected=$.cookie('wikiEditor-'+context.instance+'-booklet-'+id+'-page');var $booklet=$('<div></div>').attr({'class':'booklet section section-'+id,'rel':id});var $pages=$('<div></div>').attr('class','pages');var $index=$('<div></div>').attr('class','index');if('pages'in booklet){if(!(selected in booklet.pages)){selected=null;}
|
| 78 | 77 | for(page in booklet.pages){if(selected===null){selected=page;}
|
| 79 | 78 | var $page=$.wikiEditor.modules.toolbar.fn.buildPage(context,page,booklet.pages[page]);var $bookmark=$.wikiEditor.modules.toolbar.fn.buildBookmark(context,page,booklet.pages[page]);if(selected==page){$page.show();$bookmark.addClass('current');}else{$page.hide();}
|
| 80 | 79 | $pages.append($page);$index.append($bookmark);}}
|
| — | — | @@ -84,7 +83,7 @@ |
| 85 | 84 | $page.append($table);break;case'characters':$page.addClass('page-characters');$characters=$('<div></div>');if('language'in page){$characters.attr('lang',page.language);}
|
| 86 | 85 | if('direction'in page){$characters.attr('dir',page.direction);}
|
| 87 | 86 | if('characters'in page){for(character in page.characters){var tool=page.characters[character];if(typeof tool=='string'){tool={'label':tool,'action':{'type':'encapsulate','options':{'pre':tool}}};}
|
| 88 | | -if('action'in tool&&'label'in tool){var $character=$('<a></a>').attr('href','#').text(tool.label).data('context',context).data('action',tool.action).click(function(){$.wikiEditor.modules.toolbar.fn.doAction($(this).data('context'),$(this).data('action'));return false;});$characters.append($character);}}
|
| | 87 | +if('action'in tool&&'label'in tool){var $character=$('<a></a>').attr('rel',tool.label).attr('href','#').text(tool.label).data('context',context).data('action',tool.action).click(function(){$.wikiEditor.modules.toolbar.fn.doAction($(this).data('context'),$(this).data('action'));return false;});$characters.append($character);}}
|
| 89 | 88 | $page.append($characters);}
|
| 90 | 89 | break;}
|
| 91 | 90 | return $page;},build:function(context,config){var $tabs=$('<div></div>').addClass('tabs').appendTo(context.modules.$toolbar);var $sections=$('<div></div>').addClass('sections').appendTo(context.modules.$toolbar);context.modules.$toolbar.append($('<div></div>').addClass('break'));var selected=$.cookie('wikiEditor-'+context.instance+'-toolbar-section');var sectionQueue=[];for(section in config){if(section=='main'){context.modules.$toolbar.prepend($.wikiEditor.modules.toolbar.fn.buildSection(context,section,config[section]));}else{s={'context':context,'$sections':$sections,'$tabs':$tabs,'section':section,'config':config[section],'selected':(selected==section)};sectionQueue[sectionQueue.length]=s;s.$tabs.append($('<span></span>').attr({'class':'tab tab-'+s.section,'rel':s.section}).append($('<a></a>').addClass(s.selected?'current':null).attr('href','#').text($.wikiEditor.modules.toolbar.fn.autoMsg(s.config,'label')).data('context',s.context).click(function(){var $section=$(this).data('context').$ui.find('.section-'+
|
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toolbar.js |
| — | — | @@ -172,12 +172,18 @@ |
| 173 | 173 | var label = $.wikiEditor.modules.toolbar.fn.autoMsg( tool, 'label' ); |
| 174 | 174 | switch ( tool.type ) { |
| 175 | 175 | case 'button': |
| | 176 | + var src = tool.icon; |
| | 177 | + if ( src.indexOf( 'http://' ) !== 0 && src.indexOf( 'https://' ) !== 0 ) { |
| | 178 | + src = $.wikiEditor.modules.toolbar.imgPath + src; |
| | 179 | + } |
| 176 | 180 | $button = $( '<img />' ).attr( { |
| 177 | | - 'src': $.wikiEditor.modules.toolbar.imgPath + tool.icon, |
| 178 | | - 'alt': label, |
| 179 | | - 'title': label, |
| 180 | | - 'rel': id, |
| 181 | | - 'class': 'tool tool-' + id |
| | 181 | + 'src' : src, |
| | 182 | + 'width' : 22, |
| | 183 | + 'height' : 22, |
| | 184 | + 'alt' : label, |
| | 185 | + 'title' : label, |
| | 186 | + 'rel' : id, |
| | 187 | + 'class' : 'tool tool-button' |
| 182 | 188 | } ); |
| 183 | 189 | if ( 'action' in tool ) { |
| 184 | 190 | $button |
| — | — | @@ -193,40 +199,33 @@ |
| 194 | 200 | } |
| 195 | 201 | return $button; |
| 196 | 202 | case 'select': |
| 197 | | - var $select = $( '<select></select>' ).attr( { |
| 198 | | - 'rel': id, |
| 199 | | - 'class': 'tool tool-' + id |
| 200 | | - } ); |
| 201 | | - $select.append( $( '<option></option>' ).text( label ) ) |
| | 203 | + var $select = $( '<div />' ) |
| | 204 | + .attr( { 'rel' : id, 'class' : 'tool tool-select' } ) |
| | 205 | + .click( function() { |
| | 206 | + var $options = $(this).find( '.options' ); |
| | 207 | + $options.animate( { 'opacity': 'toggle' }, 'fast' ); |
| | 208 | + } ); |
| | 209 | + $options = $( '<div />' ).addClass( 'options' ); |
| 202 | 210 | if ( 'list' in tool ) { |
| 203 | | - $select |
| 204 | | - .data( 'list', tool.list ) |
| 205 | | - .data( 'context', context ) |
| 206 | | - .click( function() { |
| 207 | | - var list = $(this).data( 'list' ); |
| 208 | | - var val = $(this).val(); |
| 209 | | - if ( val in list && 'action' in list[val] ) { |
| 210 | | - $.wikiEditor.modules.toolbar.fn.doAction( |
| 211 | | - $(this).data( 'context' ), list[val].action |
| 212 | | - ); |
| 213 | | - } |
| 214 | | - $(this) |
| 215 | | - .find(":selected").attr( 'selected', false ) |
| 216 | | - .find(":first").attr( 'selected', true ); |
| 217 | | - return false; |
| 218 | | - } ); |
| 219 | 211 | for ( option in tool.list ) { |
| 220 | | - var optionLabel = |
| 221 | | - $.wikiEditor.modules.toolbar.fn.autoMsg( |
| 222 | | - tool.list[option], 'label' |
| 223 | | - ); |
| 224 | | - $select.append( |
| 225 | | - $( '<option></option>' ) |
| | 212 | + var optionLabel = $.wikiEditor.modules.toolbar.fn.autoMsg( tool.list[option], 'label' ); |
| | 213 | + $options.append( |
| | 214 | + $( '<a />' ) |
| | 215 | + .data( 'action', tool.list[option].action ) |
| | 216 | + .data( 'context', context ) |
| | 217 | + .click( function() { |
| | 218 | + $.wikiEditor.modules.toolbar.fn.doAction( |
| | 219 | + $(this).data( 'context' ), $(this).data( 'action' ) |
| | 220 | + ); |
| | 221 | + } ) |
| 226 | 222 | .text( optionLabel ) |
| 227 | | - .attr( 'value', option ) |
| | 223 | + .addClass( 'option' ) |
| | 224 | + .attr( 'rel', option ) |
| 228 | 225 | ); |
| 229 | 226 | } |
| 230 | 227 | } |
| | 228 | + $select.append( $( '<div />' ).addClass( 'menu' ).append( $options ) ); |
| | 229 | + $select.append( $( '<div />' ).addClass( 'label' ).text( label ) ); |
| 231 | 230 | return $select; |
| 232 | 231 | default: return null; |
| 233 | 232 | } |
| — | — | @@ -486,4 +485,4 @@ |
| 487 | 486 | } |
| 488 | 487 | } |
| 489 | 488 | |
| 490 | | -};})(jQuery); |
| \ No newline at end of file |
| | 489 | +};})(jQuery); |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/NavigableTOC/NavigableTOC.i18n.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 491 | 490 | Merged /trunk/extensions/UsabilityInitiative/NavigableTOC/NavigableTOC.i18n.php:r55247,55251 |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/SimpleSearch/SimpleSearch.i18n.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 492 | 491 | Merged /trunk/extensions/UsabilityInitiative/SimpleSearch/SimpleSearch.i18n.php:r55247,55251 |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/UsabilityInitiative.i18n.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 493 | 492 | Merged /trunk/extensions/UsabilityInitiative/UsabilityInitiative.i18n.php:r55247,55251 |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/EditToolbar/images |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 494 | 493 | Merged /trunk/extensions/UsabilityInitiative/EditToolbar/images:r55247,55251 |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/EditToolbar/EditToolbar.i18n.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 495 | 494 | Merged /trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.i18n.php:r55247,55251 |
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/css/combined.css |
| — | — | @@ -5,6 +5,10 @@ |
| 6 | 6 | margin: 0; |
| 7 | 7 | padding: 0; |
| 8 | 8 | } |
| | 9 | +/* These IDs (#wpSummaryLabel and #wpSummary) could change in MediaWiki */ |
| | 10 | +#wpSummary, #wpSummaryLabel { |
| | 11 | + margin-bottom: 1em; |
| | 12 | +} |
| 9 | 13 | /* This ID (#wpTextbox1) could change in MediaWiki */ |
| 10 | 14 | .wikiEditor-ui textarea#wpTextbox1 { |
| 11 | 15 | border: none; |
| — | — | @@ -24,7 +28,6 @@ |
| 25 | 29 | background-color: #f3f3f3; |
| 26 | 30 | } |
| 27 | 31 | .wikiEditor-ui .wikiEditor-ui-bottom { |
| 28 | | - position: relative; |
| 29 | 32 | border: solid silver 1px; |
| 30 | 33 | border-top-width: 0; |
| 31 | 34 | } |
| — | — | @@ -33,7 +36,9 @@ |
| 34 | 37 | border: solid silver 1px; |
| 35 | 38 | border-bottom-width: 0; |
| 36 | 39 | } |
| 37 | | -/* wikiEditor toc module */ |
| | 40 | +.ui-dialog-content fieldset table td { |
| | 41 | + padding: 0.25em; |
| | 42 | +}/* wikiEditor toc module */ |
| 38 | 43 | |
| 39 | 44 | .wikiEditor-ui .wikiEditor-ui-toc { |
| 40 | 45 | /* width is set dynamically */ |
| — | — | @@ -241,17 +246,83 @@ |
| 242 | 247 | body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .group > img.tool { |
| 243 | 248 | float: right; |
| 244 | 249 | } |
| 245 | | -.wikiEditor-ui .wikiEditor-ui-toolbar .group select { |
| | 250 | +.wikiEditor-ui-toolbar .group .tool-select { |
| 246 | 251 | float: left; |
| 247 | 252 | margin: 2px; |
| 248 | 253 | height: 22px; |
| 249 | 254 | cursor: pointer; |
| | 255 | + border: solid 1px silver; |
| | 256 | + padding: 0; |
| | 257 | + margin-right: 0; |
| | 258 | + cursor: pointer; |
| | 259 | + background-color: #ffffff; |
| 250 | 260 | } |
| 251 | 261 | /* IGNORED BY IE6 */ |
| 252 | | -body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .group > select { |
| | 262 | +body.rtl .wikiEditor-ui-toolbar .group > .tool-select { |
| 253 | 263 | float: right; |
| 254 | | - font-size: 0.9em; |
| 255 | 264 | } |
| | 265 | +.wikiEditor-ui-toolbar .group .tool-select .label { |
| | 266 | + background-image: url(../images/wikiEditor/toolbar/arrow-down.png); |
| | 267 | + background-position: center right; |
| | 268 | + background-repeat: no-repeat; |
| | 269 | + padding: 0; |
| | 270 | + margin: 0; |
| | 271 | + padding-left: 4px; |
| | 272 | + padding-right: 22px; |
| | 273 | + margin-right: 4px; |
| | 274 | + cursor: pointer; |
| | 275 | +} |
| | 276 | +body.rtl .wikiEditor-ui-toolbar .group .tool-select .label { |
| | 277 | + background-position: center left; |
| | 278 | + padding-right: 4px; |
| | 279 | + padding-left: 22px; |
| | 280 | + margin-left: 4px; |
| | 281 | + margin-right: 0; |
| | 282 | +} |
| | 283 | +body.rtl .wikiEditor-ui-toolbar .group .tool-select .menu { |
| | 284 | + clear: both; |
| | 285 | +} |
| | 286 | +.wikiEditor-ui-toolbar .group .tool-select .menu .options { |
| | 287 | + position: absolute; |
| | 288 | + display: none; |
| | 289 | + margin-left: -1px; |
| | 290 | + border: solid 1px silver; |
| | 291 | + background-color: #ffffff; |
| | 292 | +} |
| | 293 | +body.rtl .wikiEditor-ui-toolbar .group .tool-select .menu { |
| | 294 | + margin-left: -1px; |
| | 295 | + margin-right: -1px; |
| | 296 | +} |
| | 297 | +/* IGNORED BY IE6 */ |
| | 298 | +.wikiEditor-ui-toolbar .group .tool-select .options { |
| | 299 | + margin-top: 22px; |
| | 300 | +} |
| | 301 | +.wikiEditor-ui-toolbar .group .tool-select .options .option { |
| | 302 | + display: block; |
| | 303 | + padding: 0.5em; |
| | 304 | + text-decoration: none; |
| | 305 | + color: black; |
| | 306 | + whitespace: nowrap; |
| | 307 | +} |
| | 308 | +.wikiEditor-ui-toolbar .group .tool-select .options .option:hover { |
| | 309 | + background-color: #f3f3f3; |
| | 310 | +} |
| | 311 | +.wikiEditor-ui-toolbar .group .tool-select .options .option[rel=heading-2] { |
| | 312 | + font-size: 150%; |
| | 313 | + font-weight: normal; |
| | 314 | +} |
| | 315 | +.wikiEditor-ui-toolbar .group .tool-select .options .option[rel=heading-3] { |
| | 316 | + font-size: 132%; |
| | 317 | + font-weight: normal; |
| | 318 | +} |
| | 319 | +.wikiEditor-ui-toolbar .group .tool-select .options .option[rel=heading-4] { |
| | 320 | + font-size: 116%; |
| | 321 | + font-weight: normal; |
| | 322 | +} |
| | 323 | +.wikiEditor-ui-toolbar .group .tool-select .options .option[rel=heading-5] { |
| | 324 | + font-size: 100%; |
| | 325 | + font-weight: bold; |
| | 326 | +} |
| 256 | 327 | /* Booklet */ |
| 257 | 328 | .wikiEditor-ui .wikiEditor-ui-toolbar .booklet .index { |
| 258 | 329 | float: left; |
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/css/combined.min.css |
| — | — | @@ -1 +1 @@ |
| 2 | | -form#editform{margin:0;padding:0;}.wikiEditor-ui textarea#wpTextbox1{border:none;padding:0;width:100%;margin:-1px;}.wikiEditor-ui .wikiEditor-ui-text > textarea#wpTextbox1{margin:0;}.wikiEditor-ui{float:left;position:relative;clear:both;width:100%;line-height:1em;background-color:#f3f3f3;}.wikiEditor-ui .wikiEditor-ui-bottom{position:relative;border:solid silver 1px;border-top-width:0;}.wikiEditor-ui .wikiEditor-ui-top{position:relative;border:solid silver 1px;border-bottom-width:0;}.wikiEditor-ui .wikiEditor-ui-toc{position:absolute;right:-1px;top:0;padding:0;border-left:solid silver 1px;overflow:auto;}body.rtl .wikiEditor-ui .wikiEditor-ui-toc{right:auto;left:-1px;border-left:none;border-right:solid silver 1px;}.wikiEditor-ui .wikiEditor-ui-toc ul{padding:0;margin:0.5em 1em;list-style:none;}.wikiEditor-ui .wikiEditor-ui-toc ul ul{padding:0;margin:0;margin-left:0.75em;margin-bottom:0 !important;margin-top:0 !important;list-style:none;}body.rtl .wikiEditor-ui .wikiEditor-ui-toc ul ul{margin-left:0;margin-right:0.75em;}.wikiEditor-ui .wikiEditor-ui-toc ul li a{display:block;font-size:0.9em;}.wikiEditor-ui .wikiEditor-ui-toc ul li a.currentSelection{font-weight:bold;}.wikiEditor-ui .wikiEditor-ui-toc ul li a.section-0{font-size:1em;border-bottom:solid 1px #DDDDDD;}.wikiEditor-ui .wikiEditor-ui-toolbar{position:relative;}.wikiEditor-ui .wikiEditor-ui-toolbar .break{border-bottom:solid silver 1px;clear:both;}.wikiEditor-ui .wikiEditor-ui-toolbar .sections{float:left;width:100%;clear:both;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .sections{float:right;}.wikiEditor-ui .wikiEditor-ui-toolbar .sections .section{display:none;float:left;width:100%;margin-left:-1px;border-left:solid silver 1px;border-right:solid silver 1px;border-top:solid 1px #DDDDDD;background-color:#F3F3F3;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .sections .section{float:right;margin-left:auto;margin-right:-1px;}.wikiEditor-ui .wikiEditor-ui-toolbar .sections .loading{padding-top:0.5em;padding-bottom:0.5em;}.wikiEditor-ui .wikiEditor-ui-toolbar .sections div .spinner{display:none;}.wikiEditor-ui .wikiEditor-ui-toolbar .sections .loading .spinner{display:block;background-image:url(../images/wikiEditor/toolbar/loading.gif);background-position:left center;background-repeat:no-repeat;padding-left:32px;margin-left:1em;float:left;color:#666666;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .sections .loading .spinner{background-position:right center;padding-left:0;padding-right:32px;margin-left:0;margin-right:1em;float:right;}.wikiEditor-ui .wikiEditor-ui-toolbar .tabs,.wikiEditor-ui .wikiEditor-ui-toolbar .group{float:left;height:26px;margin:3px;padding:0;padding-right:6px;border-right:solid 1px #DDDDDD;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .tabs,body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .group{float:right;padding-right:0;padding-left:6px;border-right:none;border-left:solid 1px #DDDDDD;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .first{border-right:none;}.wikiEditor-ui .wikiEditor-ui-toolbar .tabs{list-style:none;}.wikiEditor-ui .wikiEditor-ui-toolbar .tabs span.tab{display:inline-block;float:left;line-height:26px;}.wikiEditor-ui .wikiEditor-ui-toolbar .tabs > span.tab{display:block;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .tabs > span.tab{float:right;}.wikiEditor-ui .wikiEditor-ui-toolbar .tabs span.tab a,.wikiEditor-ui .wikiEditor-ui-toolbar .tabs span.tab a:visited{display:inline-block;float:left;padding-left:18px;padding-right:12px;height:26px;cursor:pointer;color:#0645ad;background-image:url(../images/wikiEditor/toolbar/arrow-right.png);background-position:left center;background-repeat:no-repeat;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .tabs span.tab a,body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .tabs span.tab a:visited{padding-left:12px;padding-right:18px;background-image:url(../images/wikiEditor/toolbar/arrow-left.png);background-position:right center;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .tabs > span.tab > a,body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .tabs > pan.tab > a:visited{float:right;}.wikiEditor-ui .wikiEditor-ui-toolbar .tabs span.tab a.current,.wikiEditor-ui .wikiEditor-ui-toolbar .tabs span.tab a.current:visited{color:#333333;background-image:url(../images/wikiEditor/toolbar/arrow-down.png);}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .tabs span.tab a.current,body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .tabs span.tab a.current:visited{background-image:url(../images/wikiEditor/toolbar/arrow-down.png);}.wikiEditor-ui .wikiEditor-ui-toolbar .tabs span.tab a.current:hover{text-decoration:none;}.wikiEditor-ui .wikiEditor-ui-toolbar .group .label{float:left;border:0px;height:22px;line-height:22px;margin:2px;margin-left:5px;margin-right:8px;color:#777777;cursor:default;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .group > .label{float:right;margin-left:8px;margin-right:5px;}.wikiEditor-ui .wikiEditor-ui-toolbar .group img.tool{float:left;border:0px;height:22px;width:22px;padding:2px;cursor:pointer;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .group > img.tool{float:right;}.wikiEditor-ui .wikiEditor-ui-toolbar .group select{float:left;margin:2px;height:22px;cursor:pointer;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .group > select{float:right;font-size:0.9em;}.wikiEditor-ui .wikiEditor-ui-toolbar .booklet .index{float:left;width:20%;height:125px;overflow:auto;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .booklet .index{float:right;}.wikiEditor-ui .wikiEditor-ui-toolbar .booklet .index div{padding:4px;padding-left:6px;cursor:pointer;color:#0645ad;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .booklet .index div{padding-left:4px;padding-right:6px;}.wikiEditor-ui .wikiEditor-ui-toolbar .booklet .index .current{background-color:#FAFAFA;color:#333333;cursor:default;}.wikiEditor-ui .wikiEditor-ui-toolbar .booklet .pages{float:right;width:80%;height:125px;overflow:auto;background-color:#FAFAFA;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .booklet .pages{float:left;}.wikiEditor-ui .wikiEditor-ui-toolbar .section-help .page-table table{padding-left:5px;padding-right:5px;background:none;}.wikiEditor-ui .wikiEditor-ui-toolbar .section-help .page-table table th{color:#999999;}.wikiEditor-ui .wikiEditor-ui-toolbar .section-help .page-table table td{color:black;border-top:solid 1px #EEEEEE;}.wikiEditor-ui .wikiEditor-ui-toolbar .section-help .page-table table th,.wikiEditor-ui .wikiEditor-ui-toolbar .section-help .page-table table td{text-align:left;padding:5px;margin:0px;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .section-help .page-table table th,body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .section-help .page-table table td{text-align:right;}.wikiEditor-ui .wikiEditor-ui-toolbar .section-help .page-table table td.syntax{font-family:monospace;}.wikiEditor-ui .wikiEditor-ui-toolbar .section-help .page-table table td.syntax,.wikiEditor-ui .wikiEditor-ui-toolbar .section-help .page-table table td.result{width:40%;}.wikiEditor-ui .wikiEditor-ui-toolbar .section-help .page-table table td.description{width:20%;}.wikiEditor-ui .wikiEditor-ui-toolbar .section-characters .page-characters div a{border:solid 1px #DDDDDD;padding:5px;padding-left:8px;padding-right:8px;margin-left:5px;margin-top:5px;height:1em;float:left;display:block;color:black;text-decoration:none;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .section-characters .page-characters > div > a,.wikiEditor-ui .wikiEditor-ui-toolbar .section-characters .page-characters div[dir=rtl] a{direction:rtl;float:right;margin-left:0;margin-right:5px;}.wikiEditor-ui .wikiEditor-ui-toolbar .section-characters .page-characters div a:hover{background-color:white;text-decoration:none;border-color:#a8d7f9;} |
| | 2 | +form#editform{margin:0;padding:0;}#wpSummary,#wpSummaryLabel{margin-bottom:1em;}.wikiEditor-ui textarea#wpTextbox1{border:none;padding:0;width:100%;margin:-1px;}.wikiEditor-ui .wikiEditor-ui-text > textarea#wpTextbox1{margin:0;}.wikiEditor-ui{float:left;position:relative;clear:both;width:100%;line-height:1em;background-color:#f3f3f3;}.wikiEditor-ui .wikiEditor-ui-bottom{border:solid silver 1px;border-top-width:0;}.wikiEditor-ui .wikiEditor-ui-top{position:relative;border:solid silver 1px;border-bottom-width:0;}.ui-dialog-content fieldset table td{padding:0.25em;}.wikiEditor-ui .wikiEditor-ui-toc{position:absolute;right:-1px;top:0;padding:0;border-left:solid silver 1px;overflow:auto;}body.rtl .wikiEditor-ui .wikiEditor-ui-toc{right:auto;left:-1px;border-left:none;border-right:solid silver 1px;}.wikiEditor-ui .wikiEditor-ui-toc ul{padding:0;margin:0.5em 1em;list-style:none;}.wikiEditor-ui .wikiEditor-ui-toc ul ul{padding:0;margin:0;margin-left:0.75em;margin-bottom:0 !important;margin-top:0 !important;list-style:none;}body.rtl .wikiEditor-ui .wikiEditor-ui-toc ul ul{margin-left:0;margin-right:0.75em;}.wikiEditor-ui .wikiEditor-ui-toc ul li a{display:block;font-size:0.9em;}.wikiEditor-ui .wikiEditor-ui-toc ul li a.currentSelection{font-weight:bold;}.wikiEditor-ui .wikiEditor-ui-toc ul li a.section-0{font-size:1em;border-bottom:solid 1px #DDDDDD;}.wikiEditor-ui .wikiEditor-ui-toolbar{position:relative;}.wikiEditor-ui .wikiEditor-ui-toolbar .break{border-bottom:solid silver 1px;clear:both;}.wikiEditor-ui .wikiEditor-ui-toolbar .sections{float:left;width:100%;clear:both;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .sections{float:right;}.wikiEditor-ui .wikiEditor-ui-toolbar .sections .section{display:none;float:left;width:100%;margin-left:-1px;border-left:solid silver 1px;border-right:solid silver 1px;border-top:solid 1px #DDDDDD;background-color:#F3F3F3;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .sections .section{float:right;margin-left:auto;margin-right:-1px;}.wikiEditor-ui .wikiEditor-ui-toolbar .sections .loading{padding-top:0.5em;padding-bottom:0.5em;}.wikiEditor-ui .wikiEditor-ui-toolbar .sections div .spinner{display:none;}.wikiEditor-ui .wikiEditor-ui-toolbar .sections .loading .spinner{display:block;background-image:url(../images/wikiEditor/toolbar/loading.gif);background-position:left center;background-repeat:no-repeat;padding-left:32px;margin-left:1em;float:left;color:#666666;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .sections .loading .spinner{background-position:right center;padding-left:0;padding-right:32px;margin-left:0;margin-right:1em;float:right;}.wikiEditor-ui .wikiEditor-ui-toolbar .tabs,.wikiEditor-ui .wikiEditor-ui-toolbar .group{float:left;height:26px;margin:3px;padding:0;padding-right:6px;border-right:solid 1px #DDDDDD;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .tabs,body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .group{float:right;padding-right:0;padding-left:6px;border-right:none;border-left:solid 1px #DDDDDD;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .first{border-right:none;}.wikiEditor-ui .wikiEditor-ui-toolbar .tabs{list-style:none;}.wikiEditor-ui .wikiEditor-ui-toolbar .tabs span.tab{display:inline-block;float:left;line-height:26px;}.wikiEditor-ui .wikiEditor-ui-toolbar .tabs > span.tab{display:block;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .tabs > span.tab{float:right;}.wikiEditor-ui .wikiEditor-ui-toolbar .tabs span.tab a,.wikiEditor-ui .wikiEditor-ui-toolbar .tabs span.tab a:visited{display:inline-block;float:left;padding-left:18px;padding-right:12px;height:26px;cursor:pointer;color:#0645ad;background-image:url(../images/wikiEditor/toolbar/arrow-right.png);background-position:left center;background-repeat:no-repeat;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .tabs span.tab a,body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .tabs span.tab a:visited{padding-left:12px;padding-right:18px;background-image:url(../images/wikiEditor/toolbar/arrow-left.png);background-position:right center;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .tabs > span.tab > a,body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .tabs > pan.tab > a:visited{float:right;}.wikiEditor-ui .wikiEditor-ui-toolbar .tabs span.tab a.current,.wikiEditor-ui .wikiEditor-ui-toolbar .tabs span.tab a.current:visited{color:#333333;background-image:url(../images/wikiEditor/toolbar/arrow-down.png);}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .tabs span.tab a.current,body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .tabs span.tab a.current:visited{background-image:url(../images/wikiEditor/toolbar/arrow-down.png);}.wikiEditor-ui .wikiEditor-ui-toolbar .tabs span.tab a.current:hover{text-decoration:none;}.wikiEditor-ui .wikiEditor-ui-toolbar .group .label{float:left;border:0px;height:22px;line-height:22px;margin:2px;margin-left:5px;margin-right:8px;color:#777777;cursor:default;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .group > .label{float:right;margin-left:8px;margin-right:5px;}.wikiEditor-ui .wikiEditor-ui-toolbar .group img.tool{float:left;border:0px;height:22px;width:22px;padding:2px;cursor:pointer;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .group > img.tool{float:right;}.wikiEditor-ui-toolbar .group .tool-select{float:left;margin:2px;height:22px;cursor:pointer;border:solid 1px silver;padding:0;margin-right:0;cursor:pointer;background-color:#ffffff;}body.rtl .wikiEditor-ui-toolbar .group > .tool-select{float:right;}.wikiEditor-ui-toolbar .group .tool-select .label{background-image:url(../images/wikiEditor/toolbar/arrow-down.png);background-position:center right;background-repeat:no-repeat;padding:0;margin:0;padding-left:4px;padding-right:22px;margin-right:4px;cursor:pointer;}body.rtl .wikiEditor-ui-toolbar .group .tool-select .label{background-position:center left;padding-right:4px;padding-left:22px;margin-left:4px;margin-right:0;}body.rtl .wikiEditor-ui-toolbar .group .tool-select .menu{clear:both;}.wikiEditor-ui-toolbar .group .tool-select .menu .options{position:absolute;display:none;margin-left:-1px;border:solid 1px silver;background-color:#ffffff;}body.rtl .wikiEditor-ui-toolbar .group .tool-select .menu{margin-left:-1px;margin-right:-1px;}.wikiEditor-ui-toolbar .group .tool-select .options {margin-top:22px;}.wikiEditor-ui-toolbar .group .tool-select .options .option{display:block;padding:0.5em;text-decoration:none;color:black;whitespace:nowrap;}.wikiEditor-ui-toolbar .group .tool-select .options .option:hover{background-color:#f3f3f3;}.wikiEditor-ui-toolbar .group .tool-select .options .option[rel=heading-2]{font-size:150%;font-weight:normal;}.wikiEditor-ui-toolbar .group .tool-select .options .option[rel=heading-3]{font-size:132%;font-weight:normal;}.wikiEditor-ui-toolbar .group .tool-select .options .option[rel=heading-4]{font-size:116%;font-weight:normal;}.wikiEditor-ui-toolbar .group .tool-select .options .option[rel=heading-5]{font-size:100%;font-weight:bold;}.wikiEditor-ui .wikiEditor-ui-toolbar .booklet .index{float:left;width:20%;height:125px;overflow:auto;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .booklet .index{float:right;}.wikiEditor-ui .wikiEditor-ui-toolbar .booklet .index div{padding:4px;padding-left:6px;cursor:pointer;color:#0645ad;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .booklet .index div{padding-left:4px;padding-right:6px;}.wikiEditor-ui .wikiEditor-ui-toolbar .booklet .index .current{background-color:#FAFAFA;color:#333333;cursor:default;}.wikiEditor-ui .wikiEditor-ui-toolbar .booklet .pages{float:right;width:80%;height:125px;overflow:auto;background-color:#FAFAFA;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .booklet .pages{float:left;}.wikiEditor-ui .wikiEditor-ui-toolbar .section-help .page-table table{padding-left:5px;padding-right:5px;background:none;}.wikiEditor-ui .wikiEditor-ui-toolbar .section-help .page-table table th{color:#999999;}.wikiEditor-ui .wikiEditor-ui-toolbar .section-help .page-table table td{color:black;border-top:solid 1px #EEEEEE;}.wikiEditor-ui .wikiEditor-ui-toolbar .section-help .page-table table th,.wikiEditor-ui .wikiEditor-ui-toolbar .section-help .page-table table td{text-align:left;padding:5px;margin:0px;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .section-help .page-table table th,body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .section-help .page-table table td{text-align:right;}.wikiEditor-ui .wikiEditor-ui-toolbar .section-help .page-table table td.syntax{font-family:monospace;}.wikiEditor-ui .wikiEditor-ui-toolbar .section-help .page-table table td.syntax,.wikiEditor-ui .wikiEditor-ui-toolbar .section-help .page-table table td.result{width:40%;}.wikiEditor-ui .wikiEditor-ui-toolbar .section-help .page-table table td.description{width:20%;}.wikiEditor-ui .wikiEditor-ui-toolbar .section-characters .page-characters div a{border:solid 1px #DDDDDD;padding:5px;padding-left:8px;padding-right:8px;margin-left:5px;margin-top:5px;height:1em;float:left;display:block;color:black;text-decoration:none;}body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .section-characters .page-characters > div > a,.wikiEditor-ui .wikiEditor-ui-toolbar .section-characters .page-characters div[dir=rtl] a{direction:rtl;float:right;margin-left:0;margin-right:5px;}.wikiEditor-ui .wikiEditor-ui-toolbar .section-characters .page-characters div a:hover{background-color:white;text-decoration:none;border-color:#a8d7f9;} |
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/css/wikiEditor.css |
| — | — | @@ -28,7 +28,6 @@ |
| 29 | 29 | background-color: #f3f3f3; |
| 30 | 30 | } |
| 31 | 31 | .wikiEditor-ui .wikiEditor-ui-bottom { |
| 32 | | - position: relative; |
| 33 | 32 | border: solid silver 1px; |
| 34 | 33 | border-top-width: 0; |
| 35 | 34 | } |
| — | — | @@ -37,3 +36,6 @@ |
| 38 | 37 | border: solid silver 1px; |
| 39 | 38 | border-bottom-width: 0; |
| 40 | 39 | } |
| | 40 | +.ui-dialog-content fieldset table td { |
| | 41 | + padding: 0.25em; |
| | 42 | +} |
| \ No newline at end of file |
| Index: branches/wmf-deployment/extensions/UsabilityInitiative/css/wikiEditor.toolbar.css |
| — | — | @@ -162,17 +162,83 @@ |
| 163 | 163 | body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .group > img.tool { |
| 164 | 164 | float: right; |
| 165 | 165 | } |
| 166 | | -.wikiEditor-ui .wikiEditor-ui-toolbar .group select { |
| | 166 | +.wikiEditor-ui-toolbar .group .tool-select { |
| 167 | 167 | float: left; |
| 168 | 168 | margin: 2px; |
| 169 | 169 | height: 22px; |
| 170 | 170 | cursor: pointer; |
| | 171 | + border: solid 1px silver; |
| | 172 | + padding: 0; |
| | 173 | + margin-right: 0; |
| | 174 | + cursor: pointer; |
| | 175 | + background-color: #ffffff; |
| 171 | 176 | } |
| 172 | 177 | /* IGNORED BY IE6 */ |
| 173 | | -body.rtl .wikiEditor-ui .wikiEditor-ui-toolbar .group > select { |
| | 178 | +body.rtl .wikiEditor-ui-toolbar .group > .tool-select { |
| 174 | 179 | float: right; |
| 175 | | - font-size: 0.9em; |
| 176 | 180 | } |
| | 181 | +.wikiEditor-ui-toolbar .group .tool-select .label { |
| | 182 | + background-image: url(../images/wikiEditor/toolbar/arrow-down.png); |
| | 183 | + background-position: center right; |
| | 184 | + background-repeat: no-repeat; |
| | 185 | + padding: 0; |
| | 186 | + margin: 0; |
| | 187 | + padding-left: 4px; |
| | 188 | + padding-right: 22px; |
| | 189 | + margin-right: 4px; |
| | 190 | + cursor: pointer; |
| | 191 | +} |
| | 192 | +body.rtl .wikiEditor-ui-toolbar .group .tool-select .label { |
| | 193 | + background-position: center left; |
| | 194 | + padding-right: 4px; |
| | 195 | + padding-left: 22px; |
| | 196 | + margin-left: 4px; |
| | 197 | + margin-right: 0; |
| | 198 | +} |
| | 199 | +body.rtl .wikiEditor-ui-toolbar .group .tool-select .menu { |
| | 200 | + clear: both; |
| | 201 | +} |
| | 202 | +.wikiEditor-ui-toolbar .group .tool-select .menu .options { |
| | 203 | + position: absolute; |
| | 204 | + display: none; |
| | 205 | + margin-left: -1px; |
| | 206 | + border: solid 1px silver; |
| | 207 | + background-color: #ffffff; |
| | 208 | +} |
| | 209 | +body.rtl .wikiEditor-ui-toolbar .group .tool-select .menu { |
| | 210 | + margin-left: -1px; |
| | 211 | + margin-right: -1px; |
| | 212 | +} |
| | 213 | +/* IGNORED BY IE6 */ |
| | 214 | +.wikiEditor-ui-toolbar .group .tool-select .options { |
| | 215 | + margin-top: 22px; |
| | 216 | +} |
| | 217 | +.wikiEditor-ui-toolbar .group .tool-select .options .option { |
| | 218 | + display: block; |
| | 219 | + padding: 0.5em; |
| | 220 | + text-decoration: none; |
| | 221 | + color: black; |
| | 222 | + whitespace: nowrap; |
| | 223 | +} |
| | 224 | +.wikiEditor-ui-toolbar .group .tool-select .options .option:hover { |
| | 225 | + background-color: #f3f3f3; |
| | 226 | +} |
| | 227 | +.wikiEditor-ui-toolbar .group .tool-select .options .option[rel=heading-2] { |
| | 228 | + font-size: 150%; |
| | 229 | + font-weight: normal; |
| | 230 | +} |
| | 231 | +.wikiEditor-ui-toolbar .group .tool-select .options .option[rel=heading-3] { |
| | 232 | + font-size: 132%; |
| | 233 | + font-weight: normal; |
| | 234 | +} |
| | 235 | +.wikiEditor-ui-toolbar .group .tool-select .options .option[rel=heading-4] { |
| | 236 | + font-size: 116%; |
| | 237 | + font-weight: normal; |
| | 238 | +} |
| | 239 | +.wikiEditor-ui-toolbar .group .tool-select .options .option[rel=heading-5] { |
| | 240 | + font-size: 100%; |
| | 241 | + font-weight: bold; |
| | 242 | +} |
| 177 | 243 | /* Booklet */ |
| 178 | 244 | .wikiEditor-ui .wikiEditor-ui-toolbar .booklet .index { |
| 179 | 245 | float: left; |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/OptIn/OptIn.i18n.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 180 | 246 | Merged /trunk/extensions/UsabilityInitiative/OptIn/OptIn.i18n.php:r55247,55251 |
| Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 181 | 247 | Merged /trunk/extensions/UsabilityInitiative:r55247,55251 |