fae-rails 1.7.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2efad2fc9feedd56fc9ec582e9ac519e6f7c0a8b
-  data.tar.gz: 1f3079cb3d1143a955289d8add21a72a7b6772a4
+  metadata.gz: 792dd37ac209ab8e11c320ca46d8fa889aa7b076
+  data.tar.gz: 2b06e7346546949a0537f25f0e2c20245c536036
 SHA512:
-  metadata.gz: ccf4b94fe96cdc89fe3119ba65ee96584dea2cacbc6dc15a7b8518a90a8053f1481c82201d7165883b3ad57bfb993abe0d5368242ae2e18750a8ec3d5a29bf8b
-  data.tar.gz: 5f3702e59f1583fac3bcddada5aff0c324c2a9464c4071584256995ccbed06e4ae8329f14b1bcb8e5667d500a50b1bb199d449d8a5555a07c53ae6c2df941a3d
+  metadata.gz: 52ceefb35b9b05867733ca0f125657b474a9517c1df2bcd5706ca51dd76c81bb14458062fa15ede894c9073623e8f43f336e96e09a2291567918a1112c2cdb69
+  data.tar.gz: 963568ce30f5c580bdb33eefb24639145ea4b2c1f5a271dfb08ae85a63e49d9f22efbde7e0c0e18dbf634ee7fdcc4c0fccec1831c29745fe68cf0297ff89d28a

data/Rakefile

@@ -25,9 +25,6 @@ require 'rspec/core/rake_task'
 desc "Run all specs in spec directory (excluding plugin specs)"
 RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
 
-# @deprecation - remove require when we drop Rails 4 support
-require 'sub_test_task_patch'
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'

data/app/assets/javascripts/fae/_tables.js

@@ -17,16 +17,14 @@ Fae.tables = {
   sort_cookie_name: 'Fae_table_sort_preferences',
 
   ready: function() {
-    // @depreciation - remove `|| FCH.exists('.main_table-sort_columns')` and only use FCH.exists('.js-sort-column') in v2.0
-    if (FCH.exists('.js-sort-column') || FCH.exists('.main_table-sort_columns')) {
+    if (FCH.exists('.js-sort-column')) {
       this.dateColumnSorting();
       this.columnSorting();
       this.defaultSortCookie();
       this.sortColumnsFromCookies();
     }
 
-    // @depreciation - remove || FCH.exists('.main_content-sortable-handle') and only use FCH.exists('.sortable-handle') in v2.0
-    if (FCH.exists('.sortable-handle') || FCH.exists('.main_content-sortable-handle')) {
+    if (FCH.exists('.sortable-handle')) {
       this.rowSorting();
     }
 
@@ -36,10 +34,7 @@ Fae.tables = {
       this.collapsibleTable();
     }
 
-    // @depreciation - remove conditional wrapping and call endingSelectShim like `this.endingSelectShim()` in v2.0
-    if (FCH.exists('form ' + Fae.content_selector)) {
-      this.endingSelectShim(Fae.content_selector);
-    }
+    this.endingSelectShim();
 
     if (FCH.exists('.js-tooltip')) {
       this.tooltip();
@@ -54,8 +49,7 @@ Fae.tables = {
     var path = window.location.pathname;
     var cookie_value = Cookies.getJSON(_this.sort_cookie_name);
 
-    // @depreciation - remove `, .main_table-sort_columns` and only use '.js-sort-column' in v2.0
-    $('.js-sort-column, .main_table-sort_columns')
+    $('.js-sort-column')
       .tablesorter()
       .on('sortEnd', function(e) {
         var $this = $(this);
@@ -142,8 +136,7 @@ Fae.tables = {
       return;
     }
 
-    // @depreciation - remove `, .main_table-sort_columns` and only use '.js-sort-column' in v2.0
-    $('.js-sort-column, .main_table-sort_columns').each(function(idx) {
+    $('.js-sort-column').each(function(idx) {
       // If this table exists in the cookie hash
       if (cookie_value[path].hasOwnProperty(idx)) {
         // Use array value within another array because of how tablesorter accepts this argument
@@ -156,15 +149,10 @@ Fae.tables = {
    * Make table rows draggable by user
    */
   rowSorting: function() {
-    // @depreciation - remove sort_selector var in v2.0
-    var sort_selector = FCH.exists('.sortable-handle') ? '.sortable-handle' : '.main_content-sortable-handle';
-
-    // @depreciation - remove `, .main_content-sortable` and only use '.js-sort-row' in v2.0
-    $('.js-sort-row, .main_content-sortable').sortable({
+    $('.js-sort-row').sortable({
       items: 'tbody tr',
       opacity: 0.8,
-      // @depreciation - replace sort_selector with '.sortable-handle' in v2.0
-      handle: (sort_selector),
+      handle: ('.sortable-handle'),
 
       //helper function to preserve the width of the table row
       helper: function(e, $tr) {
@@ -271,11 +259,9 @@ Fae.tables = {
 
   /**
    * Add extra space if the last item in a form is a select menu so the dropdown doesn't run off the screen or section
-   * @param {String} selector - Last of type element to target
-   * @deprecation remove selector arg and replace selector variable with '.content' in v2.0
    */
-  endingSelectShim: function(selector) {
-    $('form ' + selector + ':last-of-type').each(function() {
+  endingSelectShim: function() {
+    $('form .content:last-of-type').each(function() {
       var $last_item = $(this).find('.input:last-of-type');
 
       if( $last_item.hasClass('select') ) {
@@ -342,8 +328,8 @@ Fae.tables = {
    */
   sizeFixedHeader: function() {
     var $tables = $('.content table');
-    // @depreciation - change value from ternary to $('.js-content-header').outerHeight() in v2.0
-    var header_height = FCH.exists('.js-content-header') ? $('.js-content-header').outerHeight() : $('.main_content-header').outerHeight();
+
+    var header_height = $('.js-content-header').outerHeight();
     if(FCH.large_down) {
       header_height = $('#js-main-header').outerHeight();
     }

data/app/assets/javascripts/fae/application.js

@@ -13,8 +13,8 @@
 //= require jquery
 //= require jquery_ujs
 //= require jquery.remotipart
-//= require jquery.ui.sortable
-//= require jquery.ui.datepicker
+//= require jquery-ui/widgets/sortable
+//= require jquery-ui/widgets/datepicker
 //= require underscore
 //= require json2
 //= require judge

data/app/assets/javascripts/fae/fae_init.js

@@ -5,8 +5,4 @@
   window.FCH = new FrobCoreHelpers(Fae, {
     mobile_fps: false
   });
-
-  // Selector to support pre-1.3 changes
-  // @depreciation - replace Fae.content_selector property and all instances of it with '.content' in v2.0
-  Fae.content_selector = FCH.exists('.main_content-section') || FCH.exists('.main_content-sections') ? '.main_content-section-area' : '.content';
 })();

data/app/assets/javascripts/fae/form/_ajax.js

@@ -123,13 +123,10 @@ Fae.form.ajax = {
           if($html.hasClass('js-addedit-form') || $html.hasClass( 'js-index-addedit-form' )) {
             // we're returning the table, replace everything
             _this._addEditReplaceAndReinit($this, $html.html(), $target);
-          } else if ($html.hasClass('nested-form') || $html.hasClass('form_content-wrapper')) {
-
-            // @depreciation - remove `|| $html.hasClass('form_content_wrapper')` from above conditional as well as the following ternary (value should just be '.nested-form') in v2.0
-            var form_wrapper_selector = $html.hasClass('nested-form') ? '.nested-form' : '.form_content-wrapper';
+          } else if ($html.hasClass('nested-form')) {
 
             // we're returning the form due to an error, just replace the form
-            $this.find( form_wrapper_selector ).replaceWith(data);
+            $this.find( '.nested-form' ).replaceWith(data);
             $this.find('.select select').fae_chosen();
             $this.find('.input.file').fileinputer();
 
@@ -286,7 +283,7 @@ Fae.form.ajax = {
   },
 
   /**
-   * Attaching click handlers to #main_content to allow ajax replacement
+   * Attaching click handlers to #js-main-content to allow ajax replacement
    * @todo Clean this up, moving listeners into their respective component classes (select, checkbox, etc.)
    */
   htmlListeners: function() {

data/app/assets/javascripts/fae/form/_validator.js

@@ -214,9 +214,9 @@ Fae.form.validator = {
 
     var $wrapper = $input.closest('.input');
     if ($wrapper.children('.error').length) {
-      $wrapper.children('.error').text(messages.join(','));
+      $wrapper.children('.error').text(messages.join(', '));
     } else {
-      $wrapper.addClass('field_with_errors').append("<span class='error'>" + messages.join(',') + "</span>");
+      $wrapper.addClass('field_with_errors').append("<span class='error'>" + messages.join(', ') + "</span>");
     }
   },
 

data/app/assets/javascripts/fae/navigation/_language.js

@@ -83,7 +83,7 @@ Fae.navigation.language = {
    */
   checkForHiddenErrors: function() {
     if (this.el.$select.length && $('div.field_with_errors:hidden').length && !FCH.exists('.hidden_errors')) {
-      $(Fae.content_selector).prepend('<div class="hidden_errors field_with_errors"><span class="error">There are hidden errors. Click "All Languages" in the language nav to view all errors.</span></div>');
+      $('.content').prepend('<div class="hidden_errors field_with_errors"><span class="error">There are hidden errors. Click "All Languages" in the language nav to view all errors.</span></div>');
     }
   }
 };

data/app/assets/javascripts/fae/navigation/_navigation.js

@@ -167,27 +167,15 @@ Fae.navigation = {
   stickyHeaders: function(just_headers) {
     just_headers = FCH.setDefault(just_headers, false);
 
-    if(FCH.exists('.js-content-header')) {
-      var $header = $('.js-content-header');
-      var sidebar_top_offset = (parseInt( $header.outerHeight(), 10) + 30) + 'px';
-      $('#js-sidenav').css('padding-top', sidebar_top_offset );
-
-      $header.sticky({
-        placeholder: true,
-        perpetual_placeholder: true,
-        ignore_placeholder_offsets: true
-      });
-
-    // @depreciation - remove else block in 2.0
-    } else {
-      var $header = $('.main_content-header');
-      var sidebar_top_offset = (parseInt( $header.outerHeight(), 10) + 30) + 'px';
-      $('#js-sidenav').css('padding-top', sidebar_top_offset );
-
-      $('.main_content-header').sticky({
-        placeholder: true
-      });
-    }
+    var $header = $('.js-content-header');
+    var sidebar_top_offset = (parseInt( $header.outerHeight(), 10) + 30) + 'px';
+    $('#js-sidenav').css('padding-top', sidebar_top_offset );
+
+    $header.sticky({
+      placeholder: true,
+      perpetual_placeholder: true,
+      ignore_placeholder_offsets: true
+    });
 
     if (!just_headers) {
       $('#js-sidenav').sticky();

data/app/assets/javascripts/fae/navigation/_subnav_highlighter.js

@@ -8,18 +8,7 @@
 Fae.navigation.subnav_highlighter = {
   init: function() {
     //only run everything if there is a subnav area
-    // @depreciation - change conditional to FCH.exists('.content-header-subnav') in v2.0
-    if (FCH.exists('.main_content-header-section-links') || FCH.exists('.content-header-subnav')) {
-      // @depreciation - remove entire conditional block (following 7 lines) in v2.0
-      if(Fae.content_selector === '.content') {
-        this.section_class = Fae.content_selector;
-        this.subnav_class = '#js-content-header-subnav';
-        this.addBuffer();
-      } else {
-        this.section_class = '.main_content-section';
-        this.subnav_class = '.main_content-header-section-links';
-      }
-
+    if (FCH.exists('.content-header-subnav')) {
       this.FCHListeners();
 
       //makes the subnav clicks
@@ -27,28 +16,10 @@ Fae.navigation.subnav_highlighter = {
     }
   },
 
-  /**
-   * Add space above subnav links if they're present
-   * @depreciation - Remove this function in favor of a better HTML solution in form_header in a v2.0 refactor.
-   */
-  addBuffer: function() {
-    var $subnav = $( this.subnav_class );
-    var height = $subnav.css('height');
-    $subnav.parent().css('padding-bottom', height);
-  },
-
   /**
    * Since subnavHighlighter is not a direct child of Fae and therefore unknown to FCH, these listeners are saved in private functions in this method
    */
   FCHListeners: function() {
-    // @depreciation - change value of section_class to '.content' in v2.0
-    var section_class = this.section_class;
-    // @depreciation - change value of subnav_class to '#js-content-header-subnav' in v2.0
-    // Ideally, form_header will include header.content-header.js-content-header
-    var subnav_class = this.subnav_class;
-    // @depreciation - remove legacy_buffer expression in v2.0 (the value should be 0, so it will be unnecessary)
-    var legacy_buffer = section_class === Fae.content_selector ? 0 : 32;
-
     /**
      * On scroll, change highlight of nav item. Bread and butter of this subclass.
      * @private
@@ -56,11 +27,11 @@ Fae.navigation.subnav_highlighter = {
     function scrollCallback() {
       var scroll_top = FCH.$window.scrollTop();
 
-      $(section_class).each(function(index) {
+      $('.content').each(function(index) {
         var $this = $(this);
-        var position = $this.position().top - scroll_top - legacy_buffer;
+        var position = $this.position().top - scroll_top;
         var $link = $('a[href="#' + $this.attr('id') + '"]').parent();
-        var is_scrolled_to_bottom = scroll_top - legacy_buffer >= (FCH.$document.outerHeight() - FCH.dimensions.wh);
+        var is_scrolled_to_bottom = scroll_top >= (FCH.$document.outerHeight() - FCH.dimensions.wh);
 
         $link.removeClass('-active');
         if (position <= 0 || index === 0 || is_scrolled_to_bottom) {
@@ -80,11 +51,7 @@ Fae.navigation.subnav_highlighter = {
    * Smooth scrolling on anchor links in the tab area.
    */
   anchorClickListener: function() {
-    // @depreciation - replace scroll_offset_selector variable with string '.content-header' in v2.0
-    var scroll_offset_selector = FCH.exists('.main_content-header') ? '.main_content-header' : '.content-header';
-    var scroll_offset = parseInt( $(scroll_offset_selector).css('height'), 10 );
-    // @depreciation - remove should_find_h2 in v2.0
-    var should_find_h2 = this.section_class === Fae.content_selector;
+    var scroll_offset = parseInt( $('.content-header').css('height'), 10 );
 
     /**
      * Smoothly scroll to destination if it's a link to the current page
@@ -98,8 +65,7 @@ Fae.navigation.subnav_highlighter = {
         var $target = $(this.hash);
         $target = $target.length ? $target : $('[name=' + this.hash.slice(1) + ']');
 
-        // @depreciation - remove conditional wrapping (keep $target = ... and scroll_offset -= ...) in v2.0
-        if(should_find_h2 && $target.find('h2').length) {
+        if($target.find('h2').length) {
           $target = $target.find('h2');
           scroll_offset -= 2;
         }
@@ -110,6 +76,6 @@ Fae.navigation.subnav_highlighter = {
       }
     }
 
-    $(this.subnav_class + ' a').on('click', scroller);
+    $('#js-content-header-subnav a').on('click', scroller);
   },
 };

data/app/assets/stylesheets/fae/base.scss

@@ -77,10 +77,6 @@
 @import
   'pages/error',
   'pages/login',
-  'pages/help'
-;
-
-// Legacy styles
-@import
-  'globals/legacy/pre-1.3'
+  'pages/help',
+  'pages/home'
 ;

data/app/assets/stylesheets/fae/globals/imports/_variables.scss

@@ -7,8 +7,6 @@ $custom-breakpoints: () !default;
 
 // Fae-specific breakpoints
 $fae-breakpoints: (
-  // @depreciation - remove page_header_save_block in v2.0
-  'page_header_save_block': ( max-width:  615px ),
   'login_container':        ( min-width: 700px ),
   'login_submit':           ( min-width: 500px ),
 );

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;
-  }
+  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,10 +33,10 @@
 }
 
 .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);
@@ -83,20 +74,9 @@
 }
 
 .content-header-buttons {
-  margin: 10px 0;
-
-  @include bp(large) {
-    float: right;
-    margin: 0;
-  }
-
   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/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/controllers/fae/base_controller.rb

@@ -84,7 +84,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/pages_controller.rb

@@ -5,11 +5,12 @@ module Fae
 
     def home
       @list = recently_updated
+      @models = all_models
     end
 
     def help
       require 'browser'
-      @browser = Browser.new(ua: request.user_agent, accept_language: 'en-us')
+      @browser = Browser.new(request.user_agent, accept_language: 'en-us')
     end
 
     def activity_log
@@ -40,4 +41,4 @@ module Fae
       list.flatten.sort_by(&:updated_at).reverse.first(num)
     end
   end
-end
+end