Skip to content

Commit

Permalink
added es-* local file
Browse files Browse the repository at this point in the history
  • Loading branch information
Bruno Bornsztein committed Jul 23, 2008
1 parent dd7e4da commit 161082b
Show file tree
Hide file tree
Showing 24 changed files with 356 additions and 137 deletions.
2 changes: 1 addition & 1 deletion app/views/activities/_activity.html.haml
Expand Up @@ -23,7 +23,7 @@
="left a comment:".l
= link_to truncate_words(activity.item.comment), activity.item.generate_commentable_url
- when 'Favorite'
=" favorited".l
="favorited".l
= link_to " a #{activity.item.favoritable.class.to_s.humanize.downcase}", user_favorite_path(activity.item.user, activity.item)
- when 'Clipping'
="added a clipping:".l
Expand Down
8 changes: 6 additions & 2 deletions app/views/ads/edit.html.haml
Expand Up @@ -16,11 +16,15 @@

%fieldset{"for"=>"ad_published"}
= f.check_box :published
%label="Published?".l
%label
="Published".l
\?

%fieldset{"for"=>"ad_time_constrained"}
= f.check_box :time_constrained
%label="Time constrained?".l
%label
="Time constrained".l
\?

#time_constraints{"style"=>"display:#{ @ad.time_constrained? ? 'block' : 'none'}"}
%label="Start date".l
Expand Down
4 changes: 3 additions & 1 deletion app/views/ads/index.html.haml
Expand Up @@ -8,7 +8,9 @@
%tr
%th="Name".l
%th="Frequency".l
%th="Published?".l
%th
="Published".l
\?
%th="Run".l
%th="Location".l

Expand Down
8 changes: 6 additions & 2 deletions app/views/ads/new.html.haml
Expand Up @@ -16,11 +16,15 @@

%fieldset{"for"=>"ad_published"}
= f.check_box :published
%label="Published?".l
%label
="Published".l
\?

%fieldset{"for"=>"ad_time_constrained"}
= f.check_box :time_constrained
%label="Time constrained?".l
%label
="Time constrained".l
\?

#time_constraints{"style"=>"display:#{ @ad.time_constrained? ? 'block' : 'none'}"}
%label="Start date".l
Expand Down
4 changes: 3 additions & 1 deletion app/views/ads/show.html.haml
Expand Up @@ -16,7 +16,9 @@
\:
= h @ad.frequency
%p
%strong="Published?".l
%strong
="Published".l
\?
= @ad.published?
%p
%b
Expand Down
2 changes: 1 addition & 1 deletion app/views/base/faq.html.haml
Expand Up @@ -3,7 +3,7 @@
#yui-main
.yui-b
.box
%h3="Frequently Asked Questions:".l
%h3="Frequently Asked Questions".l

%h4#what_is_it
What Is
Expand Down
18 changes: 13 additions & 5 deletions app/views/categories/edit.html.haml
Expand Up @@ -6,20 +6,28 @@
%h3="Editing category".l
- form_for(:category, :url => category_path(@category), :html => { :method => :put, :class => "MainForm" }) do |f|

%label="Name:".l
%label
="Name".l
\:
= f.text_field :name

%label="Posting tips:".l
%label
="Posting tips".l
\:
= f.text_area :tips, :rows => 3

%label="New Post text:".l
%label
="New Post text".l
\:
= f.text_field :new_post_text

%label="Navigation menu text:".l
%label
="Navigation menu text".l
:
= f.text_field :nav_text

%p
= submit_tag "Update".l
= submit_tag :update.l

= link_to 'Show'.l, category_path(@category)
|
Expand Down
4 changes: 2 additions & 2 deletions app/views/categories/new.html.haml
Expand Up @@ -2,8 +2,8 @@
%h3 New category

- form_for(:category, :url => categories_path, :html => {:class => "MainForm"}) do |f|
%label Name
%label= :name.l
= f.text_field :name
%p= submit_tag "Create".l
%p= submit_tag :create.l

= link_to 'Back'.l, categories_path
4 changes: 3 additions & 1 deletion app/views/clippings/new_clipping.html.haml
Expand Up @@ -86,7 +86,9 @@
%h3 Create a post
- form_for(:post, :url => user_posts_path(current_user), :html => {:class => "MainForm"}) do |f|
- unless @post.category || @post.contest
%label Category:
%label
="Category".l
\:
%select#post_category_id{"name"=>"post[category_id]", "id"=>"post_category_id"}
- for category in Category.find(:all)
%option{:value => category.id, :selected => category.eql?(Category.get(:talk))}
Expand Down
6 changes: 4 additions & 2 deletions app/views/clippings/show.html.haml
Expand Up @@ -33,11 +33,13 @@
= h truncate(@clipping.url, 95)

%p
="Description:".l
="Description".l
\:
=h @clipping.description

%p
="Tags:".l
="Tags".l
\:
%ul.tags
- @clipping.tags.each do |t|
%li=link_to( t.name, tag_url(t.name), :rel => 'tag')
Expand Down
2 changes: 1 addition & 1 deletion app/views/comments/_comment_form.html.haml
Expand Up @@ -13,7 +13,7 @@
.errors
- form_remote_for(:comment, :loading => "$$('div#comments div.errors')[0].innerHTML = ''; $('comment_spinner').show();", :before => "tinyMCE.activeEditor.save();", :url => comments_url(Inflector.underscore(commentable.class), commentable.id ), 500 => "$$('div#comments div.errors')[0].innerHTML = request.responseText; return false;", :success => "new Insertion.#{commentable.class.to_s.eql?('User') ? 'After': 'After' }('newest_comment', request.responseText); tinyMCE.activeEditor.setContent(\'\'); scrollToNewestComment();", :complete => "$('comment_spinner').hide();", :html => {:class => "MainForm"}) do |f|
%label
%em="(2000 character limit)".l
%em="(2000 character limit)".l :comment_character_limit
= text_area :comment, :comment, {:size => "86x5", :class => "rich_text_editor"}
%p
= submit_tag "Add Comment".l
Expand Down
2 changes: 1 addition & 1 deletion app/views/comments/index.html.haml
Expand Up @@ -5,7 +5,7 @@
.yui-b#comments.box.hfeed.comments
%h3
= Inflector.underscore(@commentable.class).capitalize
="Comments -".l
="Comments".l + " -"
= link_to @title, @comments.first.generate_commentable_url(false)

%a#newest_comment
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.haml
Expand Up @@ -37,7 +37,7 @@
%a{:href=>"/", :title=>"#{AppConfig.community_name} Home"}= "Home".l
- if !logged_in?
%li
= link_to "Log In".l , login_path
= link_to :log_in.l , login_path
- else
%li
%a{:href=>"/logout", :title=>"Log out of your #{AppConfig.community_name} account"}
Expand Down
9 changes: 6 additions & 3 deletions app/views/metro_areas/show.html.haml
Expand Up @@ -4,15 +4,18 @@

%p
%b
="Country:".l
="Country".l
\:
= h @metro_area.country.name
%p
%b
="State:".l
="State".l
\:
= @metro_area.state.name if @metro_area.state
%p
%b
="Name:".l
="Name".l
\:
= @metro_area.name
= link_to 'Edit'.l, edit_metro_area_path(@metro_area)
|
Expand Down
13 changes: 8 additions & 5 deletions app/views/posts/edit.html.haml
Expand Up @@ -18,23 +18,26 @@
="Title".l
%em (required)
= f.text_field :title
%label Category:
%label
="Category".l
\:
= f.collection_select(:category_id, Category.find(:all), :id, :name, {}, {})
%label
="Body Text ".l
="Body Text".l
%em (required)
= f.text_area :raw_post, :size => "86x15"
%label
="Tags:".l
="Tags".l
\:
= text_field_tag 'tag_list', @post.tags.collect{|t| t.name}.join(", "), {:autocomplete => "off", :size => 35}
#tag_list_auto_complete.auto_complete
= auto_complete_field 'tag_list', {:url => { :controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [',', ' '] }
%label="Save post as:".l
= f.select(:published_as, [['Published', 'live'], ['Draft', 'draft']])
%p
= submit_tag "Update"
= submit_tag :update.l
or
=link_to "cancel", user_post_path(current_user, @post)
=link_to :cancel.l, user_post_path(current_user, @post)
%p
=link_to "#{image_tag 'icons/delete.png', :plugin => :community_engine} Delete this post?", user_post_path(current_user, @post), :method => :delete, :confirm => "Are you sure you want to delete this post?"

Expand Down
2 changes: 1 addition & 1 deletion app/views/posts/manage.html.haml
Expand Up @@ -37,4 +37,4 @@
%td= post.category.name
%td= post.tags.any? ? post.tag_list : 'No tags'.l
%td= post.comments.count
%td= post.is_live? ? link_to('published'.l, user_post_path(post.user, post)) : 'draft'.l
%td= post.is_live? ? link_to(:published.l, user_post_path(post.user, post)) : 'draft'.l
5 changes: 3 additions & 2 deletions app/views/posts/new.html.haml
Expand Up @@ -14,13 +14,14 @@
.yui-b
.box
%h3
=@post.category ? (:new_post_for_category.l :category => @post.category.name) : "New Post".l
=@post.category ? (:new_post_for_category.l :category => @post.category.name) : "New post".l

= error_messages_for :post
- form_for(:post, :url => user_posts_path, :html => {:class => "MainForm"}) do |f|
- unless @post.category || @post.contest
%label
="Category:".l
="Category".l
\:
%select{:id=>"post_category_id", :name=>"post[category_id]"}
-for category in Category.find(:all)
%option{:value=>"#{category.id}", :selected => category.eql?(Category.get(:talk)) }= h(category.name)
Expand Down
2 changes: 1 addition & 1 deletion app/views/tags/show.html.haml
Expand Up @@ -55,4 +55,4 @@
- @clippings.each do |clipping|
%a{"href"=>"#{h user_clipping_url(clipping.user, clipping) }"}
%img.polaroid.clipping{"src"=>"#{h clipping.image_uri}", "style"=>"width:108px"}
%h6.all= link_to :all_clippngs_tagged.l(:tag_name => @tag.name), tag_path(:id => @tag.name, :type => 'Clipping')
%h6.all= link_to :all_clippings_tagged.l(:tag_name => @tag.name), tag_path(:id => @tag.name, :type => 'Clipping')
2 changes: 1 addition & 1 deletion app/views/users/dashboard.html.haml
Expand Up @@ -57,7 +57,7 @@
=link_to 'browse all members'.l, users_path
%p
=link_to 'Update your profile and tag yourself'.l(:update_profile_and_tag_yourself), edit_user_path(current_user)
="to start getting recommended content on your dashboard.".l(:to_get_recommended_content_on_your_dashboard)
="to start getting recommended content on your dashboard.".l :to_get_recommended_content_on_your_dashboard


-unless @network_activity.empty?
Expand Down
3 changes: 2 additions & 1 deletion app/views/users/edit.html.haml
Expand Up @@ -34,7 +34,8 @@
="Female".l

%label
="Birthday:".l
="Birthday".l
\:
= date_select :user, :birthday, {:start_year => 1926, :end_year => Time.now.year - 1}

#yui-main
Expand Down
3 changes: 2 additions & 1 deletion app/views/users/new.html.haml
Expand Up @@ -31,7 +31,8 @@
= f.text_field :email

%label{"for"=>"birthdate"}
="Birthday:".l
="Birthday".l
\:
%em="(Required: you must be at least 13 years old to sign up.)".l
= date_select :user, :birthday, {:start_year => 1926, :end_year => (Time.now.year - 13)}

Expand Down

0 comments on commit 161082b

Please sign in to comment.