Commit graph

88 commits

Author SHA1 Message Date
Bogna Knychała 4cc019aecb Merge pull request #9597 from Wikia/XW-41
XW-41 | Use new format of Ember component placeholder for single images
2016-02-15 19:06:44 +01:00
idradm d4953f7680 Merge branch 'dev' into infobox-builder-feature-branch
# Conflicts:
#	extensions/wikia/AdminDashboard/AdminDashboardLogic.class.php
#	extensions/wikia/AssetsManager/config.php
#	extensions/wikia/EditPageLayout/templates/EditPageLayout_EditPage.php
2016-02-09 11:46:56 +01:00
Tomasz Napieralski 2e5f90f543 hide changes after flag 2016-02-08 15:57:57 +01:00
Tomasz Napieralski 1b2a5bb417 use SEO friendly images for mobile in infoboxes 2016-02-05 18:02:02 +01:00
dianafa a6aeaec4ac Merge branch 'dev' into DAT-3372 2015-12-22 13:08:51 +01:00
dianafa 1b1de67f22 fix data-image-key param 2015-12-22 13:06:50 +01:00
Inez Korczynski 3647cb2f37 VE-1965: Caption comes from Parser as a safe HTML so there is no need and it shouldn't be escaped 2015-12-09 00:47:05 +00:00
Diana 49feb54689 change method name to sanitizeInfoboxFields and refactor 2015-11-05 13:21:20 +00:00
Diana 7e9836085a adjust hero image template 2015-11-03 16:31:31 +00:00
Inez Korczynski 3d05ec1758 VE-1994: Add appropriately pi-collapse and pi-collapse-[open|closed] CSS classes to PI groups wrappers 2015-10-26 21:59:34 +00:00
Paul Oslund 99dd3f4e4c VE-1993: Render videos in media collection tabs 2015-10-22 21:21:19 +00:00
Inez Korczyński 9733548c0d Merge pull request #8840 from Wikia/VE-1961
VE 1961: Render image collection tabs in infobox
2015-10-22 11:23:43 -07:00
Paul Oslund f84b29a461 VE-1961: Display caption as tab title if available 2015-10-21 20:29:39 +00:00
Paul Oslund f9055fe97c VE-1961: Handle multiple image collections in infobox 2015-10-21 02:55:23 +00:00
Paul Oslund 6eba90ee7e VE-1961: Launch gallery when clicking image in collection 2015-10-21 02:26:34 +00:00
Paul Oslund d097426242 VE-1960: Template for mobile image collections 2015-10-20 23:09:23 +00:00
Paul Oslund e6c81a3ea2 VE-1961: Render image collection tabs in infobox 2015-10-20 16:40:56 +00:00
Inez Korczynski a692e008b3 VE-1975: Modified NodeImage to return array of images instead of one image
Added support for <tabber>
Hero image still works correct
2015-10-16 01:15:52 +00:00
Rafal Leszczynski 35fd8d87a4 Merge branch 'DAT-3153' into infobox-builder-feature-branch 2015-09-11 12:48:37 +02:00
Rafal Leszczynski 280a9aa50b skip rendering labels if all labels in horizontal group are empty strings 2015-09-07 13:17:03 +02:00
Rafal Leszczynski 12bed81340 add comments to templates - linked with templates in mercury repo 2015-09-01 13:05:13 +02:00
Rafal Leszczynski 335085c92a fix escaped html in horizontal group headers 2015-08-07 16:43:50 +02:00
Rafal Leszczynski dd9bbe6b50 do not render caption in horisontal group if header is not set 2015-08-06 16:15:06 +02:00
Rafal Leszczynski 91b490c05a unify portable infobox item side spacing 2015-08-04 12:06:14 +02:00
Sebastian Marzjan 874daa8b30 Merge pull request #7975 from Wikia/3003-border-color-class
add additional class name for easy access to overwrite border color i…
2015-07-31 14:57:12 +02:00
Rafal Leszczynski 61ffd930f1 add additional class name for easy access to overwrite border color in custom theming 2015-07-31 14:54:10 +02:00
Kamil Koterba 9d1de3fc97 DAT-3074 Fixing typo in css selector 2015-07-31 13:04:59 +02:00
Rafal Leszczynski 63078cc1d8 add missing new lines and fix indentation in templates + apply pi acronym to custom theme clasclass name 2015-07-30 11:23:50 +02:00
Rafal Leszczynski 5618734513 fix tests after refactoring 2015-07-29 17:40:21 +02:00
Rafal Leszczynski f59fd6b69f refactor and simplify portable infobox templates and desctip styling 2015-07-29 17:17:20 +02:00
Rafal Leszczynski 07aca42051 Merge branch 'DAT-3003-cleanup-feature-branch' into DAT-3004-simplify-infobox-classes 2015-07-29 15:32:52 +02:00
Rafal Leszczynski 9ecc835603 Merge branch 'dev' into DAT-3003-cleanup-feature-branch 2015-07-29 15:04:51 +02:00
Rafal Leszczynski 45f5afb212 simplify class names for portable infobox elements 2015-07-29 13:07:58 +02:00
Rafal Leszczynski c92bce20cd finish test refactoring 2015-07-29 10:58:39 +02:00
Rafal Leszczynski a32bb6831c change the template and styling for horizontal groups 2015-07-28 11:46:41 +02:00
Rafal Leszczynski bc22980d2a Merge branch 'dev' into DAT-3025 2015-07-27 11:39:40 +02:00
Rafal Leszczynski c3d81dd456 add tests for rendering video thumbnail 2015-07-22 12:11:19 +02:00
Rafal Leszczynski f57ab7c737 modify image template for video support 2015-07-21 16:30:05 +02:00
dianafa 2e0e607b73 merge with dev 2015-07-16 13:06:17 +02:00
Diana 238a28a071 mock methods 2015-07-09 13:50:12 +00:00
dianafa af231a3226 refactor 2015-07-08 18:31:56 +02:00
dianafa e2aeb56cff add width and height attrs 2015-07-07 16:28:53 +02:00
dianafa bf790b3322 Merge branch 'dev' into DAT-2909 2015-07-06 18:46:02 +02:00
Sebastian Marzjan 86bfcc7592 Cherry-picking 9eb06cc 2015-07-03 12:16:18 +02:00
idradm e065533850 Merge remote-tracking branch 'origin/dev' into DAT-2909
# Conflicts:
#	extensions/wikia/GameGuides/assets/GameGuidesAssets.json
#	extensions/wikia/PortableInfobox/services/PortableInfoboxRenderService.class.php
2015-07-03 10:51:32 +02:00
idradm edda7bebbd DAT-2940 rename css selectors 2015-07-02 10:22:37 +02:00
idradm 26269c9150 DAT-2940 rename footer tag to navigation 2015-07-01 16:19:31 +02:00
Rafal Leszczynski 08bf993708 add infobox hero mobile template 2015-07-01 15:17:43 +02:00
idradm 3e8a665242 Merge remote-tracking branch 'origin/dev' into DAT-2839
# Conflicts:
#	extensions/wikia/PortableInfobox/PortableInfobox.setup.php
#	extensions/wikia/PortableInfobox/controllers/PortableInfoboxParserTagController.class.php
#	extensions/wikia/PortableInfobox/services/Parser/XmlParser.php
#	extensions/wikia/PortableInfobox/styles/PortableInfobox.scss
2015-06-19 14:43:40 +02:00
Rafal Leszczynski f569991469 Merge pull request #7488 from Wikia/DAT-2857
DAT-2857 Horizontal group
2015-06-12 15:23:44 +02:00