app/controllers/assets_controller.rb app/helpers/assets_helper.rb app/models/asset.rb app/views/assets/_asset.html.erb app/views/assets/_form.html.erb app/views/assets/_list.html.erb db/migrate/20080929112620_create_assets.rb design/kakuteru-dot-com-2_01.png design/kakuteru-dot-com-2_02.png design/kakuteru-dot-com-2_04.png design/kakuteru-dot-com-2_05.png design/kakuteru-dot-com-2_07.png design/kakuteru-dot-com-2_08.png design/kakuteru-dot-com-2_09.png design/kakuteru.png design/shaken_not_stirred.png public/images/spinner.gif test/fixtures/assets.yml test/functional/assets_controller_test.rb test/unit/asset_test.rb vendor/plugins/responds_to_parent/MIT-LICENSE vendor/plugins/responds_to_parent/README vendor/plugins/responds_to_parent/Rakefile vendor/plugins/responds_to_parent/init.rb vendor/plugins/responds_to_parent/lib/parent_selector_assertion.rb vendor/plugins/responds_to_parent/lib/responds_to_parent.rb vendor/plugins/responds_to_parent/test/assert_select_parent_test.rb vendor/plugins/responds_to_parent/test/responds_to_parent_test.rb @@ -40,16 +40,16 @@ module ApplicationHelper end end - def markup(post) + def markup(post, field = :body) case post.type when 'article' case post.markup when 'textile' - FilteredColumn::Processor.new('textile_filter', post.body).filter + FilteredColumn::Processor.new('textile_filter', post.send(field)).filter when 'markdown' - FilteredColumn::Processor.new('markdown_filter', post.body).filter + FilteredColumn::Processor.new('markdown_filter', post.send(field)).filter else - post.body + post.send(field) end when 'message' markup_nanoformats(post) app/helpers/application_helper.rb @@ -12,7 +12,7 @@ <p><label for="friendfeed_url" title="Core backend of the lifestream feed must be in XML, eg: http://friendfeed.com/api/feed/user/dominiek?format=xml">Friendfeed URL: </label><%= text_field(:stream, :friendfeed_url) %></p> <p><label for="addthis_username" title="If set, will be used for voting mechanism next to digg and twitter.">Addthis.com user: </label><%= text_field(:stream, :addthis_username) %></p> <p><label for="disqus_forum_identifier" title="If set, will be used to provide commenting by Disqus.com">Disqus forum identifier: </label><%= text_field(:stream, :disqus_forum_identifier) %></p> - <p><label for="feedburner_feed_url" title="Make sure to set /articles.rss as your FeedBurner source!">Feedburner Feed URL: </label><%= text_field(:stream, :feedburner_feed_url) %></p> + <p><label for="feedburner_feed_url" title="Make sure to set /articles.atom as your FeedBurner source!">Feedburner Feed URL: </label><%= text_field(:stream, :feedburner_feed_url) %></p> </div> <div class="clear"></div> <h2>Stream filter</h2> app/views/dashboard/index.html.erb @@ -1,12 +1,14 @@ -<% unless @stream.password %> - <h1>Set a password</h1> -<% else %> - <h1>Open Sesame</h1> -<% end %> +<div class="login"> + <% unless @stream.password %> + <h2>Set a password</h2> + <% else %> + <h2>Open Sesame</h2> + <% end %> -<% form_tag do %> - <%= error_message_on(@stream, :password) %> - <%= password_field_tag(:password) %> - <%= submit_tag('Remember me!') %> -<% end %> \ No newline at end of file + <% form_tag do %> + <%= error_message_on(@stream, :password) %> + <%= password_field_tag(:password) %> + <%= submit_tag('Remember me!') %> + <% end %> +</div> \ No newline at end of file app/views/dashboard/login.html.erb @@ -1,8 +1,12 @@ <html> <head profile="http://gmpg.org/xfn/11 http://www.w3.org/2006/03/hcard http://microformats.org/wiki/hcalendar-profile"> <title><%= @stream.title %> - <%= @stream.subtitle %></title> - <%= auto_discovery_link_tag(:rss, articles_feed_url(:format => 'rss'), :title => 'Articles RSS') %> - <%= auto_discovery_link_tag(:atom, articles_feed_url(:format => 'atom'), :title => 'Articles Atom') %> + <% if @stream.feedburner_feed_url.blank? %> + <%= auto_discovery_link_tag(:rss, articles_feed_url(:format => 'rss'), :title => 'Articles RSS') %> + <%= auto_discovery_link_tag(:atom, articles_feed_url(:format => 'atom'), :title => 'Articles Atom') %> + <% else %> + <%= auto_discovery_link_tag(:atom, @stream.feedburner_feed_url, :title => 'Articles Atom') %> + <% end %> <%= auto_discovery_link_tag(:rss, stream_feed_url(:format => 'rss'), :title => 'Lifestream RSS') %> <%= auto_discovery_link_tag(:atom, stream_feed_url(:format => 'atom'), :title => 'Lifestream Atom') %> <%= stylesheet_link_tag('html') %> app/views/layouts/application.html.erb @@ -2,7 +2,7 @@ <div class="articles summary"> <div class="latest_article"> <h2><%= link_to(articles.first.caption, read_url(:id => articles.first), :class => 'article') %></h2> - <%= articles.first.summary.blank? ? truncate_html(markup(articles.first).to_s, 244, '') : articles.first.summary %> + <%= articles.first.summary.blank? ? truncate_html(markup(articles.first).to_s, 244, '') : markup(articles.first, :summary) %> <%= link_to('read full article', read_url(:id => articles.first), :class => 'read more') %> </div> <div class="previous_articles"> app/views/posts/_articles.html.erb @@ -1,14 +1,18 @@ <div class="write"> <% form_tag do %> <p><label for="title">Title:</label> <%= text_field(:post, :caption) %></p> - <p><%= text_area(:post, :body) %></p> + <p><%= text_area(:post, :body, :class => 'body') %></p> + <% unless @post.new_record? %> + <p><label for="summary">Summary (optional):</label></p> + <p><%= text_area(:post, :summary, :class => 'summary') %></p> + <% end %> <p><label for="tags">Tags:</label> <small>Leave empty for auto-tagging</small> <%= text_field(:post, :tag_list) %></p> <% unless @post.new_record? %> - <p>Draft? <%= check_box(:post, :is_draft) %></p> - <p><label for="summary">Summary:</label> <%= text_field(:post, :summary) %></p> + <p><%= check_box(:post, :is_draft) %> Draft?</p> <% end %> - <p>Enable Tweet, Digg and Addthis? <%= check_box(:post, :is_votable) %></p> + <p><%= check_box(:post, :is_votable) %> Enable Tweet, Digg and Addthis?</p> <p><%= select(:post, :markup, Post::SUPPORTED_MARKUP_FORMATS) %></p> <%= submit_tag(@post.new_record? ? 'save as draft' : 'save') %> + <%= link_to('cancel', manage_articles_url, :rel => 'directory', :class => 'cancel') %> <% end %> </div> \ No newline at end of file app/views/posts/_form.html.erb @@ -1,7 +1,7 @@ <li> <span class="actions"> - <%= link_to('edit', edit_post_url(:id => list_article), :class => 'edit') %> · + <%= link_to('view on blog', read_url(:id => list_article), :class => 'view') %> · <%= link_to('delete', delete_post_url(:id => list_article), :class => 'delete', :confirm => 'Are you sure to delete this article?') %> </span> - <%= list_article.caption %> + <span class="caption"><%= link_to(list_article.caption, edit_post_url(:id => list_article), :class => 'edit', :title => 'Edit!', :alt => 'Edit!') %></span> </li> \ No newline at end of file app/views/posts/_list_article.html.erb @@ -1,12 +1,13 @@ -<%= link_to('Write Post', new_post_url) %> +<div class="articles"> + <%= link_to('Write Post', new_post_url) %> -<% unless @stream.drafts.blank? %> - <h1>Drafts</h1> - <ul><%= render(:partial => 'posts/list_article', :collection => @stream.drafts) %></ul> -<% end %> - -<% unless @stream.articles.blank? %> - <h1>Previous Articles</h1> - <ul><%= render(:partial => 'posts/list_article', :collection => @stream.articles) %></ul> -<% end %> + <% unless @stream.drafts.blank? %> + <h1>Drafts</h1> + <ul><%= render(:partial => 'posts/list_article', :collection => @stream.drafts) %></ul> + <% end %> + <% unless @stream.articles.blank? %> + <h1>Previous Articles</h1> + <ul><%= render(:partial => 'posts/list_article', :collection => @stream.articles) %></ul> + <% end %> +</div> \ No newline at end of file app/views/posts/articles.html.erb @@ -1,2 +1,4 @@ +<%= link_to('return to overview', manage_articles_url, :rel => 'directory', :class => 'return_to_index') %> <h1>Edit article</h1> -<%= render(:partial => 'posts/form')%> \ No newline at end of file +<%= render(:partial => 'posts/form') %> +<%= render(:partial => 'assets/list') %> \ No newline at end of file app/views/posts/edit.html.erb @@ -1,2 +1,3 @@ +<%= link_to('return to overview', manage_articles_url, :rel => 'directory', :class => 'return_to_index') %> <h1>New draft</h1> <%= render(:partial => 'posts/form')%> \ No newline at end of file app/views/posts/new.html.erb @@ -40,6 +40,7 @@ ActionController::Routing::Routes.draw do |map| #map.connect '/archive', :controller => 'posts', :method => :archive map.resources :services + map.resources :assets map.with_options(:controller => 'posts') do |m| m.archive '/archive', :action => 'archive' config/routes.rb @@ -9,7 +9,21 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20080916093733) do +ActiveRecord::Schema.define(:version => 20080929112620) do + + create_table "assets", :force => true do |t| + t.integer "post_id" + t.string "path" + t.string "file_type" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "invites", :force => true do |t| + t.string "email" + t.datetime "created_at" + t.datetime "updated_at" + end create_table "links", :force => true do |t| t.integer "post_id" @@ -91,4 +105,12 @@ ActiveRecord::Schema.define(:version => 20080916093733) do t.string "name" end + create_table "trips", :force => true do |t| + t.string "destination" + t.datetime "travel_starts_at" + t.datetime "travel_ends_at" + t.datetime "created_at" + t.datetime "updated_at" + end + end db/schema.rb design/kakuteru-dot-com-2.psd @@ -1,4 +1,7 @@ +.busy { + background: url('/images/spinner.gif') no-repeat left center !important; +} .navigation { height: 70px; @@ -25,6 +28,10 @@ ul,li { list-style-type: none; } +a.return_to_index { + float: right; +} + .navigation li { float: left; display: block; @@ -46,7 +53,6 @@ input[type=submit], textarea, select { font-size: 20px; - border: #333 1px solid; padding: 4px; } @@ -55,9 +61,8 @@ textarea { width: 500px; } -.write input[type="text"], -.write textarea { - width: 700px; +input[type=hidden] { + display: none; } form input, @@ -69,6 +74,12 @@ form select { font-size: 18px; } +form p { + clear: both; +} + +/* Settings */ + .settings form p span { float: left; } @@ -87,9 +98,7 @@ form select { clear: both; } -form p { - clear: both; -} +/* Services */ .services li { border-bottom: 1px dotted #333; @@ -110,9 +119,115 @@ form p { display: inline; } +.articles li { + padding: 0.4em; +} + +.stream li:hover, +.services li:hover, +.assets li:hover, +.articles li:hover { + background-color: #F7F7F7; +} + +li span.caption { + font-size: 18px; +} + li span.actions { display: block; + float: right; + margin: 0.2em 0; +} + +.articles a.edit { + background: url('/images/icons/24-frame.png') no-repeat left center; + padding-left: 30px; +} + +a.edit:hover { + background: url('/images/icons/16-em-pencil.png') no-repeat 5px center; + padding-left: 30px; +} + +a.delete { + background: url('/images/icons/16-em-cross.png') no-repeat left center; + padding-left: 20px; +} + +div.login { + background-color: #ddd; + width: 500px; + padding: 1em; + margin: 2em auto; +} + +.login h2 { + margin: 0.4em 0; +} + +/* Write article */ + +.write input[type="text"], +.write textarea { + width: 600px; +} + +.write textarea.summary { + height: 10em; +} + +div.write { + float: left; + margin-right: 1em; +} + +.write form input[type=checkbox] { + display: block; float: left; - margin: 0 1em 0 0; - width: 100px; + margin-right: 1em; +} + +.write textarea { + margin-bottom: 0.4em; + font-size: 14px; +} + +.write label { + display: block; + margin: 0.4em 0; +} + +/* Assets */ + +.assets { + margin-top: 100px; + background-color: #ddd; + padding: 1em; + -moz-border-radius: 10px; + margin-left: 640px; +} + +.assets li { + background: url('/images/icons/16-file-page.png') no-repeat left center; + font-size: 12px; + padding: 0.4em 0 0.4em 20px; + margin: 0.1em 0; + border-top: 1px solid #eee; +} + + +.assets li:hover { + background: url('/images/icons/16-em-plus.png') no-repeat left center; + background-color: #eee; } + +.assets .upload { + background: url('/images/icons/24-em-up.png') no-repeat left center; + padding-left: 30px; + margin: 1em 0; +} + +.assets h2 { + margin-bottom: 0.4em; +} \ No newline at end of file public/stylesheets/dashboard.css @@ -1,7 +1,10 @@ * { margin: 0; padding: 0; - border: 0; +} + +img,table,div,td,tr { + border: 0; } .clear { public/stylesheets/html.css d82c34119ba59f1c068ce33b52d62c46556adf7b Dominiek ter Heide info@dominiek.com http://github.com/dominiek/kakuteru/commit/a419a96116f0d258b15b551653fb5083d280d94c a419a96116f0d258b15b551653fb5083d280d94c

2008-10-07T03:16:49-07:00

Pimped up the articles editing with uploads and everything 300f41e5e2763fcc88d3ee27187ae94e94cbe35c Dominiek ter Heide info@dominiek.com