qbrick 2.5.0.pre → 2.5.0

data/app/models/{kuhsaft → qbrick}/two_column_brick.rb

@@ -1,4 +1,4 @@
-module Kuhsaft
+module Qbrick
   class TwoColumnBrick < ColumnBrick
     before_create :add_columns
 
@@ -40,7 +40,7 @@ module Kuhsaft
     private
 
     def add_columns
-      bricks << 2.times.map { |p| Kuhsaft::ColumnBrick.new(position: p + 1) }
+      bricks << 2.times.map { |p| Qbrick::ColumnBrick.new(position: p + 1) }
     end
   end
 end

data/app/models/{kuhsaft → qbrick}/video_brick.rb

@@ -1,4 +1,4 @@
-module Kuhsaft
+module Qbrick
   class VideoBrick < Brick
     YOUTUBE = 'youtube'
     VIMEO = 'vimeo'

data/app/uploaders/qbrick/asset_brick_asset_uploader.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+require 'carrierwave/processing/mime_types'
+
+module Qbrick
+  class AssetBrickAssetUploader < CarrierWave::Uploader::Base
+    include CarrierWave::MimeTypes
+    storage :file
+
+    process :set_content_type
+    process :save_content_type_and_size_in_model
+
+    def save_content_type_and_size_in_model
+      model.content_type = file.content_type if file.content_type
+      model.file_size = file.size
+    end
+
+    def store_dir
+      model_identifier = model.class.name.underscore.gsub(/^qbrick/, 'cms')
+      "uploads/#{model_identifier}/#{mounted_as}/#{model.id}"
+    end
+
+    def extension_white_list
+      %w(pdf doc docx xls xlsx ppt pptx)
+    end
+  end
+end

data/app/uploaders/{kuhsaft → qbrick}/asset_uploader.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-module Kuhsaft
+module Qbrick
   class AssetUploader < CarrierWave::Uploader::Base
     # Include RMagick or ImageScience support:
     include CarrierWave::MiniMagick
@@ -32,7 +32,7 @@ module Kuhsaft
       process :resize_images
       def resize_images
         resize_to_fill(100, 100) if @file.present? && @file.content_type.present? &&
-                                      @file.content_type.include?('image')
+                                    @file.content_type.include?('image')
       end
     end
 
@@ -46,5 +46,6 @@ module Kuhsaft
     # def filename
     #   "something.jpg" if original_filename
     # end
+    permissions 0600
   end
 end

data/app/uploaders/{kuhsaft → qbrick}/ckimage_uploader.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module Kuhsaft
+module Qbrick
   class CkimageUploader < CarrierWave::Uploader::Base
     include CarrierWave::MiniMagick
     storage :file

data/app/uploaders/{kuhsaft → qbrick}/image_brick_image_uploader.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
-module Kuhsaft
+module Qbrick
   class ImageBrickImageUploader < CarrierWave::Uploader::Base
     include CarrierWave::MiniMagick
 
     storage :file
 
     def store_dir
-      model_identifier = model.class.name.underscore.gsub(/^kuhsaft/, 'cms')
+      model_identifier = model.class.name.underscore.gsub(/^qbrick/, 'cms')
       "uploads/#{model_identifier}/#{mounted_as}/#{model.id}/#{version_name}"
     end
 
@@ -27,9 +27,9 @@ module Kuhsaft
     end
 
     def process_brick_image_size
-      image_size = Kuhsaft::ImageSize.find_by_name(model.image_size)
+      image_size = Qbrick::ImageSize.find_by_name(model.image_size)
       return unless image_size.present?
-      resize_to_fill(image_size.width, image_size.height)
+      resize_to_fit(image_size.width, image_size.height)
     end
   end
 end

data/app/views/devise/confirmations/new.html.haml

@@ -0,0 +1,10 @@
+%h2 Resend confirmation instructions
+= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
+  = devise_error_messages!
+  .field
+    = f.label :email
+    %br/
+    = f.email_field :email, autofocus: true
+  .actions
+    = f.submit "Resend confirmation instructions"
+= render "devise/shared/links"

data/app/views/devise/mailer/confirmation_instructions.html.haml

@@ -0,0 +1,4 @@
+%p
+  Welcome #{@email}!
+%p You can confirm your account email through the link below:
+%p= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token)

data/app/views/devise/mailer/reset_password_instructions.html.haml

@@ -0,0 +1,6 @@
+%p
+  Hello #{@resource.email}!
+%p Someone has requested a link to change your password. You can do this through the link below.
+%p= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token)
+%p If you didn't request this, please ignore this email.
+%p Your password won't change until you access the link above and create a new one.

data/app/views/devise/mailer/unlock_instructions.html.haml

@@ -0,0 +1,5 @@
+%p
+  Hello #{@resource.email}!
+%p Your account has been locked due to an excessive number of unsuccessful sign in attempts.
+%p Click the link below to unlock your account:
+%p= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token)

data/app/views/devise/passwords/edit.html.haml

@@ -0,0 +1,10 @@
+.large-8
+  %h1 Passwort ändern
+  .form
+    = simple_form_for(resource, as: resource_name, url: password_path(resource_name), wrapper: :bootstrap, html: { :method => :put }) do |f|
+      = f.input :reset_password_token, as: :hidden
+      = f.input :password, autofocus: true
+      = f.input :password_confirmation
+      = f.submit 'Passwort ändern', class: :button
+      %br
+      = render 'devise/shared/links'

data/app/views/devise/passwords/new.html.haml

@@ -0,0 +1,8 @@
+.large-8
+  %h1 Forgot your password?
+  .form
+    = simple_form_for(resource, as: resource_name, url: password_path(resource_name), wrapper: :bootstrap) do |f|
+      = f.input :email, :required => false, :autofocus => true
+      = f.submit "Send me reset password instructions", class: :button
+      %br
+      = render 'devise/shared/links'

data/app/views/devise/registrations/edit.html.haml

@@ -0,0 +1,9 @@
+%h2='Change Password'
+= simple_form_for(resource, :as => resource_name, :url => admin_registration_path(resource_name), :html => { :method => :patch }) do |f|
+  = devise_error_messages!
+  .form-inputs
+    = f.input :current_password
+    = f.input :password
+    = f.input :password_confirmation
+  .form-actions
+    = f.button :submit, 'Save'

data/app/views/devise/registrations/new.html.haml

@@ -0,0 +1,21 @@
+%h2 Sign up
+= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
+  = devise_error_messages!
+  .field
+    = f.label :email
+    %br/
+    = f.email_field :email, autofocus: true
+  .field
+    = f.label :password
+    - if @validatable
+      %em
+        (#{@minimum_password_length} characters minimum)
+    %br/
+    = f.password_field :password, autocomplete: "off"
+  .field
+    = f.label :password_confirmation
+    %br/
+    = f.password_field :password_confirmation, autocomplete: "off"
+  .actions
+    = f.submit "Sign up"
+= render "devise/shared/links"

data/app/views/devise/sessions/new.html.haml

@@ -0,0 +1,12 @@
+.large-8
+  %h1 Sign in
+  .form
+    = simple_form_for(resource, as: resource_name, url: session_path(resource_name), wrapper: :bootstrap) do |f|
+      = f.input :email, :required => false, :autofocus => true
+      = f.input :password, :required => false
+
+      - if devise_mapping.rememberable?
+        = f.input :remember_me, as: :boolean, wrapper_html: { class: 'checkbox-wrapper' }
+        = f.submit 'Login', class: :button
+      %br
+      = render 'devise/shared/links'

data/app/views/devise/shared/_links.html.haml

@@ -0,0 +1,19 @@
+- if controller_name != 'sessions'
+  = link_to "Log in", new_session_path(resource_name)
+  %br/
+- if devise_mapping.registerable? && controller_name != 'registrations'
+  = link_to "Sign up", new_registration_path(resource_name)
+  %br/
+- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations'
+  = link_to "Forgot your password?", new_password_path(resource_name)
+  %br/
+- if devise_mapping.confirmable? && controller_name != 'confirmations'
+  = link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
+  %br/
+- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
+  = link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name)
+  %br/
+- if devise_mapping.omniauthable?
+  - resource_class.omniauth_providers.each do |provider|
+    = link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider)
+    %br/

data/app/views/devise/unlocks/new.html.haml

@@ -0,0 +1,10 @@
+%h2 Resend unlock instructions
+= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f|
+  = devise_error_messages!
+  .field
+    = f.label :email
+    %br/
+    = f.email_field :email, autofocus: true
+  .actions
+    = f.submit "Resend unlock instructions"
+= render "devise/shared/links"

data/app/views/layouts/devise.html.haml

@@ -0,0 +1,16 @@
+!!!
+%html
+  %head
+    %meta{ charset: "utf-8" }
+    %title Screen Concept CMS
+    = stylesheet_link_tag 'qbrick/cms/application.css', :media => 'screen, projection'
+    = stylesheet_link_tag 'qbrick/cms/customizations.css', :media => 'screen, projection'
+    = csrf_meta_tag
+
+  %body
+    .container.cms
+      .row
+        .span3
+        .span6
+          = yield
+        .span3

data/app/views/layouts/{kuhsaft → qbrick}/cms/application.html.haml

@@ -3,8 +3,8 @@
   %head
     %meta{ charset: 'utf-8' }
     %title Screen Concept CMS
-    = stylesheet_link_tag 'kuhsaft/cms/application.css', media: 'screen, projection'
-    = stylesheet_link_tag 'kuhsaft/cms/customizations.css', media: 'screen, projection'
+    = stylesheet_link_tag 'qbrick/cms/application.css', media: 'screen, projection'
+    = stylesheet_link_tag 'qbrick/cms/customizations.css', media: 'screen, projection'
     = csrf_meta_tag
 
   %body{ :class => "#{controller_name}" }
@@ -17,9 +17,8 @@
     .container.cms
       .row
         .span12
-          = render 'content_language_switch'
           = render 'flash', :flash => flash
           = yield
 
-    = javascript_include_tag 'kuhsaft/cms/application.js'
-    = javascript_include_tag 'kuhsaft/cms/customizations.js'
+    = javascript_include_tag 'qbrick/cms/application.js'
+    = javascript_include_tag 'qbrick/cms/customizations.js'

data/app/views/layouts/qbrick/cms/ckimages.html.haml

@@ -0,0 +1,18 @@
+!!!
+%html
+  %head
+    %meta{ charset: "utf-8" }
+    %title Screen Concept CMS
+    = stylesheet_link_tag 'qbrick/cms/application.css', :media => 'screen, projection'
+    = stylesheet_link_tag 'qbrick/cms/customizations.css', :media => 'screen, projection'
+    = javascript_include_tag 'qbrick/cms/application.js'
+    = javascript_include_tag 'qbrick/cms/customizations.js'
+    = csrf_meta_tag
+
+  %body
+    .container.cms
+      .row
+        .span3
+        .span6
+          = yield
+        .span3

data/app/views/{kuhsaft → qbrick}/asset_bricks/asset_brick/_edit.html.haml

@@ -5,4 +5,4 @@
   .countrol-group
     %label
       = link_to File.basename(brick.asset.url), brick.asset.url
-= form.input :link_style, collection: Kuhsaft::AssetBrick.styles
+= form.input :link_style, collection: Qbrick::AssetBrick.styles

data/app/views/qbrick/cms/accounts/edit.html.haml

@@ -0,0 +1,12 @@
+= form_for(@admin, :url => { :action => "update_password" } ) do |f|
+  .field
+    = f.label :current_password
+    = f.password_field :current_password
+  .field
+    = f.label :password, "Password"
+    = f.password_field :password, :autocomplete => "off"
+  .field
+    = f.label :password_confirmation
+    = f.password_field :password_confirmation
+  .action_container
+    = f.submit

data/app/views/qbrick/cms/admins/_form.html.haml

@@ -0,0 +1,10 @@
+= simple_form_for([:cms, @admin], wrapper: :bootstrap) do |f|
+  = f.error_notification
+
+  .form-inputs
+    = f.input :email
+    = f.input :password
+    = f.input :password_confirmation
+
+  .form-actions
+    = f.button :submit

data/app/views/qbrick/cms/admins/edit.html.haml

@@ -0,0 +1,5 @@
+%h1= t("cms.edit_title", singular_name: @admin.model_name.human)
+
+= render 'form'
+
+= link_to t('cms.back'), cms_admins_path

data/app/views/qbrick/cms/admins/index.html.haml

@@ -0,0 +1,26 @@
+%h1= t("cms.index_title", plural_name: @admins.first.model_name.human(count: 2))
+
+.row-fluid.actions
+  .pull-right.padded
+    = link_to new_cms_admin_path, :class => 'btn btn-primary' do
+      %i.icon-plus-sign.icon-white
+      = t("cms.admin.new", plural_name: @admins.first.model_name.human, default: t('cms.default.new'))
+
+%table.table.table-bordered.table-striped
+  %thead
+    %tr
+      %th
+      %th
+      %th
+
+  %tbody
+    - @admins.each do |admin|
+      %tr
+        %td= admin.email
+        %td= link_to t("cms.edit"), edit_cms_admin_path(admin)
+        %td
+          =link_to cms_admin_path(admin), method: :delete, data: { confirm: t('cms.are_you_sure') }, class: 'btn btn-small btn-danger' do
+            %i.icon-trash.icon-white
+            =t('cms.destroy')
+
+%br

data/app/views/qbrick/cms/admins/new.html.haml

@@ -0,0 +1,5 @@
+%h1= t("cms.edit_title", singular_name: @admin.model_name.human)
+
+= render 'form'
+
+= link_to t('cms.back'), cms_admins_path

data/app/views/qbrick/cms/assets/index.html.haml

@@ -0,0 +1,3 @@
+- content_for :admin_toolbar do
+  = link_to t('.create'), qbrick.new_asset_path, :class => 'button'
+= render 'list'

data/app/views/qbrick/cms/backend/_brick_clone_menu.html.haml

@@ -0,0 +1,16 @@
+- unless @page.bricks.empty?
+  .btn-group
+    .btn.btn-small{ 'data-toggle' => 'popover', 'data-content' => t('.brick_clone_info'), 'data-original-title' => t('.brick_clone_info_title')}
+      %i.icon-info-sign
+    %a.btn.btn-small.dropdown-toggle{ 'data-toggle' => 'dropdown', 'href' => '#' }
+      = t('.clone_bricks')
+      %span.caret
+    %ul.dropdown-menu.pull-right
+      - I18n.available_locales.each do |locale|
+        - unless I18n.locale == locale
+          - if @page.translated_to?(locale)
+            %li= link_to t('.to_locale', :locale_name => locale.upcase), cms_page_mirror_path(@page, :target_locale => locale, :rutheless => false), :remote => true
+
+          - else
+            %li.disabled{ 'data-toggle' => 'tooltip', 'title' => t('.not_translated') }
+              = link_to t('.to_locale', :locale_name => locale.upcase), '#'

data/app/views/qbrick/cms/backend/_brick_type_dropdown.html.haml

@@ -0,0 +1,15 @@
+- unless brick_list.brick_types.empty?
+  .btn-group
+    - if brick_list.brick_types.allowed.count > 1
+      %a.btn.btn-small.btn-primary.dropdown-toggle{ 'data-toggle' => 'dropdown', 'href' => '#' }
+        = t('.add_element')
+        %span.caret
+      %ul.dropdown-menu.pull-right
+        - brick_list.brick_types.allowed.group_by(&:group).each do |group, types|
+          - types.map { |type| cms_brick_item brick_list, type }.compact.each do |brick_type_item|
+            %li
+              = brick_type_item
+          .divider
+    - else
+      - brick_list.brick_types.allowed.each do |type|
+        = link_to t('.add_specific_element', :name => type.class_name.constantize.model_name.human), qbrick.new_cms_brick_path(:brick => { :type => type.class_name, :brick_list_id => brick_list.id, :brick_list_type => brick_list.brick_list_type }), :remote => true, :class => 'btn btn-small btn-primary'