From bda9f69ce9c20210e7a3d7aaf2652e62534a997b Mon Sep 17 00:00:00 2001
From: Matchu <matchu1993@gmail.com>
Date: Wed, 2 Apr 2014 14:18:14 -0500
Subject: [PATCH] reorganize form a bit; group like things

---
 app/assets/stylesheets/outfits/_edit.sass | 15 ++++++--------
 app/views/outfits/edit.html.haml          | 25 ++++++++++++-----------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/app/assets/stylesheets/outfits/_edit.sass b/app/assets/stylesheets/outfits/_edit.sass
index 12c5128c..1ae63a82 100644
--- a/app/assets/stylesheets/outfits/_edit.sass
+++ b/app/assets/stylesheets/outfits/_edit.sass
@@ -279,19 +279,16 @@ body.outfits-edit
         label
           +inline-block
 
+      li.text label
+        width: 12em
+
+      li.select label
+        width: 8em
+
       li.checkbox
         list-style: none
         margin-left: -24px
 
-      &:nth-of-type(1)
-        li.text, li.select
-          label
-            width: 12em
-
-      &:nth-of-type(2)
-        li.text, li.select
-          label
-            width: 5em
   #preview-search-advanced-link
     font-size: 85%
     margin-right: 1em
diff --git a/app/views/outfits/edit.html.haml b/app/views/outfits/edit.html.haml
index 2922cc85..a0e18200 100644
--- a/app/views/outfits/edit.html.haml
+++ b/app/views/outfits/edit.html.haml
@@ -123,20 +123,14 @@
           %li.text
             %label{for: 'advanced-search-name-exclude'} Name doesn't contain
             %input{type: 'text', id: 'advanced-search-name-exclude'}
+      %div
+        %ul
           %li.select
             %label{for: 'advanced-search-nc'} Only include
             %select{id: 'advanced-search-nc'}
               %option{value: ''} NC and NP items
               %option{value: 'nc'} Neocash items
               %option{value: 'np'} Neopoint items
-      %div
-        %ul
-          %li.checkbox
-            %input{type: 'checkbox', id: 'advanced-search-species'}
-            %label{for: 'advanced-search-species'}
-              Fits the
-              -# TODO: update to current species
-              %span Acara
           %li.select
             %label{for: 'advanced-search-occupies'} Occupies
             -# TODO: populate
@@ -149,16 +143,23 @@
               %option any or no zones
       %div
         %ul
+          %li.checkbox
+            %input{type: 'checkbox', id: 'advanced-search-species'}
+            %label{for: 'advanced-search-species'}
+              Fits the
+              -# TODO: update to current species
+              %span Acara
+              (the current species)
           -# TODO: hide link if logged in
           -# TODO: enable if logged in
-          -# TODO: update return_to
-          = link_to 'Log in to use these filters.', login_path_with_return_to
           %li.checkbox.must-log-in
             %input{type: 'checkbox', id: 'advanced-search-owns', disabled: true}
-            %label{for: 'advanced-search-owns'} Only include items I own
+            %label{for: 'advanced-search-owns'} Only include items you own
           %li.checkbox.must-log-in
             %input{type: 'checkbox', id: 'advanced-search-wants', disabled: true}
-            %label{for: 'advanced-search-wants'} Only include items I want
+            %label{for: 'advanced-search-wants'} Only include items you want
+          -# TODO: update return_to
+          = link_to 'Log in to use these filters.', login_path_with_return_to
 
   #no-assets-full-message= t '.sidebar.closet.no_data.description'