| Index: branches/MwEmbedStandAlone/loader.js |
| — | — | @@ -153,6 +153,8 @@ |
| 154 | 154 | "$j.fn.textSelection" : "jquery/plugins/jquery.textSelection.js", |
| 155 | 155 | "$j.browserTest" : "jquery/plugins/jquery.browserTest.js", |
| 156 | 156 | "$j.fn.jWizard" : "jquery/plugins/jquery.jWizard.js", |
| | 157 | + "$j.fn.tipsy" : "jquery/plugins/jquery.tipsy.js", |
| | 158 | + "mw.style.tipsy" : "jquery/plugins/jquery.tipsy.css", |
| 157 | 159 | |
| 158 | 160 | "$j.effects.blind" : "jquery/jquery.ui/ui/effects.blind.js", |
| 159 | 161 | "$j.effects.drop" : "jquery/jquery.ui/ui/effects.drop.js", |
| Index: branches/MwEmbedStandAlone/skins/common/common.css |
| — | — | @@ -177,4 +177,4 @@ |
| 178 | 178 | .ui-dialog-buttonpane a{ |
| 179 | 179 | float: right; |
| 180 | 180 | margin-right: 10px; |
| 181 | | -} |
| \ No newline at end of file |
| | 181 | +} |
| Index: branches/MwEmbedStandAlone/modules/UploadWizard/loader.js |
| — | — | @@ -53,8 +53,10 @@ |
| 54 | 54 | '$j.ui.datepicker', |
| 55 | 55 | '$j.effects.core', |
| 56 | 56 | '$j.effects.slide', |
| 57 | | - '$j.effects.pulsate', |
| | 57 | + //'$j.effects.pulsate', |
| 58 | 58 | '$j.fn.autocomplete', |
| | 59 | + '$j.fn.tipsy', |
| | 60 | + 'mw.style.tipsy', |
| 59 | 61 | 'mw.style.autocomplete' |
| 60 | 62 | ], |
| 61 | 63 | [ |
| Index: branches/MwEmbedStandAlone/modules/UploadWizard/mw.UploadWizard.js |
| — | — | @@ -87,7 +87,15 @@ |
| 88 | 88 | "mwe-prevent-close": "Your files are still uploading. Are you sure you want to navigate away from this page?", |
| 89 | 89 | |
| 90 | 90 | "mwe-upwiz-files-complete": "Your files finished uploading!", |
| 91 | | - "mwe-upwiz-deeds-later": "Set deeds and licenses for each file individually on the next page" |
| | 91 | + "mwe-upwiz-deeds-later": "Set deeds and licenses for each file individually on the next page", |
| | 92 | + |
| | 93 | + "mwe-upwiz-tooltip-author": "The name of the person who took the photo, or painted the picture, drew the drawing, etc.", |
| | 94 | + "mwe-upwiz-tooltip-source": "Where this digital file came from -- could be a URL, or a book or publication", |
| | 95 | + "mwe-upwiz-tooltip-sign": "You can use your wiki User name or your real name. In both cases, this will be linked to your wiki User page", |
| | 96 | + "mwe-upwiz-tooltip-title": "A short title for the image. You may use plain language with spaces, but no line breaks. This title must be unlike all other titles in this wiki.", |
| | 97 | + "mwe-upwiz-tooltip-description": "Briefly describe everything notable about the work. For a photo, mention the main things that are depicted, the occasion or the place.", |
| | 98 | + "mwe-upwiz-tooltip-other": "Any other information you want to include about this work. You may use wikitext code." |
| | 99 | + |
| 92 | 100 | } ); |
| 93 | 101 | |
| 94 | 102 | |
| — | — | @@ -969,7 +977,9 @@ |
| 970 | 978 | _this.languageMenu = mw.LanguageUpWiz.getMenu("lang", languageCode); |
| 971 | 979 | $j(_this.languageMenu).addClass('mwe-upwiz-desc-lang-select'); |
| 972 | 980 | _this.description = $j('<textarea name="desc" rows="2" cols="36" class="mwe-upwiz-desc-lang-text"></textarea>') |
| 973 | | - .growTextArea().get(0); |
| | 981 | + .attr( 'title', gM( 'mwe-upwiz-tooltip-description' ) ) |
| | 982 | + .tipsy( { gravity: 'w', trigger: 'focus' } ) |
| | 983 | + .growTextArea(); |
| 974 | 984 | _this.div = $j('<div class="mwe-upwiz-desc-lang-container"></div>') |
| 975 | 985 | .append( _this.languageMenu ) |
| 976 | 986 | .append( _this.description ); |
| — | — | @@ -1026,7 +1036,7 @@ |
| 1027 | 1037 | _this.descriptionsDiv = $j( '<div class="mwe-upwiz-details-descriptions mwe-upwiz-details-input"></div>' ); |
| 1028 | 1038 | |
| 1029 | 1039 | |
| 1030 | | - _this.descriptionAdder = $j( '<a id="mwe-upwiz-desc-add"/>' ) |
| | 1040 | + _this.descriptionAdder = $j( '<a class="mwe-upwiz-desc-add"/>' ) |
| 1031 | 1041 | .attr( 'href', '#' ) |
| 1032 | 1042 | .html( gM( 'mwe-upwiz-desc-add-0' ) ) |
| 1033 | 1043 | .click( function( ) { _this.addDescription(); } ); |
| — | — | @@ -1040,7 +1050,10 @@ |
| 1041 | 1051 | // Commons specific help for titles |
| 1042 | 1052 | // http://commons.wikimedia.org/wiki/Commons:File_naming |
| 1043 | 1053 | // http://commons.wikimedia.org/wiki/MediaWiki:Filename-prefix-blacklist |
| | 1054 | + // XXX make sure they can't use ctrl characters or returns or any other bad stuff. |
| 1044 | 1055 | _this.titleInput = $j( '<textarea type="text" rows="1" class="mwe-title mwe-long-textarea"></textarea>' ) |
| | 1056 | + .attr( 'title', gM( 'mwe-upwiz-tooltip-title' ) ) |
| | 1057 | + .tipsy( { gravity: 'w', trigger: 'focus' } ) |
| 1045 | 1058 | .keyup( function() { |
| 1046 | 1059 | _this.setFilenameFromTitle(); |
| 1047 | 1060 | } ) |
| — | — | @@ -1049,7 +1062,8 @@ |
| 1050 | 1063 | spinner: function(bool) { _this.toggleDestinationBusy(bool); }, |
| 1051 | 1064 | preprocess: function( name ) { return _this.getFilenameFromTitle(); }, // XXX this is no longer a pre-process |
| 1052 | 1065 | processResult: function( result ) { _this.processDestinationCheck( result ); } |
| 1053 | | - } ); |
| | 1066 | + } ) |
| | 1067 | + ; |
| 1054 | 1068 | |
| 1055 | 1069 | _this.titleErrorDiv = $j('<div></div>'); |
| 1056 | 1070 | |
| — | — | @@ -1106,7 +1120,11 @@ |
| 1107 | 1121 | .append( $j( '<div class="mwe-upwiz-details-more-label"></div>' ).append( gM( 'mwe-upwiz-filename-tag' ) ) ) |
| 1108 | 1122 | .append( $j( '<div class="mwe-upwiz-details-filename mwe-upwiz-details-more-input"></div>' ) ) ) ); |
| 1109 | 1123 | |
| 1110 | | - _this.otherInformationInput = $j( '<textarea class="mwe-upwiz-other-textarea"></textarea>' ); |
| | 1124 | + _this.otherInformationInput = $j( '<textarea class="mwe-upwiz-other-textarea"></textarea>' ) |
| | 1125 | + .growTextArea() |
| | 1126 | + .attr( 'title', gM( 'mwe-upwiz-tooltip-other' ) ) |
| | 1127 | + .tipsy( { gravity: 'w', trigger: 'focus' } ); |
| | 1128 | + |
| 1111 | 1129 | var otherInformationDiv = $j('<div></div>') |
| 1112 | 1130 | .append( $j( '<div class="mwe-upwiz-details-more-label">' ).append( gM( 'mwe-upwiz-other' ) ) ) |
| 1113 | 1131 | .append( _this.otherInformationInput ); |
| — | — | @@ -1997,6 +2015,7 @@ |
| 1998 | 2016 | } ); |
| 1999 | 2017 | */ |
| 2000 | 2018 | |
| | 2019 | + |
| 2001 | 2020 | // DETAILS div |
| 2002 | 2021 | $j( '#mwe-upwiz-stepdiv-details .mwe-upwiz-button-next' ).click( function() { |
| 2003 | 2022 | _this.detailsSubmit( function() { |
| — | — | @@ -2688,6 +2707,8 @@ |
| 2689 | 2708 | } ); |
| 2690 | 2709 | |
| 2691 | 2710 | _this.setQuantity( 1 ); |
| | 2711 | + |
| | 2712 | + |
| 2692 | 2713 | }, |
| 2693 | 2714 | |
| 2694 | 2715 | |
| — | — | @@ -2711,9 +2732,15 @@ |
| 2712 | 2733 | |
| 2713 | 2734 | // synchronize both username signatures |
| 2714 | 2735 | // set initial value to configured username |
| 2715 | | - // if one changes all the others change |
| | 2736 | + // if one changes all the others change (keyup event) |
| | 2737 | + // |
| | 2738 | + // also set tooltips ( the title, tipsy() ) |
| 2716 | 2739 | $j( _this.deedChooser.selector ).find( '.mwe-upwiz-sign' ) |
| 2717 | | - .attr( { value: mw.getConfig( 'userName' ) } ) |
| | 2740 | + .attr( { |
| | 2741 | + title: gM( 'mwe-upwiz-tooltip-sign' ), |
| | 2742 | + value: mw.getConfig( 'userName' ) |
| | 2743 | + } ) |
| | 2744 | + .tipsy( { trigger: 'focus', gravity: 'w' } ) |
| 2718 | 2745 | .keyup( function() { |
| 2719 | 2746 | var thisInput = this; |
| 2720 | 2747 | var thisVal = $j( thisInput ).val(); |
| — | — | @@ -2744,8 +2771,12 @@ |
| 2745 | 2772 | var _this = this; |
| 2746 | 2773 | var sourceInput = $j('<textarea class="mwe-source mwe-long-textarea" name="source" rows="1" cols="40"></textarea>' ) |
| 2747 | 2774 | .growTextArea() |
| | 2775 | + .attr( 'title', gM( 'mwe-upwiz-tooltip-source' ) ) |
| | 2776 | + .tipsy( { trigger: 'focus', gravity: 'w' } ); |
| 2748 | 2777 | var authorInput = $j('<textarea class="mwe-author mwe-long-textarea" name="author" rows="1" cols="40"></textarea>' ) |
| 2749 | 2778 | .growTextArea() |
| | 2779 | + .attr( 'title', gM( 'mwe-upwiz-tooltip-author' ) ) |
| | 2780 | + .tipsy( { trigger: 'focus', gravity: 'w' } ); |
| 2750 | 2781 | licenseInputDiv = $j( '<div class="mwe-upwiz-deed-license"></div>' ); |
| 2751 | 2782 | licenseInput = new mw.UploadWizardLicenseInput( licenseInputDiv ); |
| 2752 | 2783 | licenseInput.setDefaultValues(); |
| — | — | @@ -2994,9 +3025,12 @@ |
| 2995 | 3026 | return this; |
| 2996 | 3027 | }; |
| 2997 | 3028 | |
| | 3029 | + this.addClass( 'mwe-grow-textarea' ); |
| | 3030 | + |
| 2998 | 3031 | this.change(this.resizeIfNeeded); |
| 2999 | 3032 | this.keyup(this.resizeIfNeeded); |
| 3000 | 3033 | |
| | 3034 | + |
| 3001 | 3035 | return this; |
| 3002 | 3036 | }; |
| 3003 | 3037 | |
| Index: branches/MwEmbedStandAlone/modules/UploadWizard/css/uploadWizard.css |
| — | — | @@ -398,10 +398,13 @@ |
| 399 | 399 | margin-left: 100px; |
| 400 | 400 | } |
| 401 | 401 | |
| 402 | | -.mwe-long-textarea { |
| | 402 | +.mwe-grow-textarea, .mwe-long-textarea { |
| 403 | 403 | overflow: hidden; |
| 404 | 404 | font-family: sans-serif; /* XXX is this right? */ |
| 405 | 405 | font-size: x-small; |
| | 406 | +} |
| | 407 | + |
| | 408 | +.mwe-long-textarea { |
| 406 | 409 | width: 370px; |
| 407 | 410 | } |
| 408 | 411 | |
| Index: branches/MwEmbedStandAlone/modules/AddMedia/loader.js |
| — | — | @@ -21,7 +21,7 @@ |
| 22 | 22 | "mw.FirefoggRender" : "modules/libSequencer/mw.FirefoggRender.js", |
| 23 | 23 | "mw.RemoteSearchDriver" : "mw.RemoteSearchDriver.js", |
| 24 | 24 | |
| 25 | | - "mw.style.AddMedia" : "css/mw.style.AddMedia.css", |
| | 25 | + "mw.style.AddMedia" : "css/mw.style.AddMedia.css", |
| 26 | 26 | |
| 27 | 27 | "baseRemoteSearch" : "searchLibs/baseRemoteSearch.js", |
| 28 | 28 | "mediaWikiSearch" : "searchLibs/mediaWikiSearch.js", |
| — | — | @@ -65,7 +65,9 @@ |
| 66 | 66 | '$j.ui.draggable', |
| 67 | 67 | '$j.ui.dialog', |
| 68 | 68 | '$j.ui.tabs', |
| 69 | | - '$j.ui.sortable' |
| | 69 | + '$j.ui.sortable', |
| | 70 | + |
| | 71 | + 'mw.style.AddMedia' |
| 70 | 72 | ] |
| 71 | 73 | ]; |
| 72 | 74 | mw.load( request , function() { |
| — | — | @@ -144,4 +146,4 @@ |
| 145 | 147 | }); |
| 146 | 148 | }); |
| 147 | 149 | |
| 148 | | -} )( window.mw ); |
| \ No newline at end of file |
| | 150 | +} )( window.mw ); |
| Index: branches/MwEmbedStandAlone/modules/EmbedPlayer/loader.js |
| — | — | @@ -79,9 +79,10 @@ |
| 80 | 80 | "vlcEmbed" : "vlcEmbed.js", |
| 81 | 81 | |
| 82 | 82 | "ctrlBuilder" : "skins/ctrlBuilder.js", |
| | 83 | + "mw.style.EmbedPlayer" : "mw.style.EmbedPlayer.css", |
| 83 | 84 | |
| | 85 | + "mw.style.kskin" : "skins/kskin/EmbedPlayer.css", |
| 84 | 86 | "kskinConfig" : "skins/kskin/kskinConfig.js", |
| 85 | | - "mw.style.kskin" : "skins/kskin/EmbedPlayer.css", |
| 86 | 87 | |
| 87 | 88 | "mvpcfConfig" : "skins/mvpcf/mvpcfConfig.js", |
| 88 | 89 | "mw.style.mvpcf" : "skins/mvpcf/EmbedPlayer.css" |
| — | — | @@ -173,7 +174,8 @@ |
| 174 | 175 | 'ctrlBuilder', |
| 175 | 176 | '$j.cookie', |
| 176 | 177 | // Add JSON lib if browsers does not define "JSON" natively |
| 177 | | - 'JSON' |
| | 178 | + 'JSON', |
| | 179 | + 'mw.style.EmbedPlayer' |
| 178 | 180 | ], |
| 179 | 181 | [ |
| 180 | 182 | '$j.fn.menu', |
| Index: branches/MwEmbedStandAlone/modules/ClipEdit/loader.js |
| — | — | @@ -8,5 +8,6 @@ |
| 9 | 9 | "mw.style.colorpicker" : "colorpicker/css/colorpicker.css", |
| 10 | 10 | |
| 11 | 11 | "$j.Jcrop" : "Jcrop/js/jquery.Jcrop.js", |
| 12 | | - "mw.style.Jcrop" : "Jcrop/css/jquery.Jcrop.css" |
| 13 | | -} ); |
| \ No newline at end of file |
| | 12 | + "mw.style.Jcrop" : "Jcrop/css/jquery.Jcrop.css", |
| | 13 | + "mw.style.ClipEdit" : "mw.style.ClipEdit.css" |
| | 14 | +} ); |