pageflow 0.6.0 → 0.7.0

data/app/assets/javascripts/pageflow/editor/views/configuration_editors/audio_loop.js

@@ -2,9 +2,6 @@ pageflow.ConfigurationEditorView.register('audio_loop', {
   configure: function() {
     this.tab('general', function() {
       this.group('general');
-
-      this.input('additional_title', pageflow.TextInputView);
-      this.input('additional_description', pageflow.TextAreaInputView, {size: 'short'});
     });
 
     this.tab('files', function() {

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

@@ -21,7 +21,7 @@ pageflow.EditChapterView = Backbone.Marionette.Layout.extend({
   },
 
   destroy: function() {
-    if (confirm("Kapitel einschließlich ALLER enthaltener Seiten wirklich löschen?\n\nDieser Schritt kann nicht rückgängig gemacht werden.")) {
+    if (confirm(I18n.t('pageflow.editor.views.edit_chapter_view.confirm_destroy'))) {
       this.model.destroy();
       this.goBack();
     }

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

@@ -24,6 +24,13 @@ pageflow.EditMetaDataView = Backbone.Marionette.Layout.extend({
 
     configurationEditor.tab('general', function() {
       this.input('title', pageflow.TextInputView);
+      this.input('locale', pageflow.SelectInputView, {
+        values: pageflow.config.availableLocales,
+        texts: _.map(pageflow.config.availableLocales, function(locale) {
+          return I18n.t('language', {locale: locale});
+        })
+      });
+
       this.input('credits', pageflow.TextAreaInputView);
     });
 

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

@@ -19,12 +19,21 @@ pageflow.EditPageView = Backbone.Marionette.Layout.extend({
   },
 
   onRender: function() {
-    this.pageTypeContainer.show(new pageflow.SelectInputView({
+    this.pageTypeContainer.show(new pageflow.ExtendedSelectInputView({
       model: this.model,
       propertyName: 'template',
+
       collection: pageflow.Page.types,
       valueProperty: 'name',
       translationKeyProperty: 'translation_key',
+      groupTranslationKeyProperty: 'category_translation_key',
+      descriptionTranslationKeyProperty: 'description_translation_key',
+
+      pictogramClass: 'type_pictogram',
+
+      helpLinkClicked: function(value) {
+        pageflow.app.trigger('toggle-help', pageflow.Page.typesByName[value].help_entry_translation_key);
+      }
     }));
 
     this.load();
@@ -39,7 +48,7 @@ pageflow.EditPageView = Backbone.Marionette.Layout.extend({
   },
 
   destroy: function() {
-    if (confirm("Seite wirklich löschen?")) {
+    if (confirm(I18n.t('pageflow.editor.views.edit_page_view.confirm_destroy'))) {
       this.model.destroy();
       this.goBack();
     }

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

@@ -13,7 +13,7 @@ pageflow.EditorView = Backbone.View.extend({
   initialize: function() {
     $(window).on('beforeunload', function(event) {
       if (pageflow.entry.get('uploading_files_count') > 0)  {
-        return 'Es werden noch Dateien hochgeladen. Wenn Sie die Seite verlassen werden die Uploads abgebrochen.';
+        return I18n.t('pageflow.editor.views.editor_views.files_pending_warning');
       }
     });
   },
@@ -21,9 +21,9 @@ pageflow.EditorView = Backbone.View.extend({
   render: function() {
     this.$el.layout({
       minSize: 300,
-      togglerTip_closed: 'Editorleiste einblenden',
-      togglerTip_open: 'Editorleiste ausblenden',
-      resizerTip: 'Größe der Editorleiste ändern',
+      togglerTip_closed: I18n.t('pageflow.editor.views.editor_views.show_editor'),
+      togglerTip_open: I18n.t('pageflow.editor.views.editor_views.hide_editor'),
+      resizerTip: I18n.t('pageflow.editor.views.editor_views.resize_editor'),
       onresize: function() {
         pageflow.app.trigger('resize');
       }

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

@@ -20,7 +20,10 @@ pageflow.EntryPreviewView = Backbone.Marionette.ItemView.extend({
       blankSlateViewConstructor: pageflow.BlankEntryView
     }));
 
-    this.ui.entry.append($('<div class="scroll_indicator indicator">Scrollen, um weiterzulesen</div>'));
+    this.ui.entry.append($('<div class="scroll_indicator indicator">' +
+                           I18n.t('pageflow.editor.views.entry_preview_view.scroll_hint',
+                                  {locale: this.model.configuration.get('locale') }) +
+                           '</div>'));
 
     this.update();
 

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

@@ -23,7 +23,7 @@ pageflow.EntryPublicationQuotaDecoratorView = Backbone.Marionette.Layout.extend(
     var view = this;
 
     if (this.model.get('checking')) {
-      view.ui.state.text(I18n.t('editor.quotas.loading'));
+      view.ui.state.text(I18n.t('pageflow.editor.quotas.loading'));
       view.ui.exhaustedMessage.hide().html('');
       view.outlet.close();
     }

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

@@ -39,7 +39,7 @@ pageflow.FilesExplorerView = Backbone.Marionette.ItemView.extend({
 
     this.tabsView = new pageflow.TabsView({
       model: this.model,
-      i18n: 'editor.files.tabs',
+      i18n: 'pageflow.editor.files.tabs',
       defaultTab: this.options.tabName
     });
 

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

@@ -10,14 +10,14 @@ pageflow.FilesView = Backbone.Marionette.ItemView.extend({
 
   onRender: function() {
     this.addFileModel = new Backbone.Model({
-      label: 'Hinzufügen',
+      label: I18n.t('pageflow.editor.views.files_view.add'),
       options: [
         {
-          label: 'Hochladen',
+          label: I18n.t('pageflow.editor.views.files_view.upload'),
           handler: this.upload.bind(this)
         },
         {
-          label: 'Wiederverwenden',
+          label: I18n.t('pageflow.editor.views.files_view.reuse'),
           handler: function() {
             pageflow.FilesExplorerView.open({
               callback: pageflow.entry.addFileUsage.bind(pageflow.entry)
@@ -31,7 +31,7 @@ pageflow.FilesView = Backbone.Marionette.ItemView.extend({
 
     this.tabsView = new pageflow.TabsView({
       model: this.model,
-      i18n: 'editor.files.tabs',
+      i18n: 'pageflow.editor.files.tabs',
       defaultTab: this.options.tabName
     });
 

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

@@ -2,17 +2,8 @@ pageflow.HelpView = Backbone.Marionette.ItemView.extend({
   template: 'templates/help',
   className: 'help',
 
-  defaultSection: 'outline',
-
-  routeSectionMapping: {
-    'pages': 'page',
-    'files': 'files',
-    'publish': 'publish'
-  },
-
   ui: {
-    breakButton: '.break',
-    message: '.error .message',
+    placeholder: '.placeholder',
     sections: 'section',
     menuItems: 'li'
   },
@@ -22,8 +13,19 @@ pageflow.HelpView = Backbone.Marionette.ItemView.extend({
       this.toggle();
     },
 
-    'click li': function(event) {
-      this.showSection($(event.currentTarget).data('section'));
+    'click .expandable > a': function(event) {
+      $(event.currentTarget).parents('.expandable').toggleClass('expanded');
+    },
+
+    'click a': function(event) {
+      var link = $(event.currentTarget);
+
+      if (link.attr('href').indexOf('#') === 0) {
+        this.showSection(link.attr('href').substring(1),
+                         {scrollIntoView: !link.parents('nav').length});
+      }
+
+      return false;
     },
 
     'click .box': function() {
@@ -36,30 +38,41 @@ pageflow.HelpView = Backbone.Marionette.ItemView.extend({
   },
 
   initialize: function() {
-    this.listenTo(pageflow.app, 'toggle-help', function() {
-      this.chooseSectionFromFragment();
+    this.listenTo(pageflow.app, 'toggle-help', function(name) {
       this.toggle();
+      this.showSection(name ||
+                       pageflow.editor.defaultHelpEntry ||
+                       this.defaultHelpEntry(),
+                       {scrollIntoView: true});
     });
   },
 
+  onRender: function() {
+    this.ui.placeholder.replaceWith($('#help_entries_seed').html());
+    this.bindUIElements();
+  },
+
   toggle: function() {
     this.$el.toggle();
   },
 
-  chooseSectionFromFragment: function() {
-    var route = _.chain(this.routeSectionMapping).keys().find(function(route) {
-      if (Backbone.history.fragment.indexOf(route) >= 0) {
-        return true;
-      }
-    }, this).value();
-
-    this.showSection(this.routeSectionMapping[route] || this.defaultSection);
+  defaultHelpEntry: function() {
+    return this.ui.sections.first().data('name');
   },
 
-  showSection: function(name) {
+  showSection: function(name, options) {
     this.ui.menuItems.each(function() {
       var menuItem = $(this);
-      menuItem.toggleClass('active', menuItem.data('section') === name);
+      var active = (menuItem.find('a').attr('href') === '#' + name);
+      menuItem.toggleClass('active', active);
+
+      if (active) {
+        menuItem.parents('.expandable').addClass('expanded');
+
+        if (options.scrollIntoView) {
+          menuItem[0].scrollIntoView();
+        }
+      }
     });
 
     this.ui.sections.each(function() {

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

@@ -17,6 +17,8 @@ pageflow.LockedView = Backbone.Marionette.ItemView.extend({
     aquired: 'hide',
 
     locked: 'show',
+
+    unauthenticated: 'goBack'
   },
 
   breakLock: function() {
@@ -30,10 +32,10 @@ pageflow.LockedView = Backbone.Marionette.ItemView.extend({
   show: function(info, options) {
     var key = info.error + '.' + options.context;
 
-    this.ui.message.html(I18n.t('edit_locks.errors.' + key + '_html', {user_name: info.held_by}));
+    this.ui.message.html(I18n.t('pageflow.edit_locks.errors.' + key + '_html', {user_name: info.held_by}));
     this.ui.message.attr('data-error', key);
 
-    this.ui.breakButton.text(I18n.t('edit_locks.break_action.' + options.context));
+    this.ui.breakButton.text(I18n.t('pageflow.edit_locks.break_action.aquire'));
 
     this.$el.removeClass('checking');
     this.$el.show();

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

@@ -33,7 +33,7 @@ pageflow.PageItemView = Backbone.Marionette.ItemView.extend({
       .addClass(this.model.get('template'));
 
     this.ui.pictogram.attr('title', this._getPictogramTitle());
-    this.ui.title.text(this.model.title() || '(Unbenannt)');
+    this.ui.title.text(this.model.title() || I18n.t('pageflow.editor.views.page_item_view.unnamed'));
   },
 
   _getPictogramTitle: function() {

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

@@ -58,9 +58,12 @@ pageflow.PagePreviewView = Backbone.Marionette.View.extend({
 
   update: function() {
     this.$el.removeClass(pageflow.Page.transitions.join(' ')).addClass(this.model.configuration.get('transition'));
+
     this.pageType().update(this.$el, this.model.configuration);
     _.extend(this.$el.data('configuration'), this.model.configuration.attributes);
+
     this.refreshScroller();
+    this.ensureTargetBlankForContentLinks();
   },
 
   updateChapterBeginningClass: function() {
@@ -80,6 +83,10 @@ pageflow.PagePreviewView = Backbone.Marionette.View.extend({
     this.$el.page('refreshScroller');
   },
 
+  ensureTargetBlankForContentLinks: function() {
+    pageflow.links.ensureTargetBlankForContentLinks(this.el);
+  },
+
   initEmbeddedViews: function() {
     var view = this;
 

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

@@ -11,6 +11,7 @@ pageflow.PublishEntryView = Backbone.Marionette.ItemView.extend({
     revisionsLink: '.published.notice a',
     publishedNotice: '.published.notice',
     saveButton: 'button.save',
+    successNotice: '.success',
     successLink: '.success a'
   },
 
@@ -109,6 +110,12 @@ pageflow.PublishEntryView = Backbone.Marionette.ItemView.extend({
         that.$el.removeClass('publishing');
         that.$el.addClass('succeeded');
         that.$('input').removeAttr('disabled');
+
+        var publishedMessage = that.options.entryPublication.get('published_message_html');
+        if (publishedMessage) {
+          that.ui.successNotice.append(publishedMessage);
+        }
+
         that.enableSave();
       });
 
@@ -196,4 +203,4 @@ pageflow.PublishEntryView.create = function(options) {
       view: new pageflow.PublishEntryView(options)
     })
   });
-};
+};

data/app/assets/javascripts/pageflow/links.js

@@ -0,0 +1,42 @@
+pageflow.links = {
+  setup: function() {
+    this.preventFocusRectOnClick();
+    this.ensureClickOnEnterKeyPress();
+    this.setupContentSkipLinks();
+    this.ensureTargetBlankForContentLinks();
+  },
+
+  preventFocusRectOnClick: function() {
+    $('body').on('click mousedown', 'a, [tabindex]', function() {
+      $(this).blur();
+    });
+  },
+
+  ensureClickOnEnterKeyPress: function() {
+    $('body').on('keypress', 'a, [tabindex]', function(e) {
+      if (e.which == 13) {
+        $(this).click();
+      }
+    });
+
+    $('body').on('keyup', 'a, [tabindex]', function (e) {
+      e.stopPropagation();
+    });
+  },
+
+  setupContentSkipLinks: function() {
+    $('.content_link').attr('href', '#firstContent');
+
+    $('.content_link').click(function(e) {
+      $('#firstContent').focus();
+      e.preventDefault();
+      return false;
+    });
+  },
+
+  // There was a time when the rich text editor did not add target
+  // attributes to inline links even though it should have.
+  ensureTargetBlankForContentLinks: function(context) {
+    $('.contentText p a', context).attr('target', '_blank');
+  }
+};

data/app/assets/javascripts/pageflow/page_types/audio.js

@@ -111,7 +111,9 @@ pageflow.pageType.register('audio', _.extend({
   },
 
   _ensureAudioPlayer: function(pageElement) {
-    this.audioPlayer = this.audioPlayer || pageflow.AudioPlayer.fromScriptTag(pageElement.find('script[data-audio]'));
+    this.audioPlayer = this.audioPlayer ||
+      pageflow.AudioPlayer.fromScriptTag(pageElement.find('script[data-audio]'),
+                                         {mediaEvents: true});
 
     pageElement.find('.vjs-controls').playerControls({
       player: this.audioPlayer

data/app/assets/javascripts/pageflow/page_types/video.js

@@ -116,6 +116,7 @@ pageflow.pageType.register('video', _.extend({
   _initVideoPlayer: function(pageElement) {
     var videoPlayer = new pageflow.VideoPlayer.Lazy(pageElement.find('[data-template=video]'), {
       bufferUnderrunWaiting: true,
+      mediaEvents: true,
       controls: true,
       customControlsOnMobile: true,
       width: '100%',

data/app/assets/javascripts/pageflow/ready.js

@@ -25,26 +25,7 @@ pageflow.ready = new $.Deferred(function(readyDeferred) {
         pageflow.history = new pageflow.History(pageflow.slides);
       });
 
-      $("body").on('click mousedown', 'a, [tabindex]', function() {
-        $(this).blur();
-      });
-
-      $("body").on('keypress', 'a, [tabindex]', function(e) {
-        if (e.which == 13) {
-          $(this).click();
-        }
-      });
-
-      $("body").on("keyup", "a, [tabindex]", function (e) {
-        e.stopPropagation();
-      });
-
-      $(".content_link").attr("href","#firstContent");
-      $(".content_link").click(function(e) {
-        $("#firstContent").focus();
-        e.preventDefault();
-        return false; }
-      );
+      pageflow.links.setup();
     });
   };
 }).promise();

data/app/assets/javascripts/pageflow/ui.js

@@ -1,7 +1,6 @@
 //= require_self
 
-//= require wysihtml5
-//= require parser_rules/simple
+//= require wysihtml5x-toolbar
 
 //= require i18n
 //= require i18n/translations
@@ -10,6 +9,7 @@
 //= require ./ui/object
 
 //= require_tree ./ui/views/mixins
+//= require ./ui/views/inputs/select_input_view
 //= require_tree ./ui/views
 //= require_tree ./ui/templates
 

data/app/assets/javascripts/pageflow/ui/templates/inputs/file_input.jst.ejs

@@ -4,6 +4,6 @@
 </label>
 <div class="file_thumbnail"></div>
 <div class="file_name"></div>
-<a href="" class="edit_positioning" title="Bildausschnitt anpassen"></a>
-<a href="" class="unset" title="Zurücksetzen"></a>
-<a href="" class="choose" title="Ändern"></a>
+<a href="" class="edit_positioning" title="<%= I18n.t('pageflow.ui.templates.inputs.file_input.adjust_positioning') %>"></a>
+<a href="" class="unset" title="<%= I18n.t('pageflow.ui.templates.inputs.file_input.reset') %>"></a>
+<a href="" class="choose" title="<%= I18n.t('pageflow.ui.templates.inputs.file_input.edit') %>"></a>