pageflow 0.9.2 → 0.10.0

data/app/assets/javascripts/pageflow/editor/models/storyline_configuration.js

@@ -0,0 +1,15 @@
+pageflow.StorylineConfiguration = pageflow.Configuration.extend({
+  modelName: 'storyline',
+  i18nKey: 'pageflow/storyline',
+
+  defaults: {
+  },
+
+  initialize: function() {
+    this.listenTo(this, 'change:main', function(model, value) {
+      if (value) {
+        this.unset('parent_page_perma_id');
+      }
+    });
+  }
+});

data/app/assets/javascripts/pageflow/editor/models/storyline_ordering.js

@@ -0,0 +1,117 @@
+pageflow.StorylineOrdering = function(storylines, pages) {
+  var storylinesByParent;
+
+  this.watch = function() {
+    storylines.on('add change:configuration', function() {
+      this.sort();
+    }, this);
+
+    pages.on('change:position change:chapter_id', function() {
+      this.sort();
+    }, this);
+  };
+
+  this.sort = function(options) {
+    prepare();
+    visit(storylinesWithoutParent(), 1, 0);
+
+    storylines.sort(options);
+  };
+
+  function visit(storylines, offset, level) {
+    return _(storylines).reduce(function(position, storyline, index) {
+      storyline.set('position', position);
+      storyline.set('level', level);
+
+      return visit(children(storyline), position + 1, level + 1);
+    }, offset);
+  }
+
+  function storylinesWithoutParent() {
+    return storylinesByParent[-1];
+  }
+
+  function children(storyline) {
+    return storylinesByParent[storyline.cid] || [];
+  }
+
+  function prepare() {
+    storylinesByParent = _(groupStorylinesByParentStoryline())
+      .reduce(function(result, storylines, key) {
+        result[key] = storylines.sort(compareStorylines);
+        return result;
+      }, {});
+  }
+
+  function groupStorylinesByParentStoryline() {
+    return storylines
+      .groupBy(function(storyline) {
+        var parentPage = getParentPage(storyline);
+        return parentPage && parentPage.chapter ? parentPage.chapter.storyline.cid : -1;
+      });
+  }
+
+  function compareStorylines(storylineA, storylineB) {
+    return compareByMainFlag(storylineA, storylineB) ||
+      compareByParentPagePosition(storylineA, storylineB) ||
+      compareByLane(storylineA, storylineB) ||
+      compareByRow(storylineA, storylineB) ||
+      compareByTitle(storylineA, storylineB);
+  }
+
+  function compareByMainFlag(storylineA, storylineB) {
+    return compare(
+      storylineA.isMain() ? -1 : 1,
+      storylineB.isMain() ? -1 : 1
+    );
+  }
+
+  function compareByParentPagePosition(storylineA, storylineB) {
+    return compare(
+      getParentPagePosition(storylineA),
+      getParentPagePosition(storylineB)
+    );
+  }
+
+  function compareByLane(storylineA, storylineB) {
+    return compare(
+      storylineA.lane(),
+      storylineB.lane()
+    );
+  }
+
+  function compareByRow(storylineA, storylineB) {
+    return compare(
+      storylineA.row(),
+      storylineB.row()
+    );
+  }
+
+  function compareByTitle(storylineA, storylineB) {
+    return compare(
+      storylineA.title(),
+      storylineB.title()
+    );
+  }
+
+  function compare(a, b) {
+    if (a > b) {
+      return 1;
+    }
+    else if (a < b) {
+      return -1;
+    }
+    else {
+      return 0;
+    }
+  }
+
+  function getParentPagePosition(storyline) {
+    var parentPage = getParentPage(storyline);
+    return parentPage && parentPage.get('position');
+  }
+
+  function getParentPage(storyline) {
+    return pages.getByPermaId(storyline.parentPagePermaId());
+  }
+};

data/app/assets/javascripts/pageflow/editor/models/storyline_scaffold.js

@@ -0,0 +1,23 @@
+pageflow.StorylineScaffold = pageflow.Scaffold.extend({
+  build: function() {
+    this.storyline = this.parent.buildStoryline(this.options.storylineAttributes);
+    this.chapter = this.storyline.buildChapter();
+
+    if (this.options.depth === 'page') {
+      this.page = this.chapter.buildPage();
+    }
+
+    pageflow.editor.trigger('scaffold:storyline', this.storyline);
+
+    return this.storyline;
+  },
+
+  load: function(response) {
+    this.storyline.set(response.storyline);
+    this.chapter.set(response.chapter);
+
+    if (this.page) {
+      this.page.set(response.page);
+    }
+  }
+});

data/app/assets/javascripts/pageflow/editor/models/storyline_transitive_child_pages.js

@@ -0,0 +1,33 @@
+pageflow.StorylineTransitiveChildPages = function(storyline, storylines, pages) {
+  var isTranstiveChildStoryline;
+
+  this.contain = function(page) {
+    if (!isTranstiveChildStoryline) {
+      search();
+    }
+
+    return !!isTranstiveChildStoryline[page.chapter.storyline.id];
+  };
+
+  function search() {
+    isTranstiveChildStoryline = storylines.reduce(function(memo, other) {
+      var current = other;
+
+      while (current) {
+        if (current === storyline || memo[current.id]) {
+          memo[other.id] = true;
+          return memo;
+        }
+
+        current = parentStoryline(current);
+      }
+
+      return memo;
+    }, {});
+  }
+
+  function parentStoryline(storyline) {
+    var parentPage = pages.getByPermaId(storyline.parentPagePermaId());
+    return parentPage && parentPage.chapter && parentPage.chapter.storyline;
+  }
+};

data/app/assets/javascripts/pageflow/editor/routers/sidebar_router.js

@@ -1,8 +1,10 @@
 pageflow.SidebarRouter = Backbone.Marionette.AppRouter.extend({
   appRoutes: {
+    'page_links/:id': 'pageLink',
     'pages/:id': 'page',
     'pages/:id/:tab': 'page',
     'chapters/:id': 'chapter',
+    'storylines/:id': 'storyline',
 
     'files/:collectionName?handler=:handler&payload=:payload': 'files',
     'files/:collectionName': 'files',
@@ -15,6 +17,7 @@ pageflow.SidebarRouter = Backbone.Marionette.AppRouter.extend({
     'meta_data/:tab': 'metaData',
     'publish': 'publish',
 
+    '?storyline=:id': 'index',
     '.*': 'index'
   }
 });

data/app/assets/javascripts/pageflow/editor/templates/edit_entry.jst.ejs

@@ -11,9 +11,4 @@
   </li>
 </ul>
 
-<h2><%= I18n.t('pageflow.editor.templates.edit_entry.outline') %></h2>
-
-<ul class="chapters outline navigatable">
-</ul>
-
-<a class="add_chapter" href=""><%= I18n.t('pageflow.editor.templates.edit_entry.new_chapter') %></a>
+<div class="edit_entry_storylines storyline_picker"></div>

data/app/assets/javascripts/pageflow/editor/templates/edit_page_link.jst.ejs

@@ -0,0 +1,3 @@
+<a class="back"><%= I18n.t('pageflow.editor.templates.edit_page_link.back') %></a>
+<a class="destroy"><%= I18n.t('pageflow.editor.templates.edit_page_link.destroy') %></a>
+<div class="form_container"></div>

data/app/assets/javascripts/pageflow/editor/templates/edit_storyline.jst.ejs

@@ -0,0 +1,12 @@
+<a class="back"><%= I18n.t('pageflow.editor.templates.edit_storyline.outline') %></a>
+<a class="destroy" data-tooltip-align="bottom right">
+  <%= I18n.t('pageflow.editor.templates.edit_storyline.destroy') %>
+</a>
+
+<div class="failure">
+  <p><%= I18n.t('pageflow.editor.templates.edit_storyline.save_error') %></p>
+  <p class="message"></p>
+  <a class="retry" href=""><%= I18n.t('pageflow.editor.templates.edit_storyline.retry') %></a>
+</div>
+
+<div class="form_container"></div>

data/app/assets/javascripts/pageflow/editor/templates/page_link_item.jst.ejs

@@ -3,5 +3,6 @@
   <span class="page_thumbnail"></span>
   <div class="title"></div>
   <div class="label"></div>
+  <a class="remove" title="<%= I18n.t('pageflow.editor.templates.page_link_item.remove') %>"></a>
   <a class="edit" title="<%= I18n.t('pageflow.editor.templates.page_link_item.edit') %>"></a>
 <div>

data/app/assets/javascripts/pageflow/editor/templates/page_selection.jst.ejs

@@ -2,8 +2,8 @@
   <h2><%= I18n.t('pageflow.editor.templates.page_selection.title') %></h2>
 
   <div class="wrapper editor">
-    <ul class="chapters">
-    </ul>
+    <div class="storyline_picker">
+    </div>
   </div>
 
   <div class="footer">

data/app/assets/javascripts/pageflow/editor/templates/storyline_outline.jst.ejs

@@ -0,0 +1,4 @@
+<h2><%= I18n.t('pageflow.editor.templates.storyline_outline.header') %></h2>
+<ul class="storyline_outline_chapters chapters"></ul>
+
+<a class="add_chapter" href=""><%= I18n.t('pageflow.editor.templates.storyline_outline.new_chapter') %></a>

data/app/assets/javascripts/pageflow/editor/templates/storyline_picker.jst.ejs

@@ -0,0 +1,7 @@
+<div class="storyline_picker_storylines">
+  <div class="storyline_picker_select_region"></div>
+  <a href="" class="add_storyline" title="<%= I18n.t('pageflow.editor.templates.storyline_picker.add') %>"></a>
+  <a href="" class="edit_storyline" title="<%= I18n.t('pageflow.editor.templates.storyline_picker.edit') %>"></a>
+</div>
+
+<div class="storyline_picker_main_region"></div>

data/app/assets/javascripts/pageflow/editor/utils/reload_stylesheet.js

@@ -0,0 +1,9 @@
+pageflow.reloadStylesheet = function(name) {
+  var link = $('head link[data-name=' + name + ']');
+
+  if (!link.data('originalHref')) {
+    link.data('originalHref', link.attr('href'));
+  }
+
+  link.attr('href', link.data('originalHref') + '&reload=' + new Date().getTime());
+};

data/app/assets/javascripts/pageflow/editor/views/configuration_editors/groups/options.js

@@ -11,7 +11,7 @@ pageflow.ConfigurationEditorTabView.groups.define('options', function(options) {
     this.input('delayed_text_fade_in', pageflow.SelectInputView, {values: pageflow.Page.delayedTextFadeIn});
   }
 
-  this.input('description', pageflow.TextAreaInputView, {size: 'short'});
+  this.input('description', pageflow.TextAreaInputView, {size: 'short', disableLinks: true});
 
   if (pageflow.features.isEnabled('atmo')) {
     this.input('atmo_audio_file_id', pageflow.FileInputView, {
@@ -34,4 +34,4 @@ pageflow.ConfigurationEditorTabView.groups.define('options', function(options) {
       values: pageflow.Page.scrollIndicatorOrientations
     });
   }
-});
+});

data/app/assets/javascripts/pageflow/editor/views/configuration_editors/groups/page_link.js

@@ -0,0 +1,10 @@
+pageflow.ConfigurationEditorTabView.groups.define('page_link', 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.editor.views.edit_page_link_view.default_page_transition',
+    values: pageflow.pageTransitions.names()
+  });
+});

data/app/assets/javascripts/pageflow/editor/views/edit_chapter_view.js

@@ -31,11 +31,7 @@ pageflow.EditChapterView = Backbone.Marionette.Layout.extend({
       });
 
       if (pageflow.features.isEnabled('chapter_hierachy')) {
-        this.input('parent_page_perma_id', pageflow.PageLinkInputView);
         this.input('display_parent_page_button', pageflow.CheckBoxInputView);
-        this.input('navigation_bar_mode', pageflow.SelectInputView, {
-          values: pageflow.ChapterFilter.strategies
-        });
       }
     });
   },

data/app/assets/javascripts/pageflow/editor/views/edit_entry_view.js

@@ -5,7 +5,8 @@ pageflow.EditEntryView = Backbone.Marionette.ItemView.extend({
 
   ui: {
     publicationStateButton: 'a.publication_state',
-    menu: '.menu'
+    menu: '.menu',
+    storylines: '.edit_entry_storylines'
   },
 
   events: {
@@ -20,10 +21,6 @@ pageflow.EditEntryView = Backbone.Marionette.ItemView.extend({
       return false;
     },
 
-    'click a.add_chapter': function() {
-      this.model.addChapter();
-    },
-
     'click .menu a': function(event) {
       editor.navigate($(event.target).data('path'), {trigger: true});
       return false;
@@ -33,16 +30,13 @@ pageflow.EditEntryView = Backbone.Marionette.ItemView.extend({
   onRender: function() {
     this._addMenuItems();
 
-    this.subview(new pageflow.SortableCollectionView({
-      el: this.$('ul.chapters'),
-      collection: this.model.chapters,
-      itemViewConstructor: pageflow.NavigatableChapterItemView,
-      itemViewOptions: {
-        sortable: true,
-        pageItemViewOptions: {
-          displayInNavigationHint: true
-        }
-      }
+    this.subview(new pageflow.StorylinePickerView({
+      el: this.ui.storylines,
+      navigatable: true,
+      editable: true,
+      displayInNavigationHint: true,
+      rememberLastSelection: true,
+      storylineId: this.options.storylineId
     }));
   },
 

data/app/assets/javascripts/pageflow/editor/views/edit_meta_data_view.js

@@ -23,15 +23,20 @@ pageflow.EditMetaDataView = Backbone.Marionette.Layout.extend({
     });
 
     configurationEditor.tab('general', function() {
-      this.input('title', pageflow.TextInputView);
+      this.input('title', pageflow.TextInputView, {
+        placeholder: entry.attributes.entry_title
+      });
       this.input('locale', pageflow.SelectInputView, {
-        values: pageflow.config.availableLocales,
-        texts: _.map(pageflow.config.availableLocales, function(locale) {
-          return I18n.t('language', {locale: locale});
+        values: pageflow.config.availablePublicLocales,
+        texts: _.map(pageflow.config.availablePublicLocales, function(locale) {
+          return I18n.t('pageflow.public._language', {locale: locale});
         })
       });
 
       this.input('credits', pageflow.TextAreaInputView);
+      this.input('author', pageflow.TextInputView);
+      this.input('publisher', pageflow.TextInputView);
+      this.input('keywords', pageflow.TextInputView);
     });
 
     configurationEditor.tab('widgets', function() {
@@ -59,7 +64,10 @@ pageflow.EditMetaDataView = Backbone.Marionette.Layout.extend({
         collection: pageflow.imageFiles,
         fileSelectionHandler: 'entryConfiguration'
       });
-      this.input('summary', pageflow.TextAreaInputView);
+      this.input('summary', pageflow.TextAreaInputView, {
+        disableRichtext: true,
+        disableLinks: true
+      });
     });
 
     this.formContainer.show(configurationEditor);
@@ -68,4 +76,4 @@ pageflow.EditMetaDataView = Backbone.Marionette.Layout.extend({
   goBack: function() {
     editor.navigate('/', {trigger: true});
   }
-});
+});

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

@@ -0,0 +1,47 @@
+pageflow.EditPageLinkView = Backbone.Marionette.Layout.extend({
+  template: 'pageflow/editor/templates/edit_page_link',
+
+  regions: {
+    formContainer: '.form_container'
+  },
+
+  ui: {
+    backButton: 'a.back'
+  },
+
+  events: {
+    'click a.back': 'goBack',
+
+    'click a.destroy': 'destroy'
+  },
+
+  onRender: function() {
+    var configurationEditor = this.options.page.pageType().createPageLinkConfigurationEditorView({
+      model: this.model,
+      page: this.options.page
+    });
+
+    this.formContainer.show(configurationEditor);
+
+    this.highlight();
+  },
+
+  highlight: function() {
+    this.model.highlight();
+
+    this.listenTo(this, 'close', function() {
+      this.model.resetHighlight();
+    });
+  },
+
+  destroy: function() {
+    if (confirm(I18n.t('pageflow.internal_links.editor.views.edit_page_link_view.confirm_destroy'))) {
+      this.model.remove();
+      this.goBack();
+    }
+  },
+
+  goBack: function() {
+    pageflow.editor.navigate('/pages/' + this.options.page.id + '/links', {trigger: true});
+  }
+});