Skip to content
This repository has been archived by the owner on Dec 10, 2021. It is now read-only.

PLAT-16 Content wall #25

Merged
merged 72 commits into from
Feb 26, 2016
Merged

PLAT-16 Content wall #25

merged 72 commits into from
Feb 26, 2016

Conversation

pvhee
Copy link
Contributor

@pvhee pvhee commented Feb 17, 2016

http://jira.comicrelief.com/browse/PLAT-13 Add a teaser block, which will be our basic tile for content wall

Changes proposed in this PR

  • Block types teaser and row (holding teasers)
  • Mashed up into the "content wall" completely with styling and responsive images
  • Panelized landing page and sample content at /fundraise

Todo

  • Add the basic block type
  • How to define a "row"?
  • Panelize content type "Landing page" for adding block rows to page, via PLAT-39 Enabling panelizer with custom panelizer on a per-node basis #58
  • Adding template suggestion/class to block (view mode machine name) via select
  • Need to decide whether the reference field one field with multiple values or 1-3 separate fields. -> should keep one entity ref. field IMO and then have a custom DS field render the 1-3 delta fields based on the row type chosen.

Nice to haves

  • Adding nodes/ wrapping block
  • Form view mode switch (to hide fields) ajax based on select
  • To be discussed more

pvhee and others added 15 commits February 17, 2016 11:25
@pvhee
Merge branch 'develop' of github.com:comicrelief/campaign into featur…
285c285 
…e/PLAT-16_content_wall
@pvhee
PLAT-16 Adding cr_teaser to config:export
d640cba
@pvhee
Merge branch 'develop' into feature/PLAT-16_content_wall
086568e
@bimsonz
Merge branch 'develop' of github.com:comicrelief/campaign into featur…
d955ba5 
…e/PLAT-16_content_wall
@bimsonz
Merge branch 'develop' of github.com:comicrelief/campaign into featur…
de072a2 
…e/PLAT-16_content_wall
@bimsonz
Merge branch 'develop' of github.com:comicrelief/campaign into featur…
08b351f 
…e/PLAT-16_content_wall
@bimsonz
PLAT-16 Profile updates
cbe2450 
Updated profile info file to include content wall modules as dep
Added DS to drupal contrib make file
@bimsonz
PLAT-16 Base content wall module
87d4b4c
@bimsonz
PLAT-16 Adding DS files
7ecf7f1
@bimsonz
Merge branch 'develop' of github.com:comicrelief/campaign into featur…
0f03670 
…e/PLAT-16_content_wall
@bimsonz
PLAT-16 Updated Content Wall export config
6a255bd 
Reorganized yml files into a more logical order
@bimsonz
PLAT-16 Updated content wall export files
bdabe15
@bimsonz
PLAT-16 Fixed build dep issue
0122bfe 
Appeared to be leaning on basic pages within the node reference field
Still facing some issue with field exports to be fixed in next commit.
@bimsonz
PLAT-16 Updated Content Wall config exports
d12b8ca 
Added default form display for both node and row blocks
@bimsonz
PLAT-16 Remove basic page dep from cw node block
9db1ca3 
This dep seems to cause a build issue and is flagged as missing
excluding for now as it builds fine without.
@bimsonz bimsonz self-assigned this Feb 23, 2016
@bimsonz
PLAT-16 Updated panel variant and added default block view modes
265c3bb 
Changed the development testpage from a block page to a panel page
as this allows for view mode selection when adding a block.
@bimsonz
PLAT-16 Removed basic page dep
c9a3fe8
@bimsonz
PLAT-16 Adding cr_content_wall to build.xml
9785559
@bimsonz
PLAT-16 Updated export config
f1826a5 
Restructured export to include new view modes, sample blocks to come
@bimsonz
PLAT-16 Image style config export
b652666
@bimsonz
PLAT-16 Export config updates
89b8f53 
Changes to view modes
@pvhee
Copy link
Contributor Author

pvhee commented Feb 24, 2016

@bimsonz could you take off the ds module from this branch here, so the diff becomes cleaner and I can help reviewing?

@bimsonz
PLAT-16 Remove DS module
aba1773
@bimsonz
PLAT-16 Default content wall block content
8370bc8 
3 Row blocks
6 Teaser blocks
@bimsonz
PLAT-16 Remove ds dep that persists / updates to default_content
12a8349 
Legacy DS dep persisting within core.entity_view_display.block_content.cw_row_block.default
Adding cr_content_wall and cr_teaser deps to cr_default_content
gusliedke and others added 22 commits February 26, 2016 16:24
@gusliedke
PLAT-16_content_wall quick fix views filter layout
387f2ef
@gusliedke
PLAT-16_content_wall update block content
1467fe7
@pvhee
PLAT-16 Exporting our first landing page with the content wall
631aab5
@gusliedke
PLAT-16_content_wall export image styles
a381dda
@pvhee
PLAT-16 Fix file ref
a616e03
@gusliedke
PLAT-16 update info file
0268fb4
@gusliedke
Merge branch 'feature/PLAT-16_content_wall' of https://github.com/com…
cc164b1 
…icrelief/campaign into feature/PLAT-16_content_wall
@gusliedke
PLAT-16 add field template
817e5b5
@gusliedke
PLAT-16 update info file image style
22edb03
@gusliedke
PLAT-16 update info file
45f323a
@gusliedke
PLAT-16 export image style
836ce84
@gusliedke
PLAT-16 update info file
2d0509a
@pvhee
PLAT-16 Fix phing install by taking off cr_default_content from the p…
05d5601 
…rofile
@pvhee
Merge branch 'feature/PLAT-16_content_wall' of github.com:comicrelief…
8925491 
…/campaign into feature/PLAT-16_content_wall
@pvhee
PLAT-16 Comments
38135aa
@pvhee
PLAT-16 Exporting the damn panelizer field, needed to hold custom ove…
dd24b64 
…rrides for panelized nodes
@pvhee
PLAT-16 Exporting panelized node settigns again, now properly
b9abbb9
@pvhee
PLAT-16 Sorting out madness with panelizer fields
6ca7d4e
@pvhee
PLAT-16 Re-enable cr_default_content as part of the profile
6a4122d
@pvhee
PLAT-16 Cleanup build.xml again
fe69505
@pvhee
PLAT-16 Exporting pathauto for landing_page
90b6f94
@pvhee
Merge branch 'develop' of github.com:comicrelief/campaign into featur…
c239ea2 
…e/PLAT-16_content_wall

Conflicts:
	build.xml
	profiles/cr/modules/custom/cr_landing_page/config/install/core.entity_view_display.node.landing.default.yml
@pvhee
Copy link
Contributor Author

pvhee commented Feb 26, 2016

screencapture-campaign-lab-fundraise-1456514982941

Seems we're there! :) @bimsonz @gusliedke @Saphyel

@pvhee
Copy link
Contributor Author

pvhee commented Feb 26, 2016

And since Travis is giving the green light, I'm gonna go ahead and merge this in to close the week.

pvhee added a commit that referenced this pull request Feb 26, 2016
@pvhee
Merge pull request #25 from comicrelief/feature/PLAT-16_content_wall
3c611b3 
PLAT-16 Content wall
@pvhee pvhee merged commit 3c611b3 into develop Feb 26, 2016
@pvhee pvhee deleted the feature/PLAT-16_content_wall branch February 26, 2016 19:36
@pvhee pvhee mentioned this pull request Jan 5, 2017
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@bimsonz bimsonz

Labels
Status: Reviewed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@pvhee @bimsonz @Saphyel @gusliedke