pageflow 0.3.0 → 0.4.0

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

@@ -10,7 +10,8 @@ pageflow.PublishEntryView = Backbone.Marionette.ItemView.extend({
     publishForeverRadioBox: 'input[value=publish_forever]',
     revisionsLink: '.published.notice a',
     publishedNotice: '.published.notice',
-    saveButton: 'button.save'
+    saveButton: 'button.save',
+    successLink: '.success a'
   },
 
   events: {
@@ -53,6 +54,8 @@ pageflow.PublishEntryView = Backbone.Marionette.ItemView.extend({
     this.$el.toggleClass('published', this.model.get('published'));
 
     this.ui.revisionsLink.attr('href', '/admin/entries/' + this.model.id);
+    this.ui.successLink.attr('href', this.model.get('pretty_url'));
+    this.ui.successLink.text(this.model.get('pretty_url'));
 
     var publishedUntil = new Date(this.model.get('published_until'));
     if (publishedUntil > new Date()) {
@@ -104,6 +107,7 @@ pageflow.PublishEntryView = Backbone.Marionette.ItemView.extend({
         if (that.isClosed) { return; }
 
         that.$el.removeClass('publishing');
+        that.$el.addClass('succeeded');
         that.$('input').removeAttr('disabled');
         that.enableSave();
       });

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

@@ -17,7 +17,7 @@ pageflow.SortableCollectionView = pageflow.CollectionView.extend({
       receive: _.bind(function(event, ui) {
         var view = ui.item.data('view');
 
-        this.updateOrder();
+        this.reindexPositions();
 
         this.itemViews.add(view);
         this.collection.add(view.model);
@@ -47,11 +47,15 @@ pageflow.SortableCollectionView = pageflow.CollectionView.extend({
   },
 
   updateOrder: function() {
-    this.$el.children().each(function(index) {
-      $(this).data('view').model.set('position', index);
-    });
+    this.reindexPositions();
 
     this.collection.sort();
     this.collection.saveOrder();
+  },
+
+  reindexPositions: function() {
+    this.$el.children().each(function(index) {
+      $(this).data('view').model.set('position', index);
+    });
   }
 });

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

@@ -3,6 +3,7 @@
 @import "pageflow/animations";
 
 @import 'pageflow/jquery_ui';
+@import "./blank_entry";
 @import "./dialogs";
 @import "./colors";
 @import "./embedded";
@@ -49,7 +50,7 @@
   @import "./menu";
   @import "./manage_files";
   @import "./files";
-  @import "./confirmable_files";
+  @import "./confirm_encoding";
   @import "./files_gallery";
   @import "./file_meta_data";
   @import "./file_stages";

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

@@ -0,0 +1,46 @@
+.blank_entry {
+  margin: 0 auto;
+  top: 5%;
+  position: relative;
+  font-family: "SourceSansPro";
+  font-size: 17px;
+  letter-spacing: 0.01em;
+  text-align: center;
+  width: 50%;
+  color: #333;
+
+  h2 {
+    font-size: 30px;
+    font-weight: normal;
+    letter-spacing: 0.02em;
+    text-transform: uppercase;
+    color: #999;
+
+    &:before {
+      content: "";
+      display: block;
+      margin: 0 auto 30px auto;
+      width: 61px;
+      height: 60px;
+      background-image: image-url('pageflow/themes/default/logo_header.png');
+      opacity: 0.3;
+    }
+  }
+
+  em {
+    font-weight: bold;
+    font-style: normal;
+  }
+
+  ol {
+    display: inline-block;
+    text-align: left;
+    padding: 20px 50px;
+    border-bottom: solid 1px #aaa;
+    border-top: solid 1px #aaa;
+  }
+
+  li {
+    padding: 15px 0;
+  }
+}

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

@@ -0,0 +1,84 @@
+.confirm_encoding {
+  .blank_slate {
+    background-color: #fff;
+    margin: 10px 0;
+    padding: 20px 0;
+
+    p {
+      margin: 10px 5px;
+      text-align: center;
+    }
+
+    a {
+      text-decoration: underline;
+    }
+  }
+
+  ul.confirmable_files {
+    margin-bottom: 15px;
+
+    li {
+      background-color: #eee;
+      margin-bottom: 2px;
+      position: relative;
+      padding: 10px 10px 0 30px;
+      white-space: nowrap;
+      overflow: hidden;
+      height: 23px;
+    }
+
+    input[type=checkbox] {
+      display: block;
+      position: absolute;
+      top: 10px;
+      left: 10px;
+      width: auto;
+      height: auto;
+    }
+
+    .file_name {
+      position: absolute;
+      left: 30px;
+      top: 9px;
+      right: 100px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+
+      font-weight: normal;
+      font-size: 13px;
+    }
+
+    .duration {
+      position: absolute;
+      right: 50px;
+      top: 9px;
+    }
+
+    .actions {
+      position: absolute;
+      right: 10px;
+      top: 3px;
+      text-align: right;
+
+      a {
+        float: left;
+        margin-left: 5px;
+      }
+    }
+
+    a.remove {
+      @include icon-only-button(#aaa);
+      @include trash-icon;
+    }
+  }
+
+  button.confirm {
+    @include icon-button;
+    @include check-icon;
+
+    &.checking {
+      @include arrows-ccw-icon;
+      @include background-icon-animation(blink);
+    }
+  }
+}

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

@@ -1,4 +1,4 @@
-.dialog {
+.dialog_container .dialog {
   position: absolute;
   top: 0;
   left: 0;

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

@@ -50,6 +50,7 @@ ul.files {
   }
 
   a.cancel,
+  a.confirm,
   a.remove,
   a.retry {
     @include icon-only-button(#aaa);
@@ -63,6 +64,10 @@ ul.files {
     @include cancel-icon;
   }
 
+  a.confirm {
+    @include check-icon;
+  }
+
   a.retry {
     @include arrows-ccw-icon;
   }

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

@@ -1,6 +1,7 @@
 .publish_entry {
   .notice.files_pending,
   .notice.published,
+  .notice.success,
   &.published .notice.not_published {
     display: none;
   }
@@ -19,6 +20,16 @@
     display: block;
   }
 
+  &.succeeded {
+    > div {
+      display: none;
+    }
+
+    .notice.success {
+      display: block;
+    }
+  }
+
   .notice {
     @include background-icon-left($left: 10px, $top: 18px);
 
@@ -37,6 +48,10 @@
       @include eye-icon;
     }
 
+    &.success {
+      @include check-icon;
+    }
+
     p {
       margin-bottom: 10px;
     }

data/app/assets/stylesheets/pageflow/navigation_bar.css.scss

@@ -176,6 +176,10 @@ $nav-color: #9c9c9c;
         -webkit-mask-image: none;
       }
     }
+
+    p {
+      margin: 0 0 0.5em;
+    }
   }
 
   .navigation_share_box {
@@ -213,13 +217,9 @@ $nav-color: #9c9c9c;
       color: #b4c552;
     }
 
-    a.legal {
+    a.legal, a.copy {
       float: left;
     }
-
-    a.copy {
-      float: right;
-    }
   }
 
   .navigation_menu {

data/app/assets/stylesheets/pageflow/player_controls.css.scss

@@ -6,14 +6,10 @@
   font-size: 0.8em;
   color: white;
 
+  h3,
   p {
-    margin: 0 3% 15px 3%;
-    width: 94%;
-  }
-
-  h3 {
     margin: 15px 3%;
-    width: 100%;
+    width: 94%;
   }
 
   &.empty {

data/app/assets/stylesheets/pageflow/themes/default/anchors.css.scss

@@ -8,7 +8,7 @@ $anchor-color: $main-color;
   text-decoration: none;
   pointer-events: all;
   position: relative;
-  margin-left: 21px;
+  margin-left: 6px;
   margin-right: 6px;
 
   &:hover {
@@ -16,7 +16,7 @@ $anchor-color: $main-color;
   }
 
   @include phone {
-    margin-left: 15px;
+    margin-left: 5px;
     margin-right: 5px;
   }
 

data/app/assets/stylesheets/pageflow/themes/default/page.css.scss

@@ -87,6 +87,7 @@ $page-color: $main-color;
     min-width: 100px;
     max-width: 221px;
     width: 13%;
+    left: 8%;
   }
 
   &.invert .content_and_background .scroller > div:after {

data/app/controllers/pageflow/application_controller.rb

@@ -11,6 +11,10 @@ module Pageflow
 
     include EditLocking
 
+    rescue_from ActionController::UnknownFormat do
+      render(status: 404, text: 'Not found')
+    end
+
     rescue_from ActiveRecord::RecordNotFound do
       respond_to do |format|
         format.html { render :file => Rails.root.join('public/404.html'), :status => :not_found }

data/app/controllers/pageflow/editor/encoding_confirmations_controller.rb

@@ -12,7 +12,7 @@ module Pageflow
         @encoding_confirmation = build_encoding_confirmation(entry)
         @encoding_confirmation.save!
 
-        head :ok
+        render(json: {})
       rescue EncodingConfirmation::QuotaExceededError
         render(action: :check, status: :forbidden)
       end

data/app/helpers/pageflow/admin/memberships_helper.rb

@@ -0,0 +1,52 @@
+module Pageflow
+  module Admin
+    module MembershipsHelper
+      def membership_entries_collection_for_parent(parent)
+        CollectionForParent.new(parent,
+                                collection_method: :entries,
+                                display_method: :title,
+                                order: 'title ASC').pairs
+      end
+
+      def membership_users_collection_for_parent(parent)
+        CollectionForParent.new(parent,
+                                collection_method: :users,
+                                display_method: :formal_name,
+                                order: 'last_name ASC, first_name ASC').pairs
+      end
+
+      class CollectionForParent
+        attr_reader :parent, :options
+
+        def initialize(parent, options)
+          @parent = parent
+          @options = options
+        end
+
+        def pairs
+          items.each_with_object([]) do |item, result|
+            result << [display(item), item.id]
+          end
+        end
+
+        private
+
+        def items
+          items_in_account - items_in_parent
+        end
+
+        def display(item)
+          item.send(options[:display_method])
+        end
+
+        def items_in_account
+          parent.account.send(options[:collection_method]).order(options[:order])
+        end
+
+        def items_in_parent
+          parent.respond_to?(options[:collection_method]) ? parent.send(options[:collection_method]) : []
+        end
+      end
+    end
+  end
+end

data/app/helpers/pageflow/admin/users_helper.rb

@@ -0,0 +1,9 @@
+module Pageflow
+  module Admin
+    module UsersHelper
+      def collection_for_user_roles
+        User.roles_accessible_by(current_ability).index_by { |role| t(role, :scope => 'admin.users.roles') }
+      end
+    end
+  end
+end

data/app/helpers/pageflow/entries_helper.rb

@@ -4,20 +4,36 @@ module Pageflow
       pageflow.short_entry_url(entry.to_model, Pageflow.config.theming_url_options(entry.theming))
     end
 
-    def entry_collection_for_parent(parent)
-      if parent.is_a?(User)
-        parent.account.entries - parent.entries
-      else
-        parent.account.entries
-      end
-    end
-
     def entry_file_rights(entry)
-      [:audio_files, :image_files, :video_files].map do |collection|
+      rights = [:audio_files, :image_files, :video_files].map do |collection|
         entry.send(collection).map do |file|
           file.rights.presence || entry.account.default_file_rights
         end
-      end.flatten.sort.uniq * ', '
+      end.flatten.sort.uniq
+
+      if rights.any?
+        content_tag :p, class: 'rights' do
+          "Bildrechte: " + rights * ', '
+        end
+      else
+        ''
+      end
+    end
+
+    def entry_global_links(entry)
+      links = []
+      if entry.theming.imprint_link_label.present? && entry.theming.imprint_link_url.present?
+        links << link_to(raw(entry.theming.imprint_link_label), entry.theming.imprint_link_url, :target => '_blank', :tabindex => 2, :class => 'legal')
+      end
+      if entry.theming.copyright_link_label.present? && entry.theming.copyright_link_url.present?
+        links << link_to(raw(entry.theming.copyright_link_label), entry.theming.copyright_link_url, :target => '_blank', :tabindex => 2, :class => 'copy')
+      end
+
+      if links.any?
+        content_tag(:h2, 'Globale Links', :class => 'hidden') + safe_join(links, ''.html_safe)
+      else
+        ''
+      end
     end
 
     def entry_theme_stylesheet_link_tag(entry)