Jkmarx/pass refinery intro config #3132
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jkmarx
commented
Dec 6, 2018
refinery/config/config.json.erb
Outdated
| @@ -109,6 +109,7 @@ | |||
| "REFINERY_GOOGLE_RECAPTCHA_SITE_KEY": "<%= @refinery_google_recaptcha_site_key || "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI" %>", | |||
| "REFINERY_GOOGLE_RECAPTCHA_SECRET_KEY": "<%= @refinery_google_recaptcha_secret_key || "6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe" %>", | |||
| "REFINERY_INNER_NAVBAR_HEIGHT": 20, | |||
| "REFINERY_INTRO": "<%= @refinery_intro || "The Stem Cell Commons is a platform for managing, analyzing, and visualizing data belonging to members of the [Harvard Stem Cell Institute (HSCI)](https://hsci.harvard.edu/).\s\s Users can upload various types of files, annotated with pertinent metadata, and can choose to share those files within their own lab, with collaborators, and/or amongst the entire HSCI community. Users can also run common analyses via customizable [Galaxy](https://galaxyproject.org/) workflows and explore subsequent results with interactive visualization tools.\s\s Watch feature-specific tutorial videos below to get started. Once you have registered an account, log in, and click [My Dashboard](https://hsci.stemcellcommons.org/dashboard/) to start managing your own workspace.\s\s If you have any questions, please contact our user liaison, [Geoff Nelson](mailto:geoffrey_nelson@hms.harvard.edu)." %>", | |||
There was a problem hiding this comment.
unsure if I should the hsci paragraph for an empty string
Codecov Report
@@ Coverage Diff @@
## develop #3132 +/- ##
===========================================
- Coverage 61.34% 61.29% -0.05%
===========================================
Files 436 435 -1
Lines 27619 27605 -14
Branches 1277 1275 -2
===========================================
- Hits 16942 16921 -21
- Misses 10677 10684 +7
Continue to review full report at Codecov.
|
scottx611x
reviewed
Dec 6, 2018
| @@ -191,6 +191,7 @@ export FACTER_REFINERY_CUSTOM_NAVBAR_ITEM="${var.refinery_custom_navbar_item}" | |||
| export FACTER_REFINERY_GOOGLE_ANALYTICS_ID="${var.refinery_google_analytics_id}" | |||
| export FACTER_REFINERY_GOOGLE_RECAPTCHA_SITE_KEY="${var.refinery_google_recaptcha_site_key}" | |||
| export FACTER_REFINERY_GOOGLE_RECAPTCHA_SECRET_KEY="${var.refinery_google_recaptcha_secret_key}" | |||
| export FACTER_REFINER_INTRO="${var.refinery_intro}" | |||
There was a problem hiding this comment.
Suggested change
| export FACTER_REFINER_INTRO="${var.refinery_intro}" | |
| export FACTER_REFINERY_INTRO="${var.refinery_intro}" |
deployment/terraform/live/vars.tf
Outdated
| @@ -162,6 +162,11 @@ variable "refinery_google_recaptcha_secret_key" { | |||
| default = "" | |||
| } | |||
|
|
|||
| variable "refinery_intro" { | |||
| description = "Mark-down to be displayed in the intro paragraph on the landing page." | |||
| default = "The refinery platform is for managing, analyzing, and visualizing data belonging to members of the [Harvard Stem Cell Institute (HSCI)](https://hsci.harvard.edu/).\s\s Users can upload various types of files, annotated with pertinent metadata, and can choose to share those files within their own lab, with collaborators. Users can also run common analyses via customizable [Galaxy](https://galaxyproject.org/) workflows and explore subsequent results with interactive visualization tools.\s\s Watch feature-specific tutorial videos below to get started. Once you have registered an account, log in, and click [My Dashboard](/dashboard) to start managing your own workspace." | |||
There was a problem hiding this comment.
I think that the default here should be flip-flopped with the default being used in config.json.erb since cloud deployments are more often a Stem Cell Commons thing. Local installs would get the paragraph about: "The refinery platform" then.
There was a problem hiding this comment.
There is no need to provide Stem Cell Commons-specific values as defaults for Refinery. All SCC customizations are available in the stemcellcommons S3 bucket (config.yaml to be replaced by terraform.tfvars after v1.6.8 is released).
jkmarx
commented
Dec 6, 2018
deployment/terraform/live/vars.tf
Outdated
| @@ -162,6 +162,11 @@ variable "refinery_google_recaptcha_secret_key" { | |||
| default = "" | |||
| } | |||
|
|
|||
| variable "refinery_intro" { | |||
| description = "Mark-down to be displayed in the intro paragraph on the landing page." | |||
| default = "The refinery platform is for managing, analyzing, and visualizing data belonging to members of the [Harvard Stem Cell Institute (HSCI)](https://hsci.harvard.edu/).\s\s Users can upload various types of files, annotated with pertinent metadata, and can choose to share those files within their own lab, with collaborators. Users can also run common analyses via customizable [Galaxy](https://galaxyproject.org/) workflows and explore subsequent results with interactive visualization tools.\s\s Watch feature-specific tutorial videos below to get started. Once you have registered an account, log in, and click [My Dashboard](/dashboard) to start managing your own workspace." | |||
There was a problem hiding this comment.
this hsci reference was a typo, this is the generic paragraph.
There was a problem hiding this comment.
It still says belonging to members of the [Harvard Stem Cell Institute (HSCI)](https://hsci.harvard.edu/)?
There was a problem hiding this comment.
@hackdna Yes, that was my point. But regardless this is a placeholder paragraph until Nils and Shannan have time to write something up.
scottx611x
approved these changes
Dec 6, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ref #2680
Note: 1) I plan on handling the css after the components are all placed. 2) The paragraphs haven't been finalized.