From 41da9d0629f7ca3421f06e14965a3eb65fb51d81 Mon Sep 17 00:00:00 2001 From: Matchu Date: Fri, 19 Sep 2014 07:26:30 -0500 Subject: [PATCH] swap the homepage forms back in anticipation of Neopets.com uptime --- app/assets/stylesheets/outfits/_new.sass | 5 ++-- app/views/outfits/new.html.haml | 30 +++++++++--------------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/app/assets/stylesheets/outfits/_new.sass b/app/assets/stylesheets/outfits/_new.sass index 69b5fcba..c3a0a48f 100644 --- a/app/assets/stylesheets/outfits/_new.sass +++ b/app/assets/stylesheets/outfits/_new.sass @@ -47,14 +47,15 @@ body.outfits-new left: 16px legend margin-left: -16px - #start-from-scratch + #load-pet-to-wardrobe font-size: 175% margin: bottom: 1em top: 1.5em - select + input font-size: 67% padding: .5em + width: 10em button +loud-awesome-button font-size: 67% diff --git a/app/views/outfits/new.html.haml b/app/views/outfits/new.html.haml index 0a24a606..ddd39ca8 100644 --- a/app/views/outfits/new.html.haml +++ b/app/views/outfits/new.html.haml @@ -13,32 +13,24 @@ %h1= t 'app_name' %h2= t '.tagline' - - localized_cache "outfits#new start_from_scratch_form pranks_funny=#{Color.pranks_funny?}" do - = form_tag wardrobe_path, method: 'GET', id: 'start-from-scratch', authenticity_token: false do - %fieldset - -#%legend= t '.start_from_scratch.legend' - %legend Choose your pet's appearance - = pet_attribute_select 'color', @colors, 8 - = pet_attribute_select 'species', @species - %button{:type => "submit"} - -#= t('.start_from_scratch.submit') - Plan outfit! - = form_tag remote_load_pet_path, method: 'GET', id: 'load-pet-to-wardrobe' do = hidden_field_tag 'impress_user', current_user.try(:id) - localized_cache action_suffix: 'outfits#new main_load_pet_form_content' do = hidden_field_tag 'redirect', "#{wardrobe_url}\#{q}" %fieldset - -#%legend= t '.load_pet.legend' - %legend - Or enter your pet's name (but, well, - = link_to 'downtime', 'https://www.facebook.com/notes/neopets/transition-update/757915977580469' - = succeed ')' do - %img{src: 'http://images.neopets.com/neoboards/smilies/tongue.gif'} + %legend= t '.load_pet.legend' = pet_name_tag :id => 'main-pet-name' %button{:type => "submit"} - -#= t '.load_pet.submit' - Go + = t '.load_pet.submit' + + - localized_cache "outfits#new start_from_scratch_form pranks_funny=#{Color.pranks_funny?}" do + = form_tag wardrobe_path, method: 'GET', id: 'start-from-scratch', authenticity_token: false do + %fieldset + %legend= t '.start_from_scratch.legend' + = pet_attribute_select 'color', @colors, 8 + = pet_attribute_select 'species', @species + %button{:type => "submit"} + = t('.start_from_scratch.submit') %ul#sections - localized_cache :action_suffix => 'your_items_module' do