fae-rails 1.7.1 → 2.2.0

data/app/assets/stylesheets/fae/globals/layout/_base.scss

@@ -33,8 +33,7 @@
     text-transform: uppercase;
     font-size: 14px;
     letter-spacing: .2em;
-    // counters the padding from .content
-    margin: 0 negate($content-buffer) 30px;
+    margin: 0 0 30px;
   }
 
   h3 {
@@ -46,3 +45,9 @@
     margin-bottom: 20px;
   }
 }
+
+p {
+  margin-bottom: 1.3em;
+  max-width: 80%;
+  line-height: 1.2em;
+}

data/app/assets/stylesheets/fae/globals/layout/_content-header.scss

@@ -1,22 +1,20 @@
+$content-header-padding: 16px;
+
 // content header
 .content-header {
-  @include clearfix;
   @include stack($fae-nav-stack);
   width: 100%;
-  padding: 16px $content-buffer;
+  padding: $content-header-padding $content-buffer;
   background: $c-content-header-bg;
   border-bottom: 1px solid $c-grey;
   position: absolute;
   left: 0;
   top: 0;
-  box-shadow: 0 0 10px $c-grey;
-
-  &:after {
-    content: '';
-    display: block;
-    height: 100%;
-    position: static;
-  }
+  box-shadow: 0 0 5px rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  flex-wrap: wrap;
 
   &.-dashboard {
     padding-top: 26px;
@@ -28,13 +26,6 @@
     }
   }
 
-  h1,
-  .breadcrumbs {
-    @include bp(large) {
-      float: left;
-    }
-  }
-
   h1 {
     padding: 5px 0;
     font-weight: bold;
@@ -42,17 +33,17 @@
 }
 
 .content-header-subnav {
-  position: absolute;
-  left: $content-buffer;
   bottom: 0;
   width: 100%;
+  margin-bottom: negate($content-header-padding);
+  flex-basis: 100%;
 
   a {
     @include transition(all .2s);
     display: inline-block;
     vertical-align: top;
     padding: 6px 0;
-    border-bottom: 4px solid transparent;
+    border-bottom: 2px solid transparent;
     margin: 0 12px;
     font-size: 13px;
     color: $c-darkest-grey;
@@ -83,20 +74,15 @@
 }
 
 .content-header-buttons {
-  margin: 10px 0;
-
-  @include bp(large) {
-    float: right;
-    margin: 0;
-  }
-
+  position: absolute;
+  height: 100%;
+  top: 0;
+  display: flex;
+  align-items: center;
+  right: 30px;
   a {
     margin-right: 5px;
 
-    @include bp(medium) {
-      height: 37px; // Fix height so descenders don't mess up the visual balance
-    }
-
     &:last-child {
       margin-right: 0;
     }

data/app/assets/stylesheets/fae/globals/navigation/_header.scss

@@ -6,7 +6,7 @@
   left: 0;
   width: 100%;
   background: $c-header-bg;
-  border-bottom: $header-border-width solid $c-custom-highlight;
+  border-top: $header-border-width solid $c-custom-highlight;
 
   @include bp(large) {
     padding: 0 $content-buffer;
@@ -87,7 +87,7 @@
   }
 }
 
-.main-header-nav {
+.main-header-nav, .utility-nav {
   @include transition(opacity .2s ease-in-out);
 
   a {

data/app/assets/stylesheets/fae/globals/navigation/_multi-col-subnav.scss

@@ -0,0 +1,50 @@
+$col_width: 176px;
+$col_width_padding: 36px;
+
+header.main-header ul ul.multicol-nav {
+  min-height: auto;
+  max-height: 1024px!important;
+  left: -($col_width * .5);
+}
+.main-header-nav li:nth-of-type(n+5) ul.multicol-nav.three,
+.main-header-nav li ul.multicol-nav.four,
+.main-header-nav li:nth-of-type(n+7) ul.multicol-nav {
+  left: -($col_width * 0.75);
+}
+.main-header-nav li:nth-of-type(n+6) ul.multicol-nav.three,
+.main-header-nav li:nth-of-type(n+2) ul.multicol-nav.four,
+.main-header-nav li:nth-of-type(n+8) ul.multicol-nav {
+  left: -($col_width * 1);
+}
+
+.main-header-nav li:nth-of-type(n+7) ul.multicol-nav.three,
+.main-header-nav li:nth-of-type(n+3) ul.multicol-nav.four {
+  left: -($col_width * 1.25);
+}
+
+.main-header-nav li:nth-of-type(n+8) ul.multicol-nav.three,
+.main-header-nav li:nth-of-type(n+4) ul.multicol-nav.four {
+  left: -($col_width * 1.75);
+}
+
+.main-header-nav li:nth-of-type(n+5) ul.multicol-nav.four {
+  left: -($col_width * 2.25);
+}
+.main-header-nav li:nth-of-type(n+6) ul.multicol-nav.four {
+  left: -($col_width * 2.5);
+}
+.main-header-nav li:nth-of-type(n+7) ul.multicol-nav.four {
+  left: -($col_width * 3);
+}
+
+
+.multicol-nav {
+  display: grid;
+  grid-template-columns: $col_width $col_width;
+  &.three {
+    grid-template-columns: $col_width $col_width $col_width;
+  }
+  &.four {
+    grid-template-columns: $col_width $col_width $col_width $col_width;
+  }
+}

data/app/assets/stylesheets/fae/modules/_buttons.scss

@@ -13,6 +13,10 @@ button[type=button],
   line-height: 1;
 }
 
+.deploy .button {
+  margin-right: 10px;
+}
+
 // Dark buttons
 
 input[type=submit],
@@ -47,6 +51,13 @@ button[type=button],
   &:hover {
     background: $c-light-button-gradient-end;
   }
+
+  &:disabled {
+    background: $c-light-button-gradient-end;
+    color: $c-mid-grey;
+    border-color: $c-grey;
+    cursor: wait;
+  }
 }
 
 .button {

data/app/assets/stylesheets/fae/modules/_deploy.scss

@@ -0,0 +1,25 @@
+.deploying-heading.running:after {
+  overflow: hidden;
+  display: inline-block;
+  vertical-align: bottom;
+  -webkit-animation: ellipsis steps(4,end) 900ms infinite;
+  animation: ellipsis steps(4,end) 900ms infinite;
+  content: "\2026"; /* ascii code for the ellipsis character */
+  width: 0px;
+}
+
+@keyframes ellipsis {
+  to {
+    width: 20px;
+  }
+}
+
+@-webkit-keyframes ellipsis {
+  to {
+    width: 20px;
+  }
+}
+
+.hidden {
+  display: none;
+}

data/app/assets/stylesheets/fae/modules/_modal.scss

@@ -76,3 +76,28 @@
     font-size: 12px;
   }
 }
+
+#fae-modal {
+  padding: 0;
+  box-shadow: none;
+
+  .simplemodal-data {
+    min-height: 100%;
+  }
+
+  .simplemodal-close {
+    position: absolute;
+    top: 5px;
+    right: 5px;
+    height: 20px;
+    width: 20px;
+
+    &:before {
+      position: relative;
+      padding: 4px;
+      top: auto;
+      right: auto;
+      color: #3b3b3b;
+    }
+  }
+}

data/app/assets/stylesheets/fae/modules/_toggles.scss

@@ -2,47 +2,63 @@
 .slider-wrapper {
   display: block;
   position: relative;
-  width: 60px;
-  border: 1px solid $c-mid-grey;
-  border-radius: 2px;
+  width: 50px;
+  border-radius: 15px;
+  height: 25px;
   font-size: 12px;
-  overflow: hidden;
   cursor: pointer;
   text-decoration: none;
-  background: $c-white;
+  background: $c-light-grey;
+  transition: background-color 0.24s;
+  &:hover, &:focus {
+    background-color: $c-mid-grey;
+  }
+  &.slider-yes-selected {
+    background: $c-custom-highlight;
+  }
 }
 
 .slider-options {
-  @include transition(left .2s);
-  position: relative;
-  left: -35px;
+  @include transition(left .24s);
   white-space: nowrap;
-
-  .slider-yes-selected & {
-    left: 0;
-  }
 }
 
 .slider-option-selector {
-  display: inline-block;
-  width: 18px;
+  display: block;
+  position: absolute;
+  width: 50%;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  border-radius: 50%;
+  box-sizing: border-box;
+  height: 100%;
+  border: 1px solid $c-mid-grey;
+  transition: left 0.24s;
+  .slider-yes-selected & {
+    left: 50%;
+  }
+  background: $c-white;
 }
 
 .slider-option-no,
 .slider-option-yes {
-  @include user-select(none);
-  display: inline-block;
-  width: 35px;
-  padding: 3px 4px;
-  text-align: center;
+  position: absolute;
+  height: 0;
+  width: 0;
+  left: -200vw;
 }
 
 .slider-option-no {
-  color: $c-slider-no-color;
-  background: $c-slider-no-bg;
+  display:block;
+  .slider-yes-selected & {
+    display: none;
+  }
 }
 
 .slider-option-yes {
-  color: $c-white;
-  background: $c-custom-highlight;
+  display: none;
+  .slider-yes-selected & {
+    display:block;
+  }
 }

data/app/assets/stylesheets/fae/modules/forms/_asset-actions.scss

@@ -45,7 +45,7 @@
     margin-right: 10px;
 
     &:focus {
-      border-color: $c-notice-content;
+      border-color: $c-focus-border;
       outline: 0;
     }
 

data/app/assets/stylesheets/fae/modules/forms/_base.scss

@@ -14,7 +14,7 @@ input[type=email] {
   max-width: 100%;
 
   &:focus {
-    border-color: $c-notice-content;
+    border-color: $c-focus-border;
   }
 }
 

data/app/assets/stylesheets/fae/modules/forms/_checkbox.scss

@@ -56,7 +56,7 @@ label.checkbox,
 
 label.checkbox.focused:before,
 .checkbox.focused label:before {
-  border-color: $c-notice-content;
+  border-color: $c-focus-border;
 }
 
 .checkbox-wrapper {

data/app/assets/stylesheets/fae/modules/forms/_date.scss

@@ -207,6 +207,22 @@
     padding: 12px;
     font-size: 19px;
     color: $c-darker-grey;
+
+  }
+
+  &.table-filter-group {
+    width: 130px;
+
+    input[type=text] {
+      border-radius: 0;
+    }
+
+    label:before {
+      right: -5px;
+      bottom: -6px;
+
+      font-size: 15px;
+    }
   }
 }
 

data/app/assets/stylesheets/fae/modules/forms/_form-manager.scss

@@ -0,0 +1,82 @@
+.form-manager-form {
+  z-index: 2;
+  background: gray(90);
+  display: none;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  overflow: scroll;
+  margin-top: 1px;
+  padding: 100px 40px 0px 30px;
+
+  .js-form-manager-submit {
+    background: gray(20);
+    color: white;
+    font-size: 13px;
+
+    &:hover {
+      background: gray(10);
+    }
+  }
+
+  .helper {
+    color: gray(40);
+    font-weight: normal;
+  }
+
+  .inner-content {
+    margin-top: 103px;
+  }
+
+  .field-input {
+    margin-bottom: 10px;
+  }
+
+  header {
+    height: 74px;
+
+    a {
+      margin-right: 5px;
+      float: right;
+    }
+  }
+
+  .form-section {
+    margin-bottom: 30px;
+    overflow: auto;
+  }
+
+  .single-field {
+    float: left;
+    width: 25%;
+    margin-right: 20px;
+
+    input {
+      width: 100%;
+    }
+
+    .field_title {
+      width: 100%;
+      display: inline-block;
+
+      label {
+        float: left;
+        margin-right: 10px;
+      }
+
+      input {
+        width: auto;
+        float: left;
+      }
+    }
+  }
+}
+
+.js-form-manager-container {
+  display: none;
+  z-index: 4;
+}
+
+.js-launch-form-manager {
+	margin-left: 10px;
+}

data/app/assets/stylesheets/fae/modules/forms/_radio.scss

@@ -64,6 +64,6 @@
 
 .radio_collection.focused {
   .radio_collection-bullet {
-    border-color: $c-notice-content;
+    border-color: $c-focus-border;
   }
 }

data/app/assets/stylesheets/fae/modules/forms/_select.scss

@@ -32,7 +32,7 @@
     top: auto;
     bottom: 100%;
     margin-bottom: -1px;
-    border-top: 1px solid $c-notice-content;
+    border-top: 1px solid $c-focus-border;
     border-bottom: none;
     box-shadow: none;
     border-radius: 0;
@@ -41,7 +41,7 @@
 
 .chosen-container-active {
   .chosen-single {
-    border-color: $c-notice-content;
+    border-color: $c-focus-border;
     background: $c-chosen-gradient-end;
   }
 }
@@ -120,7 +120,7 @@
 .chosen-container-multi.chosen-container-active {
   .chosen-single,
   .chosen-choices {
-    border-color: $c-notice-content;
+    border-color: $c-focus-border;
   }
 }
 
@@ -159,7 +159,8 @@
   }
 
   .chosen-search {
-    display: none;
+    position: absolute;
+    left: -9999px;
   }
 }
 
@@ -185,7 +186,7 @@
 
 .chosen-container {
   .chosen-drop {
-    border-color: $c-notice-content;
+    border-color: $c-focus-border;
   }
 }
 
@@ -307,7 +308,7 @@
 
     &.ms-focus {
       outline: 0;
-      border-bottom: 4px solid $c-notice-content;
+      border-bottom: 4px solid $c-focus-border;
     }
   }
 

data/app/assets/stylesheets/fae/modules/forms/_simple-mde.scss

@@ -23,7 +23,7 @@
   &.mde-focus {
     .CodeMirror-wrap,
     .editor-toolbar {
-      border-color: $c-notice-content;
+      border-color: $c-focus-border;
     }
   }
 }

data/app/assets/stylesheets/fae/modules/forms/_textarea.scss

@@ -11,6 +11,6 @@ textarea {
   border-radius: 2px;
 
   &:focus {
-    border-color: $c-notice-content;
+    border-color: $c-focus-border;
   }
 }

data/app/assets/stylesheets/fae/modules/tables/_filters.scss

@@ -58,4 +58,8 @@
 .table-filter-group {
   display: inline-block;
   margin: 0 30px 20px 0;
+
+  &.no-right-margin {
+    margin-right: 0;
+  }
 }

data/app/assets/stylesheets/fae/pages/_home.scss

@@ -0,0 +1,18 @@
+.tutorial {
+  div {
+    background-image: image-url('fae/tutorial_model_location.png');
+    height: 11em;
+    margin-left: 2em;
+    background-size: 60%;
+    background-position: left;
+    background-repeat: no-repeat;
+  }
+
+  @media (max-width: 800px){
+    height: 8em;
+  }
+
+  p {
+    margin: 2em;
+  }
+}

data/app/assets/stylesheets/fae/pages/_login.scss

@@ -33,6 +33,10 @@
   width: 50%;
   margin: auto;
 
+  h2 {
+    margin: 0 0 28px;
+  }
+
   @include bp(login_container) {
     display: inline-block;
     vertical-align: middle;

data/app/controllers/fae/application_controller.rb

@@ -17,11 +17,32 @@ module Fae
     before_action :detect_cancellation
     before_action :set_change_user
     before_action :set_locale
+    before_action :setup_form_manager
 
     private
 
+    def setup_form_manager
+      if Fae.use_form_manager
+        @form_manager = FormManager.for_model(params, @item)
+      end
+    end
+
+    # defines the locale used to translate the Fae interface
     def set_locale
-      I18n.locale = :en
+      if I18n.available_locales.include?(language_from_browser)
+        language_from_browser
+      else
+        :en
+      end
+    end
+
+    # parse HTTP_ACCEPT_LANGUAGE and return an array of language codes
+    # ex: ["en-US", "en", "zh-CN", "zh", "cs"]
+    # then grab the first and convert to symbol
+    def language_from_browser
+      if request.env['HTTP_ACCEPT_LANGUAGE'].present?
+        request.env['HTTP_ACCEPT_LANGUAGE'].scan(/[a-z-]{2,5}/i).first.try(:to_sym)
+      end
     end
 
     def check_disabled_environment

data/app/controllers/fae/base_controller.rb

@@ -35,7 +35,11 @@ module Fae
       @item = @klass.new(item_params)
 
       if @item.save
-        redirect_to @index_path, notice: t('fae.save_notice')
+        if @item.try(:fae_redirect_to_form_on_create)
+          redirect_to send("edit_admin_#{@klass_singular}_path", @item.id), notice: t('fae.save_notice')
+        else
+          redirect_to @index_path, notice: t('fae.save_notice')
+        end
       else
         build_assets
         flash[:alert] = t('fae.save_error')
@@ -84,7 +88,7 @@ module Fae
       @klass = klass_base.classify.constantize             # used as class reference in this controller
       @klass_singular = klass_base.singularize             # used in index views
       @klass_humanized = @klass_name.singularize.humanize  # used in index views
-      @index_path = '/' + params[:controller]              # used in form_header and form_buttons partials
+      @index_path = '/' + params[:controller]              # used in form_header partial
       @new_path = @index_path + '/new'                     # used in index_header partial
     end
 

data/app/controllers/fae/deploy_controller.rb

@@ -0,0 +1,24 @@
+module Fae
+  class DeployController < ApplicationController
+    before_action :admin_only
+
+    include Fae::ApplicationHelper
+
+    def index
+      raise 'Fae.netlify configs are missing.' unless netlify_enabled?
+      @deploy_hooks = DeployHook.all
+    end
+
+    def deploys_list
+      render json: Fae::NetlifyApi.new().get_deploys
+    end
+
+    def deploy_site
+      if Fae::NetlifyApi.new().run_deploy(params['deploy_hook_type'], current_user)
+        return render json: { success: true }
+      end
+      render json: {success: false}
+    end
+
+  end
+end