pageflow-progress-navigation-bar 0.4.0 → 0.5.0

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

@@ -0,0 +1,23 @@
+@include pageflow-widget-margin("progress_navigation_bar", "right") {
+  margin-right: 30px;
+
+  @include pageflow-progress-mobile-variant {
+    margin-right: 0;
+  }
+}
+
+@include pageflow-widget-margin("progress_navigation_bar", "right_max") {
+  margin-right: 120px;
+
+  @include pageflow-progress-mobile-variant {
+    margin-right: 0;
+  }
+}
+
+@include pageflow-widget-margin("progress_navigation_bar_horizontal", "top") {
+  margin-top: 30px;
+
+  @include pageflow-progress-mobile-variant {
+    margin-top: 0;
+  }
+}

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

@@ -0,0 +1,97 @@
+.js.progress_navigation_bar.vertical {
+  &.show_on_mobile {
+    opacity: 1;
+    @include transition(opacity 0.4s ease);
+  }
+
+  .header_button  {
+    display: none;
+  }
+
+  .navigation_dots {
+    right: 8px;
+    width: 14px;
+    top: 50%;
+    max-height: 100%;
+    @include transform(translate(0, -50%) !important);
+  }
+
+  .navigation_menu.mute {
+    .navi_hint {
+      display: none;
+    }
+
+    .volume-control {
+      .volume-level {
+        &:before {
+          display: block;
+          content: "";
+          background-position: -66px top;
+          top: -9px;
+          width: 18px;
+          height: 16px;
+          left: -6px;
+        }
+      }
+    }
+  }
+
+  .navigation_credits_box {
+    bottom: 0;
+  }
+
+  .navi_hint {
+    @include pageflow-progress-navigation-bar-small-height {
+      display: none;
+    }
+  }
+
+  .scroller ul {
+    @include pageflow-progress-mobile-variant {
+      right: 3px;
+      width: 8px;
+    }
+  }
+
+  .scroller li {
+    &.animate_in {
+      &.moving_forwards {
+        @include animation(pageflow-progress-navigation-bar-slide-in-from-bottom 0.4s ease-out);
+      }
+
+      &.moving_backwards {
+        @include animation(pageflow-progress-navigation-bar-slide-in-from-top 0.4s ease-out);
+      }
+
+      &.moving_down {
+        @include animation(pageflow-progress-navigation-bar-slide-in-from-right 0.4s ease-out);
+      }
+
+      &.moving_up {
+        @include animation(pageflow-progress-navigation-bar-slide-in-from-left 0.4s ease-out);
+      }
+    }
+
+    &.animate_out {
+      &.moving_forwards {
+        @include animation(pageflow-progress-navigation-bar-slide-out-to-top 0.4s ease-in);
+        opacity: 0;
+      }
+
+      &.moving_backwards {
+        @include animation(pageflow-progress-navigation-bar-slide-out-to-bottom 0.4s ease-in);
+        opacity: 0;
+      }
+
+      &.moving_down {
+        @include animation(pageflow-progress-navigation-bar-slide-out-to-left 0.4s ease-in);
+        @include transform(translate3d(-50px, 0, 0));
+      }
+
+      &.moving_up {
+        @include animation(pageflow-progress-navigation-bar-slide-out-to-right 0.4s ease-in);
+        @include transform(translate3d(50px, 0, 0));
+      }
+    }
+  }
+}

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

@@ -1,7 +1,6 @@
 <%= content_tag(:div,
-                class: ["progress_navigation_bar", entry.home_button.enabled? ? 'with_home_button' : nil].compact.join(' '),
-                data: {widget: 'progress_navigation_bar'}) do %>
-
+                class: navigation_bar_css_class(entry, class: 'progress_navigation_bar'),
+                data: {widget: horizontal ? 'progress_navigation_bar_horizontal' : 'progress_navigation_bar'}) do %>
   <div class="navigation_button_area">
     <%= render 'pageflow/progress_navigation_bar/widget/bar_top', :entry => entry %>
   </div>
@@ -12,4 +11,9 @@
                  :locals => {:image_style => :navigation_thumbnail_small, :image_width => 85, :chapters_count => entry.chapters.count} %>
     </ul>
   </div>
+  <div class="header_button">
+    <a class="navigation_main" tabindex="2" title="<%= t('pageflow.public.open_navigation') %>" data-active-title="<%= t('pageflow.public.close_navigation') %>">
+      <span class="button"></span>
+    </a>
+  </div>
 <% end %>

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

@@ -12,12 +12,7 @@
       <span class="navi_hint"><%= t('pageflow.public.first_page') %></span>
     </a>
   </li>
-  <li class="navigation_overview_item">
-    <a class="navigation_bullet navigation_index" tabindex="2" title="<%= t('pageflow.public.open_overview') %>" data-active-title="<%= t('pageflow.public.close_overview') %>">
-      <span class="button"></span>
-      <span class="navi_hint"><%= t('pageflow.public.overview') %></span>
-    </a>
-  </li>
+  <%= render('pageflow/progress_navigation_bar/widget/overview_button', overview_button: entry.overview_button) %>
   <li class="fullscreen">
     <a class="navigation_bullet navigation_fullscreen" tabindex="2" title="<%= t('pageflow.public.enter_fullscreen') %>" data-active-title="<%= t('pageflow.public.leave_fullscreen') %>">
       <span class="button"></span>
@@ -39,24 +34,13 @@
         </div>
       </div>
     </div>
+    <span class="navi_hint"><%= t('pageflow.public.volume') %></span>
   </li>
   <li class="navigation_menu share" tabindex="2">
     <div class="navigation_menu_box navigation_share_box">
-      <%= link_to "http://www.facebook.com/sharer/sharer.php?s=100&p%5Burl%5D=#{ERB::Util.url_encode(pretty_entry_url(entry))}&p%5Btitle%5D=#{ERB::Util.url_encode(entry.title)}", :target => "_blank", :tabindex => "2", :class => "share facebook", :data => { :"share-page" => "http://www.facebook.com/sharer/sharer.php?s=100&p%5Burl%5D=#{ERB::Util.url_encode(pretty_entry_url(entry))}%3Fpage%3DpermaId" } do %>
-          <span class="hint"><%= t('pageflow.public.share_on_facebook') %></span>
-          <span class="share_facebook button"></span>
-          <p>facebook</p>
-      <% end %>
-      <%= link_to "http://twitter.com/home?status=#{ERB::Util.url_encode(pretty_entry_url(entry))}", :target => "_blank", :tabindex => "2", :class => "share twitter", :data => { :"share-page" => "http://twitter.com/home?status=#{ERB::Util.url_encode(pretty_entry_url(entry))}%3Fpage%3DpermaId" } do %>
-          <span class="hint"><%= t('pageflow.public.share_on_twitter') %></span>
-          <span class="share_twitter button"></span>
-          <p>twitter</p>
-      <% end %>
-      <%= link_to "https://plus.google.com/share?url=#{ERB::Util.url_encode(pretty_entry_url(entry))}", :target => "_blank", :tabindex => "2", :class => "share google", :data => { :"share-page" => "https://plus.google.com/share?url=#{ERB::Util.url_encode(pretty_entry_url(entry))}%3Fpage%3DpermaId" } do %>
-          <span class="hint"><%= t('pageflow.public.share_on_google') %></span>
-          <span class="share_google button"></span>
-          <p>google</p>
-      <% end %>
+      <%= 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="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>
@@ -67,7 +51,7 @@
       <span class="navi_hint"><%= t('pageflow.public.share') %></span>
     </a>
   </li>
-  <li class="navigation_menu" tabindex="2">
+  <li class="navigation_menu credits" tabindex="2">
     <div class="navigation_menu_box navigation_credits_box">
       <%= render 'pageflow/entries/navigation/credits_box_content', :entry => entry %>
     </div>

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

@@ -0,0 +1,8 @@
+<% if overview_button.enabled? %>
+  <li class="navigation_overview_item">
+    <a class="navigation_bullet navigation_index" tabindex="2" title="<%= t('pageflow.public.open_overview') %>" data-active-title="<%= t('pageflow.public.close_overview') %>">
+      <span class="button"></span>
+      <span class="navi_hint"><%= t('pageflow.public.overview') %></span>
+    </a>
+  </li>
+<% end %>

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

@@ -10,7 +10,6 @@
     <hr />
     <% end %>
     <%= page.title %>
-
-    <%= image_tag("pageflow/#{page.template}_pictogram.png", :style => "background-image: url('#{asset_path(page.thumbnail_url(:navigation_thumbnail_large))}')") %>
+    <div class="thumbnail is_<%= page.template %>" style="background-image: url('<%= asset_path(page.thumbnail_url(:navigation_thumbnail_large)) %>')"></div>
   </div>
 <% end %>

data/config/locales/de.yml

@@ -1,4 +1,7 @@
 de:
   pageflow:
     progress_navigation_bar:
-      widget_type_name: Navigationsleiste mit Fortschrittsbalken
+      vertical:
+        widget_type_name: Navigationsleiste mit Fortschrittsbalken (vertikal)
+      horizontal:
+        widget_type_name: Navigationsleiste mit Fortschrittsbalken (horizontal)

data/config/locales/en.yml

@@ -1,4 +1,7 @@
 en:
   pageflow:
     progress_navigation_bar:
-      widget_type_name: Progress navigation bar
+      vertical:
+        widget_type_name: Progress navigation bar (vertical)
+      horizontal:
+        widget_type_name: Progress navigation bar (horizontal)

data/lib/pageflow-progress-navigation-bar.rb

@@ -3,7 +3,15 @@ require 'pageflow/progress_navigation_bar/engine'
 module Pageflow
   module ProgressNavigationBar
     def self.widget_type
-      ProgressNavigationBar::WidgetType.new
+      ProgressNavigationBar::VerticalWidgetType.new
+    end
+
+    def self.vertical_widget_type
+      ProgressNavigationBar::VerticalWidgetType.new
+    end
+
+    def self.horizontal_widget_type
+      ProgressNavigationBar::HorizontalWidgetType.new
     end
   end
 end

data/lib/pageflow/progress_navigation_bar/horizontal_widget_type.rb

@@ -0,0 +1,17 @@
+module Pageflow
+  module ProgressNavigationBar
+    class HorizontalWidgetType < ProgressNavigationBar::WidgetType
+      def name
+        'progress_navigation_bar_horizontal'
+      end
+
+      def render(template, entry)
+        super(template, entry, horizontal: true)
+      end
+
+      def translation_key
+        'pageflow.progress_navigation_bar.horizontal.widget_type_name'
+      end
+    end
+  end
+end

data/lib/pageflow/progress_navigation_bar/version.rb

@@ -1,5 +1,5 @@
 module Pageflow
   module ProgressNavigationBar
-    VERSION = '0.4.0'.freeze
+    VERSION = '0.5.0'.freeze
   end
 end

data/lib/pageflow/progress_navigation_bar/vertical_widget_type.rb

@@ -0,0 +1,17 @@
+module Pageflow
+  module ProgressNavigationBar
+    class VerticalWidgetType < ProgressNavigationBar::WidgetType
+      def name
+        'progress_navigation_bar'
+      end
+
+      def render(template, entry)
+        super(template, entry, horizontal: false)
+      end
+
+      def translation_key
+        'pageflow.progress_navigation_bar.vertical.widget_type_name'
+      end
+    end
+  end
+end

data/lib/pageflow/progress_navigation_bar/widget_type.rb

@@ -1,13 +1,14 @@
 module Pageflow
   module ProgressNavigationBar
     class WidgetType < Pageflow::WidgetType
-      def name
-        'progress_navigation_bar'
-      end
-
       def roles
         ['navigation']
       end
+
+      def render(template, entry, locals)
+        template.render(File.join('pageflow/progress_navigation_bar/widget'),
+                        locals.merge(entry: entry))
+      end
     end
   end
 end

data/pageflow-progress-navigation-bar.gemspec

@@ -16,12 +16,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'pageflow', '~> 0.10'
+  spec.add_runtime_dependency 'pageflow', '~> 0.11'
   spec.add_runtime_dependency 'pageflow-public-i18n', '~> 1.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
 
   # Semantic versioning rake tasks
-  spec.add_development_dependency 'semmy', '~> 0.2'
+  spec.add_development_dependency 'semmy', '~> 0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-progress-navigation-bar
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: pageflow-public-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.3.0
 description: 
 email:
 - info@codevise.de
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".jshintrc"
+- ".scss-lint.yml"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -97,20 +98,35 @@ files:
 - app/assets/images/pageflow/progress_navigation_bar/volume_control_sprite.png
 - app/assets/javascript/pageflow/progress_navigation_bar.js
 - app/assets/javascript/pageflow/progress_navigation_bar/widget.js
-- app/assets/stylesheets/pageflow/cross_dependant_styles.css.scss
-- app/assets/stylesheets/pageflow/progress_navigation_bar.css.scss
+- app/assets/stylesheets/pageflow/progress_navigation_bar.scss
 - app/assets/stylesheets/pageflow/progress_navigation_bar/animations.scss
-- app/assets/stylesheets/pageflow/progress_navigation_bar/themes/default.css.scss
+- app/assets/stylesheets/pageflow/progress_navigation_bar/animations2.scss
+- app/assets/stylesheets/pageflow/progress_navigation_bar/cross_dependant_styles.scss
+- app/assets/stylesheets/pageflow/progress_navigation_bar/horizontal.scss
+- app/assets/stylesheets/pageflow/progress_navigation_bar/mixins.scss
+- app/assets/stylesheets/pageflow/progress_navigation_bar/themes/default.scss
+- app/assets/stylesheets/pageflow/progress_navigation_bar/themes/default/buttons.scss
+- app/assets/stylesheets/pageflow/progress_navigation_bar/themes/default/credits.scss
+- 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
 - app/views/pageflow/progress_navigation_bar/_widget.html.erb
 - app/views/pageflow/progress_navigation_bar/widget/_bar_top.html.erb
 - app/views/pageflow/progress_navigation_bar/widget/_credits_box_content.html.erb
 - app/views/pageflow/progress_navigation_bar/widget/_home_button.html.erb
+- app/views/pageflow/progress_navigation_bar/widget/_overview_button.html.erb
 - app/views/pageflow/progress_navigation_bar/widget/_page.html.erb
 - config/locales/de.yml
 - config/locales/en.yml
 - lib/pageflow-progress-navigation-bar.rb
 - lib/pageflow/progress_navigation_bar/engine.rb
+- lib/pageflow/progress_navigation_bar/horizontal_widget_type.rb
 - lib/pageflow/progress_navigation_bar/version.rb
+- lib/pageflow/progress_navigation_bar/vertical_widget_type.rb
 - lib/pageflow/progress_navigation_bar/widget_type.rb
 - pageflow-progress-navigation-bar.gemspec
 homepage: https://github.com/codevise/pageflow-progress-navigation-bar
@@ -133,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Pageflow navigation widget.

data/app/assets/stylesheets/pageflow/cross_dependant_styles.css.scss

@@ -1,35 +0,0 @@
-body .widget_progress_navigation_bar_present .navigation_mobile {
-  .menu.index {
-    right: 20px;
-  }
-
-  &.active .menu.index {
-    right: 200px;
-  }
-
-  .parent_page {
-    right: 70px;
-  }
-
-  &.active .parent_page {
-    right: 250px;
-  }
-}
-
-.navigation_mobile, .navigation_mobile > * {
-  body.has_mobile_platform .widget_progress_navigation_bar_present & {
-    display: block;
-  }
-}
-
-.js .widget_progress_navigation_bar_present .page .close_button {
-  @include desktop {
-    right: 125px;
-  }
-}
-
-.js .widget_progress_navigation_bar_present .videoWrapper {
-  @include desktop {
-    margin-right: 30px;
-  }
-}