From fd560935cd1d5464d223a6f72aac53c10e86b43c Mon Sep 17 00:00:00 2001
From: saurabhbhatia <saurabh.a.bhatia@gmail.com>
Date: Tue, 10 Dec 2013 10:17:10 +0800
Subject: [PATCH] Fixed the order of the fields in responsive settings page

---
 .../admin/sites/responsive_setting.html.erb   | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/views/admin/sites/responsive_setting.html.erb b/app/views/admin/sites/responsive_setting.html.erb
index 7a39089a..cdd25f43 100644
--- a/app/views/admin/sites/responsive_setting.html.erb
+++ b/app/views/admin/sites/responsive_setting.html.erb
@@ -27,6 +27,16 @@
                 </div>
               </div>
 
+              <div class="control-group">
+                <label class="control-label muted">Select Announcement Categories</label>
+                <div class="controls">
+                  <% @module.categories.each do |category| %>
+                    <%= check_box_tag "site[announcement_category][]", category.id.to_s, (@site.announcement_category.include?(category) rescue false), :class=>"toggle-check", :data => { :title => "#{category.title}", disabled: true }, "data-deploy"=>"inline", :checked => (@site.announcement_category.include?(category.id.to_s)) %>
+                  <% end %>
+                </div>
+              </div>
+
+
              <div class="control-group">
                     <label class="control-label muted">Mobile Site Icon</label>
                     <div class="controls">
@@ -56,22 +66,13 @@
                       </div>
                     </div>
 
-              <div class="control-group">
-                <label class="control-label muted">Select Announcement Categories</label>
-                <div class="controls">
-                  <% @module.categories.each do |category| %>
-                    <%= check_box_tag "site[announcement_category][]", category.id.to_s, (@site.announcement_category.include?(category) rescue false), :class=>"toggle-check", :data => { :title => "#{category.title}", disabled: true }, "data-deploy"=>"inline", :checked => (@site.announcement_category.include?(category.id.to_s)) %>
-                  <% end %>
-                </div>
-              </div>
-
                <div class="control-group">
                 <label class="control-label muted">Select Orbit Bar Color</label>
                 <div class="controls">
-                 <input type="text" value="<%= (@site.mobile_bar_color.empty? ? '#FFFFF' : @site.mobile_bar_color[0]) %>" class="color-picker" name="site[mobile_bar_color][]" <%= (@site.mobile_bar_color.empty? ? "disabled='disabled'" : "") %> />
-                 <input type="text" value="<%= (@site.mobile_bar_color.empty? ? '#FFFFF' : @site.mobile_bar_color[1]) %>" class="color-picker" name="site[mobile_bar_color][]" <%= (@site.mobile_bar_color.empty? ? "disabled='disabled'" : "") %> />
+                 <input type="text" value="<%= (@site.mobile_bar_color.nil? ? '#FFFFF' : @site.mobile_bar_color[0]) %>" class="color-picker" name="site[mobile_bar_color][]" <%= (@site.mobile_bar_color.nil? ? "disabled='disabled'" : "") %> />
+                 <input type="text" value="<%= (@site.mobile_bar_color.nil? ? '#FFFFF' : @site.mobile_bar_color[1]) %>" class="color-picker" name="site[mobile_bar_color][]" <%= (@site.mobile_bar_color.nil? ? "disabled='disabled'" : "") %> />
                  OR
-                 <input type="checkbox" <%= (@site.mobile_bar_color.empty? ? "checked='checked'" : "") %> name="site[default_bar_color]" id="default_bar_color" style="margin:0 0 3px 10px;" /> Default Color
+                 <input type="checkbox" <%= (@site.mobile_bar_color.nil? ? "checked='checked'" : "") %> name="site[default_bar_color]" id="default_bar_color" style="margin:0 0 3px 10px;" /> Default Color
                 </div>
               </div>