public/javascripts/form_submit_button.js @@ -6,4 +6,5 @@ class Project < ActiveRecord::Base has_friendly_id :name, :use_slug => true named_scope :ordered, :order => 'completed_on DESC' + named_scope :latest, :limit => 5 end \ No newline at end of file app/models/project.rb @@ -2,7 +2,6 @@ class Upload < ActiveRecord::Base belongs_to :attachable, :polymorphic => true has_attached_file :data, :styles => { :large => "800x800>", - :medium => "300x300>", :small => '200x200#', :square => "75x75#" } validates_attachment_size :data, :less_than => 5.megabytes app/models/upload.rb @@ -1,36 +1,37 @@ -- form_for @article, :html => {:class => 'form'} do |f| - = f.error_messages - %p - = f.label :title - %br - = f.text_field :title - %p - = f.label :description - %br - = f.text_field :description - %p - = f.label :body - %span= "Markdown or HTML is ok." - %br - = f.text_area :body, :class => 'big' - %p - = f.label :published - %br - = f.check_box :published - %p - = f.label :published_on - %br - = f.date_select :published_on +.articles_form + - form_for @article, :html => {:class => 'form'} do |f| + = f.error_messages + %p + = f.label :title + %br + = f.text_field :title + %p + = f.label :description + %br + = f.text_field :description + %p + = f.label :body + %span= "Markdown or HTML is ok." + %br + = f.text_area :body, :class => 'big' + %p + = f.label :published + %br + = f.check_box :published + %p + = f.label :published_on + %br + = f.date_select :published_on - - if Tag.all.empty? - = "No tags yet. Create one after saving this article." - - else - %h4= "Tags" - %ul.tags - - for tag in Tag.all - %li - = tag.name - = check_box_tag 'article[tag_list][]', tag.name, @article.tag_list.include?(tag.name), :id => "check_tag_#{tag.id}" - %p - = f.submit "Submit" - = link_to "Cancel", @article, :class => 'cancel' \ No newline at end of file + - if Tag.all.empty? + = "No tags yet. Create one after saving this article." + - else + %h4= "Tags" + %ul.tags + - for tag in Tag.all + %li + = tag.name + = check_box_tag 'article[tag_list][]', tag.name, @article.tag_list.include?(tag.name), :id => "check_tag_#{tag.id}" + %p + = f.submit "Submit" + = link_to "Cancel", @article, :class => 'cancel' \ No newline at end of file app/views/articles/_form.html.haml @@ -1,4 +1,4 @@ -- javascript 'new_comment' +- javascript 'form_submit_button' .new_comment - form_for [article, comment], :html => {:class => 'form'} do |f| = f.error_messages @@ -20,4 +20,4 @@ %br = f.text_field :challenge %div - = f.submit "Save comment" \ No newline at end of file + = f.submit "Save comment", :id => 'form_submit_button' \ No newline at end of file app/views/comments/_form.html.haml @@ -6,9 +6,9 @@ %meta{:name => "description", :content => yield(:meta_description) || website.tagline } %meta{:name => "keywords", :content => yield(:meta_keywords) || website.default_tags } = stylesheet_link_tag 'reset', 'application', 'menu' - %link{:href => "/stylesheets/#{h(website.theme || "blue")}.css?#{Time.now.to_i}", :media => 'screen', :rel => 'stylesheet theme', :type => 'text/css'} = javascript_include_tag 'jquery-1.3.2.min', 'search_box', 'admin' = yield(:head) + %link{:href => "/stylesheets/#{h(website.theme || "blue")}.css?#{Time.now.to_i}", :media => 'screen', :rel => 'stylesheet theme', :type => 'text/css'} %body - if admin? #admin-area @@ -87,7 +87,8 @@ - for tag in Tag.all %li= link_to tag.name, tagged_articles_path(:tag => tag.name) #service-list - %h4= t(:elsewhere) if website.flickr_username || website.twitter_username + - if !website.flickr_username.blank? || !website.twitter_username.blank? + %h4= t(:elsewhere) %ul %li.flickr= link_to website.flickr_username, "http://flickr.com/photos/#{website.flickr_username}" if website.flickr_username %li.twitter= link_to website.twitter_username, "http://twitter.com/#{website.twitter_username}" if website.twitter_username app/views/layouts/application.html.haml @@ -1,18 +1,19 @@ -- form_for @page, :html => {:class => 'form'} do |f| - = f.error_messages - %p - = f.label :name - %br - = f.text_field :name - %p - = f.label :body - %span= "Plain HTML only" - %br - = f.text_area :body, :class => 'big' - %p - = f.label :published - %br - = f.check_box :published - %p - = f.submit "Submit" - = link_to "Cancel", @page, :class => 'cancel' \ No newline at end of file +.pages_form + - form_for @page, :html => {:class => 'form'} do |f| + = f.error_messages + %p + = f.label :name + %br + = f.text_field :name + %p + = f.label :body + %span= "Plain HTML only" + %br + = f.text_area :body, :class => 'big' + %p + = f.label :published + %br + = f.check_box :published + %p + = f.submit "Submit" + = link_to "Cancel", @page, :class => 'cancel' \ No newline at end of file app/views/pages/_form.html.haml @@ -1,33 +1,34 @@ -- form_for @project, :html => {:class => 'form'} do |f| - = f.error_messages - %p - = f.label :name - %br - = f.text_field :name - %p - = f.label :description - %span= "Plain HTML only" - %br - = f.text_area :description - %p - = f.label :role - %br - = f.text_field :role - %p - = f.label :url - %span= "e.g. http://www.company.com" - %br - = f.text_field :url - %p - = f.label :duration - %br - = f.text_field :duration - %p - = f.label :completed_on - %br - = f.date_select :completed_on - - if !@project.new_record? - %p= link_to 'Add Upload', new_upload_project_path(@project) - %p - = f.submit "Save" - = link_to "Cancel", projects_path, :class => 'cancel' \ No newline at end of file +.project_form + - form_for @project, :html => {:class => 'form'} do |f| + = f.error_messages + %p + = f.label :name + %br + = f.text_field :name + %p + = f.label :description + %span= "Plain HTML only" + %br + = f.text_area :description + %p + = f.label :role + %br + = f.text_field :role + %p + = f.label :url + %span= "e.g. http://www.company.com" + %br + = f.text_field :url + %p + = f.label :duration + %br + = f.text_field :duration + %p + = f.label :completed_on + %br + = f.date_select :completed_on + - if !@project.new_record? + %p= link_to 'Add Screenshots to project', new_upload_project_path(@project) + %p + = f.submit "Save" + = link_to "Cancel", projects_path, :class => 'cancel' \ No newline at end of file app/views/projects/_form.html.haml @@ -5,6 +5,7 @@ :javascript $(function() { $('form.new_upload .buttons').hide(); + $('form.new_upload').append("<p class='notice'>Tip: Control or command-click multiple files to upload them all at once</p>"); $("#upload_data").uploadify({ 'uploader': '/flash/uploadify.swf', 'script': '/projects/#{params[:id]}/create_upload', app/views/projects/new_upload.html.haml @@ -1,3 +1,4 @@ +- javascript 'form_submit_button' %h2= "Contact #{website.owner_name}" %p.required= "All fields are required." .contact_form @@ -15,4 +16,4 @@ %br = text_area_tag :message %p - = submit_tag "Send" \ No newline at end of file + = submit_tag "Send Message", :id => 'form_submit_button' \ No newline at end of file app/views/sites/new_contact_form_email.html.haml @@ -48,7 +48,7 @@ Feature: Manage projects When I go to the list of projects And I follow "Project One" And I edit the project "Project One" - When I follow "Add Upload" + When I follow "Add Screenshots to project" And I attach a file onto "upload_data" And I press "Save" Then I should see "Upload saved" features/manage_projects.feature @@ -106,8 +106,7 @@ form p { margin: 20px 0; } .tags li input[type=checkbox] { position: relative; - left: -4px; - top: 2px; } + left: -4px; } .tags a, .tags a:visited { font-size: 20px; color: #555; @@ -214,11 +213,19 @@ form p { position: relative; top: -3px; } +.notice { + padding: 10px; + margin: 10px 0; + background-color: #FFF6BF; + border-top: 1px solid #FFD324; + border-bottom: 1px solid #FFD324; } + .success { padding: 10px; margin: 10px 0; background-color: #CFC; - border: solid 1px #6C6; } + border-top: solid 1px #6C6; + border-bottom: solid 1px #6C6; } .admin-links { padding: 20px 0; } @@ -226,10 +233,14 @@ form p { padding: 10px; background: #000; color: #fff; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; } + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + -moz-box-shadow: #555 1px 1px 1px; + -webkit-box-shadow: #555 1px 1px 1px; + text-shadow: 1px 0px 1px #aaa; } .admin-links a:hover { - background: #333; + background: #222; + text-shadow: none; text-decoration: none; } .index .project .images { @@ -369,3 +380,14 @@ form p { .quiet { color: #999; font-size: 11px; } + +.project_form textarea, .pages_form textarea, .articles_form textarea { + width: 700px; } +.project_form a:hover, .pages_form a:hover, .articles_form a:hover { + text-decoration: underline; } + +.articles_form .tags li { + display: inline; } + +.contact_form textarea { + width: 400px; } public/stylesheets/application.css @@ -9,7 +9,6 @@ label { .form input[type=text]:focus, .form input[type=password]:focus { border: 1px solid #888; } .form textarea { - width: 400px; height: 200px; font-size: 1.3em; border: 1px solid #ccc; } @@ -74,8 +73,13 @@ label { .pagination { padding: 20px 0 0 200px; margin: 20px 0; } - .pagination a, .pagination a:visited, .pagination a:hover { - color: #10306A; } + .pagination a { + border: 1px solid #c3deeb; + background: #fff; + color: #c3deeb; } + .pagination a:hover { + border: 1px solid #10306A; + color: #10306A; } .pagination span.current { border: 1px solid #10306A; background: #10306A; } public/stylesheets/blue.css @@ -97,7 +97,6 @@ form input[type=checkbox] :position relative :left -4px - :top 2px a, a:visited :font-size 20px :color #555 @@ -216,21 +215,32 @@ form input[type=submit] :position relative :top -3px +.notice + :padding 10px + :margin 10px 0 + :background-color #FFF6BF + :border-top 1px solid #FFD324 + :border-bottom 1px solid #FFD324 .success :padding 10px :margin 10px 0 :background-color #CFC - :border solid 1px #6C6 + :border-top solid 1px #6C6 + :border-bottom solid 1px #6C6 .admin-links :padding 20px 0 a :padding 10px :background #000 :color #fff - :-webkit-border-radius 2px - :-moz-border-radius 2px + :-webkit-border-radius 4px + :-moz-border-radius 4px + :-moz-box-shadow #555 1px 1px 1px + :-webkit-box-shadow #555 1px 1px 1px + :text-shadow 1px 0px 1px #aaa &:hover - :background #333 + :background #222 + :text-shadow none :text-decoration none .index .project @@ -367,4 +377,16 @@ form .quiet :color #999 :font-size 11px - \ No newline at end of file +.project_form, .pages_form, .articles_form + textarea + :width 700px + a + &:hover + :text-decoration underline +.articles_form + .tags + li + :display inline +.contact_form + textarea + :width 400px \ No newline at end of file public/stylesheets/sass/application.sass @@ -9,7 +9,6 @@ label &:focus :border 1px solid #888 textarea - :width 400px :height 200px :font-size 1.3em :border 1px solid #ccc @@ -76,8 +75,13 @@ label .pagination :padding 20px 0 0 200px :margin 20px 0 - a,a:visited,a:hover - :color #10306A + a + :border 1px solid #c3deeb + :background #fff + :color #c3deeb + &:hover + :border 1px solid #10306A + :color #10306A span.current :border 1px solid #10306A :background #10306A public/stylesheets/sass/blue.sass @@ -1,6 +1,6 @@ require("spec_helper.js"); require("../../public/javascripts/search_box.js"); -require("../../public/javascripts/new_comment.js"); +require("../../public/javascripts/form_submit_button.js"); Screw.Unit(function(){ describe("With my search box and default text", function() { @@ -18,8 +18,8 @@ Screw.Unit(function(){ describe("Posting a comment", function() { it("should disable button and replace text", function() { - expect($('#comment_submit').click().attr('disabled')).to(equal, true); - expect($('#comment_submit').click().val()).to(equal, 'Please wait...'); + expect($('#form_submit_button').click().attr('disabled')).to(equal, true); + expect($('#form_submit_button').click().val()).to(equal, 'Please wait...'); }); }); }); \ No newline at end of file test/javascript/application_spec.js @@ -39,7 +39,7 @@ <input id="comment_challenge" name="comment[challenge]" size="30" type="text" /> </p> <p> - <input id="comment_submit" name="commit" type="submit" value="Save comment" /> + <input id="form_submit_button" name="commit" type="submit" value="Save comment" /> </p> </form> </div> test/javascript/fixtures/application.html public/javascripts/new_comment.js 16484bf251bab0f73e60b78b1a292dc9aa88e2dd Andy Atkinson andy@webandy.com http://github.com/webandy/rehash/commit/cad9a47c7915295fe9b3cf4e24190030e82bb01a cad9a47c7915295fe9b3cf4e24190030e82bb01a 2009-10-24T14:47:33-07:00 2009-10-24T14:47:33-07:00 style and verbigage tweaks 5814d300ddf8ef9304453e0edef8c8e10edb1254 Andy Atkinson andy@webandy.com