schema/migrations/003_add_model_assets.rb @@ -7,6 +7,7 @@ - Image uploading(& thumbnailing) via attachment_fu - Write articles in Textile, Markdown, or HTML - Users may vote on comments (no registration required) + - Comments may use Textile and are proteted using Whistler - completely UJS using JQuery - RESTful architecture @@ -19,6 +20,7 @@ - RedCloth - CodeRay - merb\_can\_filter + - whistler - image_science ### Get Started - clone,configure,migrate README.markdown @@ -3,14 +3,15 @@ class Application < Merb::Controller include AuthenticatedSystem include GlobalMixin - before :articles + before :sidebar private - def articles + def sidebar if logged_in? @articles = Article.find :all, :order => 'published_at DESC' @assets = Asset.find :all, :conditions => "parent_id IS NULL", :order => "created_at DESC" + @comments_count = Comment.count :all else Article.with_published do @articles = Article.find :all, :order => 'published_at DESC' app/controllers/application.rb @@ -3,9 +3,7 @@ class Articles < Application before :login_required, :exclude => [:index, :show] #before :basic_authentication, :exclude => [:index, :show] - before :layout - before :articles def index display @articles app/controllers/articles.rb @@ -1,11 +1,8 @@ class Asset < ActiveRecord::Base - - # Associations - belongs_to :attachable, :polymorphic => true # Plugins has_attachment :storage => :file_system, - :thumbnails => { :large => '300x300!', :med => '160x160!', :small => '75x75!', :thumb => '50x50!', :tiny => '40x40!', :micro => '30x30!' }, + :thumbnails => { :banner => '660x140!', :ver => '300x500>', :hor => '500x300>', :large => '300x300!', :med => '160x160!', :small => '75x75!', :thumb => '50x50!' }, :max_size => 5.megabytes, :path_prefix => "public/uploads/assets", :content_type => :image app/models/asset.rb @@ -1,48 +1,3 @@ -<style type="text/css" media="screen"> - - #asset_form{ - padding:15px 30px 30px 30px; - background:#eee; - } - #images ul{ - list-style-type:none; - padding:0; - margin:0; - } - #images li{ - float:left; - margin:5px; - padding:0; - } - #images a img{ - border:1px solid #aaa; - padding:4px; - display:block; - } - #images a img:hover{ - border-color:blue; - } - li.asset{ - position:relative; - } - .asset_panel{ - position:absolute; - bottom:5px; - right:5px; - background:#fff; - font-size:10px; - padding-top:3px; - padding-left:5px; - } - .asset_panel a{ - font-weight:300; - text-decoration:none; - } - a.del{ - color:red; - } -</style> - <% form_for :asset, :action => url(:assets), :multipart => true do %> <%= file_control :uploaded_data, :label => "Upload Asset" %> <input name="commit" type="submit" value="Upload" /> app/views/assets/index.html.erb @@ -1,10 +1,10 @@ -<img src="<%#= @asset.public_filename %>" /> +<img src="<%= @asset.public_filename :banner %>" /> +<img src="<%= @asset.public_filename :ver %>" /> +<img src="<%= @asset.public_filename :hor %>" /> <img src="<%= @asset.public_filename :large %>" /> <img src="<%= @asset.public_filename :med %>" /> <img src="<%= @asset.public_filename :small %>" /> <img src="<%= @asset.public_filename :thumb %>" /> -<img src="<%= @asset.public_filename :tiny %>" /> -<img src="<%= @asset.public_filename :micro %>" /> <p> <b>Filename:</b> app/views/assets/show.html.erb @@ -1,53 +1,22 @@ -<style type="text/css" media="screen"> - #sbar h3{ - border-bottom:1px dotted #ccc; - } - #sbar ul{ - list-style-type:none; - padding:0; - } - #article_list li{ - padding:4px 0; - } - .article_btn{ - - } - li a.title{ - font-family:Arial; - font-size:12px; - color:#666; - text-decoration:none; - } - - #asset_list li{ - float:left; - padding-right:4px; - } - .btn{ - clear:both; - text-decoration:none; - } - .draft{ - color:red; - } -</style> - -<div id="article_list"> - <h3>Articles(<%= @articles.length %>) - <%= link_to 'new', "/articles/new", :class => 'btn' %></h3> +<div id="article_list" class="listing"> + <h2><a href="/articles">Articles</a> <%= @articles.length %> <%= link_to 'new', "/articles/new", :class => 'btn' %></h2> <% unless @articles.empty? %> <ul> <% for article in @articles %> - <li><%= '<span class="draft">draft - </span>' unless article.published_at %><%= link_to article.title, "/articles/#{article.to_param}", :class => 'title' %> - - <%= link_to 'edit', "/articles/#{article.to_param}/edit" %> | - <%= link_to 'destroy', "/articles/#{article.to_param}", :class => 'delete' %></li> + <li> + <%= '<span class="draft">draft - </span>' unless article.published_at %><%= link_to article.title, "/articles/#{article.to_param}", :class => 'title' %> + <span class="btns"> + <%= link_to 'edit', "/articles/#{article.to_param}/edit" %> | + <%= link_to 'destroy', "/articles/#{article.to_param}", :class => 'delete' %> + </span> + </li> <% end %> </ul> <% end %> </div> - -<div id="asset_list"> - <h3>Assets(<%= @assets.length %>) - <%= link_to 'manage', "/assets", :class => 'btn' %></h3> +<div id="asset_list" class="listing"> + <h2><a href="/assets">Assets</a> <%= @assets.length %> <%#= link_to 'add', "/assets", :class => 'btn' %></h2> <% unless @assets.empty? %> <ul> <% for asset in @assets %> @@ -56,3 +25,7 @@ </ul> <% end %> </div> + +<div id="comment_list" class="listing"> + <h2><a href="/comments">Comments</a> <%= @comments_count %> <%#= link_to 'review', "/comments", :class => 'btn right' %></h2> +</div> \ No newline at end of file app/views/shared/_admin_sbar.html.erb @@ -17,8 +17,12 @@ $(document).ready(function() { //RESTful delete if ($(event.target).is('a.delete')) { - $('<form method="POST" style="display:none"></form>').attr('action', event.target.href ).html('<input type="hidden" name="_method" value="delete" />').appendTo("body")[0].submit(); - return false; + if (confirm("Oops! Do you really mean to delete?")) { + $('<form method="POST" style="display:none"></form>').attr('action', event.target.href ).html('<input type="hidden" name="_method" value="delete" />').appendTo("body")[0].submit(); + return false; + }else{ + return false; + } } }); public/javascripts/application.js @@ -59,4 +59,106 @@ } #comments_list td.body{ width:50%; + } + +/*----------------------------------- + Admin - Sidebar (needs cleanup) +-----------------------------------*/ + + #sbar h2{ + border-bottom:1px dotted #ccc; + color:#aaa; + position:relative; + } + #sbar h2 a{ + color:#000; + text-decoration:none; + } + #sbar ul{ + list-style-type:none; + padding:0; + } + #article_list li{ + padding:4px 0; + } + li a.title{ + font-family:Arial; + font-size:14px; + color:#333; + text-decoration:none; + } + #asset_list li{ + float:left; + padding-right:4px; + } + a.btn{ + clear:both; + text-decoration:none; + color:#2244FF; + position:absolute; + right:0; + } + #article_list li{ + position:relative; + } + .btns{ + position:absolute; + right:0; + font-size:10px; + } + .btns a{ + text-decoration:none; + } + .draft{ + color:#c00; + font-weight:bold; + } + .listing{ + clear:both; + margin-bottom:15px; + } + +/*----------------------------------- + Admin - Asset Uploader (needs cleanup) +-----------------------------------*/ + + #asset_form{ + padding:15px 30px 30px 30px; + background:#eee; + } + #images ul{ + list-style-type:none; + padding:0; + margin:0; + } + #images li{ + float:left; + margin:5px; + padding:0; + } + #images a img{ + border:1px solid #aaa; + padding:4px; + display:block; + } + #images a img:hover{ + border-color:#24F; + } + li.asset{ + position:relative; + } + .asset_panel{ + position:absolute; + bottom:5px; + right:5px; + background:#fff; + font-size:10px; + padding-top:3px; + padding-left:5px; + } + .asset_panel a{ + text-decoration:none; + } + a.del{ + color:#E24; } \ No newline at end of file public/stylesheets/admin.css @@ -51,6 +51,25 @@ helpers .left{float:left} .right{float:right} + +/*----------------------------------- +image classes +-----------------------------------*/ +.center{ +text-align:center; +} +img.border{ +padding:5px; +border:1px solid #ccc; +} +img.matte{ +padding:10px 10px 11px; +background:#eee; +} +img.left{margin:10px 20px 10px 0;} +img.right{margin:10px 0 10px 20px;} +img.cneter{margin-left:10px;} + /*----------------------------------- Default Typography -----------------------------------*/ @@ -71,7 +90,7 @@ letter-spacing:-.06em; } h2{ -margin-top:28px; +margin-top:22px; margin-bottom:-.06em; font-size:1.6em; } public/stylesheets/master.css @@ -2,6 +2,7 @@ class AddModelComments < ActiveRecord::Migration def self.up create_table :comments do |t| t.column :article_id, :integer + t.column :admin, :boolean, :default => false t.column :user_ip, :string t.column :user_agent, :string t.column :referrer, :string @@ -14,10 +15,10 @@ class AddModelComments < ActiveRecord::Migration t.column :vote_count, :integer, :default => 1 t.column :body, :text t.column :body_html, :text - t.column :created_at, :datetime - t.column :updated_at, :datetime + t.timestamps end add_index :comments, :article_id + add_index :comments, :approved end def self.down schema/migrations/002_add_model_comments.rb @@ -37,10 +37,10 @@ ActiveRecord::Schema.define(:version => 3) do t.integer "size" t.string "attachable_type" t.integer "attachable_id" - t.datetime "updated_at" - t.datetime "created_at" t.string "thumbnail" t.integer "parent_id" + t.datetime "created_at" + t.datetime "updated_at" end add_index "assets", ["parent_id"], :name => "index_assets_on_parent_id" @@ -49,6 +49,7 @@ ActiveRecord::Schema.define(:version => 3) do create_table "comments", :force => true do |t| t.integer "article_id" + t.boolean "admin", :default => false t.string "user_ip" t.string "user_agent" t.string "referrer" @@ -65,6 +66,7 @@ ActiveRecord::Schema.define(:version => 3) do t.datetime "updated_at" end + add_index "comments", ["approved"], :name => "index_comments_on_approved" add_index "comments", ["article_id"], :name => "index_comments_on_article_id" end schema/schema.rb schema/migrations/003_asset_migration.rb fc71a6418e2e10b97d579c5a3206ea17cc201652 brockwhitten brockwhitten@8b0ec7b7-bd45-0410-8a4e-3563a9e70f90 http://github.com/sintaxi/pmpknpi/commit/6eb278fa2ef46f3a827c35df3cfa38861b609bf7 6eb278fa2ef46f3a827c35df3cfa38861b609bf7 2008-04-11T01:50:19-07:00 2008-04-11T01:50:19-07:00 subversion is a being picky git-svn-id: https://pmpknpi.googlecode.com/svn/trunk@71 8b0ec7b7-bd45-0410-8a4e-3563a9e70f90 dca994352f333d16a162b8e4447515783ad8ab7f brockwhitten brockwhitten@8b0ec7b7-bd45-0410-8a4e-3563a9e70f90