pageflow-internal-links 0.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0845761ea65ab16498a70c7d3364b69cc1c3aff6
-  data.tar.gz: 3676084ee081f6d236146aece24c1c92db12cb33
+SHA256:
+  metadata.gz: a67bfee3d626cf9a0a643a7add49c68d8c067893cc8c1c3bb5347fd33efa2073
+  data.tar.gz: 372ebdcdbadabe29207dbcd006070f11ca5758db38d890957ea61bba96e38c8d
 SHA512:
-  metadata.gz: ac0533baa66a611b2ca887a04261b8e9ea5903ebca758853152b72a6b2db907cf111f2b00e960b60339bf8dda4981578e05986d50400a5718c5d7322fe2ad89f
-  data.tar.gz: c11bcc37e3da97991256825f8de1355f6954970b8122922b5ee68326773c6cc74f26a712049c8e30a35b984dab689cf9fb481ba7e71d5ff1b62c4e6743a6ff4c
+  metadata.gz: 3a2fb981be093a996100e8eff03a36f92abfe733f9b449bb6a71d964a2cfdf38805dd5d777061bd7d6122feaa976a3e0d6ad0d084a75b7902085b00c14ef1c3a
+  data.tar.gz: 3465a131040f6d91f066620b1d0c44ae68ba1542de82005572a7d888908f46fe0921881a699691bc2552a0660da426926ecb98e12cc2cc18940f651a9aaa71b6

data/.gitignore

@@ -12,6 +12,7 @@ doc/
 lib/bundler/man
 pkg
 rdoc
+spec/dummy
 spec/reports
 test/tmp
 test/version_tmp

data/.scss-lint.yml

@@ -0,0 +1,40 @@
+#https://github.com/brigade/scss-lint/blob/master/lib/scss_lint/linter/README.md
+
+scss_files: 'app/assets/stylesheets/**/*.scss'
+
+linters:
+  Indentation:
+    severity: warning
+    width: 2
+
+  NameFormat:
+    placeholder_convention: "^[-a-z_]+$"
+    mixin_convention: "^[-a-z_]+$"
+  SelectorFormat:
+    convention: "^[-a-z0-9_]+$"
+
+  StringQuotes:
+    style: double_quotes
+
+  DeclarationOrder:
+    enabled: false
+  PropertySortOrder:
+    enabled: false
+  NestingDepth:
+    max_depth: 4
+
+  IdSelector:
+    enabled: false
+  QualifyingElement:
+    enabled: true
+    allow_element_with_attribute: true
+    allow_element_with_class: true
+    allow_element_with_id: true
+
+  ColorKeyword:
+    enabled: false
+  LeadingZero:
+    style: include_zero
+
+  Shorthand:
+    enabled: false

data/.travis.yml

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

data/CHANGELOG.md

@@ -1,18 +1,14 @@
 # CHANGELOG
 
-### Version 0.2.0
+### Version 1.4.0
 
-2016-06-09
+2020-08-13
 
-[Compare changes](https://github.com/codevise/pageflow-internal-links/compare/v0.1.0...v0.2.0)
+[Compare changes](https://github.com/codevise/pageflow-internal-links/compare/1-3-stable...v1.4.0)
 
-- Use common page link attribute inline help texts
-  ([#5](https://github.com/codevise/pageflow-internal-links/pull/5))
-- Add themeable page type pictograms
-  ([#4](https://github.com/codevise/pageflow-internal-links/pull/4))
+- Bug fix: Remove empty space in mosaic layout
+  ([#22](https://github.com/codevise/pageflow-internal-links/pull/22))
 
-### Version 0.1.0
-
-2015-10-23
-
-Initial release.
+See
+[1-3-stable branch](https://github.com/codevise/pageflow-internal-links/blob/1-3-stable/CHANGELOG.md)
+for previous changes.

data/Gemfile

@@ -1,10 +1,5 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in chart.gemspec
+gem 'rails', '~> 5.2.0' #Added specific rails version because the travis tests were failing due to dependancy problem. REDMIN#17649
 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'

data/README.md

@@ -1,6 +1,7 @@
 # Pageflow Internal Links
 
 [![Gem Version](https://badge.fury.io/rb/pageflow-internal-links.svg)](http://badge.fury.io/rb/pageflow-internal-links)
+[![Build Status](https://travis-ci.org/codevise/pageflow-internal-links.svg?branch=master)](https://travis-ci.org/codevise/pageflow-internal-links)
 
 Page types for linking to pages inside a Pageflow.
 
@@ -15,7 +16,7 @@ Register the page types:
 
     # config/initializers/pageflow.rb
     Pageflow.configure do |config|
-      config.page_types.register(Pageflow::InternalLinks.grid_page_type)
+      config.plugin(Pageflow::InternalLinks.plugin)
     end
 
 Include javascripts and stylesheets:
@@ -26,15 +27,15 @@ Include javascripts and stylesheets:
     # app/assets/javascripts/pageflow/editor.js
     //= require pageflow/internal_links/editor
 
-    # app/assets/stylesheets/pageflow/application.css.scss
+    # app/assets/stylesheets/pageflow/application.scss
     @import "pageflow/internal_links";
 
-    # app/assets/stylesheets/pageflow/editor.css.scss
+    # app/assets/stylesheets/pageflow/editor.scss
     @import "pageflow/internal_links/editor";
 
 Import the default theme additions:
 
-    # app/assets/stylesheets/pageflow/themes/default.css.scss
+    # app/assets/stylesheets/pageflow/themes/default.scss
 
     @import "pageflow/internal_links/themes/default";
     @import "pageflow/internal_links/themes/default/list_as_multiple_choice";
@@ -51,7 +52,9 @@ Migrate the database:
 
     bundle exec rake db:migrate
 
-Restart the application server.
+Restart the application server. The grid page type is available by
+default. For the list page type enable the corresponding feature in
+the tab *features*.
 
 ## Troubleshooting
 

data/app/assets/javascripts/pageflow/internal_links/editor/config.js

@@ -5,11 +5,6 @@ pageflow.editor.pageTypes.register('internal_links_grid', {
     'nav li': {
       view: pageflow.internalLinks.GridItemEmbeddedView,
       options: {propertyName: 'linked_page_ids'}
-    },
-
-    '.background_image': {
-      view: pageflow.BackgroundImageEmbeddedView,
-      options: {propertyName: 'background_image_id'}
     }
   },
 
@@ -24,11 +19,6 @@ pageflow.editor.pageTypes.register('internal_links_list', {
   embeddedViews: {
     'nav': {
       view: pageflow.internalLinks.ListEmbeddedView
-    },
-
-    '.background_image': {
-      view: pageflow.BackgroundImageEmbeddedView,
-      options: {propertyName: 'background_image_id'}
     }
   },
 

data/app/assets/javascripts/pageflow/internal_links/editor/models/page_link.js

@@ -1,6 +1,8 @@
 pageflow.internalLinks.PageLink = Backbone.Model.extend({
   i18nKey: 'pageflow/internal_links/page_link',
 
+  mixins: [pageflow.transientReferences],
+
   targetPage: function() {
     return pageflow.pages.getByPermaId(this.get('target_page_id'));
   },
@@ -9,6 +11,21 @@ pageflow.internalLinks.PageLink = Backbone.Model.extend({
     return this.get('label');
   },
 
+  thumbnailFile: function() {
+    var thumbnailFile = this.getReference('thumbnail_image_id',
+                                           pageflow.imageFiles);
+
+    if (thumbnailFile) {
+      return thumbnailFile;
+    }
+    else if (this.targetPage()) {
+      return this.targetPage().thumbnailFile();
+    }
+    else {
+      return null
+    }
+  },
+
   editPath: function() {
     return '/internal_links_pages/' + this.getRoutableId() + '/page_links/' + this.id;
   },
@@ -32,4 +49,4 @@ pageflow.internalLinks.PageLink = Backbone.Model.extend({
   remove: function() {
     this.collection.remove(this);
   }
-});
+});

data/app/assets/javascripts/pageflow/internal_links/editor/models/page_link_file_selection_handler.js

@@ -0,0 +1,17 @@
+pageflow.internalLinks.PageLinkFileSelectionHandler = function(options) {
+  var page = pageflow.pages.get(options.id);
+  var pageLink = page.pageLinks().get(options.pageLinkId);
+
+  this.call = function(file) {
+    pageLink.setReference(options.attributeName, file);
+  };
+
+  this.getReferer = function() {
+    return '/internal_links_pages/' + options.id + '/page_links/' + options.pageLinkId;
+  };
+};
+
+pageflow.editor.registerFileSelectionHandler(
+  'internalLinks.pageLink',
+  pageflow.internalLinks.PageLinkFileSelectionHandler
+);

data/app/assets/javascripts/pageflow/internal_links/editor/views/edit_page_link_view.js

@@ -43,14 +43,24 @@ pageflow.internalLinks.EditPageLinkView = Backbone.Marionette.Layout.extend({
   },
 
   configure: function(configurationEditor) {
+    var pageLink = this.model;
+    var page = pageLink.collection.page;
+
     configurationEditor.tab('general', function() {
-      this.input('label', pageflow.TextInputView);
-      this.input('target_page_id', pageflow.PageLinkInputView);
-      this.input('page_transition', pageflow.SelectInputView, {
-        translationKeyPrefix: 'pageflow.page_transitions',
-        includeBlank: true,
-        blankTranslationKey: 'pageflow.internal_links.editor.views.edit_page_link_view.default_page_transition',
-        values: pageflow.pageTransitions.names()
+      this.group('page_link');
+      this.input('thumbnail_image_id', pageflow.FileInputView, {
+        collection: pageflow.imageFiles,
+        positioning: false,
+
+        fileSelectionHandler: 'internalLinks.pageLink',
+        fileSelectionHandlerOptions: {
+          pageLinkId: pageLink.id,
+        },
+
+        visibleBinding: 'id',
+        visible: function() {
+          return page.get('template') === 'internal_links_list';
+        }
       });
       this.input('description', pageflow.TextAreaInputView, {
         size: 'short'
@@ -68,4 +78,4 @@ pageflow.internalLinks.EditPageLinkView = Backbone.Marionette.Layout.extend({
   goBack: function() {
     pageflow.editor.navigate('/pages/' + this.options.page.id + '/links', {trigger: true});
   }
-});
+});

data/app/assets/javascripts/pageflow/internal_links/editor/views/grid_configuration_editor_view.js

@@ -5,7 +5,7 @@ pageflow.internalLinks.GridConfigurationEditorView = pageflow.ConfigurationEdito
     });
 
     this.tab('files', function() {
-      this.input('background_image_id', pageflow.FileInputView, {collection: pageflow.imageFiles});
+      this.group('background');
       this.input('thumbnail_image_id', pageflow.FileInputView, {
         collection: pageflow.imageFiles,
         positioning: false

data/app/assets/javascripts/pageflow/internal_links/editor/views/list_configuration_editor_view.js

@@ -5,7 +5,7 @@ pageflow.internalLinks.ListConfigurationEditorView = pageflow.ConfigurationEdito
     });
 
     this.tab('files', function() {
-      this.input('background_image_id', pageflow.FileInputView, {collection: pageflow.imageFiles});
+      this.group('background');
       this.input('thumbnail_image_id', pageflow.FileInputView, {
         collection: pageflow.imageFiles,
         positioning: false

data/app/assets/javascripts/pageflow/internal_links/editor/views/list_item_embedded_view.js

@@ -36,12 +36,17 @@ pageflow.internalLinks.ListItemEmbeddedView = Backbone.Marionette.ItemView.exten
   update: function() {
     var targetPage = this.targetPage();
 
-    if (!('currentTargetPage' in this) || this.currentTargetPage !== targetPage) {
+    if (!('currentTargetPage' in this) ||
+        this.currentTargetPage !== targetPage ||
+        !('currentThumbnailImageId' in this) ||
+        this.currentThumbnailImageId != this.model.get('thumbnail_image_id')) {
+
       if (this.currentTargetPage) {
         this.stopListening(this.currentTargetPage.configuration, 'change:description');
       }
 
       this.currentTargetPage = targetPage;
+      this.currentThumbnailImageId = this.model.get('thumbnail_image_id');
 
       this.ui.link.attr('data-page', targetPage ? targetPage.get('perma_id') : null);
 
@@ -68,7 +73,7 @@ pageflow.internalLinks.ListItemEmbeddedView = Backbone.Marionette.ItemView.exten
       this.ui.description.html(this.model.get('description'));
     }
     else {
-      this.ui.description.html(targetPage ? targetPage.configuration.get('description') : '');
+      this.ui.description.html(targetPage ? (targetPage.configuration.get('description') || '') : '');
     }
   },
 
@@ -80,7 +85,7 @@ pageflow.internalLinks.ListItemEmbeddedView = Backbone.Marionette.ItemView.exten
     }
 
     this.thumbnailView = this.subview(new pageflow.PageThumbnailView({
-      model: targetPage,
+      model: this.model,
       imageUrlPropertyName: 'link_thumbnail_url'
     }));
 
@@ -95,9 +100,13 @@ pageflow.internalLinks.ListItemEmbeddedView = Backbone.Marionette.ItemView.exten
     this.$el.toggleClass('empty', !targetPage && !editable);
     this.$el.toggleClass('unassigned', !targetPage);
     this.$el.toggleClass('highlighted', !!this.model.get('highlighted'));
+    this.ui.link.toggleClass('custom_thumbnail', !!this.model.getReference('thumbnail_image_id', pageflow.imageFiles));
+    this.ui.link.toggleClass('no_custom_thumbnail', !this.model.getReference('thumbnail_image_id', pageflow.imageFiles));
+    this.ui.link.toggleClass('own_description', !!this.model.get('description'));
+    this.ui.link.toggleClass('no_own_description', !this.model.get('description'));
   },
 
   targetPage: function() {
     return this.model.targetPage();
   }
-});
+});

data/app/assets/javascripts/pageflow/internal_links/grid_page_type.js

@@ -1,4 +1,4 @@
-pageflow.pageType.register('internal_links_grid', _.extend({
+pageflow.react.registerPageTypeWithDefaultBackground('internal_links_grid', _.extend({
   prepareNextPageTimeout: 0,
 
   enhance: function(pageElement, configuration) {
@@ -10,17 +10,8 @@ pageflow.pageType.register('internal_links_grid', _.extend({
     });
   },
 
-  preload: function(pageElement, configuration) {
-    return pageflow.preload.backgroundImage(pageElement.find('.background_image'));
-  },
-
   update: function(pageElement, configuration) {
-    pageElement.find('h2 .tagline').text(configuration.get('tagline') || '');
-    pageElement.find('h2 .title').text(configuration.get('title') || '');
-    pageElement.find('h2 .subtitle').text(configuration.get('subtitle') || '');
-    pageElement.find('p').html(configuration.get('text') || '');
-
-    this.updateCommonPageCssClasses(pageElement, configuration);
+    this.updateDefaultPageContent(pageElement, configuration);
 
     pageElement.find('.shadow').css({
       opacity: configuration.get('gradient_opacity') / 100
@@ -28,4 +19,4 @@ pageflow.pageType.register('internal_links_grid', _.extend({
 
     pageElement.find('nav').attr('data-layout', configuration.get('linked_pages_layout'));
   }
-}, pageflow.commonPageCssClasses));
+}, pageflow.defaultPageContent));

data/app/assets/javascripts/pageflow/internal_links/list_page_type.js

@@ -1,4 +1,4 @@
-pageflow.pageType.register('internal_links_list', _.extend({
+pageflow.react.registerPageTypeWithDefaultBackground('internal_links_list', _.extend({
   prepareNextPageTimeout: 0,
 
   enhance: function(pageElement, configuration) {
@@ -10,20 +10,35 @@ pageflow.pageType.register('internal_links_list', _.extend({
     });
   },
 
-  preload: function(pageElement, configuration) {
-    return pageflow.preload.backgroundImage(pageElement.find('.background_image'));
+  activated: function(pageElement) {
+    this._updateThumbnailHeights(pageElement);
   },
 
-  update: function(pageElement, configuration) {
-    pageElement.find('h2 .tagline').text(configuration.get('tagline') || '');
-    pageElement.find('h2 .title').text(configuration.get('title') || '');
-    pageElement.find('h2 .subtitle').text(configuration.get('subtitle') || '');
-    pageElement.find('.contentText p').html(configuration.get('text') || '');
+  resize: function(pageElement) {
+    this._updateThumbnailHeights(pageElement);
+  },
 
-    this.updateCommonPageCssClasses(pageElement, configuration);
+  update: function(pageElement, configuration) {
+    this.updateDefaultPageContent(pageElement, configuration);
 
     pageElement.find('.shadow').css({
       opacity: configuration.get('gradient_opacity') / 100
     });
+
+    this._updateThumbnailHeights(pageElement);
+  },
+
+  _updateThumbnailHeights: function(pageElement) {
+    pageElement.find('.page_link.custom_thumbnail').each(function() {
+      var thumbnail = $('.page_thumbnail', this);
+      var details = $('.details', this);
+
+      if ($(this).hasClass('own_description')) {
+        thumbnail.css('bottom', details.outerHeight() + 'px');
+      }
+      else {
+        thumbnail.css('bottom', '0');
+      }
+    });
   }
-}, pageflow.commonPageCssClasses));
+}, pageflow.defaultPageContent));

data/app/assets/stylesheets/pageflow/internal_links/grid.scss

@@ -1,29 +1,5 @@
 @include pageflow-page-type(internal_links_grid);
 
-.js .page .internal_links_page .scroller > div,
-.page .internal_links_page .scroller > div
- {
-  @include pad_portrait {
-    padding: 15% 8% 5% 8%;
-  }
-}
-
-.js .page:first-child .internal_links_page .scroller > div,
-.js .page:first-child .content_and_background.internal_links_page > .page_header,
-.page:first-child .internal_links_page .scroller > div,
-.js .page:first-child .content_and_background.internal_links_page > .page_header {
-  @include pad_portrait {
-    padding: 110px 8% 5% 8%;
-  }
-}
-
-.js .page .internal_links_page {
-  .scroller > div {
-    padding: 15% 14% 5% 8%;
-    width: 100%;
-  }
-}
-
 .internal_links_page {
   nav {
     position: relative;
@@ -75,12 +51,6 @@
         top: 50%;
         left: 0;
         width: 100%;
-        color: white;
-        text-transform: uppercase;
-        text-align: center;
-        line-height: 1.2em;
-        letter-spacing: 0.05em;
-        font-size: 0.8em;
         opacity: 0;
         z-index: 1;
         @include transform(translate3d(0,-50%,0));
@@ -95,7 +65,7 @@
         .placeholder,
         .thumbnail {
           &:after {
-            opacity: 0.8;
+            opacity: 1;
           }
         }
       }
@@ -104,7 +74,6 @@
       .thumbnail {
         &:after {
           opacity: 0;
-          background-color: black;
           width: 100%;
           height: 100%;
           position: absolute;
@@ -124,6 +93,7 @@
       background-position: center;
       background-size: cover;
       position: relative;
+      background-repeat: no-repeat;
 
       div {
         position: absolute;
@@ -150,11 +120,6 @@
         padding-top: 58.5%;
       }
 
-      .title {
-        font-size: 1em;
-        line-height: 1.4em;
-      }
-
       &.empty {
         padding-top: 22.815%;
 
@@ -168,6 +133,7 @@
       @extend %hero;
       float: left;
       margin: 0;
+      padding: 0 0.8% 0 0px;
 
       @include phone {
         float: none;
@@ -209,20 +175,6 @@
   }
 }
 
-.invert .internal_links_page {
-  nav {
-    .thumbnail, .placeholder {
-      &:after {
-        background-color: white;
-      }
-    }
-
-    .title {
-      color: black;
-    }
-  }
-}
-
 .text_position_right .internal_links_page {
   nav {
     margin-left: auto;