pageflow 0.6.0 → 0.7.0

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

@@ -88,6 +88,11 @@ $page-color: $main-color;
     max-width: 221px;
     width: 13%;
     left: 8%;
+
+    @include mobile {
+      padding-top: 1%;
+      height: 35px;
+    }
   }
 
   &.invert .content_and_background .scroller > div:after {

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

@@ -0,0 +1,20 @@
+$theme-name: "default";
+
+$main-color: #e84d2c;
+$main-color-dark: #b14a08;
+
+$focus-color: #c1c1c1;
+
+$anchor-color: #e84d2c;
+
+$basic-background-color: #353535;
+$basic-background-color-transparent: rgba(53, 53, 53, 0.9);
+$header-background-color: gray;
+
+$addInfobox-text-color: #fff; /* for the description text inside the info box */
+$addInfobox-controls-text-color: #ccc; /* for control text like durations */
+$addInfobox-background-color: #191919;
+$addInfobox-border-color: #505050;
+
+$standard-font: SourceSansPro;
+$standard-font-size: 16px;

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

@@ -5,3 +5,5 @@
   @import "./ui/forms";
   @import "./ui/tabs_view";
 }
+
+@import "./ui/input/extended_select_input";

data/app/assets/stylesheets/pageflow/ui/input/extended_select_input.css.scss

@@ -0,0 +1,105 @@
+.extended_select_input {
+  .ui-selectmenu-button span.ui-selectmenu-text {
+    font-family: Helvetica, Sans-Serif;
+    font-size: 13px;
+  }
+}
+
+.extended_select_input_menu {
+  border: solid 1px #aaa;
+
+  ul {
+    width: 600px;
+    border: none;
+    border-radius: 0;
+  }
+
+  .ui-state-default,
+  .ui-widget-content
+  .ui-state-default,
+  .ui-widget-header
+  .ui-state-default {
+    background: white;
+    border: 1px solid rgb(187, 187, 187);
+  }
+
+  .ui-state-hover,
+  .ui-widget-content .ui-state-hover,
+  .ui-widget-header .ui-state-hover,
+  .ui-state-focus,
+  .ui-widget-content .ui-state-focus,
+  .ui-widget-header .ui-state-focus {
+    background: white;
+    margin: 0;
+    background: rgb(248, 248, 248);
+  }
+
+  .type_pictogram {
+    position: absolute;
+    width: 25px;
+    height: 25px;
+    top: 0;
+    bottom: 0;
+    margin: auto 0;
+  }
+
+  .text-container {
+    position: absolute;
+    top: 50%;
+    @include transform(translate(0,-50%));
+    width: 66%;
+    margin-left: 20%;
+    overflow: hidden;
+  }
+
+  p {
+    margin: 0;
+  }
+
+  a {
+    @include help-circled-icon;
+
+    text-decoration: none;
+    float: right;
+    opacity: 0.2;
+    position: absolute;
+    bottom: 3px;
+    right: 7px;
+
+    &:hover {
+      opacity: 1;
+    }
+  }
+
+  .ui-menu-item {
+    float: left;
+    width: 33.33%;
+    outline: 0;
+    box-sizing: border-box;
+    min-height: 90px;
+    padding: 10px 2%;
+    border: 1px solid rgb(242, 242, 242);
+  }
+
+  .ui-selectmenu-optgroup {
+    float: left;
+    width: 100%;
+    margin: 0 !important;
+    border: 0;
+    background-color: rgb(211,211,211);
+  }
+
+  .ui-widget {
+    font-family: Helvetica, Sans-Serif;
+    font-size: 13px;
+
+    .item-description {
+      font-size: 11px;
+      color: gray;
+    }
+  }
+
+  .ui-state-focus {
+    background: #D2E5FA;
+  }
+}

data/app/controllers/concerns/pageflow/edit_locking.rb

@@ -5,7 +5,7 @@ module Pageflow
     included do
       rescue_from EditLock::NotHeldError, EditLock::HeldByOtherSessionError do |exception|
         respond_to do |format|
-          format.html { redirect_to :back, :alert => t('edit_locks.required') }
+          format.html { redirect_to :back, :alert => t('pageflow.edit_locks.required') }
           format.json do
             render(:status => :conflict, :json => {
                      :error_message => exception.message,
@@ -17,7 +17,7 @@ module Pageflow
 
       rescue_from EditLock::HeldByOtherUserError do |exception|
         respond_to do |format|
-          format.html { redirect_to :back, :alert => t('edit_locks.required_but_held_by_other_user') }
+          format.html { redirect_to :back, :alert => t('pageflow.edit_locks.required_but_held_by_other_user') }
           format.json do
             render(:status => :conflict, :json => {
                      :error_message => exception.message,

data/app/controllers/concerns/pageflow/quota_verification.rb

@@ -6,7 +6,7 @@ module Pageflow
       rescue_from Quota::ExhaustedError do |exception|
         respond_to do |format|
           format.html do
-            redirect_to :back, :alert => t('quotas.exhausted')
+            redirect_to :back, :alert => t('pageflow.quotas.exhausted')
           end
           format.json do
             render(:status => :forbidden,

data/app/controllers/pageflow/application_controller.rb

@@ -5,6 +5,10 @@ module Pageflow
   class ApplicationController < ActionController::Base
     layout 'pageflow/application'
 
+    before_filter do
+      I18n.locale = current_user.try(:locale) || I18n.default_locale
+    end
+
     # Prevent CSRF attacks by raising an exception.
     # For APIs, you may want to use :null_session instead.
     protect_from_forgery with: :exception
@@ -24,14 +28,14 @@ module Pageflow
 
     rescue_from CanCan::AccessDenied do |exception|
       respond_to do |format|
-        format.html { redirect_to main_app.admin_root_path, :alert => t('unauthorized') }
+        format.html { redirect_to main_app.admin_root_path, :alert => t('pageflow.unauthorized') }
         format.any(:json, :css) { head :forbidden }
       end
     end
 
     rescue_from StateMachine::InvalidTransition do |exception|
       respond_to do |format|
-        format.html { redirect_to main_app.admin_root_path, :alert => t('invalid_transition') }
+        format.html { redirect_to main_app.admin_root_path, :alert => t('pageflow.invalid_transition') }
         format.json { head :bad_request }
       end
     end

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

@@ -9,6 +9,11 @@ module Pageflow
         @entries = DraftEntry.accessible_by(current_ability, :use_files)
         respond_with(@entries)
       end
+
+      def seed
+        @entry = DraftEntry.find(params[:id])
+        authorize!(:edit, @entry.to_model)
+      end
     end
   end
 end

data/app/controllers/pageflow/entries_controller.rb

@@ -20,6 +20,7 @@ module Pageflow
       respond_to do |format|
         format.any(:html, :css) do
           @entry = PublishedEntry.find(params[:id], entry_request_scope)
+          I18n.locale = @entry.locale
 
           if params[:page].present?
             @entry.share_target = Page.find_by_perma_id(params[:page])
@@ -49,6 +50,7 @@ module Pageflow
     def partials
       authenticate_user!
       @entry = DraftEntry.find(params[:id])
+      I18n.locale = @entry.locale
       authorize!(:show, @entry.to_model)
 
       respond_to do |format|
@@ -75,7 +77,7 @@ module Pageflow
     def entry_params
       params.require(:entry).permit(:title, :summary, :credits, :manual_start, :home_url, :home_button_enabled,
                                     :emphasize_chapter_beginning, :emphasize_new_pages,
-                                    :share_image_id, :share_image_x, :share_image_y)
+                                    :share_image_id, :share_image_x, :share_image_y, :locale)
     end
 
     def entry_request_scope

data/app/controllers/pageflow/revisions_controller.rb

@@ -11,6 +11,8 @@ module Pageflow
       authorize!(:show, revision) unless request.format.css?
 
       @entry = PublishedEntry.new(revision.entry, revision)
+      I18n.locale = @entry.locale
+
       render :template => 'pageflow/entries/show'
     end
 

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

@@ -0,0 +1,11 @@
+module Pageflow
+  module Admin
+    module LocalesHelper
+      def available_locales_collection
+        Pageflow.config.available_locales.map do |locale|
+          [I18n.t('language', locale: locale), locale.to_s]
+        end
+      end
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ 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') }
+        User.roles_accessible_by(current_ability).index_by { |role| t(role, :scope => 'pageflow.admin.users.roles') }
       end
     end
   end

data/app/helpers/pageflow/entries_helper.rb

@@ -1,5 +1,7 @@
 module Pageflow
   module EntriesHelper
+    include RenderJsonHelper
+
     def pretty_entry_url(entry)
       pageflow.short_entry_url(entry.to_model, Pageflow.config.theming_url_options(entry.theming))
     end
@@ -13,7 +15,7 @@ module Pageflow
 
       if rights.any?
         content_tag :p, class: 'rights' do
-          "Bildrechte: " + rights * ', '
+          I18n.t('pageflow.helpers.entries.image_rights') + ": " + rights * ', '
         end
       else
         ''
@@ -30,7 +32,7 @@ module Pageflow
       end
 
       if links.any?
-        content_tag(:h2, 'Globale Links', :class => 'hidden') + safe_join(links, ''.html_safe)
+        content_tag(:h2, I18n.t('pageflow.helpers.entries.global_links'), :class => 'hidden') + safe_join(links, ''.html_safe)
       else
         ''
       end
@@ -71,5 +73,9 @@ module Pageflow
       return '' if entry.summary.blank?
       strip_tags(entry.summary.gsub(/<br ?\/?>/, ' ').squish)
     end
+
+    def entry_pages_json_seed(entry)
+      sanitize_json(entry.pages.to_json(only: [:id, :perma_id, :configuration])).html_safe
+    end
   end
 end

data/app/helpers/pageflow/file_thumbnails_helper.rb

@@ -12,7 +12,7 @@ module Pageflow
 
     def file_thumbnail_css_class(file, style)
       return if file.blank?
-      [file.class.model_name.singular, style, file.id] * '_'
+      [file.to_model.class.model_name.singular, style, file.to_model.id] * '_'
     end
   end
 end

data/app/helpers/pageflow/files_helper.rb

@@ -24,5 +24,18 @@ module Pageflow
         "-"
       end
     end
+
+    def files_json_seeds(entry)
+      inner = Pageflow.config.file_types.map do |file_type, result|
+        json = render_json_partial(partial: 'pageflow/editor/files/file',
+                                   collection: entry.files(file_type.model),
+                                   locals: {file_type: file_type},
+                                   as: :file)
+
+        %'"#{file_type.collection_name}": #{json}'
+      end.join(',')
+
+      "{#{inner}}".html_safe
+    end
   end
 end

data/app/helpers/pageflow/help_entries_helper.rb

@@ -0,0 +1,19 @@
+module Pageflow
+  # @api private
+  module HelpEntriesHelper
+    def help_entry_sections
+      render(partial: 'pageflow/help_entries/section',
+             collection: Pageflow.config.help_entries.flat,
+             as: :help_entry)
+    end
+
+    def help_entries_menu
+      render('pageflow/help_entries/menu', help_entries: Pageflow.config.help_entries)
+    end
+
+    def help_entry_li(help_entry, &block)
+      css_class = help_entry.children.present? ? 'expandable' : nil
+      content_tag(:li, class: css_class, &block)
+    end
+  end
+end

data/app/helpers/pageflow/render_json_helper.rb

@@ -21,6 +21,17 @@ module Pageflow
       end
     end
 
+    ESCAPED_CHARS = {
+      "\u2028" => '\u2028',
+      "\u2029" => '\u2029'
+    }
+
+    ESCAPED_CHARS_REGEX = /[\u2028\u2029]/u
+
+    def sanitize_json(json)
+      json.gsub(ESCAPED_CHARS_REGEX, ESCAPED_CHARS)
+    end
+
     def render_html_partial(*args)
       render_with_format(:html) do
         render(*args)

data/app/mailers/pageflow/user_mailer.rb

@@ -4,7 +4,10 @@ module Pageflow
 
     def invitation(options)
       @user = User.find(options['user_id'])
-      mail(:to => @user.email, :subject => t('.subject'), :from => Pageflow.config.mailer_sender)
+      I18n.with_locale(@user.locale) do
+        headers('X-Language' => I18n.locale)
+        mail(:to => @user.email, :subject => t('.subject'), :from => Pageflow.config.mailer_sender)
+      end
     end
   end
 end

data/app/models/pageflow/draft_entry.rb

@@ -17,6 +17,7 @@ module Pageflow
              :share_image_id, :share_image_x, :share_image_y,
              :files,
              :image_files, :video_files, :audio_files,
+             :locale,
              :to => :draft)
 
     def initialize(entry, draft = nil)

data/app/models/pageflow/positioned_file.rb

@@ -0,0 +1,45 @@
+module Pageflow
+  class PositionedFile
+    attr_reader :file, :position_x, :position_y
+
+    delegate :thumbnail_url, to: :file
+
+    def initialize(file, position_x = nil, position_y = nil)
+      @file = file
+      @position_x = position_x.presence || 50
+      @position_y = position_y.presence || 50
+    end
+
+    def ==(other)
+      super(other) ||
+        other == file ||
+        (other.is_a?(PositionedFile) && other.file == file)
+    end
+
+    def to_model
+      file
+    end
+
+    def self.wrap(file, position_x, position_y)
+      file ? new(file, position_x, position_y) : nil
+    end
+
+    def self.null
+      Null.new
+    end
+
+    class Null < PositionedFile
+      def initialize
+        super(nil)
+      end
+
+      def thumbnail_url(*args)
+        ImageFile.new.processed_attachment.url(*args)
+      end
+
+      def blank?
+        true
+      end
+    end
+  end
+end