imagine_cms 4.2.4 → 5.2.0

data/app/views/manage/cms_pages/_list_page.html.erb

@@ -0,0 +1,8 @@
+<div id="<%= "cb_item_#{list_page.id}" %>" class="cb_item" style="width: 148px; overflow: hidden; margin: 2px; float: left; cursor: pointer" onclick="$('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: 'new', mode: 'ajax_new', parent_id: list_page %>', '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' %>', 'Page Properties: <%= list_page.name %>'); return false; }; $('edit_content_link').href = '<%=raw url_for action: 'edit_page_content', id: list_page %>'; $('delete_link').href = '<%=raw url_for action: 'delete_page', id: list_page.id %>'; setTimeout('cbSelectItem(\'' + this.id + '\', <%= @page_level %>, \'<%=raw url_for action: 'list_pages', level: @page_level + 1, parent_id: list_page.id %>\');', 200);" ondblclick="$('edit_content_link').click();">
+  <table cellpadding="0" cellspacing="0" border="0">
+    <tr>
+      <td valign="top"><%= image_tag 'management/icon_page.gif', style: 'margin: 2px 5px 0 0;' %></td>
+      <td<%= list_page.published_version >= 0 ? '' : ' style="color: gray"'.html_safe %>><%= list_page.name %></td>
+    </tr>
+  </table>
+</div>

data/app/views/{management/cms → manage/cms_pages}/_page_list.html.erb

@@ -29,8 +29,8 @@
       
       <table>
         <tr>
-          <td><%= button_to_function('Add Page/Folder', "new Ajax.Updater('page_list_#{key}-source-list', '/manage/cms/page_list_add_folder?key=#{key}&i=' + $('page_objects_#{key}-sources-folder-count').value, {asynchronous:true, evalScripts:true, insertion:Insertion.Bottom}); $('page_objects_#{key}-sources-folder-count').value++;", :class => 'form_button') %></td>
-          <td><%= button_to_function('Add Tag', "new Ajax.Updater('page_list_#{key}-source-list', '/manage/cms/page_list_add_tag?key=#{key}&i=' + $('page_objects_#{key}-sources-tag-count').value, {asynchronous:true, evalScripts:true, insertion:Insertion.Bottom}); $('page_objects_#{key}-sources-tag-count').value++;", :class => 'form_button') %></td>
+          <td><%= button_to_function('Add Page/Folder', "new Ajax.Updater('page_list_#{key}-source-list', '/manage/cms_pages/page_list_add_folder?key=#{key}&i=' + $('page_objects_#{key}-sources-folder-count').value, {asynchronous:true, evalScripts:true, insertion:Insertion.Bottom}); $('page_objects_#{key}-sources-folder-count').value++;", class: 'form_button') %></td>
+          <td><%= button_to_function('Add Tag', "new Ajax.Updater('page_list_#{key}-source-list', '/manage/cms_pages/page_list_add_tag?key=#{key}&i=' + $('page_objects_#{key}-sources-tag-count').value, {asynchronous:true, evalScripts:true, insertion:Insertion.Bottom}); $('page_objects_#{key}-sources-tag-count').value++;", class: 'form_button') %></td>
           <td>
             <%= check_box :page_objects, "#{key}-include-expired", { class: 'form', style: '' }, 'true', 'false' %>
             <label for="page_objects_<%= key %>-include-expired">Include expired items</label>

data/app/views/{management/cms → manage/cms_pages}/_template_options.html.erb

@@ -1,7 +1,7 @@
-<%- unless @template_options.empty? -%>
+<%- unless @template_options.to_h.empty? -%>
 <div style="background-color: white; width: 100%; border: 1px solid #aaaaaa;">
-  <%- @template_options.each do |name, type| -%>
-    <%- key = name.gsub(/[^\w\d]/, '_') -%>
+  <%- @template_options.to_h.each do |name, type| -%>
+    <%- key = name.to_s.gsub(/[^\w\d]/, '_') -%>
     <table width="100%">
       <col width="55%" /><col width="45%" />
       <tr>

data/app/views/{management/cms → manage/cms_pages}/_upload_image.html.erb

@@ -59,7 +59,7 @@
     </tr>
   </table>
   <%- end -%>
-</fieldset><br/>
+</fieldset><br>
 
 <%= form_remote_tag(:update => 'insert_image_dialog_content', :html => { :id => 'mainform' },
                     :url => { :action => 'crop_image', :id => @pg }) do -%>

data/app/views/{management/cms → manage/cms_pages}/edit_page_content.html.erb

@@ -1,3 +1,10 @@
+<script type="text/javascript">
+  taglist = new Array(<%= @taglist.size %>)
+  <%- @taglist.each_with_index do |tag, i| -%>
+  taglist[<%= i %>]="<%=j tag %>";
+  <%- end -%>
+</script>
+
 <%= form_tag({}, id: 'page_content_form') do %>
   <%= submit_tag 'Save', id: 'btn_save', style: 'display: none' %>
   <%= render inline: @template_content %>

data/app/views/{management/cms → manage/cms_pages}/gallery_management.html.erb

@@ -11,7 +11,7 @@
       <%= form_remote_tag :url => { :action => 'select_gallery', :id => @pg },
                           :update => 'select_gallery' do -%>
         Current Gallery:
-        <select name="gallery_id" onchange="new Ajax.Updater('gallery_container', '/manage/cms/select_gallery/<%= @pg.id %>', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this.form)}); return false;">
+        <select name="gallery_id" onchange="new Ajax.Updater('gallery_container', '/manage/cms_pages/<%= @pg.id %>/select_gallery', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this.form)}); return false;">
         <%-
           @galleries.each do |gallery|
             unless session[:broken_galleries].include?(File.basename(gallery))

data/app/views/{management/cms/pages.html.erb → manage/cms_pages/index.html.erb}

@@ -68,7 +68,7 @@ EOF
     cbNumColumns = <%= @page_levels.size - 1 %>;
     $('columnBrowserLevel' + cbNumColumns).scrollIntoView();
     $('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; };
+    $('new_link').onclick = function () { editProperties('<%=raw url_for(action: 'new', 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 %>';
     $('delete_link').href = '<%=raw url_for action: 'delete_page', id: list_page.id %>';

data/app/views/{management/cms → manage/cms_pages}/toolbar_preview.html.erb

@@ -3,13 +3,13 @@
     <tbody>
       <tr valign="top" align="left">
       <% if @pg -%>
-        <td onclick="location.href = '<%= url_for :controller => '/management/cms', :action => 'edit_page_content', :id => @pg, :version => params[:version] %>';">
+        <td onclick="location.href = '<%= url_for controller: '/manage/cms_pages', action: 'edit_page_content', id: @pg, version: params[:version] %>';">
           <!-- save -->
           <span class="iconContainer">
             <span title="Edit" class="dojoE2TBIcon dojoE2TBIcon_Save">&nbsp;</span>
           </span>
         </td>
-        <td onclick="location.href = '<%= url_for :controller => '/management/cms', :action => 'edit_page_content', :id => @pg, :version => params[:version] %>';" style="vertical-align: middle; cursor: pointer">
+        <td onclick="location.href = '<%= url_for controller: '/manage/cms_pages', action: 'edit_page_content', id: @pg, version: params[:version] %>';" style="vertical-align: middle; cursor: pointer">
           <span title="Edit" style="font-family: Arial">Edit</span>
         </td>
         
@@ -30,8 +30,8 @@
           </span>
         </td>
         
-        <td onclick="location.href = '<%= url_for :controller => '/management/cms', :action => 'pages', :path => (@pg ? @pg.path : nil) %>';" style="vertical-align: middle; cursor: pointer">
-          <a href="<%= url_for :controller => '/management/cms', :action => 'pages', :path => (@pg ? @pg.path : nil) %>" style="text-decoration: none"><span title="Manage Pages" style="font-family: Arial; color: #3c3c3c;">Pages</span></a>
+        <td onclick="location.href = '<%= url_for controller: '/manage/cms_pages', action: 'index', path: (@pg ? @pg.path : nil) %>';" style="vertical-align: middle; cursor: pointer">
+          <a href="<%= url_for controller: '/manage/cms_pages', action: 'index', path: (@pg ? @pg.path : nil) %>" style="text-decoration: none"><span title="Manage Pages" style="font-family: Arial; color: #3c3c3c;">Pages</span></a>
         </td>
         
         <td isSpacer="true">
@@ -65,7 +65,7 @@
         
         <td style="vertical-align: middle;">
           <%- if !UseCmsAccessLevels || user_has_permission?(:manage_cms_publishing) -%>
-            <%= form_remote_tag(:url => { :controller => '/management/cms', :action => 'set_page_version', :id => @pg },
+            <%= form_remote_tag(:url => { :controller => '/manage/cms_pages', :action => 'set_page_version', :id => @pg },
                                :loading => "$('set_page_version_loading').show();",
                                :complete => "$('set_page_version_loading').hide();" + (@pg ? "$('pg_published_version_container').style.borderColor = ($('pg_published_version').value == '0' || $('pg_published_version').value == '#{@pg.versions.last.version}') ? '#EBEBEB' : 'red';" : '')) do -%>
               <div id="pg_published_version_container" style="border-color: <%= @pg && (@pg.published_version == 0 || @pg.published_version == @pg.versions.last.version) ? '#EBEBEB' : 'red' %>; border-style: solid; border-width: 2px;">
@@ -78,7 +78,7 @@
             <% end %>
           <%- else -%>
             <%- if params[:version] && params[:version].to_i != @pg.published_version && !(@pg.published_version == 0 && params[:version].to_i == @pg.versions.count) -%>
-              <%= form_remote_tag(:url => { :controller => '/management/cms', :action => 'request_review', :id => @pg, :version => (params[:version] || @pg.published_version) },
+              <%= form_remote_tag(:url => { :controller => '/manage/cms_pages', :action => 'request_review', :id => @pg, :version => (params[:version] || @pg.published_version) },
                                  :loading => "$('set_page_version_loading').show();",
                                  :complete => "$('set_page_version_loading').hide();") do -%>
                 <%= submit_tag "Submit Version #{(params[:version])} for Review" %>

data/app/views/manage/cms_snippets/_cms_snippet.html.erb

@@ -0,0 +1,3 @@
+<tr>
+  <td><%= link_to cms_snippet.name, action: 'edit', id: cms_snippet %></td>
+</tr>

data/app/views/manage/cms_snippets/edit.html.erb

@@ -0,0 +1,25 @@
+<%= flash_message %>
+
+<h2><%= params[:action].titlecase %> Snippet</h2>
+
+<%= form_with(model: ['manage', @cms_snippet], local: true) do |f| %>
+  <%= f.text_field :name, placeholder: 'Snippet Name', :size => '50' %>
+  <div class="codemirror-html-container">
+    <%= f.text_area :content, class: 'codemirror-html autocomplete-off' %>
+  </div>
+  <%= f.submit 'Save Snippet', class: 'form_button' %>
+  <button onclick="jQuery('#preview_frame').show(); jQuery('#preview_frame')[0].scrollIntoView(); jQuery('#preview_content').val(jQuery('textarea[name=\'cms_snippet[content]\']').val()); jQuery('#preview_form').submit(); return false;" class="form_button">Preview</button>
+  <%= link_to 'Cancel', action: 'index' %>
+  <br>
+  
+  <br>
+  <%= render partial: '/manage/cms_templates/template_reference' %>
+  <br>
+  
+  <iframe id="preview_frame" name="preview_frame"></iframe>
+<% end %>
+
+<%= form_tag(url_for(controller: '/cms/content', action: 'preview_template'), id: 'preview_form', target: 'preview_frame') do %>
+  <%= text_area_tag 'content', '', id: 'preview_content', style: 'display: none;' %>
+  <%= hidden_field_tag 'mode', 'preview' %>
+<% end %>

data/app/views/{management/cms/snippets.html.erb → manage/cms_snippets/index.html.erb}

@@ -1,6 +1,6 @@
 <h2>CMS &raquo; Snippets</h2>
 
-<p><%= button_to 'Create New Snippet', { action: 'edit_snippet' }, method: :get %></p>
+<p><%= button_to 'Create New Snippet', new_manage_cms_snippet_path, method: :get %></p>
 
 <%= flash_message %>
 
@@ -8,5 +8,5 @@
   <tr>
     <th>Name</th>
   </tr>
-  <%= render partial: 'snippet', collection: @snippets %>
+  <%= render @cms_snippets %>
 </table>

data/app/views/manage/cms_templates/_cms_template.html.erb

@@ -0,0 +1,3 @@
+<tr>
+  <td><%= link_to cms_template.name, action: 'edit', id: cms_template %></td>
+</tr>

data/app/views/{management/cms → manage/cms_templates}/_template_reference.html.erb

@@ -14,8 +14,8 @@
 <%= snippet('Top Nav') %>
 <%= page_list('My Page List',
                   template: 'html', header: 'html', footer: 'html',
-                  folders: 'f1,f2', include_tags: 't1,t2',
-                  exclude_tags: 't3,t4', require_tags: 't5,t6',
+                  folders: 'f1,f2', pages: 'p1,p2',
+                  include_tags: 't1,t2', exclude_tags: 't3,t4', require_tags: 't5,t6',
                   primary_sort_key: 'article_date', primary_sort_direction: 'asc',
                   item_count: 5, item_offset: 1, use_pagination: 1,
                   empty_message: 'Coming soon!') %>

data/app/views/manage/cms_templates/edit.html.erb

@@ -0,0 +1,26 @@
+<%= flash_message %>
+
+<h2><%= params[:action].titlecase %> Template</h2>
+
+<%= form_with(model: [:manage, @cms_template], local: true) do |f| %>
+  <%= f.text_field :name, placeholder: 'Template Name', size: '50' %>
+  <div class="codemirror-html-container">
+    <%= f.text_area :content, class: 'codemirror-html autocomplete-off' %>
+  </div>
+  <%= f.submit 'Save Template', class: 'form_button' %>
+  <button onclick="window.CodemirrorInstances.forEach((cm) => { cm.save(); }); jQuery('#preview_frame').show(); jQuery('#preview_frame')[0].scrollIntoView(); jQuery('#preview_content').val(jQuery('textarea[name=\'cms_template[content]\']').val()); jQuery('#preview_form').submit(); return false;" class="form_button">Preview</button>
+  <%= link_to 'Cancel', action: 'index' %>
+  <br>
+  
+  <br>
+  <%= render partial: 'template_reference' %>
+  <br>
+  
+  <iframe id="preview_frame" name="preview_frame"></iframe>
+<% end %>
+
+<%= form_tag(url_for(controller: '/cms/content', action: 'preview_template'), id: 'preview_form', target: 'preview_frame') do %>
+  <%= text_area_tag 'content', '', id: 'preview_content', style: 'display: none;' %>
+  <%= hidden_field_tag 'mode', 'preview' %>
+  <%= hidden_field_tag 'id', params[:id] %>
+<% end %>

data/app/views/{management/cms/templates.html.erb → manage/cms_templates/index.html.erb}

@@ -1,6 +1,6 @@
 <h2>CMS &raquo; Templates</h2>
 
-<p><%= button_to 'Create New Template', { action: 'edit_template' }, method: :get %></p>
+<p><%= button_to 'Create New Template', new_manage_cms_template_path, method: :get %></p>
 
 <%= flash_message %>
 
@@ -8,5 +8,5 @@
   <tr>
     <th>Name</th>
   </tr>
-  <%= render partial: 'temp', collection: @temps %>
+  <%= render @cms_templates %>
 </table>

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

@@ -3,10 +3,12 @@
   Manage Your Site
 </h2>
 
+<%= flash_message %>
+
 <p>
   <ul>
     <%- if user_has_permission? :manage_cms -%>
-    <li><%= link_to 'CMS', :controller => '/management/cms', :action => 'index' %>
+    <li><%= link_to 'CMS', manage_cms_path %>
         - Manage content management system</li>
     <%- end -%>
     <%- if user_has_permission? :manage_users -%>

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

@@ -1,6 +1,6 @@
 <%= flash_message %>
 
-<%= form_for(@user) do |f| %>
+<%= form_for(@usr) do |f| %>
 <table>
   <tr>
     <td>First name:</td>
@@ -28,7 +28,7 @@
     <td><%= f.password_field :password_confirmation %></td>
   </tr>
   
-  <%- if @user.username != session[:user_username] -%>
+  <%- if @usr.username != session[:user_username] -%>
     <tr>
       <td>This user is allowed to:</td>
       <td>

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

@@ -13,14 +13,14 @@
     <td bgcolor="#dedede" width="10%">&nbsp;</td>
     <td bgcolor="#dedede" width="10%">&nbsp;</td>
   </tr>
-  <%- @users.each do |u| %>
+  <%- @usrs.each do |u| %>
   <tr>
     <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><%= 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 }, :method => :delete, :class => 'form_button', :data => { :confirm => 'Are you sure you want to delete ' + u.username + '?' }) if u.username != session[:user_username] %></td>
+    <td><%= button_to('Delete', { :action => 'destroy', :id => u }, :method => :delete, :class => 'form_button', :onclick => "return confirm('Are you sure you want to delete #{u.username}?');") if u.username != session[:user_username] %></td>
   </tr>
   <% end %>
 </table>

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

@@ -2,7 +2,7 @@
 
 <%= flash_message %>
 
-<%= form_for(@user) do |f| %>
+<%= form_for(@usr) do |f| %>
 <table>
   <tr>
     <td>First name:</td>

data/config/initializers/constants.rb

@@ -14,6 +14,9 @@ UseCmsPageCaching = false unless defined? UseCmsPageCaching
 UseCmsAccessLevels = false unless defined? UseCmsAccessLevels
 EnableAssetTimestamping = true unless defined? EnableAssetTimestamping
 
+CmsImageMaxWidth = 2500 unless defined? CmsImageMaxWidth
+CmsImageMaxHeight = 2500 unless defined? CmsImageMaxHeight
+
 # CMS gallery setup
 GalleryMaxWidth = 586 unless defined? GalleryMaxWidth
 GalleryMaxHeight = 400 unless defined? GalleryMaxHeight

data/config/routes.rb

@@ -3,21 +3,68 @@ Rails.application.routes.draw do
   match 'manage'                                => 'management/default#index', :via => [ :get ]
   match 'manage/login'                          => 'management/user#login', :via => [ :get, :post ]
   match 'manage/logout'                         => 'management/user#logout', :via => [ :get, :post ]
-  match 'manage/user(/:action(/:id))'           => 'management/user', :via => [ :get, :post ]
-  
   match 'manage/cms/preview_template'           => 'cms/content#preview_template', :via => [ :post ]
-  match 'manage/cms(/:action(/:id))'            => 'management/cms', :via => [ :get, :post ]
   
-  # slowly convert to resourceful routes
-  # match 'manage/users(/:action(/:id))'          => 'management/users'
-  resources :users, :path => 'manage/users', :controller => 'management/users' do
+  namespace :manage do
+    get 'cms' => 'cms#index'
+
+    resources :cms_pages do
+      collection do
+        get :list_pages, :select_page, :list_pages_select
+        post :list_pages, :select_page, :list_pages_select
+        get :toolbar_preview
+        get :page_attribute
+        
+        # for new pages (no id yet)
+        get :show_template_options
+        post :edit_page
+
+        # page list dialog functions
+        post :page_list_add_folder, :page_list_add_tag
+      end
       member do
-        post :enable
-        post :disable
-        post :edit     # COMPAT: Remove for 3.1
+        get :toolbar_preview, :toolbar_edit
+        post :set_page_version, :request_review
+
+        get :edit_page, :show_template_options
+        post :edit_page
+        post :delete_page
+
+        get :edit_page_content, :insert_page_object_config
+        post :edit_page_content
+
+        get :create_file_link, :upload_file, :receive_file
+        post :create_file_link, :upload_file, :receive_file
+        
+        get :upload_image, :receive_image, :crop_image, :save_crop, :upload_status
+        post :upload_image, :receive_image, :crop_image, :save_crop, :upload_status
+        get :upload_thumb, :crop_thumb, :save_crop_thumb
+        post :upload_thumb, :crop_thumb, :save_crop_thumb
+        get :upload_feature_image, :crop_feature_image, :save_crop_feature_image
+        post :upload_feature_image, :crop_feature_image, :save_crop_feature_image
+
+        
+        get :receive_gallery, :complete_gallery, :gallery_setup, :add_to_gallery
+        post :receive_gallery, :complete_gallery, :gallery_setup, :add_to_gallery
+        get :gallery_management, :select_gallery, :set_gallery_order, :save_gallery_settings
+        post :gallery_management, :select_gallery, :set_gallery_order, :save_gallery_settings
+        get :sort_images, :sort_images_save
+        post :sort_images, :sort_images_save
+        get :image_details, :update_caption
+        post :image_details, :update_caption
+        # get :delete_photo, :delete_gallery
+        post :delete_photo, :delete_gallery
       end
     end
-  # end
+    resources :cms_templates
+    resources :cms_snippets
+  end
+
+  resources :users, path: 'manage/users', controller: 'management/users' do
+    member do
+      post :enable, :disable
+    end
+  end
   
   match 'util/date_picker'                      => 'util#date_picker', :as => :date_picker, :via => [ :get, :post ]
   

data/db/migrate/20121108004747_add_settings_table.rb

@@ -1,18 +1,14 @@
-class AddSettingsTable < ActiveRecord::Migration
+class AddSettingsTable < ActiveRecord::Migration[4.2]
   
-  def up
-    create_table "settings" do |t|
-      t.column "name",              :string, :null => false
-      t.column "value",             :text
+  def change
+    create_table :settings do |t|
+      t.string :name, null: false
+      t.text :value
       
-      t.column "created_on",        :timestamp
-      t.column "updated_on",        :timestamp
+      t.datetime :created_on
+      t.datetime :updated_on
     end
-    add_index "settings", ["name"], :name => "UN_settings_name", :unique => true
-  end
-  
-  def down
-    drop_table "settings"
+    add_index "settings", ["name"], name: "UN_settings_name", unique: true
   end
   
 end

data/db/migrate/20121108005110_add_tasks_table.rb

@@ -1,17 +1,13 @@
-class AddTasksTable < ActiveRecord::Migration
+class AddTasksTable < ActiveRecord::Migration[4.2]
   
-  def up
-    create_table "tasks" do |t|
-      t.column "name",              :string, :null => false
+  def change
+    create_table :tasks do |t|
+      t.string :name, null: false
       
-      t.column "created_on",        :timestamp
-      t.column "updated_on",        :timestamp
+      t.datetime :created_on
+      t.datetime :updated_on
     end
-    add_index "tasks", ["name"], :name => "UN_tasks_name", :unique => true
-  end
-  
-  def down
-    drop_table "tasks"
+    add_index "tasks", ["name"], name: "UN_tasks_name", unique: true
   end
   
 end