diff --git a/app/views/items/index.html.haml b/app/views/items/index.html.haml
index e4ba0094..face1d73 100644
--- a/app/views/items/index.html.haml
+++ b/app/views/items/index.html.haml
@@ -2,8 +2,7 @@
- title t('.title_with_query', :query => @query)
- if @items.empty?
%p= t '.no_results_html', :query_html => content_tag(:strong, @query)
- %p= t '.modeling_request_html',
- :modeling_link => link_to(t('.modeling_link_content'), root_path)
+ %p= twl '.modeling_request', :modeling_link_url => root_path
- else
= will_paginate @items
= render @items
@@ -14,29 +13,28 @@
#search-help
%h2= t '.search_help_header'
%dl
- %dt= t '.basic_example_query'
- %dd= t '.basic_example_description'
- %dt= t '.user_items_example_query'
+ %dt= t '.examples.basic.query'
+ %dd= t '.examples.basic.description'
+ %dt= t '.examples.user_items.query'
%dd
- = t '.user_items_example_description_html',
- :user_items_link => link_to(t('.user_items_example_link_content'),
- your_items_path)
- %dt= t '.nc_example_query'
- %dd= t '.nc_example_description'
- %dt= t '.pb_example_query'
- %dd= t '.pb_example_description'
- %dt= t '.species_example_query'
- %dd= t '.species_example_description'
- %dt= t '.type_example_query'
- %dd= t '.type_example_description'
+ = twl '.examples.user_items.description',
+ :user_items_link_url => your_items_path
+ %dt= t '.examples.nc.query'
+ %dd= t '.examples.nc.description'
+ %dt= t '.examples.pb.query'
+ %dd= t '.examples.pb.description'
+ %dt= t '.examples.species.query'
+ %dd= t '.examples.species.description'
+ %dt= t '.examples.type.query'
+ %dd= t '.examples.type.description'
- localized_cache 'items#index newest_items' do
#search-new-items
- %h2= t '.newest_items_header'
+ %h2= t '.newest_items.header'
= render @newest_items
- localized_cache :action_suffix => 'species_search_links' do
#species-search-links
- %h2= t '.species_search_header'
+ %h2= t '.species_search.header'
= standard_species_search_links
diff --git a/config/locales/en-meep.yml b/config/locales/en-meep.yml
index 18f2a12c..42d60bb3 100644
--- a/config/locales/en-meep.yml
+++ b/config/locales/en-meep.yml
@@ -234,32 +234,41 @@ en-meep:
no_results_html:
We couldn't meep any wearables that meeped %{query_html}.
Meep!
- modeling_request_html:
- Are we meeping something? To meep an item to our database, just
- %{modeling_link}, and we'll meep our database instantly. Meep!
- modeling_link_content: meep us a pet who is meeping it
+ modeling_request:
+ main_html:
+ Are we meeping something? To meep an item to our database, just
+ %{modeling_link}, and we'll meep our database instantly. Meep!
+ modeling_link_content: meep us a pet who is meeping it
search_help_header: Find what you're meeping for
- basic_example_query: kreludor "altador cup" -background
- basic_example_description:
- returns any item with the meep "kreludor" and the meep "altador cup"
- in it, but not the meep "background"
- user_items_example_query: hat user:owns
- user_items_example_description_html:
- returns %{user_items_link} with the meep "hat"
- user_items_example_link_content: items that you meep
- nc_example_query: blue is:nc
- nc_example_description:
- returns any NC Meep item with the meep "blue" in it
- pb_example_query: collar -is:pb
- pb_example_description:
- returns any item with the meep "collar" in it that isn't from a paint
- brush
- species_example_query: species:shoyru
- species_example_description: returns any item a Shoyru can meep
- type_example_query: type:hat
- type_example_description: returns any item that fills a "hat" meep
- newest_items_header: New Meeps
- species_search_header: Can't decide? Meep by species
+ examples:
+ basic:
+ query: kreludor "altador cup" -background
+ description:
+ returns any item with the meep "kreludor" and the meep "altador
+ cup" in it, but not the meep "background"
+ user_items:
+ query: hat user:owns
+ description:
+ main_html: returns %{user_items_link} with the meep "hat"
+ user_items_link_content: items that you meep
+ nc:
+ query: blue is:nc
+ description: returns any NC Meep item with the meep "blue" in it
+ pb:
+ query: collar -is:pb
+ description:
+ returns any item with the meep "collar" in it that isn't from a
+ paint brush
+ species:
+ query: species:shoyru
+ description: returns any item a Shoyru can meep
+ type:
+ query: type:hat
+ description: returns any item that fills a "hat" meep
+ newest_items:
+ header: New Meeps
+ species_search:
+ header: Can't decide? Meep by species
item:
nc:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5614be87..42f7e718 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -235,32 +235,41 @@ en:
no_results_html:
We couldn't find any wearables that matched %{query_html}.
Sorry!
- modeling_request_html:
- Are we missing something? To add an item to our database, just
- %{modeling_link}, and we'll update our database instantly. Thanks!
- modeling_link_content: show us a pet who is wearing it
+ modeling_request:
+ main_html:
+ Are we missing something? To add an item to our database, just
+ %{modeling_link}, and we'll update our database instantly. Thanks!
+ modeling_link_content: show us a pet who is wearing it
search_help_header: Find what you're looking for
- basic_example_query: kreludor "altador cup" -background
- basic_example_description:
- returns any item with the word "kreludor" and the phrase "altador cup"
- in it, but not the word "background"
- user_items_example_query: hat user:owns
- user_items_example_description_html:
- returns %{user_items_link} with the word "hat"
- user_items_example_link_content: items that you own
- nc_example_query: blue is:nc
- nc_example_description:
- returns any NC Mall item with the word "blue" in it
- pb_example_query: collar -is:pb
- pb_example_description:
- returns any item with the word "collar" in it that isn't from a paint
- brush
- species_example_query: species:shoyru
- species_example_description: returns any item a Shoyru can wear
- type_example_query: type:hat
- type_example_description: returns any item that fills a "hat" zone
- newest_items_header: Newest items
- species_search_header: Can't decide? Search by species
+ examples:
+ basic:
+ query: kreludor "altador cup" -background
+ description:
+ returns any item with the word "kreludor" and the phrase "altador
+ cup" in it, but not the word "background"
+ user_items:
+ query: hat user:owns
+ description:
+ main_html: returns %{user_items_link} with the word "hat"
+ user_items_link_content: items you own
+ nc:
+ query: blue is:nc
+ description: returns any NC Mall item with the word "blue" in it
+ pb:
+ query: collar -is:pb
+ description:
+ returns any item with the word "collar" in it that isn't from a
+ paint brush
+ species:
+ query: species:shoyru
+ description: returns any item a Shoyru can wear
+ type:
+ query: type:hat
+ description: returns any item that fills a "hat" zone
+ newest_items:
+ header: Newest items
+ species_search:
+ header: Can't decide? Search by species
item:
nc: