From 8e3a2f59e9d65bf8409c7ef354dacca45d26536d Mon Sep 17 00:00:00 2001 From: Matchu Date: Wed, 17 Sep 2014 22:47:29 -0500 Subject: [PATCH] swap the new outfit forms because downtime --- app/assets/stylesheets/outfits/_new.sass | 7 +++--- app/views/outfits/new.html.haml | 31 +++++++++++++++--------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/outfits/_new.sass b/app/assets/stylesheets/outfits/_new.sass index 09442ffd..69b5fcba 100644 --- a/app/assets/stylesheets/outfits/_new.sass +++ b/app/assets/stylesheets/outfits/_new.sass @@ -47,15 +47,14 @@ body.outfits-new left: 16px legend margin-left: -16px - #load-pet-to-wardrobe + #start-from-scratch font-size: 175% margin: bottom: 1em - top: 2em - input + top: 1.5em + select 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 b6f45b8e..0a24a606 100644 --- a/app/views/outfits/new.html.haml +++ b/app/views/outfits/new.html.haml @@ -12,24 +12,33 @@ %span %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= 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'} = pet_name_tag :id => 'main-pet-name' %button{:type => "submit"} - = 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 - %input{:type => "submit", :value => t('.start_from_scratch.submit')} + -#= t '.load_pet.submit' + Go %ul#sections - localized_cache :action_suffix => 'your_items_module' do