virgo 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89bd833b71fd2de302e09bafbf26427176a8c8e3
-  data.tar.gz: 12ca9949a0f488fb92ae1efa45df0147ec1e6821
+  metadata.gz: 006f9a7e7eebf2320f3b7b3c9911330c59e0d7a2
+  data.tar.gz: ec60cb4faae14678751be88d850c2e16209b7b52
 SHA512:
-  metadata.gz: d3a28d660df91cb5733975f2d22e898e6bbe7b99619f88cab2f6b7477da1063ae05cfd2b1ccc39c9fe512e899ae24250d966f1ef23b81723a940d9b572d4103b
-  data.tar.gz: e4be89fbc74988a4d3046075168acbce9b8e5be6fb2adadea96dfedf9f342b305cf96d93bc6c02f1fcb8c974da709373a76bf4100b5ffdf946b941629c681852
+  metadata.gz: af069d3128ea968e81660fbe8545433e96bf637708877abb4109b0d0a58d18f0358cdfa344fce155ece14bea46ac1eaa3f8b7a7f19896fccb7683fe2c9fc2f68
+  data.tar.gz: b9fd6de828adec03d083fee8376ded9f402e39b30416842aae8c8213f1025e9223a2db1e0f8e2ed2df6ed947e7b24041ee6a2ac5c6649eadf5584e3e1522291d

data/app/assets/javascripts/virgo/admin/page_modules/edit_subject_form.coffee

@@ -7,11 +7,11 @@ class PageModuleEditSubjectForm
 
     @post_select.autocomplete
       source: (request, response) =>
-        $.get "/admin/posts/find", {term: request.term}, (resp) =>
+        $.get @post_select.attr("data-autocomplete-uri"), {term: request.term}, (resp) =>
           data = []
 
           for item in resp.posts
-            data.push({label: item.headline, value: item.headline, subject_id: item.id})
+            data.push({label: item.label, value: item.label, subject_id: item.value})
 
           response(data)
 
@@ -24,6 +24,16 @@ class PageModuleEditSubjectForm
       @subject_id_input.val("")
 
   init_multiselect: =>
-    $('.js-post-multiselect').multiselect()
+    @post_multiselect = $('.js-post-multiselect')
+    @post_multiselect.multiselect({
+      searchFunc: @search_posts
+    })
+
+  search_posts: (term, callback) =>
+    if term != ""
+      $.get @post_multiselect.attr("data-autocomplete-uri"), {term: term}, (response) =>
+        callback([response.posts])
+    else
+      callback([null])
 
 window.PageModuleEditSubjectForm = PageModuleEditSubjectForm

data/app/assets/javascripts/virgo/common.coffee

@@ -81,3 +81,6 @@ window.invertObject = (obj) ->
     new_obj[v] = k
 
   new_obj
+
+window.isMobileBrowser = ->
+  /Mobile|iP(hone|od|ad)|Android|BlackBerry|IEMobile|Kindle|NetFront|Silk-Accelerated|(hpw|web)OS|Fennec|Minimo|Opera M(obi|ini)|Blazer|Dolfin|Dolphin|Skyfire|Zune/i.test(navigator.userAgent)

data/app/assets/javascripts/virgo/components/header.coffee

@@ -37,7 +37,6 @@ class Header
           $("#signup-modal .modal-dialog").replaceWith($(response.html).find(".modal-dialog"))
 
 
-
     unless (window.localStorage? && window.localStorage.getItem("emailPromptHidden") == "true")
       $(".sticky-signup-form, .navbar-spacer.large").removeClass('hidden')
 

data/app/assets/javascripts/virgo/lib/jquery-ui-multiselect.js

@@ -31,6 +31,7 @@ $.widget("ui.multiselect", {
   options: {
     sortable: true,
     searchable: true,
+    ajaxSearchFunc: null,
     doubleClickable: true,
     animated: 'fast',
     show: 'slideDown',
@@ -142,6 +143,7 @@ $.widget("ui.multiselect", {
     this.selectedList.children('.ui-element').remove();
     this.availableList.children('.ui-element').remove();
     this.count = 0;
+    this.rowValueMapping = {};
 
     var that = this;
     var items = $(options.map(function(i) {
@@ -165,6 +167,7 @@ $.widget("ui.multiselect", {
     option = $(option);
     var node = $('<li class="ui-state-default ui-element" title="'+option.text()+'"><span class="ui-icon"/>'+option.text()+'<a href="#" class="action"><span class="ui-corner-all ui-icon"/></a></li>').hide();
     node.data('optionLink', option);
+    node.attr("data-option-val", option.val());
     return node;
   },
   // clones an item with associated data
@@ -257,6 +260,42 @@ $.widget("ui.multiselect", {
       });
     }
   },
+
+  // taken from John Resig's liveUpdate script
+  _filterByValues: function(allowedValues) {
+    var list = this.availableList;
+
+    var rows = list.children('li'),
+      cache = rows.map(function(){
+        return $(this).text().toLowerCase();
+      });
+
+    if (!allowedValues || allowedValues.length == 0) {
+      rows.show();
+    } else {
+      rows.hide();
+
+      for (var i = 0; i < allowedValues.length; i++) {
+        var item = allowedValues[i];
+        var value = item.value;
+        var label = item.label;
+        var row = rows.filter("[data-option-val='" + value + "']");
+
+        if (row.length == 0) {
+          var opt = $("<option />")
+          opt.text(label);
+          opt.val(value);
+          this.element.append(opt);
+          var row = this._getOptionNode(opt);
+          row.appendTo(this.availableList).show();
+          this._applyItemState(row, false);
+        }
+
+        row.show();
+      }
+    }
+  },
+
   _registerDoubleClickEvents: function(elements) {
     if (!this.options.doubleClickable) return;
     elements.dblclick(function(ev) {
@@ -325,7 +364,17 @@ $.widget("ui.multiselect", {
         return false;
     })
     .keyup(function() {
-      that._filter.apply(this, [that.availableList]);
+      var searchFunc = that.options.searchFunc;
+
+      if (searchFunc) {
+        var term = $(this).val();
+
+        searchFunc(term, function(results) {
+          that._filterByValues.apply(that, results);
+        });
+      } else {
+        that._filter.apply(this, [that.availableList]);
+      }
     });
   }
 });

data/app/assets/javascripts/virgo/lib/ouibounce.js

@@ -109,28 +109,11 @@ return function ouibounce(el, custom_config) {
   }
 
   function checkCookieValue(cookieName, value) {
-    return parseCookies()[cookieName] === value;
-  }
-
-  function parseCookies() {
-    // cookies are separated by '; '
-    var cookies = document.cookie.split('; ');
-
-    var ret = {};
-    for (var i = cookies.length - 1; i >= 0; i--) {
-      var el = cookies[i].split('=');
-      ret[el[0]] = el[1];
-    }
-    return ret;
+    return $.cookie("viewedOuibounceModal") == value;
   }
 
   function isDisabled() {
-    // ! important! - we are temporarily ONLY going to show these on mobile
-    if (!mobileCheck()){
-      return true;
-    }
-
-    return checkCookieValue(cookieName, 'true') && !aggressive && !(window.app_env == "production" && $.cookie("ouibounceSignupOccurred") == "true");
+    return ((checkCookieValue(cookieName, 'true') && !aggressive) || (window.app_env == "production" && $.cookie("ouibounceSignupOccurred") == "true"));
   }
 
   // You can use ouibounce without passing an element
@@ -142,6 +125,8 @@ return function ouibounce(el, custom_config) {
 
     callback();
     disable();
+
+    $(document).trigger("ouibounce_modal_shown")
   }
 
   function disable(custom_options) {

data/app/assets/javascripts/virgo/page_modules.coffee

@@ -136,11 +136,11 @@ class ListSignup
           source = "footer-form"
 
         $(document).trigger("ouibounceSignupOccurred")
-        if window.analytics?
-          window.analytics.track('email_signup', {
-            email: $(".email-input").val(),
-            signupSource: source
-          })
+        $(document).trigger("list_signup_occurred", {
+          email: $wrap.find(".email-input").val(),
+          signupSource: source
+        })
+
       else
         $wrap.find('.list-signup-message.error').html(response.message).show()
 
@@ -154,22 +154,3 @@ class ColumnFocus
       window.location = $(this).attr('data-uri')
 
 $ -> new ColumnFocus if $('.column-box').length
-
-
-# class CategoryFocus
-#   constructor: ->
-#     $(window).resize @resize_boxes
-#     @resize_boxes()
-
-#   resize_boxes: ->
-#     max_box = {}
-
-#     $('.category-box').each ->
-#       if !max_box['height'] || max_box['height'] < $(this).height()
-#         max_box['height'] = $(this).height()
-#         max_box['element'] = this
-
-#     $('.category-box').not(max_box['element']).each ->
-#       $(this).height(max_box['height'])
-
-# $ -> new CategoryFocus if $('.category-box').length

data/app/assets/stylesheets/virgo/admin.sass

@@ -1,4 +1,4 @@
-@import common
+@import virgo/common
 
 body.admin
   .alert-container

data/app/assets/stylesheets/virgo/application.sass

@@ -13,7 +13,7 @@
 //= require ./install
 //= require_self
 
-@import common
+@import virgo/common
 @import bootstrap/variables
 
 

data/app/assets/stylesheets/virgo/columns.sass

@@ -1,4 +1,4 @@
-@import common
+@import virgo/common
 @import bootstrap/variables
 
 body.columns.index

data/app/assets/stylesheets/virgo/page_modules.sass

@@ -1,6 +1,6 @@
 @import bootstrap/variables
 @import bootstrap/mixins
-@import common
+@import virgo/common
 
 .feature-heading-container, .post-banner-img
   .photo-credit

data/app/assets/stylesheets/virgo/posts.sass

@@ -1,4 +1,4 @@
-@import common
+@import virgo/common
 @import bootstrap/variables
 
 body.posts.index .alert
@@ -404,7 +404,7 @@ body.categories.show
 
 .post-img
   margin: 12px auto 0 auto
-  padding: 12px 12px 0 12px
+  padding: 12px 0 0 0
   max-width: 100%
 
 .sidebar-header
@@ -611,7 +611,7 @@ body.posts.show
 
       .post-headline
         .text
-          line-height: 27px
+          line-height: 1.3em
 
       .post-byline
         line-height: 18px
@@ -748,35 +748,5 @@ body.browser-mozilla
   // max-width: 800px
   margin: 0 auto 15px auto
 
-
-.related-posts
-  .recommendations-head
-    color: $hover_color
-    text-transform: uppercase
-    font-size: 64px
-    line-height: 1em
-    border-bottom: 8px solid $hover_color
-    display: inline-block
-    float: left
-    margin-right: 15px
-
-  .related-post-items
-    .post-thumb-box
-      float: left
-      width: 290px
-
-      .author-info
-        margin-top: 6px
-
-      .post-thumb-box-img
-        height: 186px
-
-      .post-thumb-text .post-thumb-headline
-        font-size: 27px
-
-      &:last-child
-        @media (max-width: 1388px)
-          display: none
-
 .post-comments
   margin-top: 20px

data/app/assets/stylesheets/virgo/search.sass

@@ -1,4 +1,4 @@
-@import common
+@import virgo/common
 
 .search-page
   min-height: 500px

data/app/assets/stylesheets/virgo/ui.sass

@@ -1,7 +1,7 @@
 @import bootstrap/mixins
 @import bootstrap/variables
 @import font-awesome/variables
-@import common
+@import virgo/common
 
 .full-width
   display: block

data/app/assets/stylesheets/virgo/users.sass

@@ -1,4 +1,4 @@
-@import common
+@import virgo/common
 
 .session-box
   margin-top: 126px

data/app/controllers/virgo/admin/posts_controller.rb

@@ -18,6 +18,18 @@ module Virgo
                    .page(params[:page])
     end
 
+    def options
+      @posts = Post.search_by_headline(params[:term])
+
+      data = @posts.map { |post|
+        {value: post.id, label: truncate(post.headline, length: 100)}
+      }
+
+      render json: {
+        posts: data
+      }
+    end
+
     # auto-complete endpoint
     def find
       @posts = Post.search_by_similarity(params[:term])

data/app/controllers/virgo/admin/sites_controller.rb

@@ -16,6 +16,18 @@ module Virgo
       end
     end
 
+
+    def styles
+      if request.patch?
+        if @site.update(site_params)
+          flash[:notice] = "Site styles saved"
+          redirect_to admin_site_styles_path
+        else
+          render :styles
+        end
+      end
+    end
+
     private
 
     def set_site
@@ -25,7 +37,7 @@ module Virgo
     end
 
     def site_params
-      params.permit(site: [:name, :description, :tagline, :disqus_app_id, :twitter_handle, :instagram_account_name, :pinterest_account_name])[:site]
+      params.permit(site: [:name, :description, :style_overrides, :tagline, :disqus_app_id, :twitter_handle, :instagram_account_name, :pinterest_account_name])[:site]
     end
   end
 end

data/app/controllers/virgo/application_controller.rb

@@ -17,7 +17,7 @@ module Virgo
 
     # Graceful error handling - commented out b/c it is difficult (impossible?)
     # to override these rescues in a decorator - if you like the strategy
-    # paste it into a decorator...
+    # set config.enable_virgo_error_handlers = true in an initializer
     #
     if Rails.application.config.enable_virgo_error_handlers
       rescue_from Exception, with: :render_500

data/app/models/concerns/virgo/post/recommendations.rb

@@ -6,7 +6,7 @@ module Virgo
       included do
         def recommendations
           if post_tags.any?
-            Post.where.not(id: id).joins(:tags).where("post_tags.tag_id IN (?)", post_tags.pluck(:tag_id)).uniq.order(created_at: :desc).by_similarity_to(headline)
+            Post.where.not(id: id).joins(:tags).where("virgo_post_tags.tag_id IN (?)", post_tags.pluck(:tag_id)).uniq.order(created_at: :desc).by_similarity_to(headline)
           end
         end
       end

data/app/models/concerns/virgo/post/search.rb

@@ -23,7 +23,7 @@ module Virgo
           if filters[:category_ids].present?
             filters[:category_ids].each_with_index do |id, i|
               items = items.joins(
-                "INNER JOIN post_categories pc#{i} ON posts.id = pc#{i}.post_id AND pc#{i}.category_id = #{id.to_i}"
+                "INNER JOIN virgo_post_categories pc#{i} ON virgo_posts.id = pc#{i}.post_id AND pc#{i}.category_id = #{id.to_i}"
               )
             end
           end
@@ -35,17 +35,17 @@ module Virgo
           if filters[:tag_ids].present?
             filters[:tag_ids].each_with_index do |id, i|
               items = items.joins(
-                "INNER JOIN post_tags pt#{i} ON posts.id = pt#{i}.post_id AND pt#{i}.tag_id = #{id.to_i}"
+                "INNER JOIN virgo_post_tags pt#{i} ON virgo_posts.id = pt#{i}.post_id AND pt#{i}.tag_id = #{id.to_i}"
               )
             end
           end
 
           if filters[:term].present?
-            items = items.where("posts.headline ILIKE :term", term: "%#{filters[:term]}%")
+            items = items.where("virgo_posts.headline ILIKE :term", term: "%#{filters[:term]}%")
           end
 
           if filters[:user_ids].present?
-            items = items.where("posts.author_id IN (?)", filters[:user_ids])
+            items = items.where("virgo_posts.author_id IN (?)", filters[:user_ids])
           end
 
           if filters[:month].present?
@@ -88,8 +88,12 @@ module Virgo
           select("virgo_posts.*, SIMILARITY(virgo_posts.search_document, #{sanitized}) AS search_similarity").order("search_similarity DESC")
         }
 
+        scope :search_by_headline, ->(term) {
+          Virgo::Post.where("headline ILIKE :term", term: "%#{term}%")
+        }
+
         def self.reindex!
-          ::Post.find_each do |post|
+          Virgo::Post.find_each do |post|
             post.send :generate_search_document, force: true
             post.save!
           end
@@ -97,4 +101,4 @@ module Virgo
       end
     end
   end
-end
+end