pageflow-linkmap-page 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b493ac7493f526d49f5805c713a211ba6447de0e
-  data.tar.gz: 16e8273aa2955e2abec0d289a3aeb294d6ffb7c5
+  metadata.gz: 4be69c22ece16a9e318bb3566dc670fd6a1ca230
+  data.tar.gz: a7a90492548b93bbdc273717175616593c2dace0
 SHA512:
-  metadata.gz: a1082d4931f516b774ccf34def7f6ac4bc8dd1e3f1a8a30f1676e70646f0ad55da29379cb76ea8074ca53720e2928ce95632fe83b42d510ea72c90a1687f68fa
-  data.tar.gz: c42dd554b92d398453024079f6d0c826c0b1a5f77f847c7f1bab77b994da0346f6849069ffc5dd23a6562a55e20cd2e6aa92bf5be131099e9f8e28abe2501a40
+  metadata.gz: 2452e5b8dd93e30d517de81f8172decd7a716e787d45401e17cc037a62e1a5c5fb5351cb2c9c5c37fda452c3b98995fbfc4374e5e85f5cdc651b8bdcaab8dbfa
+  data.tar.gz: 3c2cbf1be66d085a038b1c2c666c6b93a5d27230efa64dcf2e3ef2dc183947fba95a673e424f8c6a9baea2b38f13488c3f4997dd4bcd85ebe4d861c4fe20a96a

data/.travis.yml

@@ -0,0 +1,14 @@
+language: ruby
+rvm:
+  - 2.3.1
+
+# User container based travis infrastructure which allows caching
+# features for open source projects.
+sudo: false
+cache: bundler
+
+services:
+  - redis-server
+
+script:
+  - bin/rspec

data/CHANGELOG.md

@@ -1,8 +1,46 @@
 # CHANGELOG
 
+### Version 0.2.0
+
+2017-04-21
+
+[Compare changes](http://github.com/codevise/pageflow-linkmap-page/compare/v0.1.0...v0.2.0)
+
+- Add vertical scroll indicators
+  ([#7](https://github.com/codevise/pageflow-linkmap-page/pull/7))
+- Prevent scrolling via mousemove on mobile platform
+  ([#21](https://github.com/codevise/pageflow-linkmap-page/pull/21))
+- Improve panorama scaling
+  ([#20](https://github.com/codevise/pageflow-linkmap-page/pull/20))
+- Ensure viewport is covered when scroll area restricted
+  ([#19](https://github.com/codevise/pageflow-linkmap-page/pull/19))
+- Disable links in overlay boxes
+  ([#18](https://github.com/codevise/pageflow-linkmap-page/pull/18))
+- Prevent overlays to be displayed behind editor bar
+  ([#8](https://github.com/codevise/pageflow-linkmap-page/pull/8))
+- Use info box title as title for text only areas
+  ([#16](https://github.com/codevise/pageflow-linkmap-page/pull/16))
+- Fix translation typo
+  ([#13](https://github.com/codevise/pageflow-linkmap-page/pull/13))
+
+Internals:
+
+- Fix test suite and run on travis
+  ([#15](https://github.com/codevise/pageflow-linkmap-page/pull/15))
+- Add .erb extension
+  ([#11](https://github.com/codevise/pageflow-linkmap-page/pull/11))
+- Remove unused files
+  ([#17](https://github.com/codevise/pageflow-linkmap-page/pull/17))
+
+Documentation:
+
+- Add instructions to migrate external links migrations
+  ([#3](https://github.com/codevise/pageflow-linkmap-page/pull/3))
+- Explicitly note to enable the feature
+  ([#12](https://github.com/codevise/pageflow-linkmap-page/pull/12))
+
 ### Version 0.1.0
 
 2016-06-09
 
 - Initial release
-

data/Gemfile

@@ -3,14 +3,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in chart.gemspec
 gemspec
 
-# Rails 4 compat
-gem 'activeadmin', :git => 'https://github.com/codevise/active_admin.git', :branch => 'rails4'
-gem 'ransack'
-gem 'inherited_resources', '1.4.1'
-gem 'formtastic', '2.3.0.rc2'
+gem 'state_machine', git: 'https://github.com/codevise/state_machine.git'
 
-gem 'pageflow', path: '.bundle/linked/pageflow'
-gem 'pageflow-support', path: '.bundle/linked/pageflow/spec/support'
+gem 'pageflow', '0.11.3'
+gem 'pageflow-support', '0.11.3'
 
 gem 'teaspoon', git: 'https://github.com/modeset/teaspoon'
 

data/README.md

@@ -1,6 +1,7 @@
 # Pageflow Linkmap Page
 
-[![Gem Version](https://badge.fury.io/rb/pageflow-linkmap-page.svg)](http://badge.fury.io/rb/pageflowlinkmap-page)
+[![Gem Version](https://badge.fury.io/rb/pageflow-linkmap-page.svg)](http://badge.fury.io/rb/pageflow-linkmap-page)
+[![Build Status](https://travis-ci.org/codevise/pageflow-linkmap-page.svg?branch=master)](https://travis-ci.org/codevise/pageflow-linkmap-page)
 
 Page type to display customizable link areas to internal/external
 pages and inline audio players.
@@ -10,6 +11,7 @@ pages and inline audio players.
 Add this line to your application's `Gemfile`:
 
     gem 'pageflow-linkmap-page'
+    gem 'pageflow-external-links' # needed to copy the migration contained within
 
 Register the page type inside the configure block in `config/initializers/pageflow.rb`
 
@@ -44,8 +46,10 @@ Install dependencies:
 
     bundle install
 
+Then follow the installation instructions for the [pageflow-external-links](https://github.com/codevise/pageflow-external-links) gem.
+
 Restart the application server and enable the corresponding page type
-feature.
+feature for entries in the tab *features*.
 
 ## Troubleshooting
 

data/app/assets/javascript/pageflow/linkmap_page/editor/models/area.js

@@ -26,8 +26,13 @@ pageflow.linkmapPage.Area = Backbone.Model.extend({
   },
 
   title: function() {
-    var target = this.target();
-    return target ? target.title() : null;
+    if (this.get('target_type') === 'text_only') {
+      return this.get('link_title');
+    }
+    else {
+      var target = this.target();
+      return target ? target.title() : null;
+    }
   },
 
   thumbnailFile: function() {

data/app/assets/javascript/pageflow/linkmap_page/editor/templates/scaled_on_phone_hint.jst.ejs

@@ -0,0 +1 @@
+<p></p>

data/app/assets/javascript/pageflow/linkmap_page/editor/views/configuration_editor_view.js

@@ -71,6 +71,10 @@ pageflow.linkmapPage.ConfigurationEditorView = pageflow.ConfigurationEditorView.
     });
 
     this.tab('areas', function() {
+      this.view(pageflow.linkmapPage.ScaledOnPhoneHintView, {
+        model: this.model.page
+      });
+
       this.view(pageflow.linkmapPage.AreasListView, {
         model: this.model
       });

data/app/assets/javascript/pageflow/linkmap_page/editor/views/edit_area_view.js

@@ -76,7 +76,10 @@ pageflow.linkmapPage.EditAreaView = Backbone.Marionette.Layout.extend({
       });
 
       this.input('link_title', pageflow.TextInputView);
-      this.input('link_description', pageflow.TextAreaInputView, {size: 'short'});
+      this.input('link_description', pageflow.TextAreaInputView, {
+        size: 'short',
+        disableLinks: true
+      });
     });
 
     configurationEditor.tab('appearance', function() {

data/app/assets/javascript/pageflow/linkmap_page/editor/views/scaled_on_phone_hint_view.js

@@ -0,0 +1,39 @@
+pageflow.linkmapPage.ScaledOnPhoneHintView = Backbone.Marionette.ItemView.extend({
+  template: 'pageflow/linkmap_page/editor/templates/scaled_on_phone_hint',
+  className: 'scaled_on_phone_hint',
+
+  modelEvents: {
+    'change:scaled_on_portrait_phone change:scaled_on_landscape_phone': 'update'
+  },
+
+  ui: {
+    hint: 'p'
+  },
+
+  onRender: function() {
+    this.update();
+  },
+
+  update: function() {
+    this.$el.toggle(this.model.get('scaled_on_portrait_phone') ||
+                    this.model.get('scaled_on_landscape_phone'));
+
+    if (this.model.get('scaled_on_portrait_phone') &&
+        this.model.get('scaled_on_landscape_phone')) {
+      this.ui.hint.text(this.hintText('both'));
+    }
+    else if (this.model.get('scaled_on_portrait_phone')) {
+      this.ui.hint.text(this.hintText('portrait'));
+    }
+    else if (this.model.get('scaled_on_landscape_phone')) {
+      this.ui.hint.text(this.hintText('landscape'));
+    }
+  },
+
+  hintText: function(orientation) {
+    var prefix = 'pageflow.linkmap_page.editor.views.scaled_on_phone_hint';
+    return I18n.t(prefix + '.text', {
+      orientation: I18n.t(prefix + '.orientations.' + orientation)
+    });
+  }
+});

data/app/assets/javascript/pageflow/linkmap_page/page_type.js

@@ -23,6 +23,7 @@ pageflow.pageType.register('linkmap_page', _.extend({
       scroller: this.scroller,
       activeAreasSelector: '.linkmap_areas > *',
       limitScrolling: configuration.limit_scrolling,
+      minScaling: pageflow.browser.has('mobile platform'),
       addEnvironment: configuration.add_environment,
       marginScrollingDisabled: configuration.margin_scrolling_disabled,
       startScrollPosition: this.getPanoramaStartScrollPosition(configuration)
@@ -219,6 +220,9 @@ pageflow.pageType.register('linkmap_page', _.extend({
                                    this.getPanoramaStartScrollPosition(configuration.attributes),
                                    minScaling);
 
+      this.updateScaledOnPhoneFlags(configuration.page,
+                                    this.content.linkmapPanorama('instance'));
+
       this.content.linkmapLookaround('update',
                                      configuration.get('margin_scrolling_disabled'));
       this.setupHoverImages(pageElement, configuration.attributes);
@@ -229,6 +233,22 @@ pageflow.pageType.register('linkmap_page', _.extend({
     });
   },
 
+  updateScaledOnPhoneFlags: function(page, panorama) {
+    page.set('scaled_on_portrait_phone',
+             panorama.getPanoramaSize({
+               pageWidth: 360,
+               pageHeight: 640,
+               minScaling: true
+             }).scaled);
+
+    page.set('scaled_on_landscape_phone',
+             panorama.getPanoramaSize({
+               pageWidth: 640,
+               pageHeight: 360,
+               minScaling: true
+             }).scaled);
+  },
+
   updateVideoPlayState: function(configuration) {
     if (configuration.hasChanged('background_type')) {
       if (this.isVideoEnabled(configuration.attributes)) {

data/app/assets/javascript/pageflow/linkmap_page/widgets/linkmap_lookaround.js

@@ -61,13 +61,15 @@
         that.initialGamma = null;
       });
 
-      this.element.on('mousemove', function(e) {
-        var containerWidth = that.element.width();
-        var containerHeight = that.element.height();
+      if (!pageflow.browser.has('mobile platform')) {
+        this.element.on('mousemove', function(e) {
+          var containerWidth = that.element.width();
+          var containerHeight = that.element.height();
 
-        that.scrollStrategyX.updateMouse(e.pageX / containerWidth);
-        that.scrollStrategyY.updateMouse(e.pageY / containerHeight);
-      });
+          that.scrollStrategyX.updateMouse(e.pageX / containerWidth);
+          that.scrollStrategyY.updateMouse(e.pageY / containerHeight);
+        });
+      }
     },
 
     enable: function() {

data/app/assets/javascript/pageflow/linkmap_page/widgets/linkmap_panorama.js

@@ -2,8 +2,6 @@
   $.widget('pageflow.linkmapPanorama', {
     scrollHoverMargin : 0.2,
     environmentMargin : 0.2,
-    minScaling: true,
-    minScalingSize: 80,
     lastMouseMoveEvent: null,
 
     _create: function() {
@@ -13,6 +11,7 @@
       this.addEnvironment = this.options.addEnvironment;
       this.panorama = this.options.panorama();
       this.limitScrolling = this.options.limitScrolling;
+      this.minScaling = this.options.minScaling;
       this.scroller = this.options.scroller;
 
       this.activeAreas = pageElement.find(this.options.activeAreasSelector);
@@ -93,15 +92,13 @@
 
           that.overlayBox.addClass('active');
 
-
-
           if(that.panorama.width() - (area.position().left + area.outerWidth()) < that.overlayBox.outerWidth()) {
             var overlayAlignmentDirection = "left";
             that.overlayBox.addClass('left_aligned');
           }
           else {
             var spaceLeftOfArea = area.offset().left;
-            var spaceRightOfArea = $(window).width() - area.offset().left - area.outerWidth();
+            var spaceRightOfArea = $(pageElement).width() - area.offset().left - area.outerWidth();
 
             if(spaceLeftOfArea < spaceRightOfArea || spaceLeftOfArea < that.overlayBox.outerWidth()) {
               var overlayAlignmentDirection = "right";
@@ -131,8 +128,8 @@
           }
 
           var spaceToBottom = that.panorama.height() - area.position().top;
-          var spaceToViewportBottom = $(window).height() - area.offset().top - area.height() / 2;
-          var spaceToViewportTop = $(window).height() - 50;
+          var spaceToViewportBottom = $(pageElement).height() - area.offset().top - area.height() / 2;
+          var spaceToViewportTop = $(pageElement).height() - 50;
           var minMargin = 40;
 
           if(that.overlayBox.outerHeight() > spaceToBottom) {
@@ -241,33 +238,6 @@
       }
 
       return scrollArea;
-
-    },
-
-    getMinScale: function(activeAreas) {
-      var smallestScale;
-      var that = this;
-      var minimumSize = this.minScalingSize;
-      var smallestSize = Math.min(this.panorama.attr('data-width'), this.panorama.attr('data-height'));
-
-      if(this.minScaling) {
-
-        for (var i = 0; i < activeAreas.length; i++) {
-          var el = $(activeAreas[i]);
-
-          if(el.attr('data-height') / 100 *  that.panorama.attr('data-height') < smallestSize) {
-            smallestSize = el.attr('data-height') / 100 *  that.panorama.attr('data-height');
-          }
-          if(el.attr('data-width') / 100 *  that.panorama.attr('data-width')  < smallestSize) {
-            smallestSize = el.attr('data-width') / 100 *  that.panorama.attr('data-width');
-          }
-          smallestScale = minimumSize / smallestSize;
-        }
-      } else {
-        smallestScale = 0;
-      }
-
-      return smallestScale;
     },
 
     update: function(addEnvironment, limitScrolling, startScrollPosition, minScaling) {
@@ -285,10 +255,19 @@
 
         this.panorama = this.options.panorama();
 
-        this.panoramaSize = this.getPanoramaSize(pageElement);
+        this.panoramaSize = this.getPanoramaSize({
+          pageWidth: pageElement.width(),
+          pageHeight: pageElement.height(),
+
+          minScaling: this.minScaling
+        });
+
         this.panorama.width(this.panoramaSize.width);
         this.panorama.height(this.panoramaSize.height);
 
+        pageElement.toggleClass('linkmap_panorama_h', this.panoramaSize.orientation === 'h');
+        pageElement.toggleClass('linkmap_panorama_v', this.panoramaSize.orientation === 'v');
+
         this.activeAreas = pageElement.find(this.options.activeAreasSelector);
         this.scrollArea = this.getScrollArea(this.activeAreas);
 
@@ -297,54 +276,44 @@
         this.innerScrollerElement.width(this.scrollArea.right - this.scrollArea.left);
         this.innerScrollerElement.height(this.scrollArea.bottom - this.scrollArea.top);
 
+        var centerX = Math.max(0, (pageElement.width() - (this.scrollArea.right - this.scrollArea.left)) / 2);
+        var centerY = Math.max(0, (pageElement.height() - (this.scrollArea.bottom - this.scrollArea.top)) / 2);
+
+        var translateX = this.scrollArea.left - centerX;
+        var translateY = this.scrollArea.top - centerY;
+
         var maxTranslateX = this.panoramaSize.width - pageElement.width();
         var maxTranslateY = this.panoramaSize.height - pageElement.height();
 
         this.panoramaWrapper.css({
-          left: -Math.min(maxTranslateX, this.scrollArea.left) +'px',
-          top: -Math.min(maxTranslateY, this.scrollArea.top) + 'px'
+          left: -Math.min(maxTranslateX, Math.max(0, translateX)) +'px',
+          top: -Math.min(maxTranslateY, Math.max(0, translateY)) + 'px'
         });
 
         this.innerScrollerElement.removeClass('measuring');
         this.scroller.refresh();
-
-        var leftToCenterInnerScroller = (pageElement.width() - (this.scrollArea.right - this.scrollArea.left)) / 2;
-        var topToCenterInnerScroller = (pageElement.height() - (this.scrollArea.bottom - this.scrollArea.top)) / 2;
-
-        this.innerScrollerElement.css('left', (this.scroller.maxX() == 0 && this.panoramaSize.width > this.scrollArea.right - this.scrollArea.left ? Math.min(leftToCenterInnerScroller, this.scrollArea.left) : 0) + "px");
-        this.innerScrollerElement.css('top', (this.scroller.maxY() == 0 && this.panoramaSize.height > pageElement.height() ? Math.min(topToCenterInnerScroller, this.scrollArea.top) : 0) + "px");
       });
     },
 
-    getPanoramaSize: function(pageElement) {
-      var result = {};
-      var windowRatio = pageElement.width() / pageElement.height();
-      var environmentMargin = this.addEnvironment ? (1 + this.environmentMargin) : 1;
-      var smallestScale = this.getMinScale(this.activeAreas);
-      var imageRatio;
-
-      if (this.panorama.attr('data-height') > 0) {
-        imageRatio = this.panorama.attr('data-width') / this.panorama.attr('data-height');
-      }
-      else {
-        imageRatio = 1;
-      }
-
-      if(imageRatio > windowRatio) {
-        result.height = pageElement.height() * environmentMargin;
-        result.width = result.height * imageRatio;
-      }
-      else {
-        result.width = pageElement.width() * environmentMargin;
-        result.height = result.width / imageRatio;
-      }
+    getPanoramaSize: function(options) {
+      return pageflow.linkmapPage.getPanoramaSize({
+        pageWidth: options.pageWidth,
+        pageHeight: options.pageHeight,
 
-      if (result.width < this.panorama.attr('data-width') * smallestScale) {
-        result.width = this.panorama.attr('data-width') * smallestScale;
-        result.height = this.panorama.attr('data-height') * smallestScale;
-      }
+        panoramaWidth: this.panorama.attr('data-width'),
+        panoramaHeight: this.panorama.attr('data-height'),
 
-      return result;
+        areaDimensions: this.activeAreas.map(function() {
+          var el = $(this);
+          return {
+            width: el.attr('data-width'),
+            height: el.attr('data-height')
+          };
+        }).get(),
+
+        minScaling: options.minScaling,
+        addEnvironment: this.addEnvironment
+      });
     },
 
     resetScrollPosition: function() {

data/app/assets/javascript/pageflow/linkmap_page/widgets/linkmap_panorama/get_panorama_size.js

@@ -0,0 +1,60 @@
+pageflow.linkmapPage.getPanoramaSize = (function() {
+  var MIN_SCALING_SIZE = 80;
+  var ENVIRONMENT_MARGIN = 1.2;
+
+  return function getPanoramaSize(options) {
+    var result = {
+      scaled: false
+    };
+
+    var environmentMargin = options.addEnvironment ? ENVIRONMENT_MARGIN : 1;
+
+    var windowRatio = options.pageWidth / options.pageHeight;
+    var imageRatio;
+
+    if (options.panoramaHeight > 0) {
+      imageRatio = options.panoramaWidth / options.panoramaHeight;
+    }
+    else {
+      imageRatio = 1;
+    }
+
+    if (imageRatio > windowRatio) {
+      result.height = options.pageHeight * environmentMargin;
+      result.width = result.height * imageRatio;
+      result.orientation = 'h';
+    }
+    else {
+      result.width = options.pageWidth * environmentMargin;
+      result.height = result.width / imageRatio;
+      result.orientation = 'v';
+    }
+
+    if (options.minScaling) {
+      var minScale = getMinScale(options);
+
+      if (result.width < options.panoramaWidth * minScale) {
+        result.width = options.panoramaWidth * minScale;
+        result.height = options.panoramaHeight * minScale;
+        result.scaled = true;
+      }
+    }
+
+    return result;
+  };
+
+  function getMinScale(options) {
+    var that = this;
+
+    var smallestSize = Math.min(options.panoramaWidth, options.panoramaHeight);
+
+    _(options.areaDimensions).each(function(dimensions) {
+      var width = dimensions.width / 100 * options.panoramaWidth;
+      var height = dimensions.height / 100 * options.panoramaHeight;
+
+      smallestSize = Math.min(smallestSize, Math.min(width, height));
+    });
+
+    return MIN_SCALING_SIZE / smallestSize;
+  }
+}());

data/app/assets/javascript/pageflow/linkmap_page/widgets/linkmap_scroll_indicators.js

@@ -1,4 +1,6 @@
 (function($) {
+  var margin = 40;
+
   $.widget('pageflow.linkmapScrollIndicators', {
     _create: function() {
       var element = this.element;
@@ -9,9 +11,11 @@
       toggle();
 
       function toggle() {
-        element.toggleClass('can_scroll_left', Math.ceil(scroller.positionX()) < 0);
-        element.toggleClass('can_scroll_right', Math.floor(scroller.positionX()) > scroller.maxX());
+        element.toggleClass('can_scroll_left', Math.ceil(scroller.positionX()) < - margin);
+        element.toggleClass('can_scroll_right', Math.floor(scroller.positionX()) > scroller.maxX() + margin);
+        element.toggleClass('can_scroll_up', Math.ceil(scroller.positionY()) < - margin);
+        element.toggleClass('can_scroll_down', Math.floor(scroller.positionY()) > scroller.maxY() + margin);
       }
     }
   });
-}(jQuery))
+}(jQuery));

data/app/assets/stylesheets/pageflow/linkmap_page/themes/default/scroll_indicators.scss

@@ -4,10 +4,10 @@
   $arrow-margin-mobile: 10px;
 
   .arrow_left,
-  .arrow_right {
+  .arrow_right,
+  .arrow_up,
+  .arrow_down {
     position: absolute;
-    top: 50%;
-    margin-top: -40px;
     width: 80px;
     height: 80px;
     text-decoration: none;
@@ -15,6 +15,10 @@
     z-index: 10;
     display: block;
 
+    @include phone {
+      @include transform(scale(0.5))
+    }
+
     &:before {
       color: #fff;
       width: 100%;
@@ -42,41 +46,67 @@
     }
   }
 
+  .arrow_left,
+  .arrow_right {
+    margin-top: -40px;
+    top: 50%;
+  }
+
+  .arrow_up,
+  .arrow_down {
+    left: 50%;
+  }
+
   .arrow_left {
     @include fa-angle-left-icon;
     left: 10px;
 
     @include phone {
       left: $arrow-margin-mobile;
-      @include transform(scale(0.5))
     }
   }
 
   .arrow_right {
     @include fa-angle-right-icon;
     right: $arrow-margin;
+    @extend %pageflow_widget_margin_right !optional;
 
     @include phone {
       right: $arrow-margin-mobile;
-      @include transform(scale(0.5))
     }
+  }
 
-    .widget_default_navigation_present & {
-      @include desktop {
-        right: $arrow-margin-with-default-navigation;
-      }
+  .arrow_up {
+    @include fa-angle-up-icon;
+    top: $arrow-margin;
 
-      @include pad_portrait {
-        right: $arrow-margin-mobile;
-      }
+    @include phone {
+      top: 0;
+    }
+  }
+
+  .arrow_down {
+    @include fa-angle-down-icon;
+    bottom: $arrow-margin;
+
+    @include phone {
+      bottom: 0;
     }
   }
 
-  &.can_scroll_left .arrow_left:before {
+  .linkmap_panorama_h &.can_scroll_left .arrow_left:before {
+    opacity: 1;
+  }
+
+  .linkmap_panorama_h  &.can_scroll_right .arrow_right:before {
+    opacity: 1;
+  }
+
+  .linkmap_panorama_v &.can_scroll_up .arrow_up:before {
     opacity: 1;
   }
 
-  &.can_scroll_right .arrow_right:before {
+  .linkmap_panorama_v &.can_scroll_down .arrow_down:before {
     opacity: 1;
   }
-}
+}

data/app/views/pageflow/linkmap_page/{page.html → page.html.erb}

@@ -41,11 +41,17 @@
       </div>
     </div>
 
+    <div class="arrow_up">
+      <span class="hint"><%= t('.scroll_up') %></span>
+    </div>
     <div class="arrow_left">
       <span class="hint"><%= t('.scroll_left') %></span>
     </div>
     <div class="arrow_right">
       <span class="hint"><%= t('.scroll_right') %></span>
     </div>
+    <div class="arrow_down">
+      <span class="hint"><%= t('.scroll_down') %></span>
+    </div>
   </div>
 </div>

data/{exec → bin}/rspec

@@ -9,7 +9,4 @@ rescue LoadError
 end
 require 'bundler/setup'
 
-require 'pageflow/support'
-Pageflow::Dummy.setup
-
 load Gem.bin_path('rspec-core', 'rspec')

data/config/locales/new/scaled_on_phone_hint.de.yml

@@ -0,0 +1,11 @@
+de:
+  pageflow:
+    linkmap_page:
+      editor:
+        views:
+          scaled_on_phone_hint:
+            text: "Das Panorama wird im %{orientation} skaliert, um eine Mindestgröße der Hotspots für die Touch-Eingabe zu gewährleisten. Hotspots vergrößern, um Skalierung zu vermeiden."
+            orientations:
+              both: "Phone Layout"
+              landscape: "Landscape Phone Layout"
+              portrait: "Portrait Phone Layout"

data/config/locales/new/scaled_on_phone_hint.en.yml

@@ -0,0 +1,11 @@
+en:
+  pageflow:
+    linkmap_page:
+      editor:
+        views:
+          scaled_on_phone_hint:
+            text: "The panorama will be scaled on %{orientation} to ensure minimum hotspot size for touch interaction. Increase hotspot size to prevent scaling."
+            orientations:
+              both: "phones"
+              landscape: "phones in landscape orientation"
+              portrait: "phones in portrait orientation"

data/config/locales/new/scroll_indicators_v.de.yml

@@ -0,0 +1,6 @@
+de:
+  pageflow:
+    linkmap_page:
+      page:
+        scroll_up: Nach oben scrollen
+        scroll_down: Nach unten scrollen

data/config/locales/new/scroll_indicators_v.en.yml

@@ -0,0 +1,6 @@
+en:
+  pageflow:
+    linkmap_page:
+      page:
+        scroll_up: Scroll up
+        scroll_down: Scroll down

data/config/locales/new/typo.en.yml

@@ -0,0 +1,6 @@
+en:
+  pageflow:
+    linkmap_page:
+      page_attributes:
+        limit_scrolling:
+          label: Restrict to hotspot areas

data/lib/generators/pageflow_linkmap_page/install/install_generator.rb

@@ -0,0 +1,31 @@
+module PageflowLinkmapPage
+  class InstallGenerator < Rails::Generators::Base
+    desc 'Install the Pageflow plugin and the necessary migrations.'
+
+    def register_plugin
+      inject_into_file('config/initializers/pageflow.rb',
+                       after: "Pageflow.configure do |config|\n") do
+
+        "  config.plugin(Pageflow::#{engine_name_suffix.camelize}.plugin)\n"
+      end
+    end
+
+    def mount_engine
+      route("mount #{engine.name}, at: '/#{engine_name_suffix}'\n")
+    end
+
+    def install_migrations
+      rake 'pageflow_external_links:install:migrations'
+    end
+
+    private
+
+    def engine_name_suffix
+      engine.engine_name.gsub(/^pageflow_/, '')
+    end
+
+    def engine
+      Pageflow::LinkmapPage::Engine
+    end
+  end
+end

data/lib/pageflow/linkmap_page/engine.rb

@@ -1,3 +1,5 @@
+require 'pageflow-external-links'
+
 module Pageflow
   module LinkmapPage
     class Engine < Rails::Engine

data/lib/pageflow/linkmap_page/version.rb

@@ -1,5 +1,5 @@
 module Pageflow
   module LinkmapPage
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

data/pageflow-linkmap-page.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
@@ -25,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec-rails', '~> 2.0'
+  spec.add_development_dependency 'rspec-rails', '~> 3.0'
   spec.add_development_dependency 'factory_girl_rails'
   spec.add_development_dependency 'sqlite3'
 

data/spec/helpers/pageflow/linkmap_page/areas_helper_spec.rb

@@ -5,25 +5,28 @@ module Pageflow
     describe AreasHelper do
       describe '#linkmap_area_divs' do
         it 'renders div with attribute name as class' do
+          entry = create(:entry)
           configuration = {}
 
-          html = helper.linkmap_areas_div(configuration, 'linkmap_page_link_areas')
+          html = helper.linkmap_areas_div(entry, configuration)
 
-          expect(html).to have_selector('div.linkmap_areas.linkmap_page_link_areas')
+          expect(html).to have_selector('div.linkmap_areas')
         end
 
         it 'renders linkmap areas' do
-          configuration = {'linkmap_page_link_areas' => [{}]}
+          entry = create(:entry)
+          configuration = {'linkmap_areas' => [{}]}
 
-          html = helper.linkmap_areas_div(configuration, 'linkmap_page_link_areas')
+          html = helper.linkmap_areas_div(entry, configuration)
 
           expect(html).to have_selector('div a[href]')
         end
 
-        it 'renders hover image divs inside linkmap areas' do
-          configuration = {'linkmap_page_link_areas' => [{}], 'hover_image_id' => 5}
+        it 'renders hover image inside linkmap areas' do
+          entry = create(:entry)
+          configuration = {'linkmap_areas' => [{}], 'hover_image_id' => 5}
 
-          html = helper.linkmap_areas_div(configuration, 'linkmap_page_link_areas')
+          html = helper.linkmap_areas_div(entry, configuration)
 
           expect(html).to have_selector('a div[class~="image_panorama_5"]')
         end
@@ -31,15 +34,18 @@ module Pageflow
 
       describe '#linkmap_area' do
         it 'renders link tag' do
-          html = helper.linkmap_area({}, 0)
+          entry = create(:entry)
+
+          html = helper.linkmap_area(entry, {}, 0)
 
           expect(html).to have_selector('a[href]')
         end
 
         it 'sets inline styles for position and size' do
+          entry = create(:entry)
           attributes = {top: 20, left: 30, width: 40, height: 50}
 
-          html = helper.linkmap_area(attributes, 0)
+          html = helper.linkmap_area(entry, attributes, 0)
 
           expect(html).to include('top: 20%;')
           expect(html).to include('left: 30%;')
@@ -48,19 +54,21 @@ module Pageflow
         end
 
         it 'sets data attribute for audio file' do
-          attributes = {audio_file_id: 25}
+          entry = create(:entry)
+          attributes = {target_type: 'audio_file', target_id: 25}
 
-          html = helper.linkmap_area(attributes, 5)
+          html = helper.linkmap_area(entry, attributes, 5)
 
           expect(html).to have_selector('a[data-audio-file="25.area_5"]')
         end
 
-        it 'sets data attribute for audio file' do
-          attributes = {target_page_id: 10}
+        it 'sets data attribute for page link' do
+          entry = create(:entry)
+          attributes = {target_type: 'page', target_id: 10}
 
-          html = helper.linkmap_area(attributes, 0)
+          html = helper.linkmap_area(entry, attributes, 0)
 
-          expect(html).to have_selector('a[data-page="10"]')
+          expect(html).to have_selector('a[data-target-id="10"]')
         end
       end
     end

data/spec/spec_helper.rb

@@ -1,7 +1,12 @@
 ENV['RAILS_ENV'] ||= 'test'
-# ENV['PAGEFLOW_PLUGIN_ENGINE'] = 'pageflow_linkmap_page'
+ENV['PAGEFLOW_PLUGIN_ENGINE'] = 'pageflow_linkmap_page'
 
-require 'pageflow'
+require 'factory_girl_rails'
+
+require 'pageflow/support'
+Pageflow::Dummy.setup
+
+require 'pageflow-linkmap-page'
 require 'rspec/rails'
 
 engine_root = File.join(File.dirname(__FILE__), '..')

data/spec/support/config/devise.rb

@@ -0,0 +1,10 @@
+RSpec.configure do |config|
+  module DeviseTestHelpersWithScope
+    def sign_in(user)
+      super(:user, user)
+    end
+  end
+
+  config.include Devise::TestHelpers, type: :controller
+  config.include DeviseTestHelpersWithScope, type: :controller
+end

data/spec/support/config/factory_girl.rb

@@ -0,0 +1,12 @@
+RSpec.configure do |config|
+  # Allow to use build and create methods without FactoryGirl prefix.
+  config.include FactoryGirl::Syntax::Methods
+
+  # Make sure factories are up to date when using spring. Skip in CI
+  # since reloading causes factories to be excluded in test coverage.
+  unless ENV['CI']
+    config.before(:all) do
+      FactoryGirl.reload
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-linkmap-page
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +160,7 @@ files:
 - ".gitignore"
 - ".jshintignore"
 - ".jshintrc"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -186,6 +187,7 @@ files:
 - app/assets/javascript/pageflow/linkmap_page/editor/routers/side_bar_router.js
 - app/assets/javascript/pageflow/linkmap_page/editor/templates/edit_area.jst.ejs
 - app/assets/javascript/pageflow/linkmap_page/editor/templates/embedded/area_item.jst.ejs
+- app/assets/javascript/pageflow/linkmap_page/editor/templates/scaled_on_phone_hint.jst.ejs
 - app/assets/javascript/pageflow/linkmap_page/editor/views/areas_list_view.js
 - app/assets/javascript/pageflow/linkmap_page/editor/views/configuration_editor_view.js
 - app/assets/javascript/pageflow/linkmap_page/editor/views/edit_area_view.js
@@ -193,6 +195,7 @@ files:
 - app/assets/javascript/pageflow/linkmap_page/editor/views/embedded/area_item_embedded_view.js
 - app/assets/javascript/pageflow/linkmap_page/editor/views/embedded/areas_embedded_view.js
 - app/assets/javascript/pageflow/linkmap_page/editor/views/embedded/panorama_embedded_view.js
+- app/assets/javascript/pageflow/linkmap_page/editor/views/scaled_on_phone_hint_view.js
 - app/assets/javascript/pageflow/linkmap_page/features.js
 - app/assets/javascript/pageflow/linkmap_page/page_type.js
 - app/assets/javascript/pageflow/linkmap_page/vendor/gyro.js
@@ -203,6 +206,7 @@ files:
 - app/assets/javascript/pageflow/linkmap_page/widgets/linkmap_lookaround.js
 - app/assets/javascript/pageflow/linkmap_page/widgets/linkmap_lookaround_strategies/target_speed.js
 - app/assets/javascript/pageflow/linkmap_page/widgets/linkmap_panorama.js
+- app/assets/javascript/pageflow/linkmap_page/widgets/linkmap_panorama/get_panorama_size.js
 - app/assets/javascript/pageflow/linkmap_page/widgets/linkmap_scroll_indicators.js
 - app/assets/stylesheets/pageflow/linkmap_page.css.scss
 - app/assets/stylesheets/pageflow/linkmap_page/animations/rotate.css.scss
@@ -213,21 +217,25 @@ files:
 - app/assets/stylesheets/pageflow/linkmap_page/editor/resizable.css.scss
 - app/assets/stylesheets/pageflow/linkmap_page/themes/default.css.scss
 - app/assets/stylesheets/pageflow/linkmap_page/themes/default/scroll_indicators.scss
-- app/controllers/pageflow/external_links/sites_controller.rb
 - app/helpers/pageflow/linkmap_page/areas_helper.rb
-- app/models/pageflow/linkmap_page/site.rb
 - app/views/pageflow/linkmap_page/areas/_div.html.erb
-- app/views/pageflow/linkmap_page/page.html
+- app/views/pageflow/linkmap_page/page.html.erb
+- bin/rspec
+- bin/spring
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/new/inverted.de.yml
 - config/locales/new/inverted.en.yml
+- config/locales/new/scaled_on_phone_hint.de.yml
+- config/locales/new/scaled_on_phone_hint.en.yml
+- config/locales/new/scroll_indicators_v.de.yml
+- config/locales/new/scroll_indicators_v.en.yml
 - config/locales/new/text_only_area_type.de.yml
 - config/locales/new/text_only_area_type.en.yml
+- config/locales/new/typo.en.yml
 - config/routes.rb
 - config/spring.rb
-- exec/rspec
-- exec/spring
+- lib/generators/pageflow_linkmap_page/install/install_generator.rb
 - lib/pageflow-linkmap-page.rb
 - lib/pageflow/linkmap_page/engine.rb
 - lib/pageflow/linkmap_page/page_type.rb
@@ -236,6 +244,8 @@ files:
 - pageflow-linkmap-page.gemspec
 - spec/helpers/pageflow/linkmap_page/areas_helper_spec.rb
 - spec/spec_helper.rb
+- spec/support/config/devise.rb
+- spec/support/config/factory_girl.rb
 homepage: http://github.com/codevise/pageflow-linkmap-page
 licenses:
 - MIT
@@ -256,10 +266,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Pageflow page type for a page that contains customizable link areas
 test_files:
 - spec/helpers/pageflow/linkmap_page/areas_helper_spec.rb
 - spec/spec_helper.rb
+- spec/support/config/devise.rb
+- spec/support/config/factory_girl.rb

data/app/controllers/pageflow/external_links/sites_controller.rb

@@ -1,40 +0,0 @@
-module Pageflow
-  module ExternalLinks
-    class SitesController < ActionController::Base
-      respond_to :json
-
-      def index
-        @entry = Entry.find(params[:entry_id])
-
-        respond_with(Site.all_for_revision(@entry.draft))
-      end
-
-      def create
-        @entry = Entry.find(params[:entry_id])
-        site = Site.all_for_revision(@entry.draft).create!(site_params)
-
-        respond_with(site)
-      end
-
-      def update
-        site = Site.find(params[:id])
-        site.update(site_params)
-
-        respond_with(site)
-      end
-
-      def destroy
-        site = Site.find(params[:id])
-        site.destroy
-
-        respond_with(site)
-      end
-
-      protected
-
-      def site_params
-        params.require(:site).permit(:url, :thumbnail, :title, :description, :open_in_new_tab)
-      end
-    end
-  end
-end

data/app/models/pageflow/linkmap_page/site.rb

@@ -1,11 +0,0 @@
-module Pageflow
-  module ExternalLinks
-    class Site < ActiveRecord::Base
-      include RevisionComponent
-
-      def thumbnail_file
-        ImageFile.find_by_id(thumbnail)
-      end
-    end
-  end
-end