kuhsaft 0.2.1 → 0.2.2

data/.gitignore

@@ -9,7 +9,9 @@ spec/dummy/db/schema.rb
 spec/dummy/public/stylesheets/*
 spec/dummy/public/uploads/tmp/*
 spec/dummy/public/uploads/kuhsaft/*
+spec/dummy/public/uploads/*
+spec/dummy/public/images/**/*
+spec/dummy/public/javascripts/**/*
 Gemfile.lock
 .DS_Store
 .sass-cache
-spec/dummy/public/uploads/*

data/app/models/kuhsaft/asset.rb

@@ -3,7 +3,7 @@ class Kuhsaft::Asset < ActiveRecord::Base
   mount_uploader :file, Kuhsaft::AssetUploader
   
   def file_type
-    if file.url.present? && ext = file.url.split('.').last
+    if file.path.present? && ext = File.extname(file.path).split('.').last
       ext.to_sym unless ext.blank?
     end
   end
@@ -19,4 +19,8 @@ class Kuhsaft::Asset < ActiveRecord::Base
   def path=val
     # do nothing
   end
+  
+  def filename
+    try(:file).try(:file).try(:filename)
+  end
 end

data/app/stylesheets/kuhsaft/cms/partials/_buttons.sass

@@ -1,13 +1,34 @@
 .toolbar
-  padding: 10px 0px
+  padding: 10px 25px
   background: #F8F8F8
   
-  a.button
+  a.button,
+  a.small-button
     +float_right
 
-a.button
+a.button,
+a.small-button,
+input.input-button,
+input.small-input-button,
+.micro-button
   background: $color1
   padding: 10px 15px
   margin-right: 10px
   +link-colors(#fff, #fff, #fff, #fff, #fff)
-  +border-radius(4px)
+  +border-radius(4px)
+
+input.input-button,
+input.small-input-button
+  border: none
+  font-size: 15px
+  font-family: "Helvetica Neue", "Helvetica", Arial, sans-serif
+
+a.small-button,
+input.small-input-button
+  padding: 5px 10px
+  
+.micro-button
+  +float_right
+  margin: 0px 10px 0px 0px
+  font-size: 11px
+  padding: 0px 4px

data/app/stylesheets/kuhsaft/cms/partials/_generic.sass

@@ -1,6 +1,7 @@
 $color1: #0c1550
 $color2: #1a2363
 $color3: #f7f8e6
+$color4: #263392
 $border-color: #cdcdcd
 
 body
@@ -11,14 +12,25 @@ body
   
 #kuhsaft-wrapper
   //background: #e9e9e9 url(/images/kuhsaft/wrapper-bg.png) repeat-x left 100px
+  width: 960px
+  margin: 0 auto
 
 .hidden
   display: none
 
 .cms-header
   background: url(/images/kuhsaft/header-bg.jpg)
-  border-bottom: 1px solid #7c7a7f
-  +min-height(200px)
+  border-bottom: 1px solid #cccccb
+  +min-height(150px)
+
+.meta-actions
+  +float_right
+  margin: 10px 25px 0px 0px
+
+.logout-box
+  +float_right
+  margin: 0px 10px 0px 0px
+  font-size: 11px
 
 .page-tree-breadcrumb
   margin-bottom: 20px
@@ -38,11 +50,11 @@ body
   border:
     top: 1px solid #7c7a7f
     right: 1px solid #7c7a7f
-  margin-top: -61px
+  margin: -41px 35px 0px 0px
   
   a
     background: $color1
-    padding: 10px 15px
+    padding: 12px 15px
     line-height: 40px
     border-left: 1px solid #ccc
     +link-colors(#fff, #fff, #fff, #fff, #fff)
@@ -52,7 +64,6 @@ body
     
   li.current
     border-left: 1px solid #7c7a7f
-    height: 41px
     a
       background: #cccccb url(/images/kuhsaft/module-nav-tab-bg.png) repeat-x
       border-left: 1px solid #e6e6e6
@@ -60,13 +71,10 @@ body
       +link-colors($color1, $color2, $color1, $color1, $color1)
 
 .cms-content-container
-  +single-box-shadow(#666, 0px, 2px, 8px)
-  margin: 20px
   width: 960px
 
 .language-tabs
   border:
-    top: 1px solid #cfcfcf
     bottom: 1px solid #cfcfcf
   background: #e3e3e3 url(/images/kuhsaft/tab-bg.png) repeat-x
   height: 40px
@@ -96,6 +104,7 @@ body
 .cms-content
   background: #f8f8f8
   padding: 35px
+  +min-height(500px)
 
 .box-container
   border:
@@ -126,9 +135,6 @@ body
 .draggable-box 
   position: relative
 
-.draggable-box.colored-box
-  background: $color3 url(/images/kuhsaft/page-part-draggable-area.png) no-repeat top right
-
 h1
   font-size: 36px
   font-weight: bold
@@ -148,7 +154,7 @@ h1
   
 a
   text-decoration: none
-  +link-colors($color1, $color2, $color1, $color1, $color2)
+  +link-colors($color1, $color4, $color1, $color1, $color2)
   
 .clear
   clear: both
@@ -181,11 +187,15 @@ a
   background: #e3e5c5
   padding: 3px 6px
   border: 
-    top: 1px solid #d2d3b9
     left: 1px solid #d2d3b9
     right: 1px solid #fefff4
     bottom: 1px solid #fefff4
-  +border-radius(3px)
+  +border-bottom-right-radius(3px)
+  +border-bottom-left-radius(3px)
+  +float-left
+  width: 619px
+  margin: -5px 0px 10px 0px
+
 
 .page-part-destroy
   font-size: 12px
@@ -197,10 +207,7 @@ a
     +float_left
 
 .page-part-tags
-  +float_left
-  width: 626px
-  
-  input
+  &.string
     width: 612px
     
 .dimmed
@@ -291,21 +298,30 @@ ul.pages-root
   width: 22px
   border-left: 0px
 
+.actions
+  height: 30px
+  width: 100%
+  clear: both
+  margin: 0px 0px 0px 0px
+  input#kuhsaft_page_submit
+    +float_right
+
 .drag-handler
-  width: 140px
-  height: 60px
-  position: absolute
-  right: 0px
-  top: 0px
-  cursor: pointer
+  background: $color3 url(/images/kuhsaft/page-part-draggable-area.png) no-repeat top right
+  width: 91px
+  height: 22px
+  margin: 0px 7px 0px 0px
+  float: right
+  cursor: url(/images/kuhsaft/openhand.cur), default !important
+  &:active
+    cursor: url(/images/kuhsaft/closedhand.cur), default !important
 
 .destroy-handler  
   text-align: right
   width: 100px
-  position: absolute
-  right: 140px
-  top: 0px
-  padding-top: 10px
+  margin: 0px 10px 0px 0px
+  padding: 5px 0px 0px 0px
+  +float_right
   
 .will-drag
   border: 1px solid #666

data/app/stylesheets/kuhsaft/cms/partials/_simple_form.sass

@@ -1,4 +1,4 @@
-label.string, label.file, label.integer, label.select
+label.string, label.file, label.integer, label.select, label.text
   width: 200px
   +float_left
   
@@ -19,8 +19,9 @@ div.input
     font-size: 12px
     margin-left: 200px
 
-textarea.text.large
-  height: 400px
+textarea.text
+  max-height: 500px
+  resize: none
 
 .input
   margin: 5px 0px
@@ -72,4 +73,4 @@ select
 .darkened-box, .lightened-box    
   input[type='text']:focus, textarea:focus
     background: $color3
-    +transition(background, 1s)
+    +transition(background, 1s)

data/app/uploaders/kuhsaft/asset_uploader.rb

@@ -30,9 +30,12 @@ class Kuhsaft::AssetUploader < CarrierWave::Uploader::Base
 
   # Create different versions of your uploaded files:
   version :thumb do
-    process :resize_to_fill => [100, 100]
+    process :resize_images
+    def resize_images
+      resize_to_fill(100, 100) if @file.present? && @file.content_type.present? && @file.content_type.include?('image')
+    end
   end
-
+  
   # Add a white list of extensions which are allowed to be uploaded.
   # For images you might use something like this:
   def extension_white_list

data/app/views/kuhsaft/cms/assets/_list.html.haml

@@ -7,5 +7,5 @@
         = link_to asset.name, edit_cms_asset_path(asset)
     .copy
       %input.string{ :type => :text, :value => asset.file.url }
-    = link_to t('.delete'), cms_asset_path(asset), :confirm => t('.confirm'), :method => :delete
+    = link_to t('.delete'), cms_asset_path(asset), :confirm => t('.confirm', :filename => asset.filename), :method => :delete
 .clear

data/app/views/kuhsaft/cms/pages/_branch.html.haml

@@ -4,7 +4,7 @@
       .branch
         = link_to page.title.presence || t('.not_translated'), edit_cms_page_path(page), :class => ('to-translate' if page.title.blank?)
         = link_to t('.add'), new_cms_page_path(:parent_id => page.id), :class => 'icon add-child-page'
-        = link_to t('.delete'), cms_page_path(page), :confirm => t('.confirm'), :method => :delete, :class => 'icon delete' if page.childs.empty?
+        = link_to t('.delete'), cms_page_path(page), :confirm => t('.confirm', :page_title => page.title), :method => :delete, :class => 'icon delete' if page.childs.empty?
         .clear
       - unless page.childs.empty?
         %ul.sortable

data/app/views/kuhsaft/cms/pages/_form.html.haml

@@ -12,16 +12,20 @@
       - @localized_page.page_parts.each do |page_part_object|
         .colored-box.draggable-box.page-part.can-drag{ :'data-id' => page_part_object.id, :'data-put-url' => cms_page_page_part_path(page_part_object, :page_id => @page) }
           = localized.fields_for :page_parts, page_part_object do |page_part|
-            .drag-handler
-            .destroy-handler
-              = link_to t('.destroy_page_part'), cms_page_page_part_path(page_part.object, :page_id => @page), :confirm => t('.confirm'), :method => :delete, :remote => true
-            - unless page_part.object.persisted?
-              = page_part.input :type, :as => :hidden, :input_html => { :value => page_part.object.class.to_s }
+            .actions
+              .drag-handler
+              - unless page_part.object.persisted?
+                = page_part.input :type, :as => :hidden, :input_html => { :value => page_part.object.class.to_s }
 
             = render :partial => page_part.object.edit_partial_path, :locals => { :input_form => page_part }
+            = page_part.label :tag_list
             .page-part-helpers
-              = page_part.input :tag_list, :as => :string, :wrapper_html => { :class => 'page-part-tags' }, :input_html => { :placeholder => t('.separate_by_comma') }
-              .clear
+              = page_part.text_field :tag_list, :placeholder => t('.separate_by_comma'), :class => 'page-part-tags string'
+            .actions
+              = page.button :submit, :class => 'small-input-button'
+              .destroy-handler
+                = link_to t('.destroy_page_part'), cms_page_page_part_path(page_part.object, :page_id => @page), :confirm => t('.confirm'), :method => :delete, :remote => true              
+            .clear
     - if localized.object.persisted? && !@page.redirect?
       .lightened-box.add-page-part
         %label.string{ :for => :page_part_type }= t('.add_element')
@@ -50,10 +54,10 @@
         = localized.label :published, t('.published_at'), :class => :radio, :for => :kuhsaft_page_localized_pages_attributes_0_published_2
         = localized.text_field :published_at, :class => 'small string', :placeholder => 'dd.mm.yyyy HH:MM'
       .column.grid-2
-        = page.button :submit
+        = page.button :submit, :class => 'input-button'
       .clear
 
 :javascript
   $(".toggle").click(function(){
     $(this).toggleClass("closed").next(".collapsable").toggleClass("hidden")
-  })
+  })

data/app/views/kuhsaft/cms/pages/index.html.haml

@@ -3,6 +3,6 @@
     %li{ :class => (:current if params[:locale] == locale.to_s) }= link_to locale.to_s, cms_pages_path(:locale => locale)
 
 - content_for :admin_toolbar do
-  = link_to t('.create'), new_cms_page_path, :class => 'button'
+  = link_to t('.create'), new_cms_page_path, :class => 'small-button'
 %ul.pages-root.sortable
   = render :partial => 'branch', :locals => { :pages => @pages }

data/app/views/kuhsaft/page_part/markdowns/_edit_markdown.html.haml

@@ -1 +1 @@
-= input_form.input :text, :as => :text, :input_html => { :class => :large }
+= input_form.input :text, :as => :text, :input_html => { :class => :small }

data/app/views/layouts/kuhsaft/admin.html.haml

@@ -2,24 +2,30 @@
 %html
   %head
     = stylesheet_link_tag 'kuhsaft/cms/screen.css', :media => 'screen, projection'
-    = stylesheet_link_tag 'kuhsaft/ui-lightness/jquery-ui-1.8.12.custom.css', :media => 'screen, projection'
-    = csrf_meta_tag
-    = javascript_include_tag 'kuhsaft/cms/jquery-1.4.4.js'
+    = javascript_include_tag 'kuhsaft/cms/jquery.min.js'
     = javascript_include_tag 'kuhsaft/cms/jquery-ui-1.8.12.custom.min.js'
-    = javascript_include_tag 'kuhsaft/cms/rails.js'
+    = javascript_include_tag 'kuhsaft/cms/jquery_ujs.js'
+    = javascript_include_tag 'kuhsaft/cms/jquery.elastic.source.js'
     = javascript_include_tag 'kuhsaft/cms/application.js'
+    = csrf_meta_tag
   %body{ :class => "#{controller_name}" }
     #kuhsaft-wrapper
       .cms-header
         .container
-          - if respond_to?(:destroy_user_session_path)
-            = link_to(t('.logout'), destroy_user_session_path, :class => :logout)
+          .meta-actions
+            %a.micro-button{ :href => '/', :target => '_blank' }
+              View Site
+            .logout-box
+              - if respond_to?(:destroy_user_session_path)
+                = current_user.first_name
+                = current_user.last_name
+                = link_to '(logout)', destroy_user_session_path, :class => 'logout micro-logout'
       .cms-content-container
         %ul.cms-module-nav
           = admin_tab(t('.pages_nav'), cms_pages_path)
           = admin_tab(t('.assets_nav'), cms_assets_path)
           = render :partial => 'cms/admin_navigation' rescue ''
-        .clear
+          .clear
         %ul.language-tabs
           = yield :cms_language_tabs
           .clear
@@ -30,4 +36,4 @@
           = yield :before_admin_content
           = yield
           = yield :after_admin_content
-      = yield :scripts
+      = yield :scripts

data/config/locales/kuhsaft.en.yml

@@ -19,14 +19,14 @@ en:
           add: 'Add page'
           create: 'Create new page'
           delete: 'Remove page'
-          confirm: 'Are you sure?'
+          confirm: 'Are you sure you want to delete the page "%{page_title}"?'
           not_translated: 'Not yet translated'
         form:
           add_page_part: 'Add element'
           unpublished: "Save page offline"
           published: "Publish page"
           published_at: "Go online on"
-          confirm: 'Are you sure?'
+          confirm: 'Are you sure you want to delete this page part?'
           destroy_page_part: 'Delete'
           separate_by_comma: 'Separate tags by comma'
         current_translation_locale: 'Current translation: %{translation_locale}'
@@ -34,7 +34,7 @@ en:
         index:
           create: 'Create new asset'
         list:
-          confirm: 'Are you sure?'
+          confirm: 'Are you sure you want to delete the asset "%{filename}"?'
           delete: 'Delete asset'
   simple_form:
     labels:

data/kuhsaft.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'guard-spork'
   s.add_development_dependency 'guard-rspec'
   s.add_development_dependency 'growl'
+  s.add_development_dependency 'linecache', '0.42'
 
   s.add_dependency 'rails', '~>3.0'
   s.add_dependency 'haml', '~> 3.1'

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/public/javascripts/kuhsaft/cms/application.js

@@ -20,12 +20,15 @@ $(function(){
   })
   
   $(".page-part-list .drag-handler").mouseenter(function(){
-    $(this).parent().addClass("will-drag")
+    $(this).parent().parent().addClass("will-drag")
   })
   .mouseleave(function(){
-    $(this).parent().removeClass("will-drag")
+    $(this).parent().parent().removeClass("will-drag")
   })
   $(".draggable-box").mouseleave(function(){
     $(this).removeClass("will-drag")
   })
+  
+  $('.colored-box textarea.text').elastic();
+  
 })