From cb3d7e9e9bec055403d9443c55347ec9dda1b7d5 Mon Sep 17 00:00:00 2001 From: albert Date: Fri, 8 Oct 2010 19:07:47 -0400 Subject: [PATCH] changes --- .../default.scssc | Bin 16904 -> 19266 bytes app/views/artists/_form.html.erb | 47 +----- ...nks.html.erb => _secondary_links.html.erb} | 2 +- app/views/artists/edit.html.erb | 8 +- app/views/artists/index.html.erb | 62 +++---- app/views/artists/new.html.erb | 8 +- app/views/artists/show.html.erb | 158 +++++++++--------- app/views/sessions/new.html.erb | 76 +++++---- config/initializers/simple_form.rb | 52 ++++++ config/locales/simple_form.en.yml | 24 +++ lib/templates/erb/scaffold/_form.html.erb | 23 +++ public/stylesheets/compiled/default.css | 27 ++- public/stylesheets/src/default.scss | 42 ++++- script/custom/watch_stylesheets | 3 + 14 files changed, 335 insertions(+), 197 deletions(-) rename app/views/artists/{_secondary_nav_links.html.erb => _secondary_links.html.erb} (90%) create mode 100644 config/initializers/simple_form.rb create mode 100644 config/locales/simple_form.en.yml create mode 100644 lib/templates/erb/scaffold/_form.html.erb create mode 100755 script/custom/watch_stylesheets diff --git a/.sass-cache/b118d4c1b1aae4efe3003ca592302b34dd7f51b1/default.scssc b/.sass-cache/b118d4c1b1aae4efe3003ca592302b34dd7f51b1/default.scssc index 757869c647bf528c65a3185ebe3b8602d3852b98..5bb4eaff86bdef44c8dde61fc65778a63bec0e9d 100644 GIT binary patch literal 19266 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 H$QdgDud{eM literal 16904 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 Nc&Hh4ssUtAGXV4L4;=si diff --git a/app/views/artists/_form.html.erb b/app/views/artists/_form.html.erb index 4d18a66e8..908d3f168 100644 --- a/app/views/artists/_form.html.erb +++ b/app/views/artists/_form.html.erb @@ -1,41 +1,8 @@ -<%= form_for(@artist) do |f| %> - <%= error_messages_for "artist" %> - - - - - - - - - - - - - - - - - - - - - - - - - -
<%= f.label :name %> - <%= f.text_field "name", :size => 30 %>
- <%= f.label :other_names %> - - <%= f.text_field "other_names", :size => 30 %> - Separate with commas -
<%= f.label :group_name %><%= f.text_field "group_name", :size => 30 %>
<%= f.label :url_string, "URLs" %><%= f.text_area "url_string", :size => "50x6", :class => "no-block" %>
<%= f.label :notes %> - <%= f.text_area "notes", :size => "50x10", :class => "no-block" %> - <%= link_to "Formatting help", wiki_page_path(:id => "help:dtext") %> -
- <%= submit_tag "Save" %> - <%= button_to_function "Cancel", "history.back()" %> -
+<%= simple_form_for(@artist) do |f| %> + <%= f.input :name %> + <%= f.input :other_names, :hint => "Separate with commas", :as => :text %> + <%= f.input :group_name %> + <%= f.input :url_string, :label => "URLs", :as => :text, :size => "10x5" %> + <%= f.input :notes, :as => :text %> + <%= f.button :submit %> <% end %> \ No newline at end of file diff --git a/app/views/artists/_secondary_nav_links.html.erb b/app/views/artists/_secondary_links.html.erb similarity index 90% rename from app/views/artists/_secondary_nav_links.html.erb rename to app/views/artists/_secondary_links.html.erb index 7ea4f645c..b32c31a7a 100644 --- a/app/views/artists/_secondary_nav_links.html.erb +++ b/app/views/artists/_secondary_links.html.erb @@ -1,4 +1,4 @@ -<% content_for(:secondary_nav_links) do %> +<% content_for(:secondary_links) do %>
  • <%= link_to "Listing", artists_path %>
  • <%= link_to "New", new_artist_path %>
    • diff --git a/app/views/artists/edit.html.erb b/app/views/artists/edit.html.erb index 851b02092..758ac5d86 100644 --- a/app/views/artists/edit.html.erb +++ b/app/views/artists/edit.html.erb @@ -1,3 +1,7 @@ -
    - <%= render :partial => "form" %> +
    +
    + <%= render :partial => "form" %> +
    + +<%= render :partial => "secondary_links" %> diff --git a/app/views/artists/index.html.erb b/app/views/artists/index.html.erb index 12fede550..07968e726 100644 --- a/app/views/artists/index.html.erb +++ b/app/views/artists/index.html.erb @@ -1,35 +1,37 @@ -
    - <%= render :partial => "search" %> +
    +
    + <%= render :partial => "search" %> - - - - - - - - - <% @artists.each do |artist| %> - <% content_tag(:tr, :id => "artist-#{artist.id}") do %> - - +
    Name
    - <%= link_to "P", posts_path(:tags => artist.name), :title => "Find posts for artist" %> - <%= link_to "E", edit_artist_path(artist), :title => "Edit artist" %> - <%= link_to "D", artist_path(artist, :method => :delete, :confirm => "Do you really want to delete this artist?") %> - - <%= link_to h(artist.name), artist_path(artist) %> - <% if !artist.group_name.blank? %> - [<%= link_to(artist.group_name, artist_path(artist)) %>] - <% end %> -
    + + + + + + + + <% @artists.each do |artist| %> + <% content_tag(:tr, :id => "artist-#{artist.id}") do %> + + + <% end %> <% end %> - <% end %> - -
    Name
    + <%= link_to "P", posts_path(:tags => artist.name), :title => "Find posts for artist" %> + <%= link_to "E", edit_artist_path(artist), :title => "Edit artist" %> + <%= link_to "D", artist_path(artist, :method => :delete, :confirm => "Do you really want to delete this artist?") %> + + <%= link_to h(artist.name), artist_path(artist) %> + <% if !artist.group_name.blank? %> + [<%= link_to(artist.group_name, artist_path(artist)) %>] + <% end %> +
    + + -
    - <%= will_paginate(@artists) %> +
    + <%= will_paginate(@artists) %> +
    + + <%= render :partial => "secondary_links" %>
    - - <%= render :partial => "secondary_nav_links" %>
    diff --git a/app/views/artists/new.html.erb b/app/views/artists/new.html.erb index c4cf99a16..2c27eb546 100644 --- a/app/views/artists/new.html.erb +++ b/app/views/artists/new.html.erb @@ -1,5 +1,7 @@ -
    - <%= render :partial => "form" %> +
    +
    + <%= render :partial => "form" %> +
    -<%= render :partial => "secondary_nav_links" %> +<%= render :partial => "secondary_links" %> diff --git a/app/views/artists/show.html.erb b/app/views/artists/show.html.erb index 4a1cafd02..a7d021c4e 100644 --- a/app/views/artists/show.html.erb +++ b/app/views/artists/show.html.erb @@ -1,90 +1,84 @@ -
    -

    Artist: <%= @artist.name.tr("_", " ") %>

    - - <% unless @artist.notes.blank? %> +
    +
    +

    Artist: <%= @artist.name.tr("_", " ") %>

    + + <% unless @artist.notes.blank? %> +
    + <%= format_text(@artist.notes) %> +
    + <% end %> +
    - <%= format_text(@artist.notes) %> -
    - <% end %> - -
    - - - - - - - <% if @artist.has_tag_alias? %> +
    Status - <% if @artist.is_banned? %> - Banned - <% elsif @artist.is_active? %> - Active - <% else %> - Inactive - <% end %> -
    + - - - - <% end %> - <% if !@artist.other_names.blank? %> - - - - - <% end %> - <% if !@artist.group_name.blank? %> - - - - - <% end %> - <% if @artist.members.any? %> - - - - - <% end %> - <% @artist.urls.each do |url| %> - - - + - <% end %> - -
    Tag Alias - <%= @artist.tag_alias_name %> -
    Other Names - <%= link_to_artists(@artist.other_names.split(/,/)) %> -
    Group - <%= link_to_artist(@artist.group_name) %> -
    Members - <%= link_to_artists(@artist.members.map(&:name)) %> -
    URLs - <%= link_to h(url.to_s), h(url.to_s) %> - <% if CurrentUser.user.is_moderator? %> - (<%= link_to("mass edit", mass_edit_admin_posts_path(:antecedent => "-#{@artist.name} source:#{ArtistUrl.normalize_for_search(url.to_s)}", :consequent => @artist.name)) %>) + Status + <% if @artist.is_banned? %> + Banned + <% elsif @artist.is_active? %> + Active + <% else %> + Inactive <% end %>
    -
    - -

    * Indicates new artist

    - -
    -

    Recent Posts

    -
    - <%#= @post_set.presenter.post_previews_html %> + <% if @artist.has_tag_alias? %> + + Tag Alias + + <%= @artist.tag_alias_name %> + + + <% end %> + <% if !@artist.other_names.blank? %> + + Other Names + + <%= link_to_artists(@artist.other_names.split(/,/)) %> + + + <% end %> + <% if !@artist.group_name.blank? %> + + Group + + <%= link_to_artist(@artist.group_name) %> + + + <% end %> + <% if @artist.members.any? %> + + Members + + <%= link_to_artists(@artist.members.map(&:name)) %> + + + <% end %> + <% @artist.urls.each do |url| %> + + URLs + + <%= link_to h(url.to_s), h(url.to_s) %> + <% if CurrentUser.user.is_moderator? %> + (<%= link_to("mass edit", mass_edit_admin_posts_path(:antecedent => "-#{@artist.name} source:#{ArtistUrl.normalize_for_search(url.to_s)}", :consequent => @artist.name)) %>) + <% end %> + + + <% end %> + +
    + +

    * Indicates new artist

    + +
    +

    Recent Posts

    +
    + <%#= @post_set.presenter.post_previews_html %> +
    +
    + + <%= render :partial => "secondary_links" %>
    - - <% content_for("footer") do %> -
  • |
    • -
  • <%= link_to "Posts", posts_path(:tags => @artist.name) %>
    • -
  • <%= link_to "Edit", edit_artist_path(@artist) %>
    • -
  • <%= link_to "Delete", artist_path(@artist, :method => :delete) %>
    • -
  • <%= link_to "History", artist_versions_path(:artist_id => @artist.id) %>
    • - <% end %> - - <%= render :partial => "secondary_nav_links" %>
    diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index 62a03644a..02ba7ddfe 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,41 +1,43 @@ -
    -
    -

    Login

    - <% form_tag(sessions_path) do %> - - - - - - - - - - - - - - - - - -
    <%= submit_tag "Login" %>
    - <%= label_tag :name %> - - <%= text_field_tag :name %> -
    <%= label_tag :password %><%= password_field_tag :password %>
    - <% end %> -
    +
    +
    +
    +

    Login

    + <% form_tag(sessions_path) do %> + + + + + + + + + + + + + + + + + +
    <%= submit_tag "Login" %>
    + <%= label_tag :name %> + + <%= text_field_tag :name %> +
    <%= label_tag :password %><%= password_field_tag :password %>
    + <% end %> +
    - + +
    <% content_for(:page_title) do %> diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb new file mode 100644 index 000000000..040e7e3f1 --- /dev/null +++ b/config/initializers/simple_form.rb @@ -0,0 +1,52 @@ +# Use this setup block to configure all options available in SimpleForm. +SimpleForm.setup do |config| + + # Components used by the form builder to generate a complete input. You can remove + # any of them, change the order, or even add your own components to the stack. + # config.components = [ :label_input, :hint, :error ] + + # Default tag used on hints. + # config.hint_tag = :span + + # Default tag used on errors. + # config.error_tag = :span + + # Method used to tidy up errors. + # config.error_method = :first + + # Default tag used for error notification helper. + # config.error_notification_tag = :p + + # You can wrap all inputs in a pre-defined tag. + # config.wrapper_tag = :div + + # CSS class to add to all wrapper tags. + # config.wrapper_class = :input + + # CSS class to add to the wrapper if the field has errors. + # config.wrapper_error_class = :field_with_errors + + # How the label text should be generated altogether with the required text. + # config.label_text = lambda { |label, required| "#{required} #{label}" } + + # Whether attributes are required by default (or not). Default is true. + # config.required_by_default = true + + # Series of attemps to detect a default label method for collection. + # config.collection_label_methods = [ :to_label, :name, :title, :to_s ] + + # Series of attemps to detect a default value method for collection. + # config.collection_value_methods = [ :id, :to_s ] + + # Collection of methods to detect if a file type was given. + # config.file_methods = [ :file?, :public_filename ] + + # Default priority for time_zone inputs. + # config.time_zone_priority = nil + + # Default priority for country inputs. + # config.country_priority = nil + + # Default size for text inputs. + config.default_input_size = 30 +end diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml new file mode 100644 index 000000000..409e2651d --- /dev/null +++ b/config/locales/simple_form.en.yml @@ -0,0 +1,24 @@ +en: + simple_form: + "yes": 'Yes' + "no": 'No' + required: + text: 'required' + mark: '*' + # You can uncomment the line below if you need to overwrite the whole required html. + # When using html, text and mark won't be used. + # html: '*' + error_notification: + default_message: "Some errors were found, please take a look:" + # Labels and hints examples + # labels: + # password: 'Password' + # user: + # new: + # email: 'E-mail para efetuar o sign in.' + # edit: + # email: 'E-mail.' + # hints: + # username: 'User name to sign in.' + # password: 'No special characters, please.' + diff --git a/lib/templates/erb/scaffold/_form.html.erb b/lib/templates/erb/scaffold/_form.html.erb new file mode 100644 index 000000000..62de5dff8 --- /dev/null +++ b/lib/templates/erb/scaffold/_form.html.erb @@ -0,0 +1,23 @@ +<%%= simple_form_for(@<%= singular_name %>) do |f| %> + <%% if @<%= singular_name %>.errors.any? %> +
    +

    <%%= pluralize(@<%= singular_name %>.errors.count, "error") %> prohibited this <%= singular_name %> from being saved:

    + +
      + <%% @<%= singular_name %>.errors.full_messages.each do |msg| %> +
    • <%%= msg %>
      • + <%% end %> +
    +
    + <%% end %> + +
    + <%- attributes.each do |attribute| -%> + <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %> + <%- end -%> +
    + +
    + <%%= f.button :submit %> +
    +<%% end %> diff --git a/public/stylesheets/compiled/default.css b/public/stylesheets/compiled/default.css index 10389ab8e..adf90659e 100644 --- a/public/stylesheets/compiled/default.css +++ b/public/stylesheets/compiled/default.css @@ -85,7 +85,7 @@ img { border: none; vertical-align: middle; } -input[type=text], input[type=password], textarea, button { +input[type=text], input[type=password], input[type=url], textarea, button { border: 1px solid #AAA; font-size: 1em; -moz-border-radius: 4px; @@ -100,6 +100,9 @@ input[type=submit] { font-size: 1em; cursor: pointer; } +input:focus, textarea:focus { + background-color: #FFD; } + input[type=submit]:hover { background-color: #F6F6F6; } @@ -154,6 +157,28 @@ aside.sidebar > section > ul li { aside.sidebar > section > ul ul li { margin-left: 1em; } +/*** Simple Form ***/ +form.simple_form input[type=submit] { + margin-left: 10em; } +form.simple_form div.input { + margin-bottom: 0.5em; } + form.simple_form div.input input, form.simple_form div.input textarea { + width: 300px; } + form.simple_form div.input textarea { + height: 100px; } + form.simple_form div.input label { + vertical-align: top; + display: inline-block; + width: 10em; + cursor: pointer; + font-weight: bold; } + form.simple_form div.input span.hint { + margin-left: 10em; + color: #666; + font-style: italic; + vertical-align: top; + display: block; } + /*** Comments ***/ div.comment-response > div { margin-top: 1em; } diff --git a/public/stylesheets/src/default.scss b/public/stylesheets/src/default.scss index 0a28fcd65..6ab838948 100644 --- a/public/stylesheets/src/default.scss +++ b/public/stylesheets/src/default.scss @@ -110,7 +110,7 @@ img { vertical-align: middle; } -input[type=text], input[type=password], textarea, button { +input[type=text], input[type=password], input[type=url], textarea, button { border: 1px solid #AAA; font-size: 1em; -moz-border-radius: 4px; @@ -127,6 +127,10 @@ input[type=submit] { cursor: pointer; } +input:focus, textarea:focus { + background-color: #FFD; +} + input[type=submit]:hover { background-color: #F6F6F6; } @@ -203,6 +207,42 @@ aside.sidebar > section > ul ul li { } +/*** Simple Form ***/ +form.simple_form { + input[type=submit] { + margin-left: 10em; + } + + div.input { + margin-bottom: 0.5em; + + input, textarea { + width: 300px; + } + + textarea { + height: 100px; + } + + label { + vertical-align: top; + display: inline-block; + width: 10em; + cursor: pointer; + font-weight: bold; + } + + span.hint { + margin-left: 10em; + color: #666; + font-style: italic; + vertical-align: top; + display: block; + } + } +} + + /*** Comments ***/ div.comment-response { } diff --git a/script/custom/watch_stylesheets b/script/custom/watch_stylesheets new file mode 100755 index 000000000..26eac9ea7 --- /dev/null +++ b/script/custom/watch_stylesheets @@ -0,0 +1,3 @@ +#!/bin/sh + +sass --watch public/stylesheets/src/default.scss:public/stylesheets/compiled/default.css