qbrick 2.5.0.pre → 2.5.0

data/Rakefile

@@ -44,7 +44,7 @@ RSpec::Core::RakeTask.new(spec: :setup)
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Kuhsaft'
+  rdoc.title    = 'Qbrick'
   rdoc.options << '--line-numbers'
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
@@ -54,12 +54,12 @@ desc 'set up the dummy app for testing'
 task :setup do
   Postgres.create_user 'screenconcept'
   within_dummy_app do
-    `bundle exec rake kuhsaft:install:migrations`
-    `bundle exec rails generate kuhsaft:install:assets`
+    `bundle exec rake qbrick:install:migrations`
+    `bundle exec rails generate qbrick:install:assets`
+    `bundle exec rake db:drop`
     `bundle exec rake db:create`
     `bundle exec rake db:migrate`
     `bundle exec rake db:test:prepare`
-    `bundle exec rake db:seed`
   end
 end
 

data/app/assets/javascripts/{kuhsaft → qbrick}/application.js.coffee

@@ -3,5 +3,5 @@
 #= require_tree ./views
 
 $ ->
-  $('.kuhsaft-text-brick').each ->
+  $('.qbrick-text-brick').each ->
     new ReadMoreView($(this))

data/app/assets/javascripts/{kuhsaft → qbrick}/cms/application.js.coffee.erb

@@ -1,4 +1,4 @@
-#= depend_on_asset kuhsaft/cms/ck-config
+#= depend_on_asset qbrick/cms/ck-config
 #
 #= require jquery
 #= require jquery_ujs
@@ -15,32 +15,45 @@
 root = exports ? this
 root.CKEDITOR.timestamp = null
 
-# As @ryabrody & @k-graefenhain found out there is obviously a bug which causes the asset_path_helper to return paths always without digest:
-# https://github.com/rails/sprockets-rails/issues/66
-# That's why we need the environment switch here:
-CKEDITOR.config.customConfig = "<%= asset_path('kuhsaft/cms/ck-config.js') %>"
+CKEDITOR.config.customConfig = "<%= asset_path('qbrick/cms/ck-config.js') %>"
 
 loadTextEditor = ->
   CKEDITOR.replaceAll('ckeditor')
 
-updateInputsForRedirectPage = (redirect_url, keywords, description) ->
-  redirect_url.removeAttr('disabled')
-  keywords.attr('disabled', 'disabled')
-  description.attr('disabled', 'disabled')
+reloadTextEditor = (ui) ->
+  editor_ids = ui.item.find('.ckeditor').map ->
+    @id
 
-clearInputsFromRedirectPage = (redirect_url, keywords, description) ->
-  redirect_url.attr('disabled', 'disabled')
-  keywords.removeAttr('disabled')
-  description.removeAttr('disabled')
+  for editor in editor_ids
+    CKEDITOR.replace editor
+
+destroyTextEditor = (ui)->
+  editor_ids = ui.item.find('.ckeditor').map ->
+    @id
+
+  for editor in editor_ids
+    CKEDITOR.instances[editor].destroy(true)
+
+pageType = ->
+  $('#page_page_type option:selected').val()
 
 checkPageType = ->
   redirect_url = $('#page_redirect_url')
   keywords = $('#page_keywords')
   description = $('#page_description')
-  if ($('#page_page_type option:selected').val() == 'redirect')
-    updateInputsForRedirectPage(redirect_url, keywords, description)
+  if (pageType() == 'redirect')
+    redirect_url.removeAttr('disabled')
+    keywords.attr('disabled', 'disabled')
+    description.attr('disabled', 'disabled')
+  else if (pageType() == 'custom')
+    redirect_url.removeAttr('disabled')
+    keywords.removeAttr('disabled')
+    description.removeAttr('disabled')
   else
-    clearInputsFromRedirectPage(redirect_url, keywords, description)
+    redirect_url.attr('disabled', 'disabled')
+    keywords.removeAttr('disabled')
+    description.removeAttr('disabled')
+
 
 sortableBrick = ->
   $(".brick-list").each (idx, elem) ->
@@ -57,7 +70,11 @@ sortableBrick = ->
         sortForm = $('#bricks-sort-form form')
         sortForm.find('input[name="bricks[ids]"]').val(idList.toArray().join(','))
         sortForm.trigger('submit')
-      )
+      stop: (event, ui) ->
+        reloadTextEditor(ui)
+      start: (event, ui) ->
+        destroyTextEditor(ui)
+    ).disableSelection()
 
 window.initSubmitLinks = (selector = null)->
   selector ||= $('body')
@@ -101,6 +118,9 @@ window.stopPropagationOfDisplayStyles = (selector) ->
 $(document).ajaxSuccess ->
   sortableBrick()
 
+  $('a.has-spinner').click ->
+    $(this).toggleClass('active')
+
 $(document).ready ->
   loadTextEditor()
   checkPageType()
@@ -134,3 +154,6 @@ $(document).ready ->
       $(elem).collapse('hide')
     $('.resize-toggler').each (index, elem) ->
       $(elem).addClass('collapsed')
+
+  $("[data-toggle=tooltip]").tooltip(placement: 'top')
+  $("[data-toggle=popover]").popover(placement: 'left', html: true, container: 'body')

data/app/assets/stylesheets/{kuhsaft → qbrick}/cms/application.css.sass

@@ -9,6 +9,7 @@ $baseBorderRadius: 0px
 $borderRadiusLarge: 0px
 $borderRadiusSmall: 0px
 
+@import bourbon
 @import bootstrap
 // base styles
 
@@ -79,10 +80,13 @@ form
 .brick-list
   padding-left: 2em
 
+.popover
+  max-width: none
+
 // The single column brick and the page-content (the "root") needs no level indentation
 // It usually acts as a helper container and is therefore not relevant
 // for the visual hierarchy
-.kuhsaft-column-brick
+.qbrick-column-brick
   border: 0px solid #fff
   > .brick-item-childs
     > .brick-list
@@ -93,6 +97,14 @@ form
   > .brick-list
     padding-left: 0
 
+.nav-tabs
+  a.not-translated:after
+    content: '*'
+    color: #d33
+  a
+    color: black
+
+
 .tab-content
   display: table
   width: 100%
@@ -163,6 +175,7 @@ form
         font-weight: bold
 
 .modal
+  text-align: left
   width: 900px
   margin-left: -450px
 
@@ -174,6 +187,24 @@ form
     top: -10px
     padding-left: 10px
 
+
+  .spinner
+    display: inline-block
+    opacity: 0
+    max-width: 0
+    @include animation-name(spinIt)
+    @include animation-duration(2s)
+    @include animation-timing-function(linear)
+    @include animation-iteration-count(infinite)
+
+    @include transition(opacity, 0.25s)
+    @include transition(max-width, 0.45s)
+
+  .has-spinner.active
+    .spinner
+      opacity: 1
+      max-width: 50px
+
 .control-group.text
   min-height: 310px
 
@@ -202,3 +233,9 @@ form
 @import nestable
 @import bootstrap-responsive
 @import bootstrap_modal
+
+@include keyframes(spinIt)
+  from
+    @include transform(rotate(0deg))
+  to
+    @include transform(rotate(360deg))

data/app/assets/stylesheets/{kuhsaft → qbrick}/modules/_text_brick.css.sass

@@ -1,7 +1,7 @@
 .button-read-more
   outline: 0 !important
 
-.kuhsaft-text-brick
+.qbrick-text-brick
   .read-more-text
     display: block
 

data/app/controllers/{kuhsaft → qbrick}/api/pages_controller.rb

@@ -1,4 +1,4 @@
-module Kuhsaft
+module Qbrick
   module Api
     class PagesController < ActionController::Base
       layout :false
@@ -6,7 +6,7 @@ module Kuhsaft
 
       def index
         I18n.locale = params[:locale]
-        @pages = Kuhsaft::Page.unscoped.published.content_page.translated.order(position: :asc)
+        @pages = Qbrick::Page.unscoped.published.content_page.translated.order(position: :asc)
         render json: @pages.as_json
       end
     end

data/app/controllers/qbrick/cms/accounts_controller.rb

@@ -0,0 +1,28 @@
+module Qbrick
+  module Cms
+    class AccountsController < BackendController
+      before_action :authenticate_admin!
+
+      def edit
+        @admin = current_admin
+      end
+
+      def update_password
+        @admin = Admin.find(current_admin.id)
+        if @admin.update_with_password(admin_params)
+          # Sign in the admin by passing validation in case their password changed
+          sign_in @admin, bypass: true
+          redirect_to cms_pages_path
+        else
+          render 'edit'
+        end
+      end
+
+      private
+
+      def admin_params
+        params.required(:admin).permit(:password, :password_confirmation, :current_password)
+      end
+    end
+  end
+end

data/app/controllers/qbrick/cms/admins_controller.rb

@@ -0,0 +1,79 @@
+module Qbrick
+  module Cms
+    class AdminsController < BackendController
+      before_action :set_admin, only: [:show, :edit, :update, :destroy]
+
+      # GET /admins
+      # GET /admins.json
+      def index
+        @admins = Admin.all
+      end
+
+      # GET /admins/1
+      # GET /admins/1.json
+      def show
+      end
+
+      # GET /admins/new
+      def new
+        @admin = Admin.new
+      end
+
+      # GET /admins/1/edit
+      def edit
+      end
+
+      # POST /admins
+      # POST /admins.json
+      def create
+        @admin = Admin.new(admin_params)
+
+        respond_to do |format|
+          if @admin.save
+            format.html { redirect_to cms_admins_path, notice: 'Admin was successfully created.' }
+            format.json { render :show, status: :created, location: @admin }
+          else
+            format.html { render :new }
+            format.json { render json: @admin.errors, status: :unprocessable_entity }
+          end
+        end
+      end
+
+      # PATCH/PUT /admins/1
+      # PATCH/PUT /admins/1.json
+      def update
+        respond_to do |format|
+          if @admin.update(admin_params)
+            format.html { redirect_to cms_admins_path, notice: 'Admin was successfully updated.' }
+            format.json { render :show, status: :ok, location: @admin }
+          else
+            format.html { render :edit }
+            format.json { render json: @admin.errors, status: :unprocessable_entity }
+          end
+        end
+      end
+
+      # DELETE /admins/1
+      # DELETE /admins/1.json
+      def destroy
+        @admin.destroy
+        respond_to do |format|
+          format.html { redirect_to cms_admins_url, notice: 'Admin was successfully destroyed.' }
+          format.json { head :no_content }
+        end
+      end
+
+      private
+
+      # Use callbacks to share common setup or constraints between actions.
+      def set_admin
+        @admin = Admin.find(params[:id])
+      end
+
+      # Never trust parameters from the scary internet, only allow the white list through.
+      def admin_params
+        params.require(:admin).permit(:email, :password, :password_confirmation)
+      end
+    end
+  end
+end

data/app/controllers/{kuhsaft → qbrick}/cms/assets_controller.rb

@@ -1,35 +1,35 @@
-module Kuhsaft
+module Qbrick
   module Cms
-    class AssetsController < AdminController
+    class AssetsController < BackendController
       def index
-        @assets = Kuhsaft::Asset.by_date
+        @assets = Qbrick::Asset.by_date
         respond_with @assets
       end
 
       def new
-        @asset = Kuhsaft::Asset.new
+        @asset = Qbrick::Asset.new
         respond_with @asset
       end
 
       def create
-        @asset = Kuhsaft::Asset.create params[:kuhsaft_asset]
+        @asset = Qbrick::Asset.create params[:qbrick_asset]
         @asset.save
         respond_with @asset, location: cms_assets_path
       end
 
       def edit
-        @asset = Kuhsaft::Asset.find(params[:id])
+        @asset = Qbrick::Asset.find(params[:id])
         respond_with @asset
       end
 
       def update
-        @asset = Kuhsaft::Asset.find(params[:id])
-        @asset.update_attributes(params[:kuhsaft_asset])
+        @asset = Qbrick::Asset.find(params[:id])
+        @asset.update_attributes(params[:qbrick_asset])
         respond_with @asset, location: cms_assets_path
       end
 
       def destroy
-        @asset = Kuhsaft::Asset.find(params[:id])
+        @asset = Qbrick::Asset.find(params[:id])
         @asset.destroy
         redirect_to cms_assets_path
       end

data/app/controllers/qbrick/cms/backend_controller.rb

@@ -0,0 +1,25 @@
+module Qbrick
+  module Cms
+    class BackendController < ActionController::Base
+      respond_to :html
+      layout 'qbrick/cms/application'
+      before_action :set_content_locale, :authenticate_admin!
+
+      def set_content_locale
+        # this was taken from: https://github.com/screenconcept/hieronymus_shop/pull/218/files
+        # and needs further work:
+        # TODO: document how to implement in frontend
+        # TODO: implement frontend part in our rails_template
+        # TODO: add specs
+        new_locale = params[:content_locale] || session['backend_locale'] || I18n.locale
+        session['backend_locale'] = new_locale.to_s
+        return if I18n.locale == new_locale || !I18n.locale_available?(new_locale)
+        I18n.locale = new_locale
+      end
+
+      def default_url_options
+        { content_locale: I18n.locale }.merge(super)
+      end
+    end
+  end
+end

data/app/controllers/{kuhsaft → qbrick}/cms/bricks_controller.rb

@@ -1,11 +1,11 @@
-module Kuhsaft
+module Qbrick
   module Cms
-    class BricksController < AdminController
+    class BricksController < BackendController
       respond_to :html, :js
+      before_action :delete_iamge_cache_params_if_params_has_image, only: :update
 
       def create
-        @brick = params[:brick][:type].constantize.create(brick_params)
-        @brick.image_size ||= ImageSize.all.first.name.to_s
+        create_brick_from_type_param
 
         if @brick.valid?
           respond_with @brick do |format|
@@ -18,18 +18,13 @@ module Kuhsaft
       end
 
       def new
-        @brick = Kuhsaft::Brick.new(brick_params)
+        @brick = Qbrick::Brick.new(brick_params)
       end
 
       def update
-        @brick = Kuhsaft::Brick.find(params[:id])
+        @brick = Qbrick::Brick.find(params[:id])
         @brick.update_attributes(brick_params)
 
-        #
-        # rails will fall back to html if ajax can't be used
-        # this is the case with the image brick, because ajax does not
-        # support image uploads
-        #
         respond_with @brick do |format|
           format.js
           format.html { redirect_to edit_cms_page_path(@brick.parents.first) }
@@ -37,7 +32,7 @@ module Kuhsaft
       end
 
       def destroy
-        @brick = Kuhsaft::Brick.find(params[:id])
+        @brick = Qbrick::Brick.find(params[:id])
         @parent_brick = @brick.brick_list
         @brick.destroy
       end
@@ -45,7 +40,7 @@ module Kuhsaft
       def sort
         if params[:bricks].present?
           params[:bricks][:ids].split(',').each_with_index do |id, idx|
-            Kuhsaft::Brick.find(id).update_attribute(:position, idx.to_i + 1)
+            Qbrick::Brick.find(id).update_attribute(:position, idx.to_i + 1)
           end
         end
         render nothing: true
@@ -53,6 +48,14 @@ module Kuhsaft
 
       private
 
+      def delete_iamge_cache_params_if_params_has_image
+        params['brick'].delete('image_cache') if params['brick']['image']
+      end
+
+      def create_brick_from_type_param
+        @brick = params[:brick][:type].constantize.create(brick_params)
+      end
+
       def brick_params
         params.require(:brick).permit!
       end