pageflow-progress-navigation-bar 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c0479b2d9f253760aa98f5f1c23cc6b530da3814b783c48cf7b29a3e0f2c39c
-  data.tar.gz: 984860f9030aec3cb9512f6c065abcb5e7ab1b4f2f400fd121b1b79aa5d5118b
+  metadata.gz: ca8ecb1fb0bb721ff0e1d1c49f8c0ccbfb44f02462873725f3f27df0e921b366
+  data.tar.gz: 3d641882476b2791607807319435f1ded2758f47e2395e5bb4066f510fbe4294
 SHA512:
-  metadata.gz: 7ffb04b92f1a5c4affb2ed1e4ce0637c5d7ca837249d7b98d749aa4a51ddefcb2633cb67d50314388a58b65052edcd843184c46fe2be1295add45a00e47e5181
-  data.tar.gz: 099db6862d644e62d49c31286660dbf6297d2efaffa3c5ebc5a0bad5ffb0e33bf3d2f0faeb4d952ed3e439e15f5039d7aea493736890ab4db061b140c475f746
+  metadata.gz: bec65c88bebfedfde1a8306b95708f40589921c3b0297e5f1a2bc5931b6d2a75b171ef9f0c8e2fa3002be3398e17e83a2198ddf092eb375df64e728544a796b6
+  data.tar.gz: 83783405540ea359ca76172da6d924df7c4f9576db8c36bdd047badf14d5570b261d97d423d87206928027f791d2547edef8481f2addab43c2cae56e281a66a0

data/CHANGELOG.md

@@ -1,16 +1,16 @@
 # CHANGELOG
 
-### Version 1.3.0
+### Version 1.4.0
 
-2019-04-08
+2019-05-20
 
-[Compare changes](https://github.com/codevise/pageflow-progress-navigation-bar/compare/1-2-stable...v1.3.0)
+[Compare changes](https://github.com/codevise/pageflow-progress-navigation-bar/compare/1-3-stable...v1.4.0)
 
+- Support for configurable sharing providers
+  ([#41](https://github.com/codevise/pageflow-progress-navigation-bar/pull/41))
 - Remove redundant chapter headers from document outline
   ([#40](https://github.com/codevise/pageflow-progress-navigation-bar/pull/40))
-- Include text in navigation bar links
-  ([#39](https://github.com/codevise/pageflow-progress-navigation-bar/pull/39))
 
 See
-[1-2-stable branch](https://github.com/codevise/pageflow-progress-navigation-bar/blob/1-2-stable/CHANGELOG.md)
+[1-3-stable branch](https://github.com/codevise/pageflow-progress-navigation-bar/blob/1-3-stable/CHANGELOG.md)
 for previous changes.

data/app/assets/javascript/pageflow/progress_navigation_bar/widget.js

@@ -44,6 +44,21 @@
       }
     },
 
+    _toggleChapterDisplay: function() {
+      var dots = $('.navigation_dots a', this.element),
+          chaptersInCurrentStoryLine;
+
+      chaptersInCurrentStoryLine = dots.filter(':not(.filtered)').get().map(function(pageLink) {
+        return $(pageLink).data('chapterId');
+      });
+
+      if (_.uniq(chaptersInCurrentStoryLine).length == 1) {
+        this.element.addClass('no_chapters');
+      } else {
+        this.element.removeClass('no_chapters');
+      }
+    },
+
     _create: function() {
       var overlays = this.element.find('.navigation_site_detail'),
           that = this,
@@ -123,11 +138,11 @@
       });
 
       var shareBox = $('.navigation_share_box', this.element),
-          links = $('> a', shareBox);
+          links = $('.share_box_icons > a', shareBox);
       shareBox.shareMenu({
         subMenu: $('.sub_share', shareBox),
         links: links,
-        insertAfter: links.last(),
+        insertAfter: $('.share_box_icons'),
         closeOnMouseLeaving: shareBox
       });
 
@@ -221,7 +236,10 @@
           scroller: scroller,
           scrollToActive: true,
           animationDuration: 400,
-          onFilterChange: that._resizeDots()
+          onFilterChange: function() {
+            that._resizeDots();
+            that._toggleChapterDisplay();
+          }
         });
 
       });

data/app/assets/stylesheets/pageflow/progress_navigation_bar.scss

@@ -302,30 +302,6 @@ $progressbar-mobile-width: 14px;
     }
   }
 
-  .navigation_share_box {
-    $size: 28px;
-    width: 210px;
-
-    a {
-      @include float-start;
-      text-decoration: none;
-      padding: 0 15px 0 15px;
-      width: 39px;
-
-      p {
-        color: $nav-color;
-        margin-bottom: 0;
-        text-align: center;
-      }
-
-      .button {
-        width: $size;
-        height: $size;
-        margin: auto;
-      }
-    }
-  }
-
   .navigation_credits_box {
     min-width: 230px;
     min-height: 4px;
@@ -478,7 +454,10 @@ $progressbar-mobile-width: 14px;
         }
       }
     }
-    .no_chapters li.chapter_beginning a, .no_chapters li a.in_active_chapter, .scroller ul.no_chapters li.chapter_beginning a.in_active_chapter {
+
+    &.no_chapters ul.navigation_dots li.chapter_beginning a,
+    &.no_chapters ul.navigation_dots li a.in_active_chapter,
+    .scroller ul.navigation_dots li.chapter_beginning a.in_active_chapter {
       background-color: $nav-dot-even;
 
       &.active {
@@ -486,6 +465,10 @@ $progressbar-mobile-width: 14px;
       }
     }
 
+    &.no_chapters .navigation_site_detail .chapter {
+      display: none;
+    }
+
     .navigation_menu_box {
       &:before {
         top: auto;

data/app/assets/stylesheets/pageflow/progress_navigation_bar/horizontal.scss

@@ -56,7 +56,7 @@ $thumbnail-small-width: 50px;
       }
 
       .navigation_share_box {
-        right: -62.5px;
+        right: -45px;
       }
 
       .navigation_credits_box {

data/app/assets/stylesheets/pageflow/progress_navigation_bar/themes/default.scss

@@ -49,7 +49,6 @@ $nav-bg-color-transparent: $basic-background-color-transparent;
   @import "./default/icons/icon_font";
   @import "./default/icons/sprite";
   @import "./default/menu_boxes";
-  @import "./default/share_box";
   @import "./default/typography";
 
   @if $progress-navigation-bar-icons == "sprite" {
@@ -155,7 +154,7 @@ $nav-bg-color-transparent: $basic-background-color-transparent;
   }
 
   @if not $progress-navigation-bar-display-share-button {
-    .navigation_menu.share {
+    .navigation_button_area .navigation_bar_buttons li.navigation_menu.share {
       display: none;
     }
   }
@@ -186,6 +185,13 @@ $nav-bg-color-transparent: $basic-background-color-transparent;
     }
   }
 
+  &.without_sharing_button,
+  &.mobile_sharing_only {
+    .navigation_button_area .navigation_bar_buttons li.navigation_menu.share {
+      display: none;
+    }
+  }
+
   .navigation_button_area .navigation_bar_buttons {
     &:after {
       background-color: $nav-bg-color-transparent;
@@ -198,12 +204,6 @@ $nav-bg-color-transparent: $basic-background-color-transparent;
     &.js a.scroll_indicator {
       background-image: image-url('pageflow/themes/default/scroll_indicator_sprite.png');
     }
-
-    .navigation_share_box {
-      a {
-        text-align: center;
-      }
-    }
   }
 
   &.js .scroller:after {
@@ -250,8 +250,11 @@ $nav-bg-color-transparent: $basic-background-color-transparent;
     img {
       display: block;
     }
+  }
 
-    &.no_chapters {
+  &.no_chapters,
+  &.no_chapters.js {
+    .scroller ul.navigation_dots {
       li.chapter_beginning a, li a.in_active_chapter, li.chapter_beginning a.in_active_chapter {
         background-color: $progress-navigation-bar-inactive-chapter-color;
 

data/app/assets/stylesheets/pageflow/progress_navigation_bar/themes/default/icons/icon_font.scss

@@ -4,10 +4,7 @@
 
   $button-icon-color,
   $active-button-icon-color,
-  $deactivated-button-icon-color,
-
-  $share-icon-color: $widget-text-color,
-  $active-share-icon-color: $main-color
+  $deactivated-button-icon-color
 ) {
   .navigation_button_area .navigation_bar_buttons {
 
@@ -135,44 +132,6 @@
         @include fa-info-icon;
       }
     }
-
-    .share_google,
-    .share_facebook,
-    .share_twitter {
-      font-size: 1.5em;
-      &:before {
-        font-family: "FontAwesome";
-        color: $share-icon-color;
-        text-shadow: none;
-      }
-    }
-
-    .share_google {
-      @include fa-google-plus-icon;
-    }
-    .share_facebook {
-      @include fa-facebook-icon;
-    }
-    .share_twitter {
-      @include fa-twitter-icon;
-    }
-
-    .navigation_share_box {
-      a.active,
-      a:hover {
-        p {
-          color: $active-share-icon-color;
-        }
-
-        .share_google,
-        .share_facebook,
-        .share_twitter {
-          &:before {
-            color: $active-share-icon-color;
-          }
-        }
-      }
-    }
   }
 
   .volume-control:before,

data/app/assets/stylesheets/pageflow/progress_navigation_bar/themes/default/icons/sprite.scss

@@ -66,30 +66,6 @@
     @include pageflow-sprite-icon-credits($target: ".button");
   }
 
-  .share.google {
-    @include pageflow-sprite-icon-google($offset: -5px, $target: ".button");
-
-    &.active {
-      @include pageflow-sprite-icon-google("active", $offset: -5px, $target: ".button");
-    }
-  }
-
-  .share.twitter {
-    @include pageflow-sprite-icon-twitter($offset: -5px, $target: ".button");
-
-    &.active {
-      @include pageflow-sprite-icon-twitter("active", $offset: -5px, $target: ".button");
-    }
-  }
-
-  .share.facebook {
-    @include pageflow-sprite-icon-facebook($offset: -5px, $target: ".button");
-
-    &.active {
-      @include pageflow-sprite-icon-facebook("active", $offset: -5px, $target: ".button");
-    }
-  }
-
   .volume-control {
     &:before,
     &:after {

data/app/views/pageflow/progress_navigation_bar/_widget.html.erb

@@ -5,7 +5,7 @@
     <%= render 'pageflow/progress_navigation_bar/widget/bar_top', :entry => entry %>
   </div>
   <div class="scroller">
-    <ul class="navigation_dots <%= entry.chapters.count > 1 ? '' : 'no_chapters' %>">
+    <ul class="navigation_dots">
       <%= render :partial => 'pageflow/progress_navigation_bar/widget/page',
                  :collection => entry.pages.displayed_in_navigation,
                  :locals => {:image_style => :navigation_thumbnail_small, :image_width => 85, :chapters_count => entry.chapters.count} %>

data/app/views/pageflow/progress_navigation_bar/widget/_bar_top.html.erb

@@ -38,9 +38,11 @@
   </li>
   <li class="navigation_menu share" tabindex="2">
     <div class="navigation_menu_box navigation_share_box">
-      <%= render 'pageflow/entries/share_menu/facebook_link', entry: entry %>
-      <%= render 'pageflow/entries/share_menu/twitter_link', entry: entry %>
-      <%= render 'pageflow/entries/share_menu/google_link', entry: entry %>
+      <div class="share_box_icons">
+        <% entry.active_share_providers.each do |provider| %>
+          <%= render "pageflow/entries/share_menu/#{provider}_link", entry: entry %>
+        <% end %>
+      </div>
       <div class="sub_share">
         <a tabindex="2" target="_blank"><%= t('pageflow.public.share_this_entry') %></a>
         <a tabindex="2" target="_blank"><%= t('pageflow.public.share_this_page') %></a>

data/app/views/pageflow/progress_navigation_bar/widget/_page.html.erb

@@ -7,8 +7,8 @@
     <div class="chapter">
       <span class="chapter_number"><%= "#{I18n.t('pageflow.public.chapter')} #{page.chapter.position + 1}" %></span>
       <span class="chapter_title"><%= page.chapter.title %></span>
+      <hr />
     </div>
-    <hr />
     <% end %>
     <%= page.title %>
     <div class="thumbnail is_<%= page.template %>">

data/lib/pageflow/progress_navigation_bar/version.rb

@@ -1,5 +1,5 @@
 module Pageflow
   module ProgressNavigationBar
-    VERSION = '1.3.0'.freeze
+    VERSION = '1.4.0'.freeze
   end
 end

data/pageflow-progress-navigation-bar.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.1'
 
-  spec.add_runtime_dependency 'pageflow', ['>= 12.5.x', '< 15']
+  spec.add_runtime_dependency 'pageflow', '~> 14.1.x'
   spec.add_runtime_dependency 'pageflow-public-i18n', '~> 1.0'
 
   spec.add_development_dependency 'bundler', '~> 1.0'

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-progress-navigation-bar
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-08 00:00:00.000000000 Z
+date: 2019-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.5.x
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '15'
+        version: 14.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.5.x
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '15'
+        version: 14.1.x
 - !ruby/object:Gem::Dependency
   name: pageflow-public-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -116,7 +110,6 @@ files:
 - app/assets/stylesheets/pageflow/progress_navigation_bar/themes/default/icons/icon_font.scss
 - app/assets/stylesheets/pageflow/progress_navigation_bar/themes/default/icons/sprite.scss
 - app/assets/stylesheets/pageflow/progress_navigation_bar/themes/default/menu_boxes.scss
-- app/assets/stylesheets/pageflow/progress_navigation_bar/themes/default/share_box.scss
 - app/assets/stylesheets/pageflow/progress_navigation_bar/themes/default/typography.scss
 - app/assets/stylesheets/pageflow/progress_navigation_bar/themes/default/widget_margin.scss
 - app/assets/stylesheets/pageflow/progress_navigation_bar/vertical.scss

data/app/assets/stylesheets/pageflow/progress_navigation_bar/themes/default/share_box.scss

@@ -1,9 +0,0 @@
-$navigation-share-link-color: #9c9c9c !default;
-
-$progress-navigation-bar-share-link-color: $navigation-share-link-color !default;
-
-.navigation_share_box {
-  a p {
-    color: $progress-navigation-bar-share-link-color;
-  }
-}