Merge branch 'hotfix-0.36.4'

Hotfix 0.36.4: Target landing page at open initiatives

**Fixes:**
- Replace landing page with new page targeted at open initiatives
- Move previous landing page to '/platform'

Author: FinnWoelm

CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## v0.36.4 (Mar 5, 2019)
+
+**Fixes:**
+- Replace landing page with new page targeted at open initiatives
+- Move previous landing page to '/platform'
+
 ## v0.36.3 (Mar 4, 2019)
 
 **Fixes:**

app/assets/images/static/clouds.png renamed to app/assets/images/static/github_for_documents/clouds.png

@@ -1,6 +1,6 @@
 // Styling for StaticController
 
-.c-static.a-index {
+.c-static.landing-page {
   $header-color: #1b2733;
   $header-color-light: #0009;
   $box-shadow-color: rgba(99, 114, 130, .1);
@@ -45,6 +45,10 @@
     font-weight: normal;
   }
 
+  .light {
+    font-weight: 400;
+  }
+
   nav {
     // scss-lint:disable ImportantRule
     background: none !important;

app/assets/images/static/dave.jpg renamed to app/assets/images/static/github_for_documents/dave.jpg

@@ -4,7 +4,13 @@
 class StaticController < ApplicationController
   layout 'landing'
 
-  def index
-    @color_scheme = 'blue darken-3'
+  def github_for_documents
+    @title = 'Manage Documents Just Like Code'
+    render 'static/github_for_documents/index'
+  end
+
+  def open_collaboration
+    @title = 'Network of Open Initiatives'
+    render 'static/open_collaboration/index'
   end
 end

app/assets/images/static/documents.png renamed to app/assets/images/static/github_for_documents/documents.png

@@ -11,7 +11,8 @@ html
       gtag('config', 'UA-133689601-1');
 
     title
-      ' Manage Documents just like Code -
+      => @title || 'Home'
+      ' -
       = Settings.app_name
     = csrf_meta_tags
 
@@ -34,7 +35,7 @@ html
 
   / body class=[controller_action_identifier, color_scheme(@color_scheme)]
   / TODO: Set correct color once identified by design team
-  body class=[controller_action_identifier, color_scheme('blue darken-2')]
+  body.landing-page class=[controller_action_identifier, color_scheme('blue darken-2')]
     main
       = render 'landing_navbar'
       = yield

app/assets/images/static/filing_system.svg renamed to app/assets/images/static/github_for_documents/filing_system.svg

@@ -6,10 +6,10 @@
         p.flow-text.gray-text.text-darken-2
           ' What if you could manage documents with the efficiency you know and
           | love from software development?
-        = render 'call_to_action'
+        = render '/static/github_for_documents/call_to_action'
 
       .col.s12.m6.l6
-        = image_tag 'static/versioning.svg', class: 'responsive-img'
+        = image_tag 'static/github_for_documents/versioning.svg', class: 'responsive-img'
 
 
     .spacing.v48px
@@ -23,21 +23,21 @@
         h3 The Best of Git & GitHub
         p.flow-text Repos, commits, diffs, pulls, and issue tracking — we’ve replicated the best of GitHub.
         .left-align
-          = image_tag 'static/github.png', class: 'responsive-img'
+          = image_tag 'static/github_for_documents/github.png', class: 'responsive-img'
 
     .col.s12.m4.l4
       .card
         h3 Adapted for Documents
         p.flow-text Diffing and merging optimized for binary file formats — from documents to spreadsheets.
         .left-align
-          = image_tag 'static/documents.png', class: 'responsive-img'
+          = image_tag 'static/github_for_documents/documents.png', class: 'responsive-img'
 
     .col.s12.m4.l4
       .card
         h3 Integrated with Cloud
         p.flow-text Your repositories are imported from the cloud service you trust — and always stay in sync.
         .left-align
-          = image_tag 'static/clouds.png', class: 'responsive-img'
+          = image_tag 'static/github_for_documents/clouds.png', class: 'responsive-img'
 
 .gray.lighten-3
 
@@ -46,7 +46,7 @@
   .container.features
     .row
       .col.s12.m6.l4
-        = image_tag 'static/icons8/icons8-repository-100.png', class: 'responsive-img'
+        = image_tag 'static/github_for_documents/icons8/icons8-repository-100.png', class: 'responsive-img'
         h3 Organize Your Work
         h4 Repositories
         ul
@@ -56,7 +56,7 @@
           li Keep files in your cloud updated with 2-way sync
 
       .col.s12.m6.l4
-        = image_tag 'static/icons8/icons8-transfer-100.png', class: 'responsive-img'
+        = image_tag 'static/github_for_documents/icons8/icons8-transfer-100.png', class: 'responsive-img'
         h3 Track Changes
         h4 Version Control
         ul
@@ -69,7 +69,7 @@
         .clearfix
 
       .col.s12.m6.l4
-        = image_tag 'static/icons8/icons8-edit-property-100.png', class: 'responsive-img'
+        = image_tag 'static/github_for_documents/icons8/icons8-edit-property-100.png', class: 'responsive-img'
         h3 Capture Insights
         h4 Commits
         ul
@@ -82,7 +82,7 @@
         .clearfix
 
       .col.s12.m6.l4
-        = image_tag 'static/icons8/icons8-workflow-100.png', class: 'responsive-img'
+        = image_tag 'static/github_for_documents/icons8/icons8-workflow-100.png', class: 'responsive-img'
         h3 Streamline Workflows
         h4 Pull Requests
         ul
@@ -95,7 +95,7 @@
         .clearfix
 
       .col.s12.m6.l4
-        = image_tag 'static/icons8/icons8-solve-100.png', class: 'responsive-img'
+        = image_tag 'static/github_for_documents/icons8/icons8-solve-100.png', class: 'responsive-img'
         h3 Tackle Problems
         h4 Issue Tracking
         ul
@@ -105,7 +105,7 @@
           li Integrate with Trello
 
       .col.s12.m6.l4
-        = image_tag 'static/icons8/icons8-secure-100.png', class: 'responsive-img'
+        = image_tag 'static/github_for_documents/icons8/icons8-secure-100.png', class: 'responsive-img'
         h3 Safe & Secure
         h4 Security
         ul
@@ -127,7 +127,7 @@
   .row
     .col.s3.m2.l1
       div.img
-        = image_tag 'static/stephanie.jpg', class: 'responsive-img'
+        = image_tag 'static/github_for_documents/stephanie.jpg', class: 'responsive-img'
     .col.s9.m10.l11
       p.flow-text I’ve wanted Git for Google Docs for ages.
       p.gray-text.text-darken-2 — Stephanie, PM, Microsoft
@@ -137,7 +137,7 @@
   .row
     .col.s3.m2.l1
       div.img
-        = image_tag 'static/dave.jpg', class: 'responsive-img'
+        = image_tag 'static/github_for_documents/dave.jpg', class: 'responsive-img'
     .col.s9.m10.l11
       p.flow-text We are working with dozens of people on our cloud and it was an absolute mess. Everyone just dumped files wherever they wanted, no one could find what they were looking for. We need Openly.
       p.gray-text.text-darken-2 — Dave, Founder and CEO, software development & consulting
@@ -147,7 +147,7 @@
   .row
     .col.s3.m2.l1
       div.img.left
-        = image_tag 'static/mike.jpg', class: 'responsive-img'
+        = image_tag 'static/github_for_documents/mike.jpg', class: 'responsive-img'
     .col.s9.m10.l11
       p.flow-text Openly supports docs just like code and you don't even need to use the command line.
       p.gray-text.text-darken-2 — Mike, Senior Technical Writer
@@ -248,7 +248,7 @@
       h2 Curious? Experience it yourself.
 
       .section
-        = render 'call_to_action'
+        = render '/static/github_for_documents/call_to_action'
 
   .spacing.v64px
 

app/assets/images/static/github.png renamed to app/assets/images/static/github_for_documents/github.png

@@ -0,0 +1,6 @@
+.spacing.v16px
+
+a.btn-large.primary-color.primary-color-text[
+  target='_blank'
+  href='https://openlyone.typeform.com/to/qP2fCY']
+  | Join Us

app/assets/images/static/icons8/icons8-edit-property-100.png renamed to app/assets/images/static/github_for_documents/icons8/icons8-edit-property-100.png

@@ -0,0 +1,88 @@
+.hero.full-height.valign-wrapper
+  .container.left-align.hero-content
+    .row
+      .col.s12.m6.l6
+        h1 It's time to tackle the world's biggest challenges.
+        h3.light
+          ' Join a network of the world's leading
+          b
+            ' open initiatives
+          | collaborating for systemic change.
+        = render 'static/open_collaboration/call_to_action'
+
+      .col.s12.m6.l6
+        = image_tag 'static/open_collaboration/celebrate.svg', class: 'responsive-img'
+
+
+    .spacing.v48px
+
+.container.highlights
+  .row.no-margin-top.no-margin-bottom
+    .col.s12
+      h3 What is an open initiative?
+      h3.light
+        ' Any organization, initiative, or startup that follows these core
+        | principles:
+  .row.no-margin-top
+    .col.s12.m4.l4
+      .card
+        h3 Open
+        p.flow-text
+          ' We do our work in the open. Learning, reusing, and building upon our
+          | work is encouraged.
+
+    .col.s12.m4.l4
+      .card
+        h3 Collaborative
+        p.flow-text
+          ' We work together with the communities we serve. Everyone is invited
+          | to get involved.
+
+    .col.s12.m4.l4
+      .card
+        h3 Impact-Driven
+        p.flow-text
+          ' We focus on creating lasting positive impact for people and planet.
+
+
+.spacing.v48px
+
+
+.black.white-text
+
+  .container
+
+    .spacing.v8px
+
+    .row
+      .col.s12.l4
+        .hide-on-med-and-down
+          = image_tag 'logo-text.svg', class: 'responsive-img'
+        .hide-on-large-only.center-align
+          = image_tag 'logo.png', class: 'responsive-img', width: 100
+
+      .col.s6.l4
+        p
+          b Openly One Inc.
+          br
+          | Suite 631
+          br
+          | 1312 17th Street
+          br
+          | Denver, CO 80202
+          br
+          | USA
+
+      .col.s6.l4
+        p
+          = mail_to '[email protected]', nil, class: 'white-text'
+          br
+          br
+          | We are a public benefit corporation ♥
+
+    .spacing.v8px
+
+
+/ add non-sticky footer here manually as a replacement for overriding the
+/ default footer
+= render 'footer'

app/assets/images/static/icons8/icons8-repository-100.png renamed to app/assets/images/static/github_for_documents/icons8/icons8-repository-100.png

@@ -21,6 +21,9 @@
   match '/422', to: 'errors#unacceptable', via: :all
   match '/500', to: 'errors#internal_server_error', via: :all
 
+  # Static pages
+  get '/platform', to: 'static#github_for_documents'
+
   devise_for :accounts, skip: %i[registrations sessions]
 
   # Routes for signups
@@ -131,5 +134,5 @@
     end
   end
 
-  root 'static#index'
+  root 'static#open_collaboration'
 end

app/assets/images/static/icons8/icons8-secure-100.png renamed to app/assets/images/static/github_for_documents/icons8/icons8-secure-100.png

@@ -3,7 +3,15 @@
 feature 'Static Pages' do
   scenario 'Visiting the home page' do
     visit '/'
-    expect(page).to have_content 'Work on documents just like you do on code.'
+    expect(page).to have_content(
+      "It's time to tackle the world's biggest challenges."
+    )
+    expect(page).to have_link 'Join Us'
+  end
+
+  scenario 'User can visit the platform landing page' do
+    visit '/platform'
+    expect(page).to have_content 'Work on documents just like you do on code'
     expect(page).to have_link 'Get Started'
   end
 end