install/images/file_types/WMA.png install/images/file_types/ac3.png install/images/file_types/ace.png install/images/file_types/ade.png install/images/file_types/adp.png install/images/file_types/ai.png install/images/file_types/aiff.png install/images/file_types/ani.png install/images/file_types/asf.png install/images/file_types/au.png install/images/file_types/avi.png install/images/file_types/bat.png install/images/file_types/bin.png install/images/file_types/bmp.png install/images/file_types/bsp.png install/images/file_types/bup.png install/images/file_types/cab.png install/images/file_types/cal.png install/images/file_types/cat.png install/images/file_types/css.png install/images/file_types/cue.png install/images/file_types/cur.png install/images/file_types/daa.png install/images/file_types/dat.png install/images/file_types/dcr.png install/images/file_types/default.png install/images/file_types/der.png install/images/file_types/dic.png install/images/file_types/divx.png install/images/file_types/diz.png install/images/file_types/dll.png install/images/file_types/doc.png install/images/file_types/docx.png install/images/file_types/dvd.png install/images/file_types/dwg.png install/images/file_types/dwt.png install/images/file_types/fon.png install/images/file_types/gam.png install/images/file_types/gif.png install/images/file_types/hlp.png install/images/file_types/hst.png install/images/file_types/html.png install/images/file_types/ico.png install/images/file_types/ifo.png install/images/file_types/inf.png install/images/file_types/ini.png install/images/file_types/iso.png install/images/file_types/java.png install/images/file_types/jif.png install/images/file_types/jpg.png install/images/file_types/log.png install/images/file_types/m4a.png install/images/file_types/mdl.png install/images/file_types/mid.png install/images/file_types/mmf.png install/images/file_types/mmm.png install/images/file_types/mov.png install/images/file_types/mp2.png install/images/file_types/mp2v.png install/images/file_types/mp3.png install/images/file_types/mp4.png install/images/file_types/mpeg.png install/images/file_types/msp.png install/images/file_types/nfo.png install/images/file_types/pdf.png install/images/file_types/php.png install/images/file_types/png.png install/images/file_types/ppt.png install/images/file_types/pptx.png install/images/file_types/psd.png install/images/file_types/ra.png install/images/file_types/rar.png install/images/file_types/reg.png install/images/file_types/rtf.png install/images/file_types/spr.png install/images/file_types/theme.png install/images/file_types/tiff.png install/images/file_types/tlb.png install/images/file_types/torrent.png install/images/file_types/ttf.png install/images/file_types/txt.png install/images/file_types/url.png install/images/file_types/vob.png install/images/file_types/vtf.png install/images/file_types/wad.png install/images/file_types/wav.png install/images/file_types/wmv.png install/images/file_types/wpl.png install/images/file_types/wri.png install/images/file_types/xls.png install/images/file_types/xlsx.png install/images/file_types/xml.png install/images/file_types/xps.png install/images/file_types/xsl.png install/images/file_types/zip.png lib/controllers/hush_cms_admin/files_controller.rb lib/models/hush_cms/file.rb lib/views/hush_cms_admin/files/edit.html.haml lib/views/hush_cms_admin/files/images.js.haml lib/views/hush_cms_admin/files/index.html.haml lib/views/hush_cms_admin/files/new.html.haml lib/views/hush_cms_admin/files/non_images.js.haml @@ -54,3 +54,5 @@ Example Copyright (c) 2008 James Brooks, Good Dog Design (james@gooddogdesign.com), released under the MIT license +Using icons (Silk Icon Set) created by Mark James (famfamfam.com) +Using icons (File Icons v2) created by Jordan Michael (Jordan-Michael.com) README @@ -58,14 +58,14 @@ class CreateHushCmsComponents < ActiveRecord::Migration add_index :hush_cms_snippets, [ :slug, :page_id ] - create_table :hush_cms_images do |t| - t.string :name, :image_file_name, :image_content_type - t.integer :image_file_size + create_table :hush_cms_files do |t| + t.string :name, :file_file_name, :file_content_type + t.integer :file_file_size t.text :content t.timestamps end - add_index :hush_cms_images, :name + add_index :hush_cms_files, :name create_table :hush_cms_calendars do |t| @@ -92,7 +92,7 @@ class CreateHushCmsComponents < ActiveRecord::Migration drop_table :hush_cms_posts drop_table :hush_cms_comments drop_table :hush_cms_snippets - drop_table :hush_cms_images + drop_table :hush_cms_files drop_table :hush_cms_calendars drop_table :hush_cms_events end generators/hush_cms/templates/hush_cms_migration.rb @@ -52,7 +52,7 @@ ul#navigation li#nav-posts a { ul#navigation li#nav-calendars a { background-image: url(../images/hush_cms/calendar.png); } -ul#navigation li#nav-images a { +ul#navigation li#nav-files a { background-image: url(../images/hush_cms/image.png); } ul#navigation li#nav-snippets a { @@ -117,8 +117,8 @@ ul#navigation li#nav-comments a { #sidebar a#sidebar-delete-post, #sidebar a#sidebar-new-snippet, #sidebar a#sidebar-snippets, -#sidebar a#sidebar-new-image, -#sidebar a#sidebar-delete-image, +#sidebar a#sidebar-new-file, +#sidebar a#sidebar-delete-file, #sidebar a#sidebar-new-calendar, #sidebar a#sidebar-permanent { display: block; @@ -139,8 +139,8 @@ ul#navigation li#nav-comments a { #sidebar a#sidebar-new-post:hover, #sidebar a#sidebar-edit-post:hover, #sidebar a#sidebar-delete-post:hover, -#sidebar a#sidebar-new-image:hover, -#sidebar a#sidebar-delete-image:hover, +#sidebar a#sidebar-new-file:hover, +#sidebar a#sidebar-delete-file:hover, #sidebar a#sidebar-new-snippet:hover, #sidebar a#sidebar-new-calendar:hover, #sidebar a#sidebar-snippets:hover { @@ -175,10 +175,10 @@ ul#navigation li#nav-comments a { #sidebar a#sidebar-delete-post { background-image: url(../images/hush_cms/newspaper_delete.png); } -#sidebar a#sidebar-new-image { +#sidebar a#sidebar-new-file { background-image: url(../images/hush_cms/image_add.png); } -#sidebar a#sidebar-delete-image { +#sidebar a#sidebar-delete-file { background-image: url(../images/hush_cms/image_delete.png); } #sidebar a#sidebar-new-calendar { @@ -395,12 +395,12 @@ ul.comments li p { color: #846F41; } -ul#images { +ul#files { list-style: none; margin: 0; padding: 0; } -ul#images li { +ul#files li { float: left; position: relative; overflow: hidden; @@ -409,23 +409,38 @@ ul#images li { margin: 0 8px 10px 9px; text-align: center; } -ul#images li > img { +ul#files li img { + display: block; + margin-bottom: 5px; padding: 1px; + height: 100px; + width: 100px; +} +ul#files li.image img { border: 1px solid #ccc; } -ul#images li span { +ul#files li.non-image img { + border: none; + background: url(../images/hush_cms/file_types/default.png) no-repeat; +} +ul#files li span { display: block; font-size: 0.7em; } -ul#images li .options { +ul#files li .options { display: none; } -ul#images li.hover .options { +ul#files li.hover .options { display: block; position: absolute; top: 84px; - right: 3px; + right: 2px; } -ul#images li .options a img { +ul#files li .options a img { border: none; + background: none; + display: inline; + padding: 0; + height: 16px; + width: 16px; } install/stylesheets/hush_cms_admin.css @@ -16,7 +16,8 @@ class HushCmsAdminController < ApplicationController :theme_advanced_buttons3 => [], :plugins => %w{contextmenu paste table}, :relative_urls => false, - :external_image_list_url => ActionController::Routing::Routes.named_routes['formatted_hush_cms_admin_images'].segments.map(&:to_s).join.gsub(/:format/, 'js')}, + :external_image_list_url => ActionController::Routing::Routes.named_routes['formatted_images_hush_cms_admin_files'].segments.map(&:to_s).join.gsub(/:format/, 'js'), + :external_link_list_url => ActionController::Routing::Routes.named_routes['formatted_non_images_hush_cms_admin_files'].segments.map(&:to_s).join.gsub(/:format/, 'js')}, :only => [:new, :create, :edit, :update]) lib/controllers/hush_cms_admin_controller.rb @@ -56,7 +56,7 @@ module ActionController end a.resources :comments, :member => { :approve => :put, :unapprove => :put } - a.resources :images + a.resources :files, :collection => { :images => :get, :non_images => :get } a.resources :snippets end end lib/extensions/mapper.rb @@ -6,7 +6,7 @@ module HushCMSViewHelpers end def hush_cms_image(name) - image_tag HushCMS::Image.find_by_name(name).image.url, :alt => name, :class => "#{name.slugify}-image" rescue '' + image_tag HushCMS::File.find_by_name(name).file.url, :alt => name, :class => "#{name.slugify}-image" rescue '' end def hush_cms_breadcrumbs(page) lib/helpers/hush_cms_view_helpers.rb @@ -16,7 +16,7 @@ %ul#navigation %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-files= link_to 'Files', hush_cms_admin_files_path %li#nav-calendars= link_to 'Calendars', hush_cms_admin_calendars_path %li#nav-snippets= link_to 'Snippets', hush_cms_admin_snippets_path lib/views/layouts/hush_cms_admin.html.haml lib/controllers/hush_cms_admin/images_controller.rb lib/models/hush_cms/image.rb lib/views/hush_cms_admin/images/edit.html.haml lib/views/hush_cms_admin/images/index.html.haml lib/views/hush_cms_admin/images/index.js.haml lib/views/hush_cms_admin/images/new.html.haml 8152a4bae80ceae212adaf874397be7833196741 James Brooks james@gooddogdesign.com http://github.com/JamesBrooks/hush_cms/commit/8461d4bd6df37a1bab3357ba2222145d89bb64e5 8461d4bd6df37a1bab3357ba2222145d89bb64e5 2008-10-27T19:16:50-07:00 2008-10-27T19:16:50-07:00 Major overhaul, renamed Image model to File, to handle a more generic type. Added file type images if it is a non-image type 5151ce8103a8c490fce6288494457f9f7c25c3a2 James Brooks james@gooddogdesign.com