Updated with some locale fixes in site preferences

app/views/admin/designs/_design.html.erb

@@ -1,4 +1,3 @@
-<%= Rails.logger.info"@@@@@@@@@@@@@@@@"+design.inspect%>
 <tr class="with_action">
 	<td class="span1"><%= check_box_tag 'to_delete[]', design.id, false, :class => "checkbox_in_list" %></td>
 	<td class="span2">

app/views/admin/sites/preference.html.erb

@@ -17,7 +17,6 @@
 
           <fieldset>
 
-            
             <!-- Input Area -->
             <div class="input-area">
               <div class="nav-name"><strong>Classification</strong></div>    
@@ -127,7 +126,7 @@
                     </div>
                   </div>
                   <div class="control-group">
-                    <label class="control-label muted">Disable personal desktop</label>
+                    <label class="control-label muted"><%= I18n.t('site.enable_personal_desktop')%></label>
                     <div class="controls">
                       <%= f.check_box :desktop_closed , :class=>"toggle-check" %>
                     </div>
@@ -143,27 +142,33 @@
                       <input type="checkbox" class="toggle-check" data-disabled="true">
                     </div>
                   </div> -->
+                  <!-- Terms of Use -->
                   <div class="control-group">
-                    <label class="control-label muted">Default Language</label>
+                    <label class="control-label muted">Enable User Language Detection
+                    </label>
                     <div class="controls">
-                    <%= @site_in_use_locales %>
-
-                    <% @site_in_use_locales.each do |locale| %>
-                      <%= check_box_tag :default_locale, locale, (@site.enabled_for.nil?), :class=>"toggle-check"  %>
-                      <%= I18nVariable.from_locale(locale) %>
-                     <% end %>
+                      <%= f.check_box :enable_language_detection, :class => "toggle-check" %> 
                     </div>
                   </div>
+
                   <div class="control-group">
                     <label class="control-label muted">Enable Language</label>
                     <div class="controls">
                      <% @site_valid_locales.each do |valid_locale| %>
-                      <%= check_box_tag "site[in_use_locales][]", locale, @site.valid_locales.include?(locale), :class=>"toggle-check" %>
-						            <%= I18nVariable.from_locale(valid_locale) %>
+                      <%= check_box_tag "site[enable_locales][]", locale, @site.valid_locales.include?(locale), :class=>"toggle-check", :data => { :title => "#{I18nVariable.from_locale(locale)}" } %>
 					            <% end %>
                     </div>
                   </div>
 
+                  <div class="control-group">
+                    <label class="control-label muted">Default Language</label>
+                    <div class="controls">
+                    <% @site_in_use_locales.each do |locale| %>
+                      <%= check_box_tag :default_locale, locale, (@site.default_locale.nil?), :class=>"toggle-check", :data => { :title => "#{I18nVariable.from_locale(locale)}" }  %>
+                     <% end %>
+                    </div>
+                  </div>
+
                 </div>
 
                 <!-- OrbitBar Them -->

app/views/layouts/_left_menu.html.erb

@@ -21,11 +21,13 @@
   </li>
 
   <!-- Desktop -->
+  <% if !@site.desktop_closed%>
   <li id="orbit-desktop">
     <a href="<%= desktop_path %>" role="button">
       <i class="icons-screen"></i> <span class="hide"><%= t(:desktop) %></span>
     </a>
   </li>
+  <% end %>
   
 </ul>
 <% if @site.default_image.present?%>