Commit graph

6860 commits

Author SHA1 Message Date
Trevor Parscal 37f4996392 Merge TransclusionDialogs into one
* Automatically select single mode when possible
* Allow dynamic switching when possible
* Hide most of the controls and information when in single mode
* Allow parameter model to be instantiated without name and value args
* Place add param buttons at the bottom of template and param pages
  which are only visible when in single mode and on the last page

Change-Id: Iaffbf1863b808c8089dfcf09a976d165f28c8b74
2014-03-05 18:15:17 -08:00
Roan Kattouw c0380f16a4 Work around DOM corruption for default-sized images
This doesn't really fix the underlying issue that the
width and height are overridden to be the default size
in the DM even if that's wrong (in the case the image's
original size is smaller than the default thumbnail size),
but it fixes the DOM corruption by storing the original
width&height and restoring them if the image still has
defaultSize=true on the way out.

Bug: 62172
Change-Id: Iaee798c5bb501310e52d0ac832b2e7cd833fc438
2014-03-05 17:44:01 -08:00
jenkins-bot 07422e308c Merge "Make new category suggestion section for hidden categories" 2014-03-06 01:33:35 +00:00
Krenair a4112ce30d Make new category suggestion section for hidden categories
Change-Id: If60437ce886c03ca1fb75ba23590e9cdb6c2d78b
2014-03-05 17:30:13 -08:00
Ed Sanders 4ad33a6267 Use align icons in media edit dialog
Depends on I70a7c6c5d32 in core.

Change-Id: I3db1d760898f4d826b078529a8d3a14dc521e13e
2014-03-05 17:25:01 -08:00
James D. Forrester 44352e675d Update VE core submodule to master (c81252c)
New changes:
08d1b0b Alignment icons
0e418e8 Update constructors of inspectors and dialogs as per changes in I345d6e6
c81252c Update OOjs UI to v0.1.0-pre (e1b23620c0)

Change-Id: I6e904dcce0116c34373fda4a8fe86f7603bfea59
2014-03-05 17:24:22 -08:00
jenkins-bot 7201311d97 Merge "Inline CR fixes for Media Edit Dialog" 2014-03-06 01:15:04 +00:00
Trevor Parscal 2a08584e8c Update constructors of inspectors and dialogs as per changes in I345d6e6
This is harmless since the values were being passed through anyway.

Change-Id: Ie81afa6b5929047b624b4376f7d70db7a7d675a4
2014-03-05 17:07:20 -08:00
Trevor Parscal 27cda86183 Update VE core submodule to master (ab70193)
Also update for dialog size changes on oojs-ui, and make the
save dialog grow from 'medium' to 'large' when viewing a diff.

New changes:
ae195ac Update OOjs UI to v0.1.0-pre (e4f6ce0156)
ab70193 Pass surface set into ve.ui.Dialog and ve.ui.Inspector

Bug: 60494
Change-Id: Ib3065e228459aa00f18c309d234f3324fdb34059
2014-03-05 16:34:14 -08:00
Ed Sanders e0f37e04e3 Update MWCommandHelpDialog now core supports multiple shortcuts
Depends on I59a10957f5a in core.

Change-Id: I37b44df84bd2551fc0983743b7b32c6c69521607
2014-03-05 16:27:09 -08:00
Roan Kattouw 19f7afb70e Update VE core submodule to master (165594b)
Remove GroupButtonWidget since it was removed in VE core.

New changes:
22edcd9 Special character inspector styling

Change-Id: I385d6b655686c753262258714dec06f8b1e5fc10
2014-03-05 15:39:10 -08:00
jenkins-bot 6d87cd6481 Merge "Make the order of insert tools consistent in dialogs" 2014-03-05 23:02:02 +00:00
Roan Kattouw 861d0976d5 Make the order of insert tools consistent in dialogs
The promote/demote rules in mw.Target had changed, but these changes
weren't copied to MWMediaEditDialog and MWReferenceDialog.

Also, we ideally shouldn't need to maintain these things
completely separately from each other.

Bug: 62286
Change-Id: I459c3310f2ac0d8860a686a05da4f45d9a888801
2014-03-05 14:49:52 -08:00
Roan Kattouw 809a16701c Update VE core submodule to master (e64d6e7)
New changes:
c0fa88a Cleanup SpecialCharacterInspector
50fe498 Store previous range in breakpoint for undo
1333306 Support platform specific message in keyboard shortcuts dialog
6bfbf53 Collapse block slugs and expand on hover/focus
ed33efb Slightly strong shading on slug hover target
4513d9c ve.ce.Node: Clean up whitespace in rgba?() syntax
8a4da8e Make the 'full size' button optional
3530f8d ve.ce.Node: Don't use padding or height in the slug transition
d3423df Support multiple shortcuts per trigger
3521fa3 Add cmd/ctrl+y as alternative shortcut for redo
873bfef Add cmd/ctrl+m as alternative shortcut for clear formatting
00b0e63 Fix rendering of multi-shortcut actions in shortcut dialog
a010dea Add Ctrl+Shift+/ shortcut for the shortcuts dialog

Change-Id: I208fba38cf6338bfc1fad2683406931071cf5f32
2014-03-05 14:25:53 -08:00
Translation updater bot 7efd0b6c65 Localisation updates from https://translatewiki.net.
Change-Id: I080bb0e657f7963752f06e129bd46232f49e63b2
2014-03-05 21:12:14 +00:00
Moriel Schottlender 9e6e690e66 Inline CR fixes for Media Edit Dialog
Fixing several inline comments from the previous commit, and
reorganizing the usability of size select clicks to prevent loop
click bug.

Change-Id: I259d86e9bbe90270d8883b7a3de96979b1d5a156
2014-03-05 14:46:10 -05:00
jenkins-bot 99fb026af4 Merge "Deal with 'none'/'border' and default size in media edit" 2014-03-05 19:11:19 +00:00
jenkins-bot d7eaf9ea1b Merge "[Browser tests] Updated Ruby version from 2.1.0 to 2.1.1" 2014-03-05 10:48:26 +00:00
Moriel Schottlender 89aecd54ba Deal with 'none'/'border' and default size in media edit
There are several conditions to defaultSize behavior of thumbnails and
frameless images and other images when it comes to default size. In the
same principle is 'border' which is not quite a type despite the fact
it 'behaves' as such in wikitext (and has a unique identifier that comes
instead of the other types.

This commit aims to organize this behavior for the user in an
understandable manner.

* Add 'basic' image type for images that have no specified type ('none')
* Handle the difference in 'default' size behavior between basic images
  and thumbnails/frameless. The thumb/frameless images have the default
  wiki size. Other images' default size is their original dimensions.
* Force wiki-configured default size for thumbnails and frameless images
  in the DM. This is done because at the moment Parsoid's output is of
  Wikipedia's default size rather than the local wiki's. The size is
  adapted if needed, directly in the DM.
* Added 'border' as a pseudo-type checkbox flag that sets css class
  'mw-image-border' is for parsoid rendering on save.
* Add 'make full size' to the size widget select and treat it as a faux
  default button for basic and frame images.

Bug: 62013
Bug: 62024
Bug: 61155
Bug: 61059
Bug: 61282
Change-Id: I6778705306f0dd6bb96afeb91383089a4ddab7ed
2014-03-05 03:53:46 +00:00
Translation updater bot f804838f49 Localisation updates from https://translatewiki.net.
Change-Id: I3f4086c274bd8c476add7042648014cc93ba3db2
2014-03-04 20:46:42 +00:00
vikassy 3486b0f424 [Browser tests] Updated Ruby version from 2.1.0 to 2.1.1
Bug: 62152
Change-Id: I61cbb10749fcc568429c626497a76c41074368e8
2014-03-04 19:48:48 +00:00
James D. Forrester a78a8b458e Update VE core submodule to master (48dd09a)
New changes:
48dd09a Update OOjs UI to v0.1.0-pre (8ac38a5c31)

Add OOjs UI's new Apex theme to the module definition (for users on
older versions of MediaWiki that do not have it available).

Change-Id: Ia79c2380aa2368d58e5980131cf70c91576dfd49
2014-03-04 11:45:12 -08:00
James D. Forrester 73f7707f4e Update VE core submodule to master (f93e960)
New changes:
5bde356 Update OOjs UI to v0.1.0-pre (f3bc5c6c1c)

Change-Id: Ic7114ffef63c26d4d73a6c86b7e3d62330f7641f
2014-03-03 18:52:11 -08:00
James D. Forrester 5823976fff Update VE core submodule to master (674b245)
New changes:
7c5b7be Increase keyboard shortcut height hack to work in FF
c9fb99d Changeable UI language in SA demo
6a885bf Localisation updates from https://translatewiki.net.
674b245 Update scripts: Ensure clean master, latest npm dependencies, abort on grunt error

Change-Id: I0648d6ea531fbfbab5a5230911a5e98819538158
2014-03-03 18:34:48 -08:00
Roan Kattouw 810fc7df16 Update VE core submodule to master (74be717)
Also add MW configuration for ModelRegistry back, was removed in core.

New changes:
564c459 Localisation updates from https://translatewiki.net.
f30e061 Consistency in test header comments
74be717 Remove MW-specific config and genericise tests in ModelRegistry

Bug: 53148
Change-Id: I67e77bd41bbff52f88632ff9e4cf5e4c48251174
2014-03-03 11:24:56 -08:00
Ed Sanders b14326624b Consistency in DM MW test naming and comments
Move MWConverter to Converter and fix some comments.

Change-Id: I8b73d064c890e9cdae61f8118b092e5041febaa5
2014-03-03 14:34:08 +00:00
Translation updater bot f72a0a4b2c Localisation updates from https://translatewiki.net.
Change-Id: I19f5d3fd4783f4c65a787828ae3366b0e659f58b
2014-03-02 20:46:00 +00:00
jenkins-bot 0aa43650b7 Merge "Revert "Revert "Set href attribute of newly inserted image to image title""" 2014-03-01 01:38:43 +00:00
Jforrester cb9548a8e6 Revert "Revert "Set href attribute of newly inserted image to image title""
This reverts commit e9ae4a94b4.

Change-Id: Icad3c2f5d3f0ddfba4bb0033011a3e5089fb5cd1
2014-03-01 01:35:57 +00:00
jenkins-bot eb10020f27 Merge "Add tooltip to page options menu widget in the toolbar" 2014-03-01 01:35:46 +00:00
Trevor Parscal 400a522fa6 Make TransclusionContent inputs full width and autosize
Also add classes to the other pages that don't have them yet for CSS targeting.

Change-Id: I0415852f93a1c54f6370016a968fd9b67d9adc42
2014-02-28 17:27:55 -08:00
Trevor Parscal 2fb2f441e8 Prevent superfluous setPage calls by introducing a lock
Also, use new getClosestPage method in ooui to select which page should
be selected next when a page is removed.

Change-Id: I7ce4d2ca55aac72f3aaa14c98c7189a440598e08
2014-02-28 17:26:04 -08:00
Trevor Parscal 61c1f11fef Use small option for template dialog
It's much cuter this way.

Change-Id: Ibd4a3660b2ec1613ec64c75d29574b73da69a3b8
2014-03-01 01:24:29 +00:00
Trevor Parscal 3edad8d0da Fix off-by-one error in TransclusionModel when moving items
The error occurs when moving an item down (increasing index) which
removes the item, adjusts the index and then inserts the item. The index
shouldn't be adjusted when moving one down, however, because once
removed everything shifts and the +1 index set initially to move it is
still good.

Change-Id: I44bd2b3eb4bbbef58a6ac181e75969ec7c2cab6f
2014-03-01 01:24:11 +00:00
Trevor Parscal 315f10cea4 Cleanup dialog properties
No need to re-initialize properties set in parent class.

Change-Id: Ib98d9636ef169f58b4044d09972063bd5f19b3af
2014-03-01 01:24:02 +00:00
Trevor Parscal def3a5e21a Cleanup page class names and comments
Change-Id: I739b5d9b295d09b86104133a8f4eb30070d664f2
2014-03-01 01:23:17 +00:00
Trevor Parscal ec004d16be Move parameter adding to a placeholder page
Parameter placeholder pages are generated for parameter with empty
string as their name.

Change-Id: I56c3df1ada6c4f41ebf6466ca280a2333da60071
2014-02-28 17:20:24 -08:00
Trevor Parscal 85e0bf533a Use template name as dialog title whenever possible
Change-Id: I4235f6ed68e1f95c4593caa23ada734fb8493426
2014-03-01 00:57:55 +00:00
Trevor Parscal cb5a9b948c Redesign template parameter pages to be more space efficient
* Show label, input and remove control on a single line
* Right align label to conserve vertical space without sacrificing
  fill-out speed
* Show description in gray text below the input
* Show remove button only when page is active
* Make description lighter when page is innactive

Change-Id: Iaa09f3bf909ccd415de7af8f428495fef3046893
2014-03-01 00:52:06 +00:00
Trevor Parscal be27de3b89 Remove outline from TemplateDialog
Change-Id: I1df5700a241671678b22f490d5d3fc4a456a4218
2014-03-01 00:51:17 +00:00
Trevor Parscal d1b0b87257 Use label of first template as Template dialog title
Change-Id: Ib273430c94249c8dbad14abb9d1f6ad3286bdc8a
2014-03-01 00:51:01 +00:00
Trevor Parscal 21efc9994b Cleanup duplication in TransclusionDialog classes
Change-Id: I96bcd07a1548b21c8a11b9d2990400d4f48e044a
2014-03-01 00:50:37 +00:00
Trevor Parscal cbd3419dfb Update VE core submodule to master (ac4b49a)
Also update template/transclusion code for OOJS UI
OutlineControlWidget changes, and uses some of the new
functionality.

New changes:
ac4b49a Update OOjs UI to v0.1.0-pre (51f922ba17)

Change-Id: Id7a1f60cd6ce3bdaba7ccb8774563b9e81c75cad
2014-02-28 16:41:42 -08:00
Roan Kattouw be096d8c9e Update VE core submodule to master (74a059a)
New changes:
da51da3 ve.ui.MediaSizeWidget: Use lowercase types hint for primitive value
54a8606 Blur the surface when a dialog is opened
3c3234f Don't show phantoms for hidden protected items
0fb119b Fix handleEnter in nodes that don't split
74a059a Don't allow getNearestCorrectOffset to return -1

Change-Id: I7c5669eb780d4b73b056ce1ca5daed453e7398df
2014-02-28 16:23:21 -08:00
James D. Forrester 3efa7490d6 Add tooltip to page options menu widget in the toolbar
Currently "Page options" but better suggestions are welcome.

Bug: 61892
Change-Id: I5cf7a4cabaaf7a5d5d0bd1b806f8d95ea4d88033
2014-02-28 11:26:47 -08:00
Ed Sanders 09c0611484 Fix-up mwcore split: Split out MWDialogTool
Because everything was broken.

Follows-up I6374854eaa1 which split up mwcore into smaller parts but
left MWDialogTool still as one file part of mwcore. Since the various
ve.dm classes are now part of the other modules that depend on mwcore,
the MWDialogTool classes were pointing at classes that don't exist yet
(e.g. ".modelClasses = [ ve.dm.MWBlockImageNode ];").

Change-Id: Ic05b173d730a8a0f6539fdcd818aaf674d2a4019
2014-02-27 16:33:19 +00:00
jenkins-bot 43abad6193 Merge "Mark hidden categories as different in the meta-data dialog" 2014-02-27 02:12:58 +00:00
Krenair 5fc0faa7e8 Mark hidden categories as different in the meta-data dialog
This gives users a clue to understand why they won't display in the
category box at the foot of the page.

Bug: 50763
Change-Id: I1cf3a76bbf6370e7f67ec16f0a931f6ea4ba9d28
2014-02-27 02:08:48 +00:00
Roan Kattouw efe925067c Followup 0f45399: move some forgotten files out of mwcore
Transclusion/TemplateModel classes to mwtransclusion, CE
LinkAnnotations to mwlink.

Change-Id: I4fdef01ce50a78e109a6297d287da49ca8e41d08
2014-02-26 17:42:00 -08:00
jenkins-bot 66df1ec1b5 Merge "Track edits where user switched into wikitext editor from VE" 2014-02-27 01:35:56 +00:00