pageflow-external-links 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2I3YWE2NmUxYTE0NTgzMjUxOWFjM2RlYjVhMWNmM2RiM2IyM2I3OQ==
+    Y2NiNWQwYjY3MjQzNzAxNGM3NjdiMTdmM2UwMTYzMjZiODIyNGUzZg==
   data.tar.gz: !binary |-
-    Mjg3ZDcwMjFiMDhmNjgzODFmYjI5Yjc5NGFlMDY3ZGM0YzUzYTM5Mg==
+    ZDM4MzFjNjUxMjUzYTFjZGZiZDEyN2Q1MWMzZDA1MWViY2I4NzFhYw==
 SHA512:
   metadata.gz: !binary |-
-    NGI5YmRlM2Q3ZGY2NjgyNWE0NzY1ZmNlYTMyOTMwNTE2YzY3ZmIyMDk0ODRh
-    YmYwZjA0Nzg4ZDlkMGIxNTUxMjIwNjIzZWNkOGU0MmYxZTc3MjFlOTFkOThi
-    YjVmMTg2OTI0ZmUwMWIzMjZiZjhhY2JhN2E0NThiNWQ0OWRmMWQ=
+    NjQ1ZmNmMzVkMjNmMWNkMDcxODE0M2UwM2E5OWE5OTJlZWJlOGRmZDU2ZWY0
+    ZmFlMDUyODRiYTA4YjliYzY4YjAzM2M3NTNjZWFiYjg0OWZmYTZlZjBkNmFl
+    YjYwYjE2YTI0YmQxYzgyYzFjMzMzOGVjZmY2Yzg5Y2E2YTY2YjA=
   data.tar.gz: !binary |-
-    YmYyZWQxNDZmZTdjNDU5YTVkZThiYTA5YjYyODllYjExYWQ0MWUxYjk3NWE4
-    NjM3Zjc2MGM4MjRjOWJlYmQwYmU4NjVlM2UxNDJiMTNmOWU1ODEzM2RjNGFj
-    YWYzODNlYjY2OGZiOTZiY2MzMTU0MjRmNTMxMTk1NjA2ZDMzYWU=
+    NzVjMDc1MDM0NjI2MjA4OWU4YjA0YTc5Y2JiOWUwMzdiNDIzMDdiMGFmNzI2
+    NGQwY2Q4YWYyZDliNDBmMDRlMjA2MWVkODkzOTExOTRhYzIzMzlkYzQwZWUy
+    NjAxNGM2Njc0ZTQ0ZTEyNjk5YWEwZWQ4ZDY3YzIwZjYyNTUwYjM=

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+### Changes on `master`
+
+- Site reference input and site selection api.
+  ([#15](https://github.com/codevise/pageflow-external-links/pull/15))
+
 ### 0.2.0
 
 2015-02-03

data/app/assets/javascripts/pageflow/external_links/editor.js

@@ -10,3 +10,7 @@
 //= require ./editor/config
 
 pageflow.externalLinks = pageflow.externalLinks || {};
+
+pageflow.externalLinks.selectSite = function() {
+  return pageflow.externalLinks.SiteSelectionView.selectSite();
+};

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

@@ -14,4 +14,5 @@ pageflow.editor.registerMainMenuItem({
 
 pageflow.editor.addInitializer(function() {
   pageflow.externalLinks.sites = new pageflow.externalLinks.SitesCollection();
+  pageflow.externalLinks.sites.ensureFetched();
 });

data/app/assets/javascripts/pageflow/external_links/editor/models/site.js

@@ -19,7 +19,11 @@ pageflow.externalLinks.Site = Backbone.Model.extend({
     return this.isNew() ? this.collection.url() : '/external_links/sites';
   },
 
-  getThumbnail: function() {
+  thumbnailFile: function() {
     return this.getReference('thumbnail', pageflow.imageFiles);
+  },
+
+  title: function() {
+    return this.get('title');
   }
 });

data/app/assets/javascripts/pageflow/external_links/editor/templates/site_selection.jst.ejs

@@ -0,0 +1,12 @@
+<div class="box">
+  <h2><%= I18n.t('pageflow.external_links.editor.templates.site_selection.title') %></h2>
+
+  <div class="wrapper editor">
+    <ul class="external_sites">
+    </ul>
+  </div>
+
+  <div class="footer">
+    <a href="" class="close"><%= I18n.t('pageflow.external_links.editor.templates.site_selection.cancel') %></a>
+  </div>
+</div>

data/app/assets/javascripts/pageflow/external_links/editor/views/configuration_editor.js

@@ -13,7 +13,7 @@ pageflow.ConfigurationEditorView.register('external_links', {
     });
 
     this.tab('links', function() {
-      this.input('linked_external_site_perma_ids', pageflow.externalLinks.SiteReferenceInputView);
+      this.input('linked_external_site_perma_ids', pageflow.externalLinks.SiteReferencesInputView);
     });
 
     this.tab('options', function() {

data/app/assets/javascripts/pageflow/external_links/editor/views/embedded/list_item_embedded_view.js

@@ -58,7 +58,7 @@ pageflow.externalLinks.ListItemEmbeddedView = Backbone.Marionette.ItemView.exten
   },
 
   updateThumbnailView: function(site) {
-    var thumbnail = site.getThumbnail();
+    var thumbnail = site.thumbnailFile();
 
     if (this.currentThumbnail !== thumbnail) {
       this.currentThumbnail = thumbnail;

data/app/assets/javascripts/pageflow/external_links/editor/views/inputs/site_reference_input_view.js

@@ -1,31 +1,9 @@
-pageflow.externalLinks.SiteReferenceInputView = Backbone.Marionette.ItemView.extend({
-  mixins: [pageflow.inputView],
-
-  template: 'pageflow/external_links/editor/templates/inputs/site_reference',
-  className: 'external_links_site_reference_input',
-
-  ui: {
-    sites: 'ul.sites'
-  },
-
-  events: {
-    'click .add_reference': function() {
-      pageflow.editor.navigate(
-        '/external_links/sites?page=' + this.model.page.id,
-        {trigger: true}
-      );
-      return false;
-    }
+pageflow.externalLinks.SiteReferenceInputView = pageflow.ReferenceInputView.extend({
+  choose: function() {
+    return pageflow.externalLinks.selectSite();
   },
 
-  onRender: function() {
-    this.subview(new pageflow.SortableCollectionView({
-      el: this.ui.sites,
-      collection: this.model.externalSiteReferences(),
-      itemViewConstructor: pageflow.externalLinks.SiteReferenceItemView,
-      itemViewOptions: {
-        page: this.model.page
-      }
-    }));
+  getTarget: function(permaId) {
+    return pageflow.externalLinks.sites.getByPermaId(permaId);
   }
-});
+});

data/app/assets/javascripts/pageflow/external_links/editor/views/inputs/site_references_input_view.js

@@ -0,0 +1,31 @@
+pageflow.externalLinks.SiteReferencesInputView = Backbone.Marionette.ItemView.extend({
+  mixins: [pageflow.inputView],
+
+  template: 'pageflow/external_links/editor/templates/inputs/site_reference',
+  className: 'external_links_site_references_input',
+
+  ui: {
+    sites: 'ul.sites'
+  },
+
+  events: {
+    'click .add_reference': function() {
+      pageflow.editor.navigate(
+        '/external_links/sites?page=' + this.model.page.id,
+        {trigger: true}
+      );
+      return false;
+    }
+  },
+
+  onRender: function() {
+    this.subview(new pageflow.SortableCollectionView({
+      el: this.ui.sites,
+      collection: this.model.externalSiteReferences(),
+      itemViewConstructor: pageflow.externalLinks.SiteReferenceItemView,
+      itemViewOptions: {
+        page: this.model.page
+      }
+    }));
+  }
+});

data/app/assets/javascripts/pageflow/external_links/editor/views/site_item_view.js

@@ -12,7 +12,7 @@ pageflow.externalLinks.SiteItemView = Backbone.Marionette.ItemView.extend({
 
   events: {
     'click': function() {
-      if (!this.model.isNew()) {
+      if (!this.model.isNew() && this.options.navigatable) {
         var query = this.options.page ? '/?page=' + this.options.page.id + '&return_to=sites' : '';
         pageflow.editor.navigate('/external_links/sites/' + this.model.get('id') + query, {trigger: true});
       }
@@ -22,7 +22,10 @@ pageflow.externalLinks.SiteItemView = Backbone.Marionette.ItemView.extend({
     'click .select': function() {
       if (this.options.selectionHandler) {
         this.options.selectionHandler.call(this.model);
-        pageflow.editor.navigate(this.options.referer, {trigger: true});
+
+        if (this.options.referer) {
+          pageflow.editor.navigate(this.options.referer, {trigger: true});
+        }
       }
       return false;
     }
@@ -38,6 +41,8 @@ pageflow.externalLinks.SiteItemView = Backbone.Marionette.ItemView.extend({
   },
 
   update: function() {
+    this.$el.toggleClass('navigatable', !!this.options.navigatable);
+
     this.ui.title.text(this.model.get('title') || I18n.t('pageflow.external_links.editor.views.site_item_view.unknown'));
     this.ui.selectButton.toggle(!!this.options.selectionHandler);
   }

data/app/assets/javascripts/pageflow/external_links/editor/views/site_reference_item_view.js

@@ -24,7 +24,7 @@ pageflow.externalLinks.SiteReferenceItemView = Backbone.Marionette.ItemView.exte
   onRender: function() {
     this.subview(new pageflow.FileThumbnailView({
       el: this.ui.thumbnail,
-      model: this.model.get('site').getThumbnail()
+      model: this.model.get('site').thumbnailFile()
     }));
 
     this.ui.title.text(this.model.get('site').get('title') || I18n.t('pageflow.external_links.editor.views.site_item_reference_view.unknown'));

data/app/assets/javascripts/pageflow/external_links/editor/views/site_selection_view.js

@@ -0,0 +1,45 @@
+pageflow.externalLinks.SiteSelectionView = Backbone.Marionette.ItemView.extend({
+  className: 'external_site_selection dialog',
+  template: 'pageflow/external_links/editor/templates/site_selection',
+
+  mixins: [pageflow.dialogView],
+
+  ui: {
+    items: 'ul'
+  },
+
+  onRender: function() {
+    var view = this;
+
+    pageflow.externalLinks.sites.ensureFetched();
+
+    this.subview(new pageflow.CollectionView({
+      el: this.ui.items,
+      collection: pageflow.externalLinks.sites,
+      itemViewConstructor: pageflow.externalLinks.SiteItemView,
+      itemViewOptions: {
+        selectionHandler: function() {
+          view.options.onSelect(this);
+          view.close();
+        }
+      },
+      blankSlateViewConstructor: Backbone.Marionette.ItemView.extend({
+        template: 'pageflow/external_links/editor/templates/sites_blank_slate'
+      })
+    }));
+  }
+});
+
+pageflow.externalLinks.SiteSelectionView.selectSite = function() {
+  return $.Deferred(function(deferred) {
+    var view = new pageflow.externalLinks.SiteSelectionView({
+      onSelect: deferred.resolve
+    });
+
+    view.on('close', function() {
+      deferred.reject();
+    });
+
+    pageflow.app.dialogRegion.show(view.render());
+  }).promise();
+};

data/app/assets/javascripts/pageflow/external_links/editor/views/sites_view.js

@@ -19,10 +19,11 @@ pageflow.externalLinks.SitesView = Backbone.Marionette.ItemView.extend({
 
     this.$el.append(this.subview(new pageflow.CollectionView({
       tagName: 'ul',
-      className: 'sites',
+      className: 'external_sites',
       collection: pageflow.externalLinks.sites,
       itemViewConstructor: pageflow.externalLinks.SiteItemView,
       itemViewOptions: {
+        navigatable: true,
         selectionHandler: this.options.selectionHandler,
         referer: this.options.referer,
         page: this.options.page

data/app/assets/stylesheets/pageflow/external_links/editor.css.scss

@@ -1,56 +1,20 @@
 @import "./editor/embedded";
+@import "./editor/site_selection";
 
 .editor {
-.manage_external_sites {
-  a.add {
-    @include plus-circled-icon;
-    @include icon-button;
-    position: absolute;
-    top: 0;
-    right: 0;
-  }
-
-  ul.sites {
-    margin-top: 10px;
-  }
-
-  ul.sites > li {
-    @include right-open-icon;
-    @include background-icon-right($color: #888, $top: 20px);
-
-    background-color: #fff;
-    margin-bottom: 2px;
-    padding: 37px 10px 0 70px;
-    white-space: nowrap;
-    overflow: hidden;
-    height: 23px;
-  }
+  @import "./editor/external_sites";
 
-  .thumbnail {
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 60px;
-    width: 60px;
-    vertical-align: middle;
-    background-size: cover;
-    background-color: #444;
-  }
-
-  a.select {
-    @include button(#590);
-
-    padding-left: 5px;
-    padding-right: 5px;
-    vertical-align: middle;
-
-    position: absolute;
-    top: 3px;
-    left: 70px;
+  .manage_external_sites {
+    a.add {
+      @include plus-circled-icon;
+      @include icon-button;
+      position: absolute;
+      top: 0;
+      right: 0;
+    }
   }
-}
 
-.external_links_site_reference_input {
+.external_links_site_references_input {
   .add_reference {
     @include plus-circled-icon;
     @include icon-button;

data/app/assets/stylesheets/pageflow/external_links/editor/external_sites.css.scss

@@ -0,0 +1,47 @@
+ul.external_sites {
+  margin-top: 10px;
+
+  > li {
+    position: relative;
+    background-color: #eee;
+    margin-bottom: 2px;
+    padding: 37px 10px 0 70px;
+    white-space: nowrap;
+    overflow: hidden;
+    height: 23px;
+
+    &.navigatable {
+      background-color: #fff;
+      @include right-open-icon;
+      @include background-icon-right($color: #888, $top: 20px);
+    }
+  }
+
+  .thumbnail {
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: 60px;
+    width: 60px;
+    vertical-align: middle;
+    background-size: cover;
+    background-color: #444;
+  }
+
+  a.select {
+    @include button(#590);
+
+    padding-left: 5px;
+    padding-right: 5px;
+    vertical-align: middle;
+
+    position: absolute;
+    top: 3px;
+    right: 5px;
+  }
+
+  .navigatable .select {
+    left: 70px;
+    right: auto;
+  }
+}

data/app/assets/stylesheets/pageflow/external_links/editor/site_selection.css.scss

@@ -0,0 +1,34 @@
+.external_site_selection {
+  .box {
+    top: 5%;
+    width: 90%;
+    max-width: 400px;
+    max-height: 745px;
+    padding-bottom: 20px;
+    height: 80%;
+  }
+
+  .wrapper {
+    background-color: #fff;
+    padding-right: 10px;
+
+    overflow: hidden;
+    overflow-y: scroll;
+
+    position: absolute;
+    top: 70px;
+    bottom: 70px;
+    left: 10px;
+    right: 10px;
+  }
+
+  ul.external_sites {
+    margin-top: 0;
+  }
+
+  .footer {
+    position: absolute;
+    bottom: 20px;
+    right: 10px;
+  }
+}

data/config/locales/de.yml

@@ -31,6 +31,9 @@ de:
           site_reference_item:
             edit: Bearbeiten
             remove: Löschen
+          site_selection:
+            cancel: Abbrechen
+            title: Externe Seite auswählen
           sites:
             add: Hinzufügen
           sites_blank_slate:

data/config/locales/en.yml

@@ -31,6 +31,9 @@ en:
           site_reference_item:
             edit: Edit
             remove: Remove
+          site_selection:
+            cancel: Cancel
+            title: Select external site
           sites:
             add: Add
           sites_blank_slate:

data/lib/pageflow/external_links/engine.rb

@@ -4,6 +4,7 @@ module Pageflow
       isolate_namespace Pageflow::ExternalLinks
 
       config.autoload_paths << File.join(config.root, 'lib')
+      config.i18n.load_path += Dir[config.root.join('config', 'locales', '**', '*.yml').to_s]
 
       config.generators do |g|
         g.test_framework :rspec,:fixture => false

data/pageflow-external-links.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "pageflow-external-links"
-  spec.version       = "0.2.0"
+  spec.version       = "0.3.0"
   spec.authors       = ["Tim Fischbach"]
   spec.email         = ["tfischbach@codevise.de"]
   spec.summary       = "Pageflow Page Type for links to external sites"
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/codevise/pageflow-external-links"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'pageflow', '~> 0.7'
+  spec.add_runtime_dependency 'pageflow', '~> 0.9'
 
   # Using translations from rails locales in javascript code.
   spec.add_runtime_dependency 'i18n-js'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-external-links
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Tim Fischbach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: i18n-js
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +143,7 @@ files:
 - app/assets/javascripts/pageflow/external_links/editor/templates/inputs/site_reference.jst.ejs
 - app/assets/javascripts/pageflow/external_links/editor/templates/site_item.jst.ejs
 - app/assets/javascripts/pageflow/external_links/editor/templates/site_reference_item.jst.ejs
+- app/assets/javascripts/pageflow/external_links/editor/templates/site_selection.jst.ejs
 - app/assets/javascripts/pageflow/external_links/editor/templates/sites.jst.ejs
 - app/assets/javascripts/pageflow/external_links/editor/templates/sites_blank_slate.jst.ejs
 - app/assets/javascripts/pageflow/external_links/editor/views/configuration_editor.js
@@ -150,13 +151,17 @@ files:
 - app/assets/javascripts/pageflow/external_links/editor/views/embedded/list_embedded_view.js
 - app/assets/javascripts/pageflow/external_links/editor/views/embedded/list_item_embedded_view.js
 - app/assets/javascripts/pageflow/external_links/editor/views/inputs/site_reference_input_view.js
+- app/assets/javascripts/pageflow/external_links/editor/views/inputs/site_references_input_view.js
 - app/assets/javascripts/pageflow/external_links/editor/views/site_item_view.js
 - app/assets/javascripts/pageflow/external_links/editor/views/site_reference_item_view.js
+- app/assets/javascripts/pageflow/external_links/editor/views/site_selection_view.js
 - app/assets/javascripts/pageflow/external_links/editor/views/sites_view.js
 - app/assets/javascripts/pageflow/external_links/page_type.js
 - app/assets/stylesheets/pageflow/external_links.css.scss
 - app/assets/stylesheets/pageflow/external_links/editor.css.scss
 - app/assets/stylesheets/pageflow/external_links/editor/embedded.css.scss
+- app/assets/stylesheets/pageflow/external_links/editor/external_sites.css.scss
+- app/assets/stylesheets/pageflow/external_links/editor/site_selection.css.scss
 - app/controllers/pageflow/external_links/sites_controller.rb
 - app/helpers/pageflow/external_links/sites_helper.rb
 - app/models/pageflow/external_links/site.rb
@@ -173,7 +178,7 @@ files:
 - lib/pageflow/external_links/page_type.rb
 - lib/pageflow/external_links/plugin.rb
 - pageflow-external-links.gemspec
-homepage: ''
+homepage: https://github.com/codevise/pageflow-external-links
 licenses:
 - MIT
 metadata: {}