From eeebe6db6e9f9d6c1c080e196e04ea6ab9c5acc1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Fri, 5 Feb 2016 01:18:58 +0000 Subject: [PATCH] mw.ForeignStructuredUpload.BookletLayout: Remove A/B test code 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 --- includes/DefaultSettings.php | 6 - .../ResourceLoaderStartUpModule.php | 2 - languages/i18n/en.json | 15 - languages/i18n/qqq.json | 17 +- resources/Resources.php | 18 - .../bookletlayout/option2/ccbysa.png | Bin 2697 -> 0 bytes .../bookletlayout/option2/ccbysa.svg | 32 -- .../bookletlayout/option2/noderiv.png | Bin 3149 -> 0 bytes .../bookletlayout/option2/noderiv.svg | 32 -- .../bookletlayout/option2/ownwork.png | Bin 1865 -> 0 bytes .../bookletlayout/option2/ownwork.svg | 26 -- .../bookletlayout/option2/useful.png | Bin 2514 -> 0 bytes .../bookletlayout/option2/useful.svg | 24 -- .../bookletlayout/option4/camera.png | Bin 1708 -> 0 bytes .../bookletlayout/option4/camera.svg | 60 ---- .../bookletlayout/option4/graphics.png | Bin 4144 -> 0 bytes .../bookletlayout/option4/graphics.svg | 98 ----- .../bookletlayout/option4/guide.html | 12 - .../bookletlayout/option4/search-ltr.png | Bin 1523 -> 0 bytes .../bookletlayout/option4/search-ltr.svg | 92 ----- .../bookletlayout/option4/search-rtl.png | Bin 1559 -> 0 bytes .../bookletlayout/option4/search-rtl.svg | 53 --- .../bookletlayout/option4/website-ltr.png | Bin 1985 -> 0 bytes .../bookletlayout/option4/website-ltr.svg | 57 --- .../bookletlayout/option4/website-rtl.png | Bin 2042 -> 0 bytes .../bookletlayout/option4/website-rtl.svg | 69 ---- ...i.ForeignStructuredUpload.BookletLayout.js | 337 +----------------- ...ForeignStructuredUpload.BookletLayout.less | 131 ------- .../mediawiki.Upload.BookletLayout.js | 4 - resources/src/mediawiki/mediawiki.Upload.js | 1 - 30 files changed, 11 insertions(+), 1075 deletions(-) delete mode 100644 resources/src/mediawiki/bookletlayout/option2/ccbysa.png delete mode 100644 resources/src/mediawiki/bookletlayout/option2/ccbysa.svg delete mode 100644 resources/src/mediawiki/bookletlayout/option2/noderiv.png delete mode 100644 resources/src/mediawiki/bookletlayout/option2/noderiv.svg delete mode 100644 resources/src/mediawiki/bookletlayout/option2/ownwork.png delete mode 100644 resources/src/mediawiki/bookletlayout/option2/ownwork.svg delete mode 100644 resources/src/mediawiki/bookletlayout/option2/useful.png delete mode 100644 resources/src/mediawiki/bookletlayout/option2/useful.svg delete mode 100644 resources/src/mediawiki/bookletlayout/option4/camera.png delete mode 100644 resources/src/mediawiki/bookletlayout/option4/camera.svg delete mode 100644 resources/src/mediawiki/bookletlayout/option4/graphics.png delete mode 100644 resources/src/mediawiki/bookletlayout/option4/graphics.svg delete mode 100644 resources/src/mediawiki/bookletlayout/option4/guide.html delete mode 100644 resources/src/mediawiki/bookletlayout/option4/search-ltr.png delete mode 100644 resources/src/mediawiki/bookletlayout/option4/search-ltr.svg delete mode 100644 resources/src/mediawiki/bookletlayout/option4/search-rtl.png delete mode 100644 resources/src/mediawiki/bookletlayout/option4/search-rtl.svg delete mode 100644 resources/src/mediawiki/bookletlayout/option4/website-ltr.png delete mode 100644 resources/src/mediawiki/bookletlayout/option4/website-ltr.svg delete mode 100644 resources/src/mediawiki/bookletlayout/option4/website-rtl.png delete mode 100644 resources/src/mediawiki/bookletlayout/option4/website-rtl.svg diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index c886f135eb..fc1985662b 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -535,12 +535,6 @@ $wgUseInstantCommons = false; */ $wgForeignUploadTargets = array(); -/** - * Cross-wiki upload A/B test configuration. - */ -$wgForeignUploadTestEnabled = false; -$wgForeignUploadTestDefault = 1; - /** * File backend structure configuration. * diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php index 4a68f8ed92..c9f515e432 100644 --- a/includes/resourceloader/ResourceLoaderStartUpModule.php +++ b/includes/resourceloader/ResourceLoaderStartUpModule.php @@ -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 ) ); diff --git a/languages/i18n/en.json b/languages/i18n/en.json index f220040b0a..1c5251ad72 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -1517,21 +1517,6 @@ "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 your own creation, not just taken from the Internet", - "foreign-structured-upload-form-2-label-noderiv": "It has to contain no work by anyone else, or inspired by them", - "foreign-structured-upload-form-2-label-useful": "It should be educational and useful for teaching others", - "foreign-structured-upload-form-2-label-ccbysa": "It must be OK to publish forever 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.", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index 7cd96cce86..39f20bde90 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -1689,24 +1689,9 @@ "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", diff --git a/resources/Resources.php b/resources/Resources.php index 7c3bc743ed..9c6ab5f278 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -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 index b39ecb67a6c8faa3d93da1a6a05e08d377a1d39e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2697 zcmV;43U>90P)wjO z`}ZF{e3*)LwvG_}es*?tetzEVYj8qG!*0kE+HD#yhfU){*QP-cERT+kT4%U!Ret{b z+3P;^>FMd|uV25)ed+b}^_MSSx@rMi#Lp=DrABEH;g26bx}Av6Aou(C@0z~>%)pY| zGP`SNRUq6AuiI--f0)I%Kk4G)0@mL$$W{=dU)b{CyI=v8&2FbrcD*{Fw&Pk;3%$c? z-XOdIkS8Z6E&SAx5n_^!G3@+sOiTZAw;nl_B3t<}5> z0_>XFnX2()Z!-huIj}UrV?;HIsU|-(tmVZ<_r}(tnC91{eWRFy-_#qPg5T7eUkV|9 zH0?R;C%+y=#HiCl$n%H2<;N6x5pGHdX*qx1^9RLDqtI+PmHWjP7Z<^=JL@l`)5+a$ zkoPa=Hzq2y0#_n3a7IW&AfCZ&GrlXN+@1(ePEN>O%zg<*Cm301i1FPVbwkLZ*XikL z(0WSfhzX`!j_%YAA^CbdgOkLa!eh0CkfYFWp>lWX)mJ_UX(491M<_;#PQ8|F91wC8 zv*!yjinzfguCXFy=RV7g_;NxEST3PMaxpc$bWd~a@UUcY{g4;;~W3EsR~t?uvdIj{QR z;eo0fP|G2d8ebxdpHuibv75e;)_xa@g=0$oa=HBY@goKEBV_rK@j0G+g+DnyKJMlh z?i36pF2gWo6w4KnQh!~h1omJ;kB}PdvMJb0`pOkbX;Z_qShGE2l(rHrL5&h2trDT{ z?EKLCUPDV(Z^CzV(|0XmIlj$7jrt8~L@(M+Meq{gJ_&D4dx>R7o<>%+FHIH?ZtQG5G z#aupjl4Egf*$6oZ)|p@y2K?vEhzb89d`b6+O70TUX4N9RK^_O?!k`gax7wUdg1$_* z(UlcS3`cjQwgd2be=aw{;R*mdXOrs5zIt|;jgU47bu&Ww5{x7|=L0*El^UV-2+x*n zZHTe-3i)cq8U=DxeT(}mhpI9n1&WbGJG@xM}={@dnGRpp?7M-xSROuII-R(2TxV4-_-7Td~Y>5 zP%1Qy_E|`|UkVjj#KNP#CzD7+j#M}%3D+~-=UXMTr_r&HNGKXC)UV6S%iK4got+KX zknnrq#}wN0?b|mm=dT~0s%lb8JPdE& zwflGP-sMjI=nyce9bNe=j6ZYJ77R8ST2@fRt^2|**AavYR@X32~x zN>P$+TZp2%XtOcdPl=EMLSv0$_iS7Fg^2DHEqD1*aG*~1OBNfl*L~83wNC{RS)J&m zKzNCz5VE}nloBB)NVrt(?_SERiy(A?09s)*$ERklxn9&#kiM1DL6p6hYmxBh_S4^B zfT?QM2{tMn%|7TzFI0 zYv^&ic8lhSar2~bImWRdc4}6+W*o)%x+~8sC`(+Xqr*aM8&}Kg=GCy6-{3Z}~hw*)**yUF`tV^XEvxgLG@~eTc zM{)Mi4SZ%zew7e*Db71aYR`!u z*XpnDW>V#*cJC~-+}zmU;5XKGX&R;3w2qqcul{UJI2&X{zmmpkJjihx!xSS`7$3V6 zNs){hB3%DJv1mf0BYt+b;)5|p4I$*wvD-Bz_SNijhOVl$ z^9xfueFO)^VNUvc9n$DyBxN76dKq(iXO57&tZR{!j5*3uK<`Q>s1)Ee7kS!AZ z)y=%cXUw`Pumri@)n9PzEr(iZ-L`CYDA^_Y)Db6QC}>PCcNbq&M`?_rPt>j{RI>N# z>I% - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/src/mediawiki/bookletlayout/option2/noderiv.png b/resources/src/mediawiki/bookletlayout/option2/noderiv.png deleted file mode 100644 index afac81f4b57c9fcadf4ade6c9ff50905824beb5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3149 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 diff --git a/resources/src/mediawiki/bookletlayout/option2/noderiv.svg b/resources/src/mediawiki/bookletlayout/option2/noderiv.svg deleted file mode 100644 index 96d80845ed..0000000000 --- a/resources/src/mediawiki/bookletlayout/option2/noderiv.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/src/mediawiki/bookletlayout/option2/ownwork.png b/resources/src/mediawiki/bookletlayout/option2/ownwork.png deleted file mode 100644 index 69df378887fc58ce78b578c76a113d036d1410b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1865 zcmai#X*k=77RIBNYEZEUEfUnOr74{>v?39vt!Xi7Ypju=mI%=jmuu-ivD7k_3X>|z zL}yG;F_xlHic&kZuVZVdOS$&#nz>)@r@7C0&ilU4`<&0`7k|eVCjnLhgFqk&8*7Z+ ziD&+~qNh%j>#^|ri75tS?+4olcm{{K2a!M)!~g;nf@`? zHK<*Z3|iCEB$XAPdyZ|UJRVQ3&1>Sb$IfyTqsiU;`WBzhUtC#HX=G9R2@)=KX9Y(wkl8x>k#8nkiF43%EZt4_itd3P;ql}^EDB58J2M* z4B?MZa&>j3h;(}PGlw@wrC9@Sr&ecUNnxtFxw+>O68^yLTl(DP;CWl?+E3zeaZ^nf zx*V(p_&3F5bwn(tg=;?fkY=UL-!ZaSGgf5hUm#{H^TOyv^F`QuNowIUO^$0Hmj}x3l@8$wqzoim5KwVL#g6;GiM)f)_>HZYI2ETQh~wT`6-0kc^u3YZ zropimQX5*nlB9enSg#TL(`>Qj2Rl1?TH}tLtA<5D!)H-kf@#^Ke?K$6TlWZ1&C&XD zu@(X9)#34ovSPNnkUiypvQd{DZ^6`>Kzx){t;W-;9dYe)ACXcv;^MulHE>}s zP$$BH7nCbtSwsZhro8?d^`q+&ahU1%%9et4p$4 z`hATMb~71otTneEloekaoB4dRLJ(mpUOcpX{(LW8AO$C+8BT~c@=bX`nKndkbYzXI zD7x?LZdO1;x^rfvH1o0s$raw&&bHHwk7SoHS3L@#QWH*a;>FFd`tSqY#>*I^&1PBCa#e z8a9g2W93wV;s=jeSP_e!VKG@6T=i|u^CCxNXqKj=5z3DYg@_|eh@`>542yM)`IKsk zyi_VOtWbZE)?&^iyr6H=SkN8i-@1o=IBXQ zmbcaQGJ^U#BR4On{r0!4_`fju>!AJaG58W_zjcml<(>5YgpD8@tSzPl?H2PN{FPhB diff --git a/resources/src/mediawiki/bookletlayout/option2/ownwork.svg b/resources/src/mediawiki/bookletlayout/option2/ownwork.svg deleted file mode 100644 index dc660c83ff..0000000000 --- a/resources/src/mediawiki/bookletlayout/option2/ownwork.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/src/mediawiki/bookletlayout/option2/useful.png b/resources/src/mediawiki/bookletlayout/option2/useful.png deleted file mode 100644 index d5b9429d054bbdeecc4c74334fb667175736f7c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2514 zcmV;@2`%=CP)>MsW`;vV-C;7lI_adClZ<9^3Z+n}~ zrctR`_EiOnP(=}{C_+W3l1z?)$>z?)$>z?)$@b=>4t)!9lXB1z3uwU!NCC(2Mx-qFFU_l5ke{R z`5eITO7NWieE2Pc!QkxdEH=^D{2+T3%@;xuv)ODqoo;8uY+-oa^|x%S=D*|f7Z(@j z=jXt=>u*cu_n&Nvm(S17ySuyN+9=>hlkhKSJ!WYHg9fjK+a@__m`KK_%Er) z#)HxK`uzM{tYh~!NBk9i z!(=k)8bb7R4qKq9r~ylepkr}{;5RyQbR*tJb0Rb|r`VCVh&gg@jy%NU8z@0SV`Y14 zlf7SK2rOabvlPJNXv>uZhc<9L)gxrD5-(0G^Wk|=MCwv8LRNuCM=ot>^q@$wn_#Bc zWaPK0S$H7#ph)giD#u8Q5XoOR__ZjyHizA*NL9T_-{43YZmx=iU#Fz72%%gx2;pj| z_)=s1VmUN8 zSapkzFh(X+ps-_fD%_A04jd7iG~H9S9#ME`;}mCxkBD&*k_(MG;aQYW71YV9XhaM# z#3q4n@t$d`*PYro8GjO(BSu6hnEF(gV>rc`WV_zwj#vocIRy(4bqU3p_J+t2pI>$n z3nBHaK14CQ;u8tRF=sNCr_|hl{ zL)=2gMnroh&_qt96 z8bw%Q?2~6KRLLcZP!Xz#3XOtJ5s)G*OK23#iBJ>#ZK0x-_>sf%2q}~jxrC@=^6~M} z#GJqpLm01@b;Anl7z_O-oqK|i=6?TIzP`SipPF0-gdQ`_{RuKHy_D03(q87VP=iuaXziM%Rq+^<4dL;(G(T&)RoJR5V;R3W zSK-v2)^U4m&*|zw=tRYD37{}S>TYU0bLn_S)0uJ#Mjxc;ZFh&V33w z@gn5(pjhY5P*Bs`b7x!+fTF|B3OaX&4Y8l6KY1L(R@~`N8_~0;J8yy>2Y#hM*xM12 zk6^9-B*aa>&m*-@=lQ%k?_x;YQ-S#cfSwd%GVe~tad?c@HHB!(bW?a!LNyg0f}%&iSlo-*x)T&yBDDA>+5R~b>kBfk|O*B^nl+YJ*2quLDv4ven*SU zsh%W0m_s|TBz&{$RxUgtFyqgv-X>;YA9fZE&DV39Srg6>WZ4Q?F?lPmcV1c z)abOVUE7cG0P#+#y1l*S6@}14y5q27kK5cB@6uHH0wu5mPd^XZMCI2S-l>HhTRVe( z$p)8Y14$E`9}5qS7`?i&8W9>W8B+dv0>kd$XSx_z+WD8zVv(wH9siG(~bfXt< zgDh%{gu}=Fj9ucy=LY&L7nOANndFc{Dqzf$CKxm>MQ zZ*On&`JC#jt+|WwcwEc9(&Zv-oeH^FEJ)qk|I2&98RyZ_5jkY@WK=GNZyx|p(-$=5 zRNY;~bs#iN6C}VA2E<1VdI-%gn$}$Jd3}{3w4BZbVEPxB6wHh6IR1TFSP_;eqtOWV zir}c*Hw^2|X^K!q5vnLcMW~_(RTQC$B2$kN{O@f z^KS|N9$J1e91dyWMTpSp423c*aAD+RGAT_(^b07*qoM6N<$g5`MMhX4Qo diff --git a/resources/src/mediawiki/bookletlayout/option2/useful.svg b/resources/src/mediawiki/bookletlayout/option2/useful.svg deleted file mode 100644 index 2af3f938fa..0000000000 --- a/resources/src/mediawiki/bookletlayout/option2/useful.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/resources/src/mediawiki/bookletlayout/option4/camera.png b/resources/src/mediawiki/bookletlayout/option4/camera.png deleted file mode 100644 index a48f9fbf4acb8dadfa2f5c98b313b083a7cdb178..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1708 zcmZuydpOf=82(|FX%t^Mw^CBcVJRgRDyPln(~m62e$3&k%%o*PlKE6?IiodC=oDS#SEjp^vGh!;edJeM43GiQKvpG%7>WoPScHX^wiW7~Q`N5{(Y4 zs9I-bI$pGsuldCB*rj8q!%jAcv$b$o7nLHRer}dvAGSwh;upNUuT=pk!R^pMqTFI6 zL?{@F*=wMVs6;ElKlt4g-zR^ZnK?3xH%#67uIGMR^WYzZ~k$_;EH;;(k>$OOEe*Qj-s%tow<+v#D**aG%6tg$7FX$hO7PpOfQ zR(pBpv<=N%#SRxYOAt{y&#X#}O*ZPJ%nhygw}hSw=^UVGbF6UR=%>pNB+$!lajDM^ zty_$=_ubz+G7uPb`axd5iH+gghdl#o_tE8xd{cjiZIzoKBo5 z(iG72kYni>3DY7bEF>M=h^rS+7eOP{0nc6Ytdz!!~K(kmeE6_@a+ zWhlo7Ypf&%7}TqGYT+baTTyH|r!kFDwFO?OO781BgfemIrTMPKUpweG6@1*osQ;*b zz_|-=^O@>O)F8;;RoY z>xbHNVU?{K$XFIcB_fjfRwvH9;HKrB?wy#f>?4_SQjb1rRtSg-bQk#LByy`=D5Y+g zyqKL%tDUnDlUb8Ei(Nb+E;TtOgL_-fYdq<&aNN`Ft`*o}eN=Ms z@>#XT!~JmS=hUpu=2Xo3jD;6;LN;o%=-jk4jeIHtTW&Zg8fSxp`R;k|a2xeECSRjo zrI}hDiYUAnA?W6uszMh_&pe_Uu{`~kI-g!bi~)^vN0KhaSlIh-z2ZHjXBEREMK922 z{XuvU9!b|_KFcUjX*$e2YPs|&i(=9_@?mmva$sPe0lfmHaNubwkx0x4cj9|C!q2yJ ywh3+i)buyvOQk79`VZwF4tRgD!Jck`JQDCRMRaAmZ>x}fKLFOj)xKZ{l=wf3_V$?o diff --git a/resources/src/mediawiki/bookletlayout/option4/camera.svg b/resources/src/mediawiki/bookletlayout/option4/camera.svg deleted file mode 100644 index b1103968eb..0000000000 --- a/resources/src/mediawiki/bookletlayout/option4/camera.svg +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/src/mediawiki/bookletlayout/option4/graphics.png b/resources/src/mediawiki/bookletlayout/option4/graphics.png deleted file mode 100644 index 5613f8800cecb8faaf07c802674db94d273b0cd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4144 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 diff --git a/resources/src/mediawiki/bookletlayout/option4/graphics.svg b/resources/src/mediawiki/bookletlayout/option4/graphics.svg deleted file mode 100644 index c32f79fb17..0000000000 --- a/resources/src/mediawiki/bookletlayout/option4/graphics.svg +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/src/mediawiki/bookletlayout/option4/guide.html b/resources/src/mediawiki/bookletlayout/option4/guide.html deleted file mode 100644 index c747851b1a..0000000000 --- a/resources/src/mediawiki/bookletlayout/option4/guide.html +++ /dev/null @@ -1,12 +0,0 @@ -
-
- -
-
- -
-
-
-
-
-
diff --git a/resources/src/mediawiki/bookletlayout/option4/search-ltr.png b/resources/src/mediawiki/bookletlayout/option4/search-ltr.png deleted file mode 100644 index 26d6beb965cab52f6fa55654b24a12e3e03bc7ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1523 zcmb7Ec`(~)7>>0?NzmF>BrUa$I@(gy)i%TtH?6v>NGgs5LE|ch))BQ)V_n^CH6=xB zg?2YV2}P=CSJModkfzR-r39s}75hu4vpYMp|Ln{+-}fHR`@YXN^UQnWoVx==7A6Y< zfgnzfcAg-RgbZL;$$SIcMxoD2fJcRB??=2q2qPw;C_}q*wCjM**8qj0JVZIdIE|6ZW7wCvdKLH^^2X5r}tby5@#R0@nUhh&e3p zt>&#{V|5PPW|9-T6v4dce#h_Dk*VI0!-Ce$PB|YXZx_xK+qXThPNyKoI@p7+ zVnWl?caD!^PlF|7B(o*DGZ8Ss#y~|*P5>?JT);xb9dcEld8i54_#SO34Xt>rIT1ptv?WF#MDbE?&mP{Zq~%)f)u6!o6oH_4>^wP{ z{O88w>XHO6X*Sj0+)N6O$J0pK~7io@X5n6#!^T*@Jb$+3oZ3oAmEZEOf` z&K{as{hf@YC0A4-l+FmGi7xC_P8?8GJDnC$ESQ;_n@hA9Dk>_f;i^rP{#G4Xcs}D% z^3EXpjq0&Q(FT>#)6-UdqCBjyoLv#Q&0+*Z!`s!N_C;p6StIg1B~7)o7OwTIqU5Gp z>dd@B4idEvWx%hzEPZipuolLhc2*MJMI;ED^-=jBa~~U-nVA|ZVR*^!H#i#VP!0P; zR-apm4SZm}8h*v?p>pLTl_(2VU`U9$R zW4Vsq4I06B<=bLsAVyc8=Xt=?L@B4%SDE`dY*Z)s-M_m&(4wQ6eR(ud!%zXCgXW_r zo$;h)nK|)3;8#@?a|CL2RWk_FGq<*7x}~-sb>)do<+yq+8*QDq4$U+iKOiUE2u2+G z7PG8x!tTDMbFe^$mzH%_N=9<4X)`9OYj9PC+=Ds!?lfeDbqywLJQ`2^L4g7lk!s>d zq|g@(kx#a}up&?fXbFVQ{ObNk=qm#B1$B=Qw6zW0Ohb70mc8szuF`?= z3QV6H7QrE;GkyGp9eIWR5_~&cB&Fu(j8t}ch-0({G{Q@GuXOUuwRT0ZT@l3NdLBZH z6ii>Zuiy29vN^uFkG*I$e-M_|>io#8mIRSQ7KgD+b(l2FO-am=Zq)_5=sxQGhvB~n z|NRFfyn5vFWn&UK%P<+u?pG4-5+}wRl^N>bAg}X?B<;YyQf)fm)O}wALB9^nG0jG9 z>j44pJ0sIpuX7E(Dk10x7`%6cEwoPTax9`{Y!8eo<^mvcw5Ds<(kU--vfp=~cJRiW z3p~Bv2Hx%1l5e=s?JJC4ZI_Lf(dgHkB&0@7LA-%xn*R2M(M*oGT=SRN)&dFf1Wl`U zOWfsof?PJGV^ z&Iq4LmLr9i>2tHY@T`_7U`bd5k_vH2B{$3E=;VW)qh>x;@^*)nQB-_E^Cl@JvEW0z z8<$+)*qFN1=_zX&=q&K}doYZXv}B<;@A~^=(aRG`eBy?@tJ|6pu?G`Zl_L%gZf2 z5;v_EH~W&3sLO? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/src/mediawiki/bookletlayout/option4/search-rtl.png b/resources/src/mediawiki/bookletlayout/option4/search-rtl.png deleted file mode 100644 index 3305928cdec53c299c380124e6890eeee8ee1f44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1559 zcmZux3pCVO93DC3XeK1vXhsiq)2a!{$a4~=$a69pZ~rkPB_tzxrmY#mur`l8l4l-c z2J4;dgsi+%@)(&(9^x#dXn%WUa-lMjBuoj-fkp+;06(-Pw>VQ4;gy`mx&l6KnU<@A?koY zA~nW_`qsBtGeaE~5Bx#TeKIWRm3}VoTz)&wJIT}A5Ki-lR3Qd7!w>_W_oJGPq`fcb z%v4ed?1$|7#+bF8(T{ZW3BF-FFz!Fkgm+Dt1Wc#qhODi^Q=agQA6I!l=Dhi^$oKO0 z{tFbeWGiwAEGa4`oRZH`nowE|4h4L=1N)VeP16tV-$T(2(|x?}7>!23SoT>?%_k{G zHR00|7wdevn1Y_ozD7KSOdUXnY&DP#ZX}b|BCtGsD4W6D>Y0A1fB?d(SfVXsJkxrmWPrtr9LpMChN$2Js#Q_~6@j8={&lN0_$`XGfJ&|yFPNw`{Xa#yLR_(S45J>U=W)uHR}b9<>-XC*(0Io ze0g(?ZjW9z@u*0r>c1`ir{iyjAVt4%O)Ar1*h@6HSjZ$DFc0RB+^y%?_fk|=n30A^ z>GW7OlLi4w@**RU_c9|}mC6r;v2X|ScF-=hg@!d)e#TRUuP7?knGhg9>n2N*@|ost z04;QP@EsKMeOn}J09CXx+Qu^D^vNYW(9+M~;g76&Y%kRbiHTnG!hA zu7>uu4{apFl0+93<`+|iX@c5#tP$N4ZY2)GJ7z; zK-^PI!3GQOMayC1f4Iuu)P-Gw$~iY}BBvNxr)p;HX`!?X&v1Aq^<%Y;`p|iqZFW5C zWmjkdyv|)s)}#P0ffX~5`8G+*_pn!!q~w=*8RN9NM{y zvud{|Nm`4`*SGMYf5fzONkGVP04}Sw6T)rQxqy&h|<}T4o zD_Iltcd)igj}%0qCU?Gb-*->@)sWw%UZ888YnOZG+HC3~H)Nc3`Q>j0 C-QvIi diff --git a/resources/src/mediawiki/bookletlayout/option4/search-rtl.svg b/resources/src/mediawiki/bookletlayout/option4/search-rtl.svg deleted file mode 100644 index 17c54d2f63..0000000000 --- a/resources/src/mediawiki/bookletlayout/option4/search-rtl.svg +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/src/mediawiki/bookletlayout/option4/website-ltr.png b/resources/src/mediawiki/bookletlayout/option4/website-ltr.png deleted file mode 100644 index 7e007514ad97e2f241512017306804459062e688..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1985 zcmV;y2R`_TP)i{ZXG(dKcER>pkr*rh%JedNLe558!47$ zleRuck;l8|i3cmN1d(^oz4zW1^A{HvIRLm$fm;B87yyU?fEWNVQk;MB{`B331S?;CQl(yk2#gT)bp{`9JNI*QTl^{UlsunuWCHX|3iv%P(n7?OEY z(N{t$ic}XZ`-jqwmP#eS61 zRiGU6)77;{$H!E30HN{l;guKwKvxO?F#r$)05JeIg}Q5{27`g$?+=H=@p$~f;6kBT zEN+#{EdGTAP;pes^E|iHxoya3BJI*?8=jiCj*rsl%={`H-x>9}|TN-?Q_eFrAVk|RjvACHW4k=5} zN{m?cg)uM%x`_dR7y#KI{ZXlMxg32IWq#3AqtSShdtz*fZk5Y9R#<8vhScfkVib#4 z7vgr@qvNQs!GG7NVDqCCKZa4ae%zlq$9%Jh2Cgww! zWXJ?ctgd}`auQ{1>c+Xe5;5do#IGccy0p8S5M%nuo4c8A=L1=(f77#Sh#2A29p|js zjPmyRmrl)*pLmL`(V*=lVx&p4)mrZa$V#QMyR$<gMQ7AAK16qqQrQ7Xxy4|~%c!&(OYBl%(2LNrw$Xy=G?)iRj zeWCQ7>`KM9Z34w@upc89R6JKoDt+}bAk2^YGjFvF?8neHVn7r|6SDGcm2K=010by1 z!Yu$$F~{)#ef{>w7nH=>*pDAI4)(bZx`{Dz+ugtap(Nr$GVgwNl5b_tATCmqG()V& z&>}*_fP`S95@J9IY*dN`Mx_7{1AwlSnK1K>7!X3w^Vr&o7!W8?%Od$k47iCsf%`!6 z4S*N`hyj2Y0EhvA7yyU?fEWOX0bmZyd@rVPuz&X3@BXXTnfSIGxP}->@Y&Bl?SAuI ze*XLRyG*#jfopW760$;mvFgs}zy4DB@)7q0F|gvJ6;p5nG2o^ZxPcfDZUt^2239=3 z;}3Ad1Q?ZC&5C(9)EuYcTq(pz#|p*W;9M!XQmI)%pNfcq6&Z^gZl}X3Aw-Nctsrg? zF|Z;tal@(A9FlL-B8D`~QVW%`g1CVg>02R{Pkv%?BStH512IyzLMq?v7p1Jg4RVY$ zt(bo)efm+`RmTcN@(uQ5m?B1Kh*;Z=jas3C8|=q0LX0~)PHVW4fEB5`anH85nEBRQ zjD_jMN^T@(MY?WS6R6qRCf`dY*-QRe!d8%rBSxB5EcwT&Sb-aKrP8!wVV^2RD^lrG zN#@Kv-x1yT;;%ndvw~b4F_fr(Dt|ZJpeqGQ_o+q`vT`ew?e!ssZf^8EkFBkU zfg6DmwJefv#K4W4*b}(78jA7uhZk18PT2rrTq7%wXaSAk_#6Pl06+|YwaH&xT%`LA zMs3%B^@@^M8_TIz9y5=wofr^vL&MB>9Hc)gH6D+L!(j{!=jC4KY}Jey+O~YYR4UD0 zGV`s87-Gfy)6?jmQ@cE~HCr_!mPS|E)0wi1hBM!$t%;Zq7l0VI!kP$(4#Twohyh@1 zSIY2FDL{;H3?G%^iAr>(0Eie%V|bIvNrZ?2A#f5QVn7I-M2Hv=o{MuB0%C;Vb~>z; zf`~9G1z<+RFnm;s{TPS=A+R3$D!sCy10LUZ2Ncev{-I zLSWfBVgPIkMx_9h%rPYH8?_iV{vxz2)|u-mhEZo1Y@(Zv7#fOUSyqj6kfKElZUV_S z0LeE1VgQh1ToKo@b8~ycJUB*6G2(ihv9WMOr=DU+gU2~YQ6OAwq*^j61wir*fEWPT z%`q62ik_sAW@sn|qf!xJREn+?KvHp-Q7Hf-1^{9JAO-+p03ZecVgRVX{{jpEC - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/src/mediawiki/bookletlayout/option4/website-rtl.png b/resources/src/mediawiki/bookletlayout/option4/website-rtl.png deleted file mode 100644 index 83ba6d3f3e7bf7ec71236ed1ed12b6d9ed6c3e80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2042 zcmYjSdpy&7AOEphh#F0nby(9&hsiNrFe+mfayn=mMX`-|in&)bj7|OAIxUyOgX9)t zZe1v~QRcb|9UW;dx#uztOQO=*qv!R!o`2q-&-e4k_w{|f-`~&so#=e>xSEQ#3IG6V z4)z3B08mhp_k~J|ay0c3rOV5%a69+#Q$gp$FH=K(0lZHT%@^emNcHn|^`-hmhIIH^ z0l=1A2LhgS<=tGKm?0s;t@m?#_3rw3)Ilsil(X2yPbQJ?e!XwlATAud)Dsa0mm2%C zVu)Jb*dLL%VythGS&Ey-^)sblxuP574)f8-`jE@JD~nPXSi`oPwe#%izMiF&dd0}+GS5<5|A8b#bL zHhRZB;HIrn;yOyD7i*^3iftdEa?T_p2G4c%+G_IB+tGI$r?aotjCMOkH#?slA2PQzvzNJZHX*X05ZxJf;+HSF~Ux zE`Q7z|9nye98hlld+sYULxG281iYDbwA(IXJwz1}Br?iEv{nb1?sxnrGZ^Hr*M%T9 zj$$Bh_v#gja?;YS=shH)(St6#A>t9<+EYQpQ03N7ue!Ebr)=-`$0j4+%oH|srX9;i z1U>KR>5&#m(z-fIRg!~i8|(jw?5-idIu-HwK&F%Og~K_m$st#QuPj@vlBitva+Ki3 z)<=8|MN_V6{_z9{Jg8v0OBLE-rg3c#jpbsWeYos7`VgqVLI4#7400#=PL=>Y(L&~3 z%^yCnu7k5;dS!&}-WRzQpO6sy;r*X1O2zWW{!`OAg70sl4Lokox7ojaVnz)MyML}i z9s6F}xNn>1Z?Rzd{@+&Uq|S+P8kh>h?mTCb8YS#Ik~Fduz^AqlxQY(__sp*>F3j|C zF!3Il5n-{qSXlGHhQay%)yTPH!~H{5BtuXEiWY%phl|ftGJ*nm!AhXQ(ymlush^*& z$L-MFrM35qo@a%LSce++jJD3`;qBHQkgGAY&9tVd>2O?3>3wD{c=OrdQv&aZ8%b3? zL2|oPJmF=k3*l(S-I3&V@d@*!N|K0oYM*nNF_dhem;H(lkF8EEq=9WI=?X8Vy#?$q zLwo({0167weC%XBWA9f_ys`~oeEV9n)Snlyg73j|nn#?A`Y@R%N~Z4?*A&X;ewknR z>^6MSPq=+1Y2=IWu-og1$jddU*MyIP)9#CH}#YtX4CCw()}h1Np==xnZHL+n=9K+*(DRAL?J7 zoSiIc8(3>ds$IKRnq4HWF{ZYZ#(rhIxi~tNuNyl$zb_+xg#vb={h3RW>f9Zorlb{$ zQJfP)oR#_erQ(3iA#5;CbGk*X){V9TgM6&BsY24KMZ!c~ z!N&DP$Q>Aw&bjD2sa()R^*^FGya+zpy2iI38p`5Qmu4%r3}5nkN=V5{X`@fleHeBc zW@uXuks+rrP@-LVHmAc9cwLLWjXa^T@9cmxDTP+sKC7cyJ4zpXRA*6;fIKLywK?y> zY$4XI1%`;4RQ|r%$^gf^ssY!7QA9u179Xropr9@c|UB-Xw90}De z3y>4F{7a*A*sz8TSp{>e<n$*7yAf`Iy-cIE(t*4`G9>-kf4AWb_FvBc{`yev49eo+Ai zVUY|mp&l8g%DB(tf8vh3^doo5qUq(X#jd~_L6w5;RZl}hG3uQT`Y?9uWk;z61-;4D z0F{BxFwGmFlsLtg!&ygpaE$sbN3Nq?lOu;+wnORSr0=XKai4{R)!=Nx>DrehKmQtBx+(D-^ZYn>b=N>xf z8{##u??Seg3B1xV5qV`oG@Y`o+D0gh|6`v3p{ diff --git a/resources/src/mediawiki/bookletlayout/option4/website-rtl.svg b/resources/src/mediawiki/bookletlayout/option4/website-rtl.svg deleted file mode 100644 index dd8b0f0719..0000000000 --- a/resources/src/mediawiki/bookletlayout/option4/website-rtl.svg +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js index 97d81fb478..e467ac10f6 100644 --- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js +++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js @@ -80,45 +80,12 @@ * @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 ); @@ -145,13 +112,7 @@ $( '

' ).append( notOwnWorkMessage.parseDom() ), $( '

' ).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( { @@ -180,16 +141,9 @@ ] ); 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(); @@ -208,270 +162,15 @@ 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( $( '

' ).msg( 'foreign-structured-upload-form-2-label-alternative' ) ) - .add( $( '

' ).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 @@ -637,23 +336,7 @@ 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 ); }; diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.less b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.less index fa15a2ecae..4143520801 100644 --- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.less +++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.less @@ -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; -} diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js index c8d64b989e..30f3e597d3 100644 --- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js +++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js @@ -210,10 +210,6 @@ 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() ); diff --git a/resources/src/mediawiki/mediawiki.Upload.js b/resources/src/mediawiki/mediawiki.Upload.js index c972f24538..4a463b0010 100644 --- a/resources/src/mediawiki/mediawiki.Upload.js +++ b/resources/src/mediawiki/mediawiki.Upload.js @@ -332,7 +332,6 @@ 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(), -- 2.20.1