install/images/calendar.png install/images/calendar_add.png install/images/calendar_delete.png install/images/calendar_edit.png install/images/calendar_view_day.png install/images/calendar_view_week.png install/images/date_add.png install/images/date_delete.png install/images/date_picker/backstripes.gif install/images/date_picker/bg_header.jpg install/images/date_picker/bullet1.gif install/images/date_picker/bullet2.gif install/images/date_picker/cal.gif install/images/date_picker/gradient-e5e5e5-ffffff.gif install/javascripts/hush_cms_date_lang/af.js install/javascripts/hush_cms_date_lang/ar.js install/javascripts/hush_cms_date_lang/de.js install/javascripts/hush_cms_date_lang/du.js install/javascripts/hush_cms_date_lang/en.js install/javascripts/hush_cms_date_lang/es.js install/javascripts/hush_cms_date_lang/fi.js install/javascripts/hush_cms_date_lang/fr.js install/javascripts/hush_cms_date_lang/gr.js install/javascripts/hush_cms_date_lang/he.js install/javascripts/hush_cms_date_lang/it.js install/javascripts/hush_cms_date_lang/nl.js install/javascripts/hush_cms_date_lang/no.js install/javascripts/hush_cms_date_lang/pt.js install/javascripts/hush_cms_date_lang/ro.js install/javascripts/hush_cms_date_lang/ru.js install/javascripts/hush_cms_date_lang/sp.js install/javascripts/hush_cms_date_lang/sv.js install/javascripts/hush_cms_date_lang/ua.js install/javascripts/hush_cms_date_picker.js install/stylesheets/hush_cms_date_picker.css lib/controllers/hush_cms_admin/calendars_controller.rb lib/controllers/hush_cms_admin/events_controller.rb lib/models/hush_cms/calendar.rb lib/models/hush_cms/event.rb lib/views/hush_cms_admin/calendars/_calendars.html.haml lib/views/hush_cms_admin/calendars/edit.html.haml lib/views/hush_cms_admin/calendars/index.html.haml lib/views/hush_cms_admin/calendars/new.html.haml lib/views/hush_cms_admin/events/edit.html.haml lib/views/hush_cms_admin/events/index.html.haml lib/views/hush_cms_admin/events/new.html.haml @@ -66,6 +66,24 @@ class CreateHushCmsComponents < ActiveRecord::Migration end add_index :hush_cms_images, :name + + + create_table :hush_cms_calendars do |t| + t.string :name, :slug + end + + add_index :hush_cms_calendars, :slug + + + create_table :hush_cms_events do |t| + t.integer :calendar_id + t.string :name + t.text :details + t.date :start_date, :finish_date + t.time :start_time, :finish_time + end + + add_index :hush_cms_events, :calendar_id end def self.down @@ -75,5 +93,7 @@ class CreateHushCmsComponents < ActiveRecord::Migration drop_table :hush_cms_comments drop_table :hush_cms_snippets drop_table :hush_cms_images + drop_table :hush_cms_calendars + drop_table :hush_cms_events end end generators/hush_cms/templates/hush_cms_migration.rb @@ -5,10 +5,16 @@ hush_config = "#{RAILS_ROOT}/config/hush.yml" hush_images = "#{RAILS_ROOT}/public/images/hush_cms" hush_javascripts = "#{RAILS_ROOT}/public/javascripts/hush_cms_admin.js" hush_stylesheets = "#{RAILS_ROOT}/public/stylesheets/hush_cms_admin.css" +date_javascripts = "#{RAILS_ROOT}/public/javascripts/hush_cms_date_picker.js" +date_stylesheets = "#{RAILS_ROOT}/public/stylesheets/hush_cms_date_picker.css" +date_languages = "#{RAILS_ROOT}/public/javascripts/hush_cms_date_lang" -FileUtils.cp File.dirname(__FILE__) + '/install/hush.yml.tpl', hush_config unless File.exist?(hush_config) -FileUtils.cp_r File.dirname(__FILE__) + '/install/images', hush_images unless File.exist?(hush_images) -FileUtils.cp_r File.dirname(__FILE__) + '/install/javascripts/hush_cms_admin.js', hush_javascripts unless File.exist?(hush_javascripts) -FileUtils.cp_r File.dirname(__FILE__) + '/install/stylesheets/hush_cms_admin.css', hush_stylesheets unless File.exist?(hush_stylesheets) +FileUtils.cp File.dirname(__FILE__) + '/install/hush.yml.tpl', hush_config unless File.exist?(hush_config) +FileUtils.cp_r File.dirname(__FILE__) + '/install/images', hush_images unless File.exist?(hush_images) +FileUtils.cp_r File.dirname(__FILE__) + '/install/javascripts/hush_cms_admin.js', hush_javascripts unless File.exist?(hush_javascripts) +FileUtils.cp_r File.dirname(__FILE__) + '/install/stylesheets/hush_cms_admin.css', hush_stylesheets unless File.exist?(hush_stylesheets) +FileUtils.cp_r File.dirname(__FILE__) + '/install/javascripts/hush_cms_date_picker.js', date_javascripts unless File.exist?(date_javascripts) +FileUtils.cp_r File.dirname(__FILE__) + '/install/stylesheets/hush_cms_date_picker.css', date_stylesheets unless File.exist?(date_stylesheets) +FileUtils.cp_r File.dirname(__FILE__) + '/install/javascripts/hush_cms_date_lang', date_languages unless File.exist?(date_languages) puts IO.read(File.join(File.dirname(__FILE__), 'install', 'INSTRUCTIONS')) install.rb @@ -49,6 +49,9 @@ ul#navigation li#nav-pages a { ul#navigation li#nav-posts a { background-image: url(../images/hush_cms/newspaper.png); } +ul#navigation li#nav-calendars a { + background-image: url(../images/hush_cms/calendar.png); +} ul#navigation li#nav-images a { background-image: url(../images/hush_cms/image.png); } @@ -116,6 +119,7 @@ ul#navigation li#nav-comments a { #sidebar a#sidebar-snippets, #sidebar a#sidebar-new-image, #sidebar a#sidebar-delete-image, +#sidebar a#sidebar-new-calendar, #sidebar a#sidebar-permanent { display: block; font-size: 0.8em; @@ -138,6 +142,7 @@ ul#navigation li#nav-comments a { #sidebar a#sidebar-new-image:hover, #sidebar a#sidebar-delete-image:hover, #sidebar a#sidebar-new-snippet:hover, +#sidebar a#sidebar-new-calendar:hover, #sidebar a#sidebar-snippets:hover { text-decoration: underline; } @@ -176,6 +181,9 @@ ul#navigation li#nav-comments a { #sidebar a#sidebar-delete-image { background-image: url(../images/hush_cms/image_delete.png); } +#sidebar a#sidebar-new-calendar { + background-image: url(../images/hush_cms/calendar_add.png); +} #sidebar a#sidebar-permanent { color: #B1A656; background-image: url(../images/hush_cms/shield.png); @@ -243,7 +251,9 @@ ul#navigation li#nav-comments a { #sidebar ul li.hover a.delete-post-category, #sidebar ul li.hover a.edit-post-category, #sidebar ul li.hover a.delete-snippet, -#sidebar ul li.hover a.edit-snippet { +#sidebar ul li.hover a.edit-snippet, +#sidebar ul li.hover a.delete-calendar, +#sidebar ul li.hover a.edit-calendar { display: block; } #sidebar ul li a.move-higher img, @@ -251,7 +261,9 @@ ul#navigation li#nav-comments a { #sidebar ul li a.delete-post-category img, #sidebar ul li a.edit-post-category img, #sidebar ul li a.delete-snippet img, -#sidebar ul li a.edit-snippet img { +#sidebar ul li a.edit-snippet img, +#sidebar ul li a.delete-calendar img, +#sidebar ul li a.edit-calendar img { position: absolute; border: none; } @@ -264,7 +276,9 @@ ul#navigation li#nav-comments a { #sidebar ul li a.delete-post-category, #sidebar ul li a.edit-post-category, #sidebar ul li a.delete-snippet, -#sidebar ul li a.edit-snippet { +#sidebar ul li a.edit-snippet, +#sidebar ul li a.delete-calendar, +#sidebar ul li a.edit-calendar { display: none; position: absolute; top: 16px; @@ -272,10 +286,12 @@ ul#navigation li#nav-comments a { width: 16px; } #sidebar ul li a.delete-post-category, -#sidebar ul li a.delete-snippet { +#sidebar ul li a.delete-snippet, +#sidebar ul li a.delete-calendar { right: 0; } -#sidebar ul li a.edit-post-category { +#sidebar ul li a.edit-post-category, +#sidebar ul li a.edit-calendar { right: 18px; } install/stylesheets/hush_cms_admin.css @@ -11,7 +11,7 @@ class HushCmsAdminController < ApplicationController :theme_advanced_resize_horizontal => false, :paste_auto_cleanup_on_paste => true, :theme_advanced_blockformats => %w{h1 h2 h3}, - :theme_advanced_buttons1 => %w{code formatselect fontsizeselect bold italic underline strikethrough separator justifyleft justifycenter justifyright indent outdent separator bullist numlist forecolor backcolor separator link unlink image undo redo}, + :theme_advanced_buttons1 => %w{code formatselect bold italic underline strikethrough separator justifyleft justifycenter justifyright indent outdent separator bullist numlist forecolor backcolor separator link unlink image}, :theme_advanced_buttons2 => [], :theme_advanced_buttons3 => [], :plugins => %w{contextmenu paste}, lib/controllers/hush_cms_admin_controller.rb @@ -51,6 +51,10 @@ module ActionController p.resources :snippets end + a.resources :calendars do |c| + c.resources :events, :collection => { :all => :get } + end + a.resources :comments, :member => { :approve => :put, :unapprove => :put } a.resources :images a.resources :snippets lib/extensions/mapper.rb @@ -8,6 +8,7 @@ class HushCMS::PostCategory < ActiveRecord::Base before_validation :assign_slug + def to_s name end lib/models/hush_cms/post_category.rb @@ -4,10 +4,10 @@ %title Hush CMS Administration %meta{'http-equiv' => 'content-type', 'content' => 'text/html;charset=utf-8'} %meta{'http-equiv' => 'Content-Style-Type', 'content' => 'text/css'} - = stylesheet_link_tag 'hush_cms_admin' + = stylesheet_link_tag 'hush_cms_admin', 'hush_cms_date_picker' = javascript_include_tiny_mce_if_used = tiny_mce if using_tiny_mce? - = javascript_include_tag 'prototype', 'effects', 'dragdrop', 'hush_cms_admin', :cache => 'hush_cms_admin_cached' + = javascript_include_tag 'prototype', 'effects', 'dragdrop', 'hush_cms_admin', 'hush_cms_date_picker', :cache => 'hush_cms_admin_cached' %body #container @@ -15,6 +15,7 @@ %li#nav-pages= link_to 'Pages', hush_cms_admin_pages_path %li#nav-posts= link_to 'Posts', hush_cms_admin_post_categories_path %li#nav-images= link_to 'Images', hush_cms_admin_images_path + %li#nav-calendars= link_to 'Calendars', hush_cms_admin_calendars_path %li#nav-snippets= link_to 'Snippets', hush_cms_admin_snippets_path - if HushCMS::PostCategory.any_with_comments? lib/views/layouts/hush_cms_admin.html.haml 1ac9352080d370e5599fc06c809b4d4f78c415c3 James Brooks james@gooddogdesign.com http://github.com/JamesBrooks/hush_cms/commit/ff63f42d0145b4134d97ca2925ab2fdeefa0f6f3 ff63f42d0145b4134d97ca2925ab2fdeefa0f6f3 2008-09-04T00:31:43-07:00 2008-09-04T00:31:43-07:00 First stage of adding Calendar/Event support to the CMS. Not complete 54e87b76b885b7f3f63d8409b94c71fdec107fcf James Brooks james@gooddogdesign.com