imagine_cms 3.0.0.beta10 → 3.0.0.beta11

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    imagine_cms (3.0.0.beta10)
+    imagine_cms (3.0.0.beta11)
       acts_as_tree (~> 1.1)
       aws-s3 (~> 0.6.3)
       mini_magick (~> 3.3)

data/app/assets/stylesheets/management.css

@@ -92,5 +92,8 @@ h1 .volunteer { background-color: #5E14CD; }
 h1 .booth { background-color: #0AC153; }
 h1 .shift { background-color: #0A612C; }
 
+table.imagine-management tr:hover { background-color: #fff8c6; }
+table.imagine-management th { background-color: #dedede; text-transform: uppercase; }
+
 table.stats th { text-align: center; padding: 1px 8px; border: 1px solid gray; border-collapse: true; }
 table.stats td { text-align: center; padding: 4px 8px; border: 1px solid gray; border-collapse: true; }

data/app/controllers/cms/content_controller.rb

@@ -50,12 +50,18 @@ module Cms # :nodoc:
     # Renders app/views/errors/404.rhtml with http status 404 Not Found.
     def not_found
       # logger.error "404 from #{request.referer}"
-      # render :template => 'errors/404', :status => 404
+      # render :template => 'imagine_cms/errors/404', :status => 404
       
       # let Rails handle 404s natively (override if you want to handle manually)
       raise ActionController::RoutingError.new('404 Not Found')
     end
     
+    def rendering_error(exception = nil)
+      logger.error "500 from #{request.referer} (exception: #{exception})"
+      @exception = exception.message
+      render :template => 'imagine_cms/errors/500', :status => 500
+    end
+    
     def show_from_db
       logger.debug 'Rendering content from database'
       
@@ -183,8 +189,9 @@ module Cms # :nodoc:
           end
         end
       rescue Exception => e
-        logger.debug "Error rendering from db: #{e.inspect.gsub(/</, '&lt;')} #{e.backtrace}"
-        log_error(e)
+        logger.debug "Error rendering from db: #{e.class}: #{e.message}"
+        # log_error(e)
+        return rendering_error(e)
       end
       
       # if we haven't rendered something from the db by now, return false

data/app/controllers/management/cms_controller.rb

@@ -30,7 +30,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   
   def check_permissions
     if !user_has_permission?(:manage_cms)
-      render '/errors/permission_denied'
+      render '/imagine_cms/errors/permission_denied'
       return false
     end
   end
@@ -38,7 +38,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   def block_basic_users
     return true unless UseCmsAccessLevels
     unless user_has_permission?(:manage_cms_full_access) && @user.cms_allowed_sections.to_s.strip.blank?
-      render '/errors/permission_denied'
+      render '/imagine_cms/errors/permission_denied'
       return false
     end
   end
@@ -308,7 +308,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
         render :update do |page|
           case params[:return_to]
           when 'preview'
-            page.redirect_to "/#{@pg.path}"
+            page.redirect_to "/#{@pg.path}/version/#{@pg.published_version > 0 ? @pg.published_version : @pg.version}"
           else
             flash[:notice] = 'Page saved.'
             session[:cms_pages_path] = @pg.path
@@ -814,8 +814,6 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   end
   
   def receive_gallery
-    require 'zip/zip'
-    
     @pg = CmsPage.find_by_id(params[:id])
     begin
       data = params[:gallery_file][:data]
@@ -1151,8 +1149,6 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
       create_preview_images(:force => 1)
       
     elsif ext == '.zip'
-      require 'zip/zip'
-      
       begin
         Zip::ZipFile.foreach(data.path) do |zipentry|
           next if ![ '.jpg', '.jpeg', '.png', '.gif' ].include?(File.extname(zipentry.name).downcase) || zipentry.size < 1000
@@ -1333,6 +1329,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     # get out now if user clicked finish
     if params[:next_clicked].to_i != 1
       @image_file = localfile
+      upload_to_s3(localfile, @pg)
       render :partial => 'crop_results_thumb' and return
     end
     
@@ -1399,6 +1396,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     
     @image_file = localfile
     File.unlink testfile
+    upload_to_s3(localfile, @pg)
     
     render :partial => 'crop_results_thumb'
   end
@@ -1415,6 +1413,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     # get out now if user clicked finish
     if params[:next_clicked].to_i != 1
       @image_file = localfile
+      upload_to_s3(localfile, @pg)
       render :partial => 'crop_results_feature_image' and return
     end
     
@@ -1481,6 +1480,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     
     @image_file = localfile
     File.unlink testfile
+    upload_to_s3(localfile, @pg)
     
     render :partial => 'crop_results_feature_image'
   end
@@ -1654,7 +1654,6 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
       s3retries = 0
       s3success = false
       
-      
       if ImagineCmsConfig['amazon_s3'] && ImagineCmsConfig['amazon_s3']['enabled']
         filename = File.join(Rails.root, 'public', 'assets', 'content', page.path, File.basename(filename))
         prefix = ImagineCmsConfig['amazon_s3'][Rails.env]['image_prefix']

data/app/helpers/cms_application_helper.rb

@@ -280,7 +280,7 @@ module CmsApplicationHelper
   
   
   def load_page_objects(obj_type = nil, name = nil)
-    if params[:version].to_i > 0 && params[:version].to_i != @pg.published_version
+    if params[:version].to_i > 0 && params[:version].to_i != @pg.published_version && !(@pg.published_version == 0 && params[:version].to_i == @pg.version)
       if is_logged_in_user?
         if user_has_permission?(:manage_cms)
           @pg.revert_to(params[:version].to_i)
@@ -1096,16 +1096,20 @@ EOF
     ret += javascript_tag("cropper = new Cropper.Img('testImage', { minWidth: 0, minHeight: 0, captureKeys: false, onEndCrop: onEndCrop });")
   end
   
-  def page_image_tag(page, filename)
+  def page_image_path(page, filename)
     if ImagineCmsConfig['amazon_s3'] && ImagineCmsConfig['amazon_s3']['enabled']
       prefix = ImagineCmsConfig['amazon_s3'][Rails.env]['image_prefix']
       hostname = ImagineCmsConfig['amazon_s3'][Rails.env]['image_hostname']
-      "<img src=\"//#{hostname}/#{prefix}/#{page.path.blank? ? 'index' : page.path}/#{File.basename(filename)}\" alt=\"#{File.basename(filename, '.*').sub(/-[[:xdigit:]]{32}\z/, '').capitalize}\" />".html_safe
+      "//#{hostname}/#{prefix}/#{page.path.blank? ? 'index' : page.path}/#{File.basename(filename)}"
     else
-      "<img src=\"/#{File.join('assets', 'content', page.path, File.basename(filename))}\" alt=\"#{File.basename(filename, '.*').sub(/-[[:xdigit:]]{32}\z/, '').capitalize}\" />".html_safe
+      "/#{File.join('assets', 'content', page.path, File.basename(filename))}"
     end
   end
   
+  def page_image_tag(page, filename)
+    "<img src=\"#{page_image_path(page, filename)}\" alt=\"#{File.basename(filename, '.*').sub(/-[[:xdigit:]]{32}\z/, '').capitalize}\" />".html_safe
+  end
+  
   def copyright_year(year)
     year_str, this_year = year.to_s, Time.now.year.to_s
     year_str << "&ndash;#{this_year}" if ((year_str.to_i.to_s == year_str) and (year_str.to_i != this_year.to_i))

data/app/models/user_group.rb

@@ -0,0 +1,6 @@
+class UserGroup < ActiveRecord::Base # :nodoc:
+  has_and_belongs_to_many :users, :join_table => 'user_group_memberships'
+  
+  validates_presence_of :name
+  validates_uniqueness_of :name
+end

data/app/views/imagine_cms/errors/500.html.erb

@@ -0,0 +1,8 @@
+<h2 style="text-transform: uppercase;">Sorry, an error occurred</h2>
+
+<p>There was an error loading the page you requested. Please try again later, or contact the site owner if the error persists.</p>
+
+<p style="margin-top: 100px; color: #999;">
+  Diagnostic Message:<br>
+  <pre style="color: #999"><%= @exception %></pre>
+</p>

data/app/views/management/cms/_crop_results_feature_image.html.erb

@@ -1 +1 @@
-<%= javascript_tag "$('pg_feature_image_path').value = '/#{File.join('images', 'content', @pg.path, File.basename(@image_file))}'; $('feature_image_preview').innerHTML = '#{page_image_tag(@pg, @image_file)}'; cancelSelectThumbnail();" %>
+<%= javascript_tag "$('pg_feature_image_path').value = '#{page_image_path(@pg, @image_file)}'; $('feature_image_preview').innerHTML = '#{page_image_tag(@pg, @image_file)}'; cancelSelectThumbnail();" %>

data/app/views/management/cms/_crop_results_thumb.html.erb

@@ -1 +1 @@
-<%= javascript_tag "$('pg_thumbnail_path').value = '/#{File.join('images', 'content', @pg.path, File.basename(@image_file))}'; $('thumbnail_preview').innerHTML = '#{page_image_tag(@pg, @image_file)}'; cancelSelectThumbnail();" %>
+<%= javascript_tag "$('pg_thumbnail_path').value = '#{page_image_path(@pg, @image_file)}'; $('thumbnail_preview').innerHTML = '#{page_image_tag(@pg, @image_file)}'; cancelSelectThumbnail();" %>

data/app/views/management/cms/_edit_page.html.erb

@@ -38,7 +38,7 @@
     <td>
       <%= select :pg, :cms_template_id, CmsTemplate.find(:all, :order => 'name').collect { |t| [ t.name, t.id ] }, {}, :class => 'form', :style => 'width: 100%;', :onchange => '' %>
       
-      <div id="edit_page_template_options" style="background-color: white; width: 100%; height: 80px; overflow: auto; border: 1px solid #aaaaaa">
+      <div id="edit_page_template_options" style="background-color: white; width: 100%; height: 60px; overflow: auto; border: 1px solid #aaaaaa">
         <%= render :partial => 'template_options' %>
       </div>
       <%= observe_field 'pg_cms_template_id', :update => 'edit_page_template_options', :with => 'template_id',
@@ -106,18 +106,18 @@
       <%- if @pg.new_record? -%>
         A thumbnail cannot be added until you save this page.
       <%- else -%>
-      <div id="thumbnail_preview">
+      <div id="thumbnail_preview" style="width: 100%; overflow: auto;">
         <%- if @pg.thumbnail_path.empty? -%>
           no thumbnail image selected
         <%- else -%>
-          <%= image_tag(@pg.thumbnail_path) %>
+          <%= image_tag(@pg.thumbnail_path, :onclick => "jQuery('#pg_thumbnail_path').show();") %>
         <%- end -%>
       </div>
       <%= button_to_function "Select Thumbnail...",
-                             "selectThumbnail('#{url_for :action => 'upload_thumb', :id => @pg.id}');",
+                             "selectThumbnail('#{url_for :action => 'upload_thumb', :id => @pg}');",
                              :class => 'form_button' %>
       <%- end -%>
-      <%= text_field :pg, :thumbnail_path, :class => 'form', :style => 'width: 350px; display: inline;' %>
+      <%= text_field :pg, :thumbnail_path, :class => 'form', :style => 'width: 100%; display: none;' %>
     </td>
   </tr>
   <%- if @pg.respond_to?(:feature_image_path) -%>
@@ -127,18 +127,18 @@
       <%- if @pg.new_record? -%>
         A feature image cannot be added until you save this page.
       <%- else -%>
-      <div id="feature_image_preview">
+      <div id="feature_image_preview" style="width: 100%; overflow: auto;">
         <%- if @pg.feature_image_path.empty? -%>
           no feature image selected
         <%- else -%>
-          <%= image_tag(@pg.feature_image_path) %>
+          <%= image_tag(@pg.feature_image_path, :onclick => "jQuery('#pg_feature_image_path').show();") %>
         <%- end -%>
       </div>
       <%= button_to_function "Select Feature Image...",
-                             "selectThumbnail('#{url_for :action => 'upload_feature_image', :id => @pg.id}');",
+                             "selectThumbnail('#{url_for :action => 'upload_feature_image', :id => @pg}');",
                              :class => 'form_button' %>
       <%- end -%>
-      <%= text_field :pg, :feature_image_path, :class => 'form', :style => 'width: 350px; display: inline;' %>
+      <%= text_field :pg, :feature_image_path, :class => 'form', :style => 'width: 100%; display: none;' %>
     </td>
   </tr>
   <%- end -%>
@@ -158,7 +158,7 @@
           </td>
         </tr>
       </table>
-      <div id="custom_attributes" style="background-color: white; height: 100px; overflow: auto; border: 1px solid #aaaaaa">
+      <div id="custom_attributes" style="background-color: white; height: 80px; overflow: auto; border: 1px solid #aaaaaa">
         <%- @page_objects.each do |key,val| -%>
           <%- key =~ /^obj-(\w+?)-(.+?)$/ -%>
           <%= render :partial => 'page_attribute', :locals => { :name => $2 } if $1 == 'attribute' %>

data/app/views/management/cms/pages.html.erb

@@ -79,7 +79,7 @@ EOF
 <script type="text/javascript">
     cbNumColumns = <%= @page_levels.size - 1 %>;
     $('columnBrowserLevel' + cbNumColumns).scrollIntoView();
-    $('view_link').href = '/<%= list_page.path %>';
+    $('view_link').href = '<%= list_page.path.blank? ? '' : '/' + list_page.path %>/version/<%= list_page.published_version > 0 ? list_page.published_version : list_page.version %>';
     $('new_link').onclick = function () { editProperties('<%=raw url_for(:action => 'edit_page', :mode => 'ajax_new', :parent_id => list_page, :authenticity_token => form_authenticity_token.to_s) %>', 'Create New Page under /<%= list_page.path %>'); return false; };
     $('edit_link').onclick = function () { editProperties('<%=raw url_for :action => 'edit_page', :id => list_page, :mode => 'ajax_edit', :authenticity_token => form_authenticity_token.to_s %>', 'Page Properties: <%= list_page.name %>'); return false; };
     $('edit_content_link').href = '<%=raw url_for :action => 'edit_page_content', :id => list_page, :authenticity_token => form_authenticity_token.to_s %>';

data/app/views/management/cms/snippets.html.erb

@@ -1,14 +1,12 @@
 <h2>CMS &raquo; Snippets</h2>
 
-<%= flash_message %>
+<p><%= button_to 'Create New Snippet', :action => 'edit_snippet' %></p>
 
-<button onclick="location.href = '<%= url_for :action => 'edit_snippet' %>'" class="form_button">Create Snippet</button>
-<br/>
-<br/>
+<%= flash_message %>
 
-<table>
+<table cellpadding="3" width="400" class="imagine-management">
   <tr>
-    <td>Name</td>
+    <th>Name</th>
   </tr>
   <%= render :partial => 'snippet', :collection => @snippets %>
 </table>

data/app/views/management/cms/templates.html.erb

@@ -1,14 +1,12 @@
 <h2>CMS &raquo; Templates</h2>
 
-<%= flash_message %>
+<p><%= button_to 'Create New Template', :action => 'edit_template' %></p>
 
-<button onclick="location.href = '<%= url_for :action => 'edit_template' %>'" class="form_button">Create Template</button>
-<br/>
-<br/>
+<%= flash_message %>
 
-<table>
+<table cellpadding="3" width="400" class="imagine-management">
   <tr>
-    <td>Name</td>
+    <th>Name</th>
   </tr>
   <%= render :partial => 'temp', :collection => @temps %>
 </table>

data/app/views/management/users/index.html.erb

@@ -1,15 +1,15 @@
-<h2>Manage Users</h2><br/>
+<h2>CMS &raquo; Users</h2>
 
-<%= link_to raw('Create a new user &raquo;'), :action => 'create' %>
+<p><%= button_to 'Create New User', :action => 'create' %></p>
 
 <%= flash_message %>
 
-<table cellspacing="3" cellpadding="1" border="0" width="95%">
+<table cellpadding="3" width="95%" class="imagine-management">
   <tr>
-    <td bgcolor="#dedede" width="26%"><b>USERNAME</b></td>
-    <td bgcolor="#dedede" width="22%"><b>FIRST NAME</b></td>
-    <td bgcolor="#dedede" width="22%"><b>LAST NAME</b></td>
-    <td bgcolor="#dedede" width="10%"><b>Active?</b></td>
+    <th width="26%">Username</th>
+    <th width="22%">First Name</th>
+    <th width="22%">Last Name</th>
+    <th width="10%">Active?</th>
     <td bgcolor="#dedede" width="10%">&nbsp;</td>
     <td bgcolor="#dedede" width="10%">&nbsp;</td>
   </tr>
@@ -18,9 +18,9 @@
     <td><%= link_to u.username, :action => 'edit', :id => u %></td>
     <td><%= u.first_name %></td>
     <td><%= u.last_name %></td>
-    <td><%= u.active ? 'Y' : 'N' %>
+    <td><%= u.active? ? 'Y' : 'N' %>
     <td><%= button_to((u.active ? 'Disable' : 'Enable'), { :action => (u.active ? 'disable' : 'enable'), :id => u}, { :class => 'form_button' }) if u.username != session[:user_username] %></td>
     <td><%= button_to('Delete', { :action => 'destroy', :id => u }, { :confirm => 'Are you sure you want to delete ' + u.username + '?', :class => 'form_button' }) if u.username != session[:user_username] %></td>
   </tr>
   <% end %>
-</table><br/>
+</table>

data/imagine_cms.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency "aws-s3",              "~> 0.6.3"
   s.add_dependency "rmagick"
   s.add_dependency "mini_magick",         "~> 3.3"
+  s.add_dependency "rubyzip"
   s.add_dependency "rinku",               "~> 1.7.2"
   s.add_dependency "net-dns",             "~> 0.7.1"
   s.add_dependency "acts_as_tree",        "~> 1.1"

data/lib/imagine_cms/engine.rb

@@ -17,6 +17,7 @@ module ImagineCms
     require 'aws/s3'
     require 'RMagick'
     require 'mini_magick'
+    require 'zip/zip'
     require 'rails_rinku'
     require 'net/dns'
     require 'acts_as_tree'

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "3.0.0.beta10"
+  VERSION = "3.0.0.beta11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta10
+  version: 3.0.0.beta11
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -91,6 +91,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rinku
   requirement: !ruby/object:Gem::Requirement
@@ -332,12 +348,14 @@ files:
 - app/models/cms_snippet.rb
 - app/models/cms_template.rb
 - app/models/user.rb
+- app/models/user_group.rb
 - app/sweepers/cms_content_sweeper.rb
-- app/views/errors/404.html.erb
-- app/views/errors/permission_denied.html.erb
 - app/views/imagine_cms/_dialogs.html.erb
 - app/views/imagine_cms/_header.html.erb
 - app/views/imagine_cms/_toolbar.html.erb
+- app/views/imagine_cms/errors/404.html.erb
+- app/views/imagine_cms/errors/500.html.erb
+- app/views/imagine_cms/errors/permission_denied.html.erb
 - app/views/layouts/management.html.erb
 - app/views/management/cms/_complete_gallery.html.erb
 - app/views/management/cms/_create_file_link.html.erb