mw.ForeignStructuredUpload.BookletLayout: Remove A/B test code
authorBartosz Dziewoński <matma.rex@gmail.com>
Fri, 5 Feb 2016 01:18:58 +0000 (01:18 +0000)
committerPrtksxna <psaxena@wikimedia.org>
Thu, 11 Feb 2016 05:03:35 +0000 (05:03 +0000)
We don't want it to accidentally end up in MediaWiki 1.27 release.
It can be restored again when needed.

This reverts commit d0e47d475cd7efd7541d51e02ab216a966da8b1f.

Bug: T120867
Change-Id: Ie1a90ad2d2ccdecf189313e18c3c5b24576363f4

30 files changed:
includes/DefaultSettings.php
includes/resourceloader/ResourceLoaderStartUpModule.php
languages/i18n/en.json
languages/i18n/qqq.json
resources/Resources.php
resources/src/mediawiki/bookletlayout/option2/ccbysa.png [deleted file]
resources/src/mediawiki/bookletlayout/option2/ccbysa.svg [deleted file]
resources/src/mediawiki/bookletlayout/option2/noderiv.png [deleted file]
resources/src/mediawiki/bookletlayout/option2/noderiv.svg [deleted file]
resources/src/mediawiki/bookletlayout/option2/ownwork.png [deleted file]
resources/src/mediawiki/bookletlayout/option2/ownwork.svg [deleted file]
resources/src/mediawiki/bookletlayout/option2/useful.png [deleted file]
resources/src/mediawiki/bookletlayout/option2/useful.svg [deleted file]
resources/src/mediawiki/bookletlayout/option4/camera.png [deleted file]
resources/src/mediawiki/bookletlayout/option4/camera.svg [deleted file]
resources/src/mediawiki/bookletlayout/option4/graphics.png [deleted file]
resources/src/mediawiki/bookletlayout/option4/graphics.svg [deleted file]
resources/src/mediawiki/bookletlayout/option4/guide.html [deleted file]
resources/src/mediawiki/bookletlayout/option4/search-ltr.png [deleted file]
resources/src/mediawiki/bookletlayout/option4/search-ltr.svg [deleted file]
resources/src/mediawiki/bookletlayout/option4/search-rtl.png [deleted file]
resources/src/mediawiki/bookletlayout/option4/search-rtl.svg [deleted file]
resources/src/mediawiki/bookletlayout/option4/website-ltr.png [deleted file]
resources/src/mediawiki/bookletlayout/option4/website-ltr.svg [deleted file]
resources/src/mediawiki/bookletlayout/option4/website-rtl.png [deleted file]
resources/src/mediawiki/bookletlayout/option4/website-rtl.svg [deleted file]
resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.less
resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
resources/src/mediawiki/mediawiki.Upload.js

index c886f13..fc19856 100644 (file)
@@ -535,12 +535,6 @@ $wgUseInstantCommons = false;
  */
 $wgForeignUploadTargets = array();
 
-/**
- * Cross-wiki upload A/B test configuration.
- */
-$wgForeignUploadTestEnabled = false;
-$wgForeignUploadTestDefault = 1;
-
 /**
  * File backend structure configuration.
  *
index 4a68f8e..c9f515e 100644 (file)
@@ -104,8 +104,6 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
                        'wgResourceLoaderLegacyModules' => self::getLegacyModules(),
                        'wgForeignUploadTargets' => $conf->get( 'ForeignUploadTargets' ),
                        'wgEnableUploads' => $conf->get( 'EnableUploads' ),
-                       'wgForeignUploadTestEnabled' => $conf->get( 'ForeignUploadTestEnabled' ),
-                       'wgForeignUploadTestDefault' => $conf->get( 'ForeignUploadTestDefault' ),
                );
 
                Hooks::run( 'ResourceLoaderGetConfigVars', array( &$vars ) );
index f220040..1c5251a 100644 (file)
        "foreign-structured-upload-form-label-own-work-message-shared": "I attest that I own the copyright on this file, and agree to irrevocably release this file to Wikimedia Commons under the [https://creativecommons.org/licenses/by-sa/4.0/ Creative Commons Attribution-ShareAlike 4.0] license, and I agree to the [https://wikimediafoundation.org/wiki/Terms_of_Use Terms of Use].",
        "foreign-structured-upload-form-label-not-own-work-message-shared": "If you do not own the copyright on this file, or you wish to release it under a different license, consider using the [https://commons.wikimedia.org/wiki/Special:UploadWizard Commons Upload Wizard].",
        "foreign-structured-upload-form-label-not-own-work-local-shared": "You may also want to try using [[Special:Upload|the upload page on {{SITENAME}}]], if the site allows the upload of this file under their policies.",
-       "foreign-structured-upload-form-2-label-intro": "Thank you for donating an image to be used on {{SITENAME}}. You should only continue if it meets several conditions:",
-       "foreign-structured-upload-form-2-label-ownwork": "It must be entirely <strong>your own creation</strong>, not just taken from the Internet",
-       "foreign-structured-upload-form-2-label-noderiv": "It has to contain <strong>no work by anyone else</strong>, or inspired by them",
-       "foreign-structured-upload-form-2-label-useful": "It should be <strong>educational and useful</strong> for teaching others",
-       "foreign-structured-upload-form-2-label-ccbysa": "It must be <strong>OK to publish forever</strong> on the Internet under the [https://creativecommons.org/licenses/by-sa/4.0/ Creative Commons Attribution-ShareAlike 4.0] license",
-       "foreign-structured-upload-form-2-label-alternative": "If not all of the above are true, you may still be able to upload this file using the [https://commons.wikimedia.org/wiki/Special:UploadWizard Commons Upload Wizard], as long as it's available under a free license.",
-       "foreign-structured-upload-form-2-label-termsofuse": "By uploading the file, you attest that you own the copyright on this file, and agree to irrevocably release this file to Wikimedia Commons under the Creative Commons Attribution-ShareAlike 4.0 license, and you agree to the [https://wikimediafoundation.org/wiki/Terms_of_Use Terms of Use].",
-       "foreign-structured-upload-form-3-label-question-website": "Did you download this image from a website, or get it from an image search?",
-       "foreign-structured-upload-form-3-label-question-ownwork": "Did you create this image (take the photo, sketch the drawing, etc.) yourself?",
-       "foreign-structured-upload-form-3-label-question-noderiv": "Does it contain, or is it inspired by, work owned by anyone else, like a logo?",
-       "foreign-structured-upload-form-3-label-yes": "Yes",
-       "foreign-structured-upload-form-3-label-no": "No",
-       "foreign-structured-upload-form-3-label-alternative": "Unfortunately, in this case, this tool does not support uploading this file. You may still be able to upload it using the [https://commons.wikimedia.org/wiki/Special:UploadWizard Commons Upload Wizard], as long as it's available under a free license.",
-       "foreign-structured-upload-form-4-label-good": "Using this tool, you can upload educational graphics you've created and photographs you've taken, that don't contain work owned by someone else.",
-       "foreign-structured-upload-form-4-label-bad": "You can not upload images found on a search engine or downloaded from other websites.",
        "backend-fail-stream": "Could not stream file \"$1\".",
        "backend-fail-backup": "Could not backup file \"$1\".",
        "backend-fail-notexists": "The file $1 does not exist.",
index 7cd96cc..39f20bd 100644 (file)
        "foreign-structured-upload-form-label-own-work-message-default": "Message shown by default when a user affirms that they are allowed to upload a file to a remote wiki.",
        "foreign-structured-upload-form-label-not-own-work-message-default": "Message shown by default when a user cannot upload a file to a remote wiki.",
        "foreign-structured-upload-form-label-not-own-work-local-default": "Suggests uploading a file locally instead of to a remote wiki.",
-       "foreign-structured-upload-form-label-own-work-message-shared": "[[File:Cross-wiki media upload dialog, December 2015 AB test option 1.png|thumb]] Legal message, confirming that the user is allowed to upload the file. Almost identical to {{msg-mw|foreign-structured-upload-form-2-label-termsofuse}}.",
+       "foreign-structured-upload-form-label-own-work-message-shared": "[[File:Cross-wiki media upload dialog, December 2015 AB test option 1.png|thumb]] Legal message, confirming that the user is allowed to upload the file.",
        "foreign-structured-upload-form-label-not-own-work-message-shared": "[[File:Cross-wiki media upload dialog, December 2015 AB test option 1.png|thumb]] Explains alternatives when the copyright isn't owned by the uploader.",
        "foreign-structured-upload-form-label-not-own-work-local-shared": "[[File:Cross-wiki media upload dialog, December 2015 AB test option 1.png|thumb]] Message suggesting the user might want to upload a file locally instead of to Wikimedia Commons.",
-       "foreign-structured-upload-form-2-label-intro": "[[File:Cross-wiki media upload dialog, December 2015 AB test option 2.png|thumb]] Introductory text in cross-wiki upload dialog.",
-       "foreign-structured-upload-form-2-label-ownwork": "[[File:Cross-wiki media upload dialog, December 2015 AB test option 2.png|thumb]] Affirmative statement, used as checkbox label. The user must tick it to continue.",
-       "foreign-structured-upload-form-2-label-noderiv": "[[File:Cross-wiki media upload dialog, December 2015 AB test option 2.png|thumb]] Affirmative statement, used as checkbox label. The user must tick it to continue.",
-       "foreign-structured-upload-form-2-label-useful": "[[File:Cross-wiki media upload dialog, December 2015 AB test option 2.png|thumb]] Affirmative statement, used as checkbox label. The user must tick it to continue.",
-       "foreign-structured-upload-form-2-label-ccbysa": "[[File:Cross-wiki media upload dialog, December 2015 AB test option 2.png|thumb]] Affirmative statement, used as checkbox label. The user must tick it to continue.",
-       "foreign-structured-upload-form-2-label-alternative": "[[File:Cross-wiki media upload dialog, December 2015 AB test option 2.png|thumb]] Explains alternatives when the copyright isn't owned by the uploader.\n\nSimilar to {{msg-mw|foreign-structured-upload-form-3-label-alternative}}.",
-       "foreign-structured-upload-form-2-label-termsofuse": "[[File:Cross-wiki media upload dialog, December 2015 AB test option 2.png|thumb]] Legal message, confirming that the user is allowed to upload the file. Almost identical to {{msg-mw|foreign-structured-upload-form-label-own-work-message-shared}}.",
-       "foreign-structured-upload-form-3-label-question-website": "[[File:Cross-wiki media upload dialog, December 2015 AB test option 3.png|thumb]] Question to the user, with Yes/No answer ({{msg-mw|foreign-structured-upload-form-3-label-yes}} / {{msg-mw|foreign-structured-upload-form-3-label-no}}). The answer determines whether the user will be able to continue.",
-       "foreign-structured-upload-form-3-label-question-ownwork": "[[File:Cross-wiki media upload dialog, December 2015 AB test option 3.png|thumb]] Question to the user, with Yes/No answer ({{msg-mw|foreign-structured-upload-form-3-label-yes}} / {{msg-mw|foreign-structured-upload-form-3-label-no}}). The answer determines whether the user will be able to continue.",
-       "foreign-structured-upload-form-3-label-question-noderiv": "[[File:Cross-wiki media upload dialog, December 2015 AB test option 3.png|thumb]] Question to the user, with Yes/No answer ({{msg-mw|foreign-structured-upload-form-3-label-yes}} / {{msg-mw|foreign-structured-upload-form-3-label-no}}). The answer determines whether the user will be able to continue.",
-       "foreign-structured-upload-form-3-label-yes": "[[File:Cross-wiki media upload dialog, December 2015 AB test option 3.png|thumb]] {{Identical|Yes}}",
-       "foreign-structured-upload-form-3-label-no": "[[File:Cross-wiki media upload dialog, December 2015 AB test option 3.png|thumb]] {{Identical|No}}",
-       "foreign-structured-upload-form-3-label-alternative": "[[File:Cross-wiki media upload dialog, December 2015 AB test option 3.png|thumb]] Explains alternatives when the copyright isn't owned by the uploader.\n\nSimilar to {{msg-mw|foreign-structured-upload-form-2-label-alternative}}.",
-       "foreign-structured-upload-form-4-label-good": "[[File:Cross-wiki media upload dialog, December 2015 AB test option 4.png|thumb]] Gives examples of good content that is welcome. There is limited space for this text in the interface, please keep it short.",
-       "foreign-structured-upload-form-4-label-bad": "[[File:Cross-wiki media upload dialog, December 2015 AB test option 4.png|thumb]] Gives examples of bad content that is unacceptable. There is limited space for this text in the interface, please keep it short.",
        "backend-fail-stream": "Parameters:\n* $1 - a filename",
        "backend-fail-backup": "Parameters:\n* $1 - a filename",
        "backend-fail-notexists": "Parameters:\n* $1 - a filename",
index 7c3bc74..9c6ab5f 100644 (file)
@@ -1277,24 +1277,6 @@ return array(
                        'foreign-structured-upload-form-label-own-work-message-local',
                        'foreign-structured-upload-form-label-not-own-work-message-local',
                        'foreign-structured-upload-form-label-not-own-work-local-local',
-                       'foreign-structured-upload-form-2-label-intro',
-                       'foreign-structured-upload-form-2-label-ownwork',
-                       'foreign-structured-upload-form-2-label-noderiv',
-                       'foreign-structured-upload-form-2-label-useful',
-                       'foreign-structured-upload-form-2-label-ccbysa',
-                       'foreign-structured-upload-form-2-label-alternative',
-                       'foreign-structured-upload-form-2-label-termsofuse',
-                       'foreign-structured-upload-form-3-label-question-website',
-                       'foreign-structured-upload-form-3-label-question-ownwork',
-                       'foreign-structured-upload-form-3-label-question-noderiv',
-                       'foreign-structured-upload-form-3-label-yes',
-                       'foreign-structured-upload-form-3-label-no',
-                       'foreign-structured-upload-form-3-label-alternative',
-                       'foreign-structured-upload-form-4-label-good',
-                       'foreign-structured-upload-form-4-label-bad',
-               ),
-               'templates' => array(
-                       'guide.html' => 'resources/src/mediawiki/bookletlayout/option4/guide.html',
                ),
        ),
        'mediawiki.toc' => array(
diff --git a/resources/src/mediawiki/bookletlayout/option2/ccbysa.png b/resources/src/mediawiki/bookletlayout/option2/ccbysa.png
deleted file mode 100644 (file)
index b39ecb6..0000000
Binary files a/resources/src/mediawiki/bookletlayout/option2/ccbysa.png and /dev/null differ
diff --git a/resources/src/mediawiki/bookletlayout/option2/ccbysa.svg b/resources/src/mediawiki/bookletlayout/option2/ccbysa.svg
deleted file mode 100644 (file)
index 605af75..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-        viewBox="0 0 150 150" style="enable-background:new 0 0 150 150;" xml:space="preserve">
-<style type="text/css">
-       .st0{fill:#FFFFFF;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
-       .st1{fill-rule:evenodd;clip-rule:evenodd;}
-</style>
-<g>
-       <circle class="st0" cx="74.9" cy="75.1" r="58.1"/>
-       <g>
-               <path class="st1" d="M74.1,63.4c-4-7.3-10.8-10.2-18.7-10.2c-11.5,0-20.6,8.1-20.6,21.9c0,14,8.6,21.9,21,21.9
-                       c8,0,14.8-4.4,18.5-11l-8.8-4.5c-2,4.7-4.9,6.1-8.7,6.1c-6.5,0-9.5-5.4-9.5-12.5c0-7.1,2.5-12.5,9.5-12.5c1.9,0,5.6,1,7.8,5.7
-                       L74.1,63.4z"/>
-               <path class="st1" d="M114.8,63.4c-4-7.3-10.8-10.2-18.7-10.2c-11.5,0-20.6,8.1-20.6,21.9c0,14,8.6,21.9,21,21.9
-                       c8,0,14.8-4.4,18.5-11l-8.8-4.5c-2,4.7-4.9,6.1-8.7,6.1c-6.5,0-9.5-5.4-9.5-12.5c0-7.1,2.5-12.5,9.5-12.5c1.9,0,5.6,1,7.8,5.7
-                       L114.8,63.4z"/>
-       </g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
diff --git a/resources/src/mediawiki/bookletlayout/option2/noderiv.png b/resources/src/mediawiki/bookletlayout/option2/noderiv.png
deleted file mode 100644 (file)
index afac81f..0000000
Binary files a/resources/src/mediawiki/bookletlayout/option2/noderiv.png and /dev/null differ
diff --git a/resources/src/mediawiki/bookletlayout/option2/noderiv.svg b/resources/src/mediawiki/bookletlayout/option2/noderiv.svg
deleted file mode 100644 (file)
index 96d8084..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-        viewBox="0 0 150 150" style="enable-background:new 0 0 150 150;" xml:space="preserve">
-<style type="text/css">
-       .st0{fill:#FFFFFF;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
-       .st1{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
-       .st2{stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
-</style>
-<g>
-       
-               <rect x="7.8" y="34.6" transform="matrix(0.2182 0.9759 -0.9759 0.2182 113.5065 3.8061)" class="st0" width="93.2" height="76.2"/>
-       <circle class="st1" cx="54.4" cy="72.7" r="26.1"/>
-</g>
-<g>
-       
-               <rect x="51.6" y="41.7" transform="matrix(-0.1524 0.9883 -0.9883 -0.1524 192.0548 -5.1264)" class="st0" width="93.2" height="76.2"/>
-       <circle class="st2" cx="98.2" cy="79.8" r="26.1"/>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
diff --git a/resources/src/mediawiki/bookletlayout/option2/ownwork.png b/resources/src/mediawiki/bookletlayout/option2/ownwork.png
deleted file mode 100644 (file)
index 69df378..0000000
Binary files a/resources/src/mediawiki/bookletlayout/option2/ownwork.png and /dev/null differ
diff --git a/resources/src/mediawiki/bookletlayout/option2/ownwork.svg b/resources/src/mediawiki/bookletlayout/option2/ownwork.svg
deleted file mode 100644 (file)
index dc660c8..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-        viewBox="0 0 150 150" style="enable-background:new 0 0 150 150;" xml:space="preserve">
-<style type="text/css">
-       .st0{fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
-       .st1{stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
-</style>
-<polygon class="st0" points="6.3,43.3 38.4,43.3 46,34.4 78.4,34.4 85.5,42.6 142.6,42.6 142.6,115 6.3,115 "/>
-<g>
-       <circle class="st0" cx="63.3" cy="78.8" r="25.8"/>
-       <circle class="st1" cx="63.3" cy="78.8" r="16.2"/>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
diff --git a/resources/src/mediawiki/bookletlayout/option2/useful.png b/resources/src/mediawiki/bookletlayout/option2/useful.png
deleted file mode 100644 (file)
index d5b9429..0000000
Binary files a/resources/src/mediawiki/bookletlayout/option2/useful.png and /dev/null differ
diff --git a/resources/src/mediawiki/bookletlayout/option2/useful.svg b/resources/src/mediawiki/bookletlayout/option2/useful.svg
deleted file mode 100644 (file)
index 2af3f93..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-        viewBox="0 0 150 150" style="enable-background:new 0 0 150 150;" xml:space="preserve">
-<style type="text/css">
-       .st0{fill:#FFFFFF;stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
-</style>
-<circle class="st0" cx="72.7" cy="62.5" r="47.1"/>
-<path d="M76,128.8c34.8,0,63.2-28.3,63.2-63.2c0-18.3-7.9-34.9-20.4-46.4l11.8-11.8L129.1,6l-11.8,11.8c0,0,0,0,0,0l-1.4,1.4
-       c13,11.2,21.3,27.8,21.3,46.4c0,33.7-27.4,61.2-61.2,61.2c-18.5,0-35.1-8.3-46.4-21.3l-0.4,0.4l0,0l-13,13l1.4,1.4l11.9-11.9
-       c10.9,11.9,26.4,19.6,43.6,20.4v15.7H49.7v2h48.9v-2H75.1v-15.7C75.4,128.8,75.7,128.8,76,128.8z"/>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
diff --git a/resources/src/mediawiki/bookletlayout/option4/camera.png b/resources/src/mediawiki/bookletlayout/option4/camera.png
deleted file mode 100644 (file)
index a48f9fb..0000000
Binary files a/resources/src/mediawiki/bookletlayout/option4/camera.png and /dev/null differ
diff --git a/resources/src/mediawiki/bookletlayout/option4/camera.svg b/resources/src/mediawiki/bookletlayout/option4/camera.svg
deleted file mode 100644 (file)
index b110396..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-        viewBox="0 0 264 162" height="162" width="264" style="enable-background:new 0 0 264 162;" xml:space="preserve">
-<style type="text/css">
-       .st0{fill:#00AF89;}
-       .st1{fill:#FFFFFF;}
-       .st2{fill:#FFFFFF;stroke:#E5E5E5;stroke-miterlimit:10;}
-       .st3{fill:#E5E5E5;}
-       .st4{fill:none;stroke:#E5E5E5;stroke-miterlimit:10;}
-       .st5{fill:#9B9A9A;}
-       .st6{fill:none;stroke:#E5E5E5;stroke-linejoin:round;stroke-miterlimit:10;}
-</style>
-<rect x="62.3" y="28.1" class="st0" width="137.6" height="105"/>
-<g>
-       <path class="st1" d="M73.1,57v64.4h45.3V78.5h25.3v42.9h45.3V57H73.1z M94.3,107.6H80.9V94.3h13.3V107.6z M94.3,91.9H80.9V78.5
-               h13.3V91.9z M109.9,107.6H96.6V94.3h13.3V107.6z M109.9,91.9H96.6V78.5h13.3V91.9z M164.3,107.6h-13.3V94.3h13.3V107.6z
-                M164.3,91.9h-13.3V78.5h13.3V91.9z M179.9,107.6h-13.3V94.3h13.3V107.6z M179.9,91.9h-13.3V78.5h13.3V91.9z"/>
-       <rect x="73.1" y="48.5" class="st1" width="116" height="5.7"/>
-       <rect x="73.1" y="39.9" class="st1" width="116" height="5.7"/>
-</g>
-<rect x="62.3" y="124" class="st1" width="137.6" height="1.7"/>
-<g>
-       <g>
-               <rect x="6.7" y="7.4" class="st2" width="35.3" height="12.7"/>
-               <rect x="42" y="11.1" class="st3" width="2.3" height="5.7"/>
-       </g>
-       <rect x="8.2" y="9.1" class="st3" width="5.2" height="9.2"/>
-       <rect x="14.5" y="9.1" class="st3" width="5.2" height="9.2"/>
-       <rect x="21" y="9.1" class="st3" width="5.2" height="9.2"/>
-</g>
-<circle class="st3" cx="252.7" cy="12.1" r="6.2"/>
-<rect x="239.3" y="9.1" class="st3" width="5.3" height="7.7"/>
-<rect x="233" y="9.1" class="st3" width="5.3" height="7.7"/>
-<rect x="214" y="143.3" class="st3" width="5.3" height="7.7"/>
-<rect x="207.6" y="143.3" class="st3" width="5.3" height="7.7"/>
-<rect x="50.4" y="143.3" class="st3" width="5.3" height="7.7"/>
-<rect x="39" y="143.3" class="st3" width="5.3" height="7.7"/>
-<line class="st4" x1="73.1" y1="148" x2="189.1" y2="148"/>
-<line class="st4" x1="132" y1="143.1" x2="132" y2="152.9"/>
-<line class="st4" x1="189.1" y1="144.3" x2="189.1" y2="151.7"/>
-<line class="st4" x1="73.1" y1="144.3" x2="73.1" y2="151.7"/>
-<line class="st4" x1="86" y1="145.5" x2="86" y2="150.5"/>
-<line class="st4" x1="100.7" y1="145.5" x2="100.7" y2="150.5"/>
-<line class="st4" x1="115.3" y1="145.5" x2="115.3" y2="150.5"/>
-<line class="st4" x1="145.8" y1="145.5" x2="145.8" y2="150.5"/>
-<line class="st4" x1="160.5" y1="145.5" x2="160.5" y2="150.5"/>
-<line class="st4" x1="175.2" y1="145.5" x2="175.2" y2="150.5"/>
-<g>
-       <rect x="113.8" y="154.1" class="st5" width="3.2" height="4.7"/>
-       <polygon class="st5" points="113.8,154.1 115.3,152.3 116.9,154.1        "/>
-</g>
-<g>
-       <g>
-               <polyline class="st6" points="34.3,147.1 31.5,147.1 34.3,144.3 31.5,147.1 34.3,147.1 31.5,149.9                 "/>
-       </g>
-       <polygon class="st3" points="33.9,149.5 32.1,151.7 30.3,149.5   "/>
-</g>
-<line class="st6" x1="48.9" y1="143.2" x2="45.9" y2="151.1"/>
-</svg>
diff --git a/resources/src/mediawiki/bookletlayout/option4/graphics.png b/resources/src/mediawiki/bookletlayout/option4/graphics.png
deleted file mode 100644 (file)
index 5613f88..0000000
Binary files a/resources/src/mediawiki/bookletlayout/option4/graphics.png and /dev/null differ
diff --git a/resources/src/mediawiki/bookletlayout/option4/graphics.svg b/resources/src/mediawiki/bookletlayout/option4/graphics.svg
deleted file mode 100644 (file)
index c32f79f..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-        viewBox="0 0 264 162" style="enable-background:new 0 0 264 162;" xml:space="preserve">
-<style type="text/css">
-       .st0{fill:none;stroke:#E5E5E5;stroke-miterlimit:10;}
-       .st1{fill:none;stroke:#9B9A9A;stroke-miterlimit:10;}
-       .st2{fill:#E5E5E5;}
-       .st3{fill:#9B9A9A;}
-       .st4{fill:#00AF89;}
-       .st5{fill:#FFFFFF;}
-       .st6{fill:none;stroke:#FFFFFF;stroke-width:5;stroke-miterlimit:10;}
-</style>
-<line class="st0" x1="2" y1="10.5" x2="262" y2="10.5"/>
-<line class="st0" x1="2" y1="24.8" x2="262" y2="24.8"/>
-<g>
-       <rect x="6.9" y="32.8" class="st1" width="9.3" height="9.3"/>
-       <rect x="16.2" y="32.8" class="st1" width="9.3" height="9.3"/>
-       <rect x="6.9" y="42.1" class="st1" width="9.3" height="9.3"/>
-       <rect x="16.2" y="42.1" class="st1" width="9.3" height="9.3"/>
-       <rect x="6.9" y="51.4" class="st1" width="9.3" height="9.3"/>
-       <rect x="16.2" y="51.4" class="st1" width="9.3" height="9.3"/>
-       <rect x="6.9" y="60.8" class="st1" width="9.3" height="9.3"/>
-       <rect x="16.2" y="60.8" class="st1" width="9.3" height="9.3"/>
-       <rect x="6.9" y="70.1" class="st1" width="9.3" height="9.3"/>
-       <rect x="16.2" y="70.1" class="st1" width="9.3" height="9.3"/>
-       <rect x="6.9" y="79.4" class="st1" width="9.3" height="9.3"/>
-       <rect x="16.2" y="79.4" class="st1" width="9.3" height="9.3"/>
-       <rect x="6.9" y="88.8" class="st1" width="9.3" height="9.3"/>
-       <rect x="16.2" y="88.8" class="st1" width="9.3" height="9.3"/>
-       <rect x="6.9" y="98.1" class="st1" width="9.3" height="9.3"/>
-       <rect x="16.2" y="98.1" class="st1" width="9.3" height="9.3"/>
-       <rect x="6.9" y="107.4" class="st1" width="9.3" height="9.3"/>
-       <rect x="16.2" y="107.4" class="st1" width="9.3" height="9.3"/>
-       <rect x="6.9" y="116.8" class="st1" width="9.3" height="9.3"/>
-       <rect x="16.2" y="116.8" class="st1" width="9.3" height="9.3"/>
-</g>
-<rect x="3.2" y="12.7" class="st2" width="9.3" height="9.3"/>
-<rect x="3.2" y="3.4" class="st2" width="4.7" height="4.7"/>
-<rect x="10.2" y="3.4" class="st2" width="4.7" height="4.7"/>
-<rect x="16.9" y="3.4" class="st2" width="4.7" height="4.7"/>
-<rect x="249.2" y="3.4" class="st2" width="4.7" height="4.7"/>
-<rect x="255.9" y="3.4" class="st2" width="4.7" height="4.7"/>
-<rect x="14.6" y="12.7" class="st2" width="9.3" height="9.3"/>
-<rect x="239.9" y="12.7" class="st2" width="9.3" height="9.3"/>
-<rect x="228.9" y="12.7" class="st2" width="9.3" height="9.3"/>
-<rect x="251.2" y="12.7" class="st2" width="9.3" height="9.3"/>
-<g>
-       <path class="st2" d="M73.5,13.7V21H26.6v-7.3H73.5 M74.5,12.7H25.6V22h48.9V12.7L74.5,12.7z"/>
-</g>
-<g>
-       <path class="st2" d="M117.8,13.7V21H76.9v-7.3H117.8 M118.8,12.7H75.9V22h42.9V12.7L118.8,12.7z"/>
-</g>
-<g>
-       <path class="st2" d="M162.5,13.7V21h-40.9v-7.3H162.5 M163.5,12.7h-42.9V22h42.9V12.7L163.5,12.7z"/>
-</g>
-<rect x="209.7" y="30.3" class="st2" width="50.9" height="32.3"/>
-<rect x="209.7" y="30.3" class="st3" width="50.9" height="5.7"/>
-<g>
-       <rect x="212.2" y="38.5" class="st3" width="6.2" height="6.2"/>
-       <rect x="239.9" y="38.5" class="st3" width="6.2" height="2.5"/>
-       <rect x="239.9" y="42.2" class="st3" width="6.2" height="2.5"/>
-       <g>
-               <path class="st3" d="M237.2,39.5v4.2H221v-4.2H237.2 M238.2,38.5H220v6.2h18.2V38.5L238.2,38.5z"/>
-       </g>
-</g>
-<g>
-       <rect x="212.2" y="46.5" class="st3" width="6.2" height="6.2"/>
-       <rect x="239.9" y="46.5" class="st3" width="6.2" height="2.5"/>
-       <rect x="239.9" y="50.2" class="st3" width="6.2" height="2.5"/>
-       <g>
-               <path class="st3" d="M237.2,47.5v4.2H221v-4.2H237.2 M238.2,46.5H220v6.2h18.2V46.5L238.2,46.5z"/>
-       </g>
-</g>
-<rect x="209.7" y="66.6" class="st2" width="50.9" height="32.3"/>
-<rect x="209.7" y="66.6" class="st3" width="50.9" height="5.7"/>
-<g>
-       <path class="st3" d="M257.2,75.8V80h-44.1v-4.2H257.2 M258.2,74.8h-46.1V81h46.1V74.8L258.2,74.8z"/>
-</g>
-<g>
-       <path class="st3" d="M257.2,81v4.2h-44.1V81H257.2 M258.2,80h-46.1v6.2h46.1V80L258.2,80z"/>
-</g>
-<g>
-       <path class="st3" d="M257.2,86.2v4.2h-44.1v-4.2H257.2 M258.2,85.2h-46.1v6.2h46.1V85.2L258.2,85.2z"/>
-</g>
-<g>
-       <path class="st3" d="M257.2,91.3v4.2h-44.1v-4.2H257.2 M258.2,90.3h-46.1v6.2h46.1V90.3L258.2,90.3z"/>
-</g>
-<ellipse class="st1" cx="218.3" cy="85.7" rx="0" ry="10.2"/>
-<rect x="69.5" y="47.5" class="st4" width="108" height="82.4"/>
-<circle class="st5" cx="123.5" cy="88.7" r="6.6"/>
-<circle class="st5" cx="116.9" cy="106.2" r="6.6"/>
-<circle class="st5" cx="154.5" cy="80.3" r="6.6"/>
-<circle class="st5" cx="93.1" cy="81.5" r="6.6"/>
-<circle class="st5" cx="141.7" cy="114.1" r="6.6"/>
-<circle class="st6" cx="123.5" cy="88.7" r="18.2"/>
-<circle class="st6" cx="123.5" cy="88.7" r="31.7"/>
-</svg>
diff --git a/resources/src/mediawiki/bookletlayout/option4/guide.html b/resources/src/mediawiki/bookletlayout/option4/guide.html
deleted file mode 100644 (file)
index c747851..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="mw-foreignStructuredUpload-bookletLayout-guide">
-       <div class="mw-foreignStructuredUpload-bookletLayout-guide-text-wrapper-good">
-               <span></span>
-       </div>
-       <div class="mw-foreignStructuredUpload-bookletLayout-guide-text-wrapper-bad">
-               <span></span>
-       </div>
-       <div class="mw-foreignStructuredUpload-bookletLayout-guide-image mw-foreignStructuredUpload-bookletLayout-guide-image-camera"></div>
-       <div class="mw-foreignStructuredUpload-bookletLayout-guide-image mw-foreignStructuredUpload-bookletLayout-guide-image-graphics"></div>
-       <div class="mw-foreignStructuredUpload-bookletLayout-guide-image mw-foreignStructuredUpload-bookletLayout-guide-image-website"></div>
-       <div class="mw-foreignStructuredUpload-bookletLayout-guide-image mw-foreignStructuredUpload-bookletLayout-guide-image-search"></div>
-</div>
diff --git a/resources/src/mediawiki/bookletlayout/option4/search-ltr.png b/resources/src/mediawiki/bookletlayout/option4/search-ltr.png
deleted file mode 100644 (file)
index 26d6beb..0000000
Binary files a/resources/src/mediawiki/bookletlayout/option4/search-ltr.png and /dev/null differ
diff --git a/resources/src/mediawiki/bookletlayout/option4/search-ltr.svg b/resources/src/mediawiki/bookletlayout/option4/search-ltr.svg
deleted file mode 100644 (file)
index 67c4ef0..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-        viewBox="0 0 264 162" style="enable-background:new 0 0 264 162;" xml:space="preserve">
-<style type="text/css">
-       .st0{display:none;}
-       .st1{display:inline;}
-       .st2{fill:#FFFFFF;}
-       .st3{fill:#E5E5E5;}
-       .st4{opacity:0.5;fill:#E5E5E5;enable-background:new    ;}
-       .st5{fill:#E5E5E5;stroke:#E5E5E5;}
-       .st6{fill:#9B9B9B;}
-       .st7{fill:#4470B6;}
-       .st8{fill:#D0D1D1;}
-       .st9{fill:none;stroke:#E5E5E5;stroke-miterlimit:10;}
-       .st10{fill:none;stroke:#D02227;stroke-miterlimit:10;}
-       .st11{fill:#D02227;}
-</style>
-<g id="Layer_1" class="st0">
-       <g class="st1">
-               <path class="st2" d="M24.8,151.4l-11.5,10l-12.9-9.6V0.5h263v151.7l-9,6.7V42.5h-39v112.6l-4.4-3.7l-7.6,5.3V42.5h-155v110.8
-                       l-9.8,8L24.8,151.4z"/>
-               <path class="st3" d="M263,1v151l-8,6V42h-40v112l-3.3-2.8l-0.6-0.5l-0.6,0.4l-6.5,4.6V42H48v111.1l-9.3,7.7l-13.3-9.6l-0.6-0.5
-                       l-0.6,0.5l-10.9,9.5L1,151.5V1L263,1L263,1z M264,0H0v152l13.4,10l11.5-10l13.9,10l10.2-8.4V43h154v114.7l8.1-5.7l4.9,4.2V43h38
-                       v116.9l10-7.4V0L264,0z M203,43H49v110.6l2.1-1.6l12.6,10l13.8-10l14.2,10l13-10l13,10l13.8-10l12.1,10l13.4-10l14.2,10l13-10
-                       l13,10l5.8-4.3L203,43L203,43z"/>
-               <path class="st4" d="M254,43h-38v113.2l7.6,5.8l13.8-10l13.9,10l2.7-2.1V43z"/>
-               <path class="st5" d="M2,14.5h260"/>
-               <path class="st3" d="M232.5,5h26v6h-26V5z M208.5,5h22v6h-22V5z M142,6v4H50V6H142z M143,5H49v6h94V5z M184.5,5h22v6h-22V5z
-                        M161.5,5h13v6h-13V5z M176.5,5h6v6h-6V5z M153.5,5h6v6h-6V5z M9,5h32v6H9V5z M52,7h2v2h-2V7z M11,36c0-7.7,6.3-14,14-14
-                       s14,6.3,14,14s-6.3,14-14,14S11,43.7,11,36z M38,107V72H13v35H38z M38,59v-5H13v5H38z"/>
-       </g>
-       <g class="st1">
-               <path class="st6" d="M123.8,68H85.6v7.8h38.1L123.8,68L123.8,68z M180.5,103v-8.8h-50.8v8.8H180.5z M90.8,80.6H69.9v8.6h20.8V80.6
-                       z M189.3,88.4v-7.8h-37.7v7.8H189.3z M100.7,94.1H75v7.8h25.7V94.1z M175.2,68H129v7.8h46.2V68z"/>
-               <path class="st7" d="M94.7,80.6v9.2h51.6v-9.2L94.7,80.6z"/>
-       </g>
-       <g class="st1">
-               <path class="st2" d="M94,94h75v44H94V94z"/>
-               <path class="st7" d="M169,94h-31v44h31V94z M150.8,118.1l5.9,9.7l3.2-3l4.8,6.1l-21.1,0l6.2-12.8H150.8z"/>
-               <g transform="scale(-1 1)">
-                       <path class="st8" d="M-102,100h-18c-0.6,0-1,0.2-1,0.5l0,0c0,0.3,0.4,0.5,1,0.5h18c0.6,0,1-0.2,1-0.5l0,0
-                               C-101,100.2-101.4,100-102,100z"/>
-                       <path class="st8" d="M-102,104h-18c-0.6,0-1,0.2-1,0.5l0,0c0,0.3,0.4,0.5,1,0.5h18c0.6,0,1-0.2,1-0.5l0,0
-                               C-101,104.2-101.4,104-102,104z"/>
-                       <path class="st8" d="M-102,108h-18c-0.6,0-1,0.2-1,0.5l0,0c0,0.3,0.4,0.5,1,0.5h18c0.6,0,1-0.2,1-0.5l0,0
-                               C-101,108.2-101.4,108-102,108z"/>
-                       <path class="st8" d="M-102,112h-26c-0.6,0-1,0.2-1,0.5l0,0c0,0.3,0.4,0.5,1,0.5h26c0.6,0,1-0.2,1-0.5l0,0
-                               C-101,112.2-101.4,112-102,112z"/>
-                       <path class="st8" d="M-102,116h-26c-0.6,0-1,0.2-1,0.5l0,0c0,0.3,0.4,0.5,1,0.5h26c0.6,0,1-0.2,1-0.5l0,0
-                               C-101,116.2-101.4,116-102,116z"/>
-                       <path class="st8" d="M-102,120h-26c-0.6,0-1,0.2-1,0.5l0,0c0,0.3,0.4,0.5,1,0.5h26c0.6,0,1-0.2,1-0.5l0,0
-                               C-101,120.2-101.4,120-102,120z"/>
-                       <path class="st8" d="M-102,124h-26c-0.6,0-1,0.2-1,0.5l0,0c0,0.3,0.4,0.5,1,0.5h26c0.6,0,1-0.2,1-0.5l0,0
-                               C-101,124.2-101.4,124-102,124z"/>
-                       <path class="st8" d="M-102,128h-26c-0.6,0-1,0.2-1,0.5l0,0c0,0.3,0.4,0.5,1,0.5h26c0.6,0,1-0.2,1-0.5l0,0
-                               C-101,128.2-101.4,128-102,128z"/>
-               </g>
-       </g>
-</g>
-<g id="Layer_2">
-       <g>
-               <rect x="4.8" y="5.5" class="st2" width="93" height="5"/>
-               <path class="st3" d="M97.2,6v4h-92V6H97.2 M98.2,5h-94v6h94V5L98.2,5z"/>
-       </g>
-       <polygon class="st3" points="177.7,8 176.4,8 109.6,8 108.2,8 106,14 111.8,14 174.2,14 180,14    "/>
-       <polygon class="st3" points="256.5,8 255.2,8 188.3,8 187,8 184.7,14 190.6,14 252.9,14 258.8,14  "/>
-       <line class="st9" x1="2" y1="14.5" x2="262" y2="14.5"/>
-       <line class="st9" x1="2" y1="32.8" x2="262" y2="32.8"/>
-       <g>
-               <circle class="st10" cx="8.9" cy="22.6" r="3.6"/>
-               <line class="st10" x1="11.6" y1="25" x2="15" y2="28.5"/>
-       </g>
-       <rect x="20.9" y="19" class="st3" width="57.6" height="9.5"/>
-       <rect x="4.3" y="37" class="st3" width="69.2" height="32.7"/>
-       <rect x="4.3" y="72.5" class="st3" width="90.1" height="56.8"/>
-       <rect x="97" y="72.5" class="st11" width="106.5" height="56.8"/>
-       <rect x="206.3" y="72.5" class="st3" width="52.4" height="56.8"/>
-       <rect x="4.3" y="132.2" class="st3" width="36.5" height="25.3"/>
-       <rect x="43.7" y="132.2" class="st3" width="62.3" height="25.3"/>
-       <rect x="109.3" y="132.2" class="st3" width="18.1" height="25.3"/>
-       <rect x="169.1" y="132.2" class="st3" width="18.1" height="25.3"/>
-       <rect x="189.8" y="132.2" class="st3" width="18.1" height="25.3"/>
-       <rect x="210.6" y="132.2" class="st3" width="48.1" height="25.3"/>
-       <rect x="130" y="132.2" class="st3" width="36" height="25.3"/>
-       <rect x="115.2" y="37" class="st3" width="36.5" height="32.7"/>
-       <rect x="76.1" y="37" class="st3" width="36.5" height="32.7"/>
-       <rect x="154.6" y="37" class="st3" width="56" height="32.7"/>
-       <rect x="213.3" y="37" class="st3" width="45.4" height="32.7"/>
-       <path class="st2" d="M102.4,115.4l9.5-9.5l12.8,12.8l26.1-26.1l31.8,31.8h-80.3L102.4,115.4z"/>
-</g>
-</svg>
diff --git a/resources/src/mediawiki/bookletlayout/option4/search-rtl.png b/resources/src/mediawiki/bookletlayout/option4/search-rtl.png
deleted file mode 100644 (file)
index 3305928..0000000
Binary files a/resources/src/mediawiki/bookletlayout/option4/search-rtl.png and /dev/null differ
diff --git a/resources/src/mediawiki/bookletlayout/option4/search-rtl.svg b/resources/src/mediawiki/bookletlayout/option4/search-rtl.svg
deleted file mode 100644 (file)
index 17c54d2..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-        viewBox="0 0 264 162" style="enable-background:new 0 0 264 162;" xml:space="preserve">
-<style type="text/css">
-       .st0{fill:#FFFFFF;}
-       .st1{fill:#E5E5E5;}
-       .st2{fill:none;stroke:#E5E5E5;stroke-miterlimit:10;}
-       .st3{fill:none;stroke:#D02227;stroke-miterlimit:10;}
-       .st4{fill:#D02227;}
-</style>
-<g>
-       <rect x="166.2" y="5.5" class="st0" width="93" height="5"/>
-       <path class="st1" d="M258.8,6v4h-92V6H258.8 M259.8,5h-94v6h94V5L259.8,5z"/>
-</g>
-<polygon class="st1" points="86.3,8 87.6,8 154.4,8 155.8,8 158,14 152.2,14 89.8,14 84,14 "/>
-<polygon class="st1" points="7.5,8 8.8,8 75.7,8 77,8 79.3,14 73.4,14 11.1,14 5.2,14 "/>
-<line class="st2" x1="262" y1="14.5" x2="2" y2="14.5"/>
-<line class="st2" x1="262" y1="32.8" x2="2" y2="32.8"/>
-<g>
-       <circle class="st3" cx="255.1" cy="22.6" r="3.6"/>
-       <line class="st3" x1="252.4" y1="25" x2="249" y2="28.5"/>
-</g>
-<rect x="185.5" y="19" class="st1" width="57.6" height="9.5"/>
-<rect x="190.5" y="37" class="st1" width="69.2" height="32.7"/>
-<rect x="169.7" y="72.5" class="st1" width="90.1" height="56.8"/>
-<rect x="60.4" y="72.5" class="st4" width="106.5" height="56.8"/>
-<rect x="5.2" y="72.5" class="st1" width="52.4" height="56.8"/>
-<rect x="223.3" y="132.2" class="st1" width="36.5" height="25.3"/>
-<rect x="158" y="132.2" class="st1" width="62.3" height="25.3"/>
-<rect x="136.6" y="132.2" class="st1" width="18.1" height="25.3"/>
-<rect x="76.8" y="132.2" class="st1" width="18.1" height="25.3"/>
-<rect x="56.1" y="132.2" class="st1" width="18.1" height="25.3"/>
-<rect x="5.2" y="132.2" class="st1" width="48.1" height="25.3"/>
-<rect x="97.9" y="132.2" class="st1" width="36" height="25.3"/>
-<rect x="112.3" y="37" class="st1" width="36.5" height="32.7"/>
-<rect x="151.4" y="37" class="st1" width="36.5" height="32.7"/>
-<rect x="53.4" y="37" class="st1" width="56" height="32.7"/>
-<rect x="5.2" y="37" class="st1" width="45.4" height="32.7"/>
-<path class="st0" d="M161.7,124.3H81.4l31.8-31.8l26.1,26.1l12.8-12.8l9.5,9.5L161.7,124.3z"/>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
diff --git a/resources/src/mediawiki/bookletlayout/option4/website-ltr.png b/resources/src/mediawiki/bookletlayout/option4/website-ltr.png
deleted file mode 100644 (file)
index 7e00751..0000000
Binary files a/resources/src/mediawiki/bookletlayout/option4/website-ltr.png and /dev/null differ
diff --git a/resources/src/mediawiki/bookletlayout/option4/website-ltr.svg b/resources/src/mediawiki/bookletlayout/option4/website-ltr.svg
deleted file mode 100644 (file)
index ed07c61..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-        viewBox="0 0 264 162" style="enable-background:new 0 0 264 162;" xml:space="preserve">
-<style type="text/css">
-       .st0{fill:#FFFFFF;}
-       .st1{fill:#E5E5E5;}
-       .st2{fill:none;stroke:#E5E5E5;stroke-miterlimit:10;}
-       .st3{fill:#D02227;}
-       .st4{fill:#9B9A9A;}
-</style>
-<g>
-       <rect x="4.8" y="5.5" class="st0" width="93" height="5"/>
-       <path class="st1" d="M97.2,6v4h-92V6H97.2 M98.2,5h-94v6h94V5L98.2,5z"/>
-</g>
-<polygon class="st1" points="177.7,8 176.4,8 109.6,8 108.2,8 106,14 111.8,14 174.2,14 180,14 "/>
-<polygon class="st1" points="256.5,8 255.2,8 188.3,8 187,8 184.7,14 190.6,14 252.9,14 258.8,14 "/>
-<line class="st2" x1="2" y1="14.5" x2="262" y2="14.5"/>
-<rect x="44" y="48.4" class="st3" width="106.5" height="56.8"/>
-<path class="st0" d="M49.3,91.2l9.5-9.5l12.8,12.8l26.1-26.1l31.8,31.8H49.3L49.3,91.2z"/>
-<circle class="st1" cx="55" cy="32.3" r="11.9"/>
-<g>
-       <rect x="70.7" y="27.4" class="st4" width="76.2" height="7"/>
-       <rect x="70.7" y="35.5" class="st4" width="22.3" height="1.7"/>
-       <rect x="95" y="35.5" class="st4" width="28.2" height="1.7"/>
-</g>
-<rect x="44" y="107.8" class="st1" width="23.3" height="23.3"/>
-<rect x="70.7" y="107.8" class="st1" width="79.8" height="1.8"/>
-<rect x="70.7" y="114" class="st1" width="79.8" height="1.8"/>
-<rect x="70.7" y="120.2" class="st1" width="79.8" height="1.8"/>
-<rect x="70.7" y="126.4" class="st1" width="79.8" height="1.8"/>
-<rect x="44" y="134.4" class="st1" width="106.5" height="1.8"/>
-<rect x="44" y="140.6" class="st1" width="106.5" height="1.8"/>
-<rect x="44" y="146.8" class="st1" width="106.5" height="1.8"/>
-<rect x="44" y="153" class="st1" width="106.5" height="1.8"/>
-<g>
-       <rect x="155.7" y="37.2" class="st1" width="57.3" height="1.8"/>
-       <rect x="155.7" y="43.4" class="st1" width="57.3" height="1.8"/>
-       <rect x="155.7" y="49.6" class="st1" width="57.3" height="1.8"/>
-       <rect x="155.7" y="55.8" class="st1" width="57.3" height="1.8"/>
-       <rect x="155.7" y="27.4" class="st1" width="57.3" height="7"/>
-</g>
-<g>
-       <rect x="155.7" y="78.2" class="st1" width="57.3" height="1.8"/>
-       <rect x="155.7" y="84.4" class="st1" width="57.3" height="1.8"/>
-       <rect x="155.7" y="90.6" class="st1" width="57.3" height="1.8"/>
-       <rect x="155.7" y="96.8" class="st1" width="57.3" height="1.8"/>
-       <rect x="155.7" y="68.4" class="st1" width="57.3" height="7"/>
-</g>
-<g>
-       <rect x="155.7" y="116.7" class="st1" width="57.3" height="1.8"/>
-       <rect x="155.7" y="122.9" class="st1" width="57.3" height="1.8"/>
-       <rect x="155.7" y="129.1" class="st1" width="57.3" height="1.8"/>
-       <rect x="155.7" y="135.3" class="st1" width="57.3" height="1.8"/>
-       <rect x="155.7" y="106.9" class="st1" width="57.3" height="7"/>
-</g>
-</svg>
diff --git a/resources/src/mediawiki/bookletlayout/option4/website-rtl.png b/resources/src/mediawiki/bookletlayout/option4/website-rtl.png
deleted file mode 100644 (file)
index 83ba6d3..0000000
Binary files a/resources/src/mediawiki/bookletlayout/option4/website-rtl.png and /dev/null differ
diff --git a/resources/src/mediawiki/bookletlayout/option4/website-rtl.svg b/resources/src/mediawiki/bookletlayout/option4/website-rtl.svg
deleted file mode 100644 (file)
index dd8b0f0..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-        viewBox="0 0 264 162" style="enable-background:new 0 0 264 162;" xml:space="preserve">
-<style type="text/css">
-       .st0{fill:#FFFFFF;}
-       .st1{fill:#E5E5E5;}
-       .st2{fill:none;stroke:#E5E5E5;stroke-miterlimit:10;}
-       .st3{fill:#D02227;}
-       .st4{fill:#9B9A9A;}
-</style>
-<g>
-       <rect x="166.2" y="5.5" class="st0" width="93" height="5"/>
-       <path class="st1" d="M258.8,6v4h-92V6H258.8 M259.8,5h-94v6h94V5L259.8,5z"/>
-</g>
-<polygon class="st1" points="86.3,8 87.6,8 154.4,8 155.8,8 158,14 152.2,14 89.8,14 84,14 "/>
-<polygon class="st1" points="7.5,8 8.8,8 75.7,8 77,8 79.3,14 73.4,14 11.1,14 5.2,14 "/>
-<line class="st2" x1="262" y1="14.5" x2="2" y2="14.5"/>
-<rect x="113.5" y="48.4" class="st3" width="106.5" height="56.8"/>
-<path class="st0" d="M214.7,100.2h-80.3l31.8-31.8l26.1,26.1l12.8-12.8l9.5,9.5L214.7,100.2z"/>
-<circle class="st1" cx="209" cy="32.3" r="11.9"/>
-<g>
-       <rect x="117" y="27.4" class="st4" width="76.2" height="7"/>
-       <rect x="171" y="35.5" class="st4" width="22.3" height="1.7"/>
-       <rect x="140.8" y="35.5" class="st4" width="28.2" height="1.7"/>
-</g>
-<rect x="196.7" y="107.8" class="st1" width="23.3" height="23.3"/>
-<rect x="113.5" y="107.8" class="st1" width="79.8" height="1.8"/>
-<rect x="113.5" y="114" class="st1" width="79.8" height="1.8"/>
-<rect x="113.5" y="120.2" class="st1" width="79.8" height="1.8"/>
-<rect x="113.5" y="126.4" class="st1" width="79.8" height="1.8"/>
-<rect x="113.5" y="134.4" class="st1" width="106.5" height="1.8"/>
-<rect x="113.5" y="140.6" class="st1" width="106.5" height="1.8"/>
-<rect x="113.5" y="146.8" class="st1" width="106.5" height="1.8"/>
-<rect x="113.5" y="153" class="st1" width="106.5" height="1.8"/>
-<g>
-       <rect x="51" y="37.2" class="st1" width="57.3" height="1.8"/>
-       <rect x="51" y="43.4" class="st1" width="57.3" height="1.8"/>
-       <rect x="51" y="49.6" class="st1" width="57.3" height="1.8"/>
-       <rect x="51" y="55.8" class="st1" width="57.3" height="1.8"/>
-       <rect x="51" y="27.4" class="st1" width="57.3" height="7"/>
-</g>
-<g>
-       <rect x="51" y="78.2" class="st1" width="57.3" height="1.8"/>
-       <rect x="51" y="84.4" class="st1" width="57.3" height="1.8"/>
-       <rect x="51" y="90.6" class="st1" width="57.3" height="1.8"/>
-       <rect x="51" y="96.8" class="st1" width="57.3" height="1.8"/>
-       <rect x="51" y="68.4" class="st1" width="57.3" height="7"/>
-</g>
-<g>
-       <rect x="51" y="116.7" class="st1" width="57.3" height="1.8"/>
-       <rect x="51" y="122.9" class="st1" width="57.3" height="1.8"/>
-       <rect x="51" y="129.1" class="st1" width="57.3" height="1.8"/>
-       <rect x="51" y="135.3" class="st1" width="57.3" height="1.8"/>
-       <rect x="51" y="106.9" class="st1" width="57.3" height="7"/>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
index 97d81fb..e467ac1 100644 (file)
         * @inheritdoc
         */
        mw.ForeignStructuredUpload.BookletLayout.prototype.renderUploadForm = function () {
-               var
-                       query = /[?&]uploadbucket=(\d)/.exec( location.search ),
-                       isTestEnabled = !!mw.config.get( 'wgForeignUploadTestEnabled' ),
-                       defaultBucket = mw.config.get( 'wgForeignUploadTestDefault' ) || 1,
-                       userId = mw.config.get( 'wgUserId' );
-
-               if ( query && query[ 1 ] ) {
-                       // Testing and debugging
-                       this.shouldRecordBucket = false;
-                       this.bucket = Number( query[ 1 ] );
-               } else if ( !userId || !isTestEnabled ) {
-                       // a) Anonymous user. This can actually happen, because our software sucks.
-                       // b) Test is not enabled on this wiki.
-                       // In either case, display the old interface and don't record bucket on uploads.
-                       this.shouldRecordBucket = false;
-                       this.bucket = defaultBucket;
-               } else {
-                       // Regular logged in user on a wiki where the test is running
-                       this.shouldRecordBucket = true;
-                       this.bucket = ( userId % 4 ) + 1; // 1, 2, 3, 4
-               }
-
-               return this[ 'renderUploadForm' + this.bucket ]();
-       };
-
-       /**
-        * Test option 1, the original one. See T120867.
-        */
-       mw.ForeignStructuredUpload.BookletLayout.prototype.renderUploadForm1 = function () {
                var fieldset, $ownWorkMessage, $notOwnWorkMessage,
-                       onUploadFormChange,
                        ownWorkMessage, notOwnWorkMessage, notOwnWorkLocal,
                        validTargets = mw.config.get( 'wgForeignUploadTargets' ),
                        target = this.target || validTargets[ 0 ] || 'local',
                        layout = this;
 
-               // Temporary override to make my life easier during A/B test
-               target = 'shared';
-
                // foreign-structured-upload-form-label-own-work-message-local
                // foreign-structured-upload-form-label-own-work-message-shared
                ownWorkMessage = mw.message( 'foreign-structured-upload-form-label-own-work-message-' + target );
                        $( '<p>' ).append( notOwnWorkMessage.parseDom() ),
                        $( '<p>' ).append( notOwnWorkLocal.parseDom() )
                );
-               $ownWorkMessage.add( $notOwnWorkMessage ).find( 'a' )
-                       .attr( 'target', '_blank' )
-                       .on( 'click', function ( e ) {
-                               // Some stupid code is trying to prevent default on all clicks, which causes the links to
-                               // not be openable, don't let it
-                               e.stopPropagation();
-                       } );
+               $ownWorkMessage.add( $notOwnWorkMessage ).find( 'a' ).attr( 'target', '_blank' );
 
                this.selectFileWidget = new OO.ui.SelectFileWidget();
                this.messageLabel = new OO.ui.LabelWidget( {
                ] );
                this.uploadForm = new OO.ui.FormLayout( { items: [ fieldset ] } );
 
-               onUploadFormChange = function () {
-                       var file = this.selectFileWidget.getValue(),
-                               ownWork = this.ownWorkCheckbox.isSelected(),
-                               valid = !!file && ownWork;
-                       this.emit( 'uploadValid', valid );
-               };
-
                // Validation
-               this.selectFileWidget.on( 'change', onUploadFormChange.bind( this ) );
-               this.ownWorkCheckbox.on( 'change', onUploadFormChange.bind( this ) );
+               this.selectFileWidget.on( 'change', this.onUploadFormChange.bind( this ) );
+               this.ownWorkCheckbox.on( 'change', this.onUploadFormChange.bind( this ) );
 
                this.selectFileWidget.on( 'change', function () {
                        var file = layout.getFile();
                return this.uploadForm;
        };
 
-       /**
-        * Test option 2, idea A from T121021. See T120867.
-        */
-       mw.ForeignStructuredUpload.BookletLayout.prototype.renderUploadForm2 = function () {
-               var fieldset, checkboxes, fields, onUploadFormChange;
-
-               this.selectFileWidget = new OO.ui.SelectFileWidget();
-               this.licenseCheckboxes = checkboxes = [
-                       new OO.ui.CheckboxInputWidget(),
-                       new OO.ui.CheckboxInputWidget(),
-                       new OO.ui.CheckboxInputWidget(),
-                       new OO.ui.CheckboxInputWidget()
-               ];
-
-               fields = [
-                       new OO.ui.FieldLayout( this.selectFileWidget, {
-                               align: 'top',
-                               label: mw.msg( 'upload-form-label-select-file' )
-                       } ),
-                       new OO.ui.FieldLayout( new OO.ui.LabelWidget( {
-                               label: mw.message( 'foreign-structured-upload-form-2-label-intro' ).parseDom()
-                       } ), {
-                               align: 'top'
-                       } ),
-                       new OO.ui.FieldLayout( checkboxes[ 0 ], {
-                               align: 'inline',
-                               classes: [
-                                       'mw-foreignStructuredUpload-bookletLayout-withicon',
-                                       'mw-foreignStructuredUpload-bookletLayout-ownwork'
-                               ],
-                               label: mw.message( 'foreign-structured-upload-form-2-label-ownwork' ).parseDom()
-                       } ),
-                       new OO.ui.FieldLayout( checkboxes[ 1 ], {
-                               align: 'inline',
-                               classes: [
-                                       'mw-foreignStructuredUpload-bookletLayout-withicon',
-                                       'mw-foreignStructuredUpload-bookletLayout-noderiv'
-                               ],
-                               label: mw.message( 'foreign-structured-upload-form-2-label-noderiv' ).parseDom()
-                       } ),
-                       new OO.ui.FieldLayout( checkboxes[ 2 ], {
-                               align: 'inline',
-                               classes: [
-                                       'mw-foreignStructuredUpload-bookletLayout-withicon',
-                                       'mw-foreignStructuredUpload-bookletLayout-useful'
-                               ],
-                               label: mw.message( 'foreign-structured-upload-form-2-label-useful' ).parseDom()
-                       } ),
-                       new OO.ui.FieldLayout( checkboxes[ 3 ], {
-                               align: 'inline',
-                               classes: [
-                                       'mw-foreignStructuredUpload-bookletLayout-withicon',
-                                       'mw-foreignStructuredUpload-bookletLayout-ccbysa'
-                               ],
-                               label: mw.message( 'foreign-structured-upload-form-2-label-ccbysa' ).parseDom()
-                       } ),
-                       new OO.ui.FieldLayout( new OO.ui.LabelWidget( {
-                               label: $()
-                                       .add( $( '<p>' ).msg( 'foreign-structured-upload-form-2-label-alternative' ) )
-                                       .add( $( '<p>' ).msg( 'foreign-structured-upload-form-2-label-termsofuse' )
-                                               .addClass( 'mw-foreignStructuredUpload-bookletLayout-license' ) )
-                       } ), {
-                               align: 'top'
-                       } )
-               ];
-
-               fieldset = new OO.ui.FieldsetLayout( { items: fields } );
-               this.uploadForm = new OO.ui.FormLayout( { items: [ fieldset ] } );
-
-               this.uploadForm.$element.find( 'a' )
-                       .attr( 'target', '_blank' )
-                       .on( 'click', function ( e ) {
-                               // Some stupid code is trying to prevent default on all clicks, which causes the links to
-                               // not be openable, don't let it
-                               e.stopPropagation();
-                       } );
-
-               onUploadFormChange = function () {
-                       var file = this.selectFileWidget.getValue(),
-                               checks = checkboxes.every( function ( checkbox ) {
-                                       return checkbox.isSelected();
-                               } ),
-                               valid = !!file && checks;
-                       this.emit( 'uploadValid', valid );
-               };
-
-               // Validation
-               this.selectFileWidget.on( 'change', onUploadFormChange.bind( this ) );
-               checkboxes[ 0 ].on( 'change', onUploadFormChange.bind( this ) );
-               checkboxes[ 1 ].on( 'change', onUploadFormChange.bind( this ) );
-               checkboxes[ 2 ].on( 'change', onUploadFormChange.bind( this ) );
-               checkboxes[ 3 ].on( 'change', onUploadFormChange.bind( this ) );
-
-               return this.uploadForm;
-       };
-
-       /**
-        * Test option 3, idea D from T121021. See T120867.
-        */
-       mw.ForeignStructuredUpload.BookletLayout.prototype.renderUploadForm3 = function () {
-               var ownWorkCheckbox, fieldset, yesMsg, noMsg, selects, selectFields,
-                       alternativeField, fields, onUploadFormChange;
-
-               this.selectFileWidget = new OO.ui.SelectFileWidget();
-               this.ownWorkCheckbox = ownWorkCheckbox = new OO.ui.CheckboxInputWidget();
-
-               yesMsg = mw.message( 'foreign-structured-upload-form-3-label-yes' ).text();
-               noMsg = mw.message( 'foreign-structured-upload-form-3-label-no' ).text();
-               selects = [
-                       new OO.ui.RadioSelectWidget( {
-                               items: [
-                                       new OO.ui.RadioOptionWidget( { data: false, label: yesMsg } ),
-                                       new OO.ui.RadioOptionWidget( { data: true, label: noMsg } )
-                               ]
-                       } ),
-                       new OO.ui.RadioSelectWidget( {
-                               items: [
-                                       new OO.ui.RadioOptionWidget( { data: true, label: yesMsg } ),
-                                       new OO.ui.RadioOptionWidget( { data: false, label: noMsg } )
-                               ]
-                       } ),
-                       new OO.ui.RadioSelectWidget( {
-                               items: [
-                                       new OO.ui.RadioOptionWidget( { data: false, label: yesMsg } ),
-                                       new OO.ui.RadioOptionWidget( { data: true, label: noMsg } )
-                               ]
-                       } )
-               ];
-
-               this.licenseSelectFields = selectFields = [
-                       new OO.ui.FieldLayout( selects[ 0 ], {
-                               align: 'top',
-                               classes: [ 'mw-foreignStructuredUpload-bookletLayout-question' ],
-                               label: mw.message( 'foreign-structured-upload-form-3-label-question-website' ).parseDom()
-                       } ),
-                       new OO.ui.FieldLayout( selects[ 1 ], {
-                               align: 'top',
-                               classes: [ 'mw-foreignStructuredUpload-bookletLayout-question' ],
-                               label: mw.message( 'foreign-structured-upload-form-3-label-question-ownwork' ).parseDom()
-                       } ).toggle( false ),
-                       new OO.ui.FieldLayout( selects[ 2 ], {
-                               align: 'top',
-                               classes: [ 'mw-foreignStructuredUpload-bookletLayout-question' ],
-                               label: mw.message( 'foreign-structured-upload-form-3-label-question-noderiv' ).parseDom()
-                       } ).toggle( false )
-               ];
-
-               alternativeField = new OO.ui.FieldLayout( new OO.ui.LabelWidget( {
-                       label: mw.message( 'foreign-structured-upload-form-3-label-alternative' ).parseDom()
-               } ), {
-                       align: 'top'
-               } ).toggle( false );
-
-               // Choosing the right answer to each question shows the next question.
-               // Switching to wrong answer hides all subsequent questions.
-               selects.forEach( function ( select, i ) {
-                       select.on( 'choose', function ( selectedOption ) {
-                               var isRightAnswer = !!selectedOption.getData();
-                               alternativeField.toggle( !isRightAnswer );
-                               if ( i + 1 === selectFields.length ) {
-                                       // Last question
-                                       return;
-                               }
-                               if ( isRightAnswer ) {
-                                       selectFields[ i + 1 ].toggle( true );
-                               } else {
-                                       selectFields.slice( i + 1 ).forEach( function ( field ) {
-                                               field.fieldWidget.selectItem( null );
-                                               field.toggle( false );
-                                       } );
-                               }
-                       } );
-               } );
-
-               fields = [
-                       new OO.ui.FieldLayout( this.selectFileWidget, {
-                               align: 'top',
-                               label: mw.msg( 'upload-form-label-select-file' )
-                       } ),
-                       selectFields[ 0 ],
-                       selectFields[ 1 ],
-                       selectFields[ 2 ],
-                       alternativeField,
-                       new OO.ui.FieldLayout( ownWorkCheckbox, {
-                               classes: [ 'mw-foreignStructuredUpload-bookletLayout-checkbox' ],
-                               align: 'inline',
-                               label: mw.message( 'foreign-structured-upload-form-label-own-work-message-shared' ).parseDom()
-                       } )
-               ];
-
-               // Must be done late, after it's been associated with the FieldLayout
-               ownWorkCheckbox.setDisabled( true );
-
-               fieldset = new OO.ui.FieldsetLayout( { items: fields } );
-               this.uploadForm = new OO.ui.FormLayout( { items: [ fieldset ] } );
-
-               this.uploadForm.$element.find( 'a' )
-                       .attr( 'target', '_blank' )
-                       .on( 'click', function ( e ) {
-                               // Some stupid code is trying to prevent default on all clicks, which causes the links to
-                               // not be openable, don't let it
-                               e.stopPropagation();
-                       } );
-
-               onUploadFormChange = function () {
-                       var file = this.selectFileWidget.getValue(),
-                               checkbox = ownWorkCheckbox.isSelected(),
-                               rightAnswers = selects.every( function ( select ) {
-                                       return select.getSelectedItem() && !!select.getSelectedItem().getData();
-                               } ),
-                               valid = !!file && checkbox && rightAnswers;
-                       ownWorkCheckbox.setDisabled( !rightAnswers );
-                       if ( !rightAnswers ) {
-                               ownWorkCheckbox.setSelected( false );
-                       }
-                       this.emit( 'uploadValid', valid );
-               };
-
-               // Validation
-               this.selectFileWidget.on( 'change', onUploadFormChange.bind( this ) );
-               this.ownWorkCheckbox.on( 'change', onUploadFormChange.bind( this ) );
-               selects[ 0 ].on( 'choose', onUploadFormChange.bind( this ) );
-               selects[ 1 ].on( 'choose', onUploadFormChange.bind( this ) );
-               selects[ 2 ].on( 'choose', onUploadFormChange.bind( this ) );
-
-               return this.uploadForm;
-       };
-
-       /**
-        * Test option 4, idea E from T121021. See T120867.
-        */
-       mw.ForeignStructuredUpload.BookletLayout.prototype.renderUploadForm4 = function () {
-               var fieldset, $guide;
-               this.renderUploadForm1();
-               fieldset = this.uploadForm.getItems()[ 0 ];
-
-               $guide = mw.template.get( 'mediawiki.ForeignStructuredUpload.BookletLayout', 'guide.html' ).render();
-               $guide.find( '.mw-foreignStructuredUpload-bookletLayout-guide-text-wrapper-good span' )
-                       .msg( 'foreign-structured-upload-form-4-label-good' );
-               $guide.find( '.mw-foreignStructuredUpload-bookletLayout-guide-text-wrapper-bad span' )
-                       .msg( 'foreign-structured-upload-form-4-label-bad' );
-
-               // Note the index, we insert after the SelectFileWidget field
-               fieldset.addItems( [
-                       new OO.ui.FieldLayout( new OO.ui.Widget( {
-                               $content: $guide
-                       } ), {
-                               align: 'top'
-                       } )
-               ], 1 );
-
-               // Hook for custom styles
-               fieldset.getItems()[ 2 ].$element.addClass( 'mw-foreignStructuredUpload-bookletLayout-guide-checkbox' );
-
-               // Streamline: remove mention of local Special:Upload
-               fieldset.getItems()[ 3 ].$element.find( 'p' ).last().remove();
-
-               return this.uploadForm;
-       };
-
        /**
         * @inheritdoc
         */
-       mw.ForeignStructuredUpload.BookletLayout.prototype.onUploadFormChange = function () {};
+       mw.ForeignStructuredUpload.BookletLayout.prototype.onUploadFormChange = function () {
+               var file = this.selectFileWidget.getValue(),
+                       ownWork = this.ownWorkCheckbox.isSelected(),
+                       valid = !!file && ownWork;
+               this.emit( 'uploadValid', valid );
+       };
 
        /**
         * @inheritdoc
        mw.ForeignStructuredUpload.BookletLayout.prototype.clear = function () {
                mw.ForeignStructuredUpload.BookletLayout.parent.prototype.clear.call( this );
 
-               if ( this.ownWorkCheckbox ) {
-                       this.ownWorkCheckbox.setSelected( false );
-               }
-               if ( this.licenseCheckboxes ) {
-                       this.licenseCheckboxes.forEach( function ( checkbox ) {
-                               checkbox.setSelected( false );
-                       } );
-               }
-               if ( this.licenseSelectFields ) {
-                       this.licenseSelectFields.forEach( function ( field, i ) {
-                               field.fieldWidget.selectItem( null );
-                               if ( i !== 0 ) {
-                                       field.toggle( false );
-                               }
-                       } );
-               }
-
+               this.ownWorkCheckbox.setSelected( false );
                this.categoriesWidget.setItemsFromData( [] );
                this.dateWidget.setValue( '' ).setValidityFlag( true );
        };
index fa15a2e..4143520 100644 (file)
@@ -1,136 +1,5 @@
-@import "mediawiki.mixins";
-
-/* All */
-
 .mw-foreignStructuredUpload-bookletLayout-license {
        font-size: 90%;
        line-height: 1.4em;
        color: #555;
 }
-
-/* Option 2 */
-
-.mw-foreignStructuredUpload-bookletLayout-withicon.oo-ui-fieldLayout.oo-ui-fieldLayout-align-inline {
-       background-repeat: no-repeat;
-       background-size: 3.5em;
-       min-height: 4em;
-       margin-bottom: 0.25em;
-       display: table;
-       vertical-align: middle;
-       -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-       box-sizing: border-box;
-       width: 100%;
-}
-
-.mw-foreignStructuredUpload-bookletLayout-withicon.oo-ui-fieldLayout.oo-ui-fieldLayout-align-inline > .oo-ui-fieldLayout-body {
-       /* Together with 'display: table' above, and FieldLayout styles, this aligns the text */
-       /* vertically to the middle. Don't try this at home, kids. */
-       display: table-row;
-}
-
-.mw-foreignStructuredUpload-bookletLayout-ownwork {
-       .background-image-svg('bookletlayout/option2/ownwork.svg', 'bookletlayout/option2/ownwork.png');
-       background-position: right center;
-       padding-right: 4.5em;
-}
-
-.mw-foreignStructuredUpload-bookletLayout-noderiv {
-       .background-image-svg('bookletlayout/option2/noderiv.svg', 'bookletlayout/option2/noderiv.png');
-       background-position: right center;
-       padding-right: 4.5em;
-}
-
-.mw-foreignStructuredUpload-bookletLayout-useful {
-       .background-image-svg('bookletlayout/option2/useful.svg', 'bookletlayout/option2/useful.png');
-       background-position: right center;
-       padding-right: 4.5em;
-}
-
-.mw-foreignStructuredUpload-bookletLayout-ccbysa {
-       .background-image-svg('bookletlayout/option2/ccbysa.svg', 'bookletlayout/option2/ccbysa.png');
-       background-position: right center;
-       padding-right: 4.5em;
-}
-
-/* Option 3 */
-
-.mw-foreignStructuredUpload-bookletLayout-question .oo-ui-radioOptionWidget {
-       display: inline-block;
-       margin-right: 2em;
-}
-
-.mw-foreignStructuredUpload-bookletLayout-checkbox.oo-ui-fieldLayout-disabled > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label {
-       /* No unreadable greys, please. This is the lightest WCAG AA compliant grey. */
-       color: #707070;
-}
-
-/* Option 4 */
-
-.mw-foreignStructuredUpload-bookletLayout-guide {
-       position: relative;
-       height: 315px;
-}
-
-.mw-foreignStructuredUpload-bookletLayout-guide-text-wrapper-good,
-.mw-foreignStructuredUpload-bookletLayout-guide-text-wrapper-bad {
-       display: table;
-       width: 150px;
-       height: 140px;
-       position: absolute;
-}
-
-.mw-foreignStructuredUpload-bookletLayout-guide-text-wrapper-good span,
-.mw-foreignStructuredUpload-bookletLayout-guide-text-wrapper-bad span {
-       display: table-cell;
-       vertical-align: middle;
-}
-
-.mw-foreignStructuredUpload-bookletLayout-guide-text-wrapper-good {
-       top: 0;
-       left: 0;
-}
-
-.mw-foreignStructuredUpload-bookletLayout-guide-text-wrapper-bad {
-       bottom: 0;
-       right: 0;
-}
-
-.mw-foreignStructuredUpload-bookletLayout-guide-image {
-       position: absolute;
-       width: 200px;
-       height: 122px;
-       background-color: #fff;
-       background-size: 200px;
-       background-repeat: no-repeat;
-       border: 1px solid #e5e5e5;
-}
-
-.mw-foreignStructuredUpload-bookletLayout-guide-image-camera {
-       .background-image-svg('bookletlayout/option4/camera.svg','bookletlayout/option4/camera.png');
-       top: 0;
-       right: 80px;
-}
-
-.mw-foreignStructuredUpload-bookletLayout-guide-image-graphics {
-       .background-image-svg('bookletlayout/option4/graphics.svg','bookletlayout/option4/graphics.png');
-       top: 50px;
-       right: 0;
-}
-
-.mw-foreignStructuredUpload-bookletLayout-guide-image-website {
-       .background-image-svg('bookletlayout/option4/website-ltr.svg','bookletlayout/option4/website-ltr.png');
-       left: 0;
-       bottom: 50px;
-}
-
-.mw-foreignStructuredUpload-bookletLayout-guide-image-search {
-       .background-image-svg('bookletlayout/option4/search-ltr.svg','bookletlayout/option4/search-ltr.png');
-       left: 80px;
-       bottom: 0;
-}
-
-.oo-ui-fieldLayout.oo-ui-fieldLayout-align-inline.mw-foreignStructuredUpload-bookletLayout-guide-checkbox {
-       /* We're really tight on vertical space. */
-       margin-bottom: 0;
-}
index c8d64b9..30f3e59 100644 (file)
 
                this.setPage( 'info' );
 
-               if ( this.shouldRecordBucket ) {
-                       this.upload.bucket = this.bucket;
-               }
-
                this.upload.setFile( file );
                // The original file name might contain invalid characters, so use our sanitized one
                this.upload.setFilename( this.getFilename() );
index c972f24..4a463b0 100644 (file)
                        upload.setState( Upload.State.UPLOADING );
 
                        return finishStash( {
-                               bucket: upload.bucket, // Automatically ignored if undefined
                                watchlist: ( upload.getWatchlist() ) ? 1 : undefined,
                                comment: upload.getComment(),
                                filename: upload.getFilename(),