From 2f61f55be2689a66c2143bf7e84cd0e115141174 Mon Sep 17 00:00:00 2001
From: saurabhbhatia <saurabh.a.bhatia@gmail.com>
Date: Fri, 8 Nov 2013 12:53:06 +0800
Subject: [PATCH] Rays fixes

---
 app/assets/javascripts/basic/orbit_js_1.0.1.js     | 7 +++++--
 app/assets/javascripts/lib/member/role-forms.js    | 8 ++++----
 app/assets/javascripts/lib/site_set.js             | 2 +-
 app/views/admin/users_new_interface/_role.html.erb | 7 +------
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/basic/orbit_js_1.0.1.js b/app/assets/javascripts/basic/orbit_js_1.0.1.js
index f57a8b50b..699a05c85 100644
--- a/app/assets/javascripts/basic/orbit_js_1.0.1.js
+++ b/app/assets/javascripts/basic/orbit_js_1.0.1.js
@@ -38,9 +38,11 @@ if($.support.touch) {
         $checked.each(function() {
             if(!$(this).closest('div').hasClass('togglebox')) {
                 $(this).wrap('<div class="toggle-control"/>');
-                if($(this).attr('type') == "hidden" && $(this).attr('value')) {
-                    $(this).wrap('<div class="togglebox disabled" />');    
+                if($(this).attr('type') == "hidden" && $(this).attr('value') == 'true') {
+                    console.log('true')
+                    $(this).wrap('<div class="togglebox disable" />');    
                 } else {
+                    console.log('false')
                     $(this).wrap('<div class="togglebox" />');
                 }
                 $('<label><b></b></label>').insertAfter($(this));
@@ -541,6 +543,7 @@ function changeStatusHidden() {
 
 // Document Ready
 $(function() {
+    console.log('true')
     showFiltersOnPageRefresh();
 
     new ini();
diff --git a/app/assets/javascripts/lib/member/role-forms.js b/app/assets/javascripts/lib/member/role-forms.js
index 2bc69ba72..e9449642e 100644
--- a/app/assets/javascripts/lib/member/role-forms.js
+++ b/app/assets/javascripts/lib/member/role-forms.js
@@ -222,7 +222,7 @@ $(function() {
 		});
 		$('#user-forms').delegate('.togglebox, .delete, .trigger, .remove-input', clickEvent, function(event) {
 			if($(this).hasClass('togglebox')) {
-				if($(this).hasClass('disabled')) {
+				if($(this).hasClass('disable')) {
 					$(this).find('.toggle-check')
 						   .attr('value', 'false')
 						   .closest('.attributes')
@@ -237,7 +237,7 @@ $(function() {
 						   .children('.attributes-body')
 						   .fadeOut(300);
 				}
-				$(this).toggleClass('disabled');
+				$(this).toggleClass('disable');
 			};
 			if($(this).hasClass('remove-input')) {
 				$(this).closest('.input-append').fadeOut(300, function() {
@@ -382,7 +382,7 @@ $(function() {
 		});
 		$('#attributes-area').delegate('.togglebox, .delete, .trigger, .remove-input', clickEvent, function(event) {
 			if($(this).hasClass('togglebox')) {
-				if($(this).hasClass('disabled')) {
+				if($(this).hasClass('disable')) {
 					$(this).find('.toggle-check')
 						   .attr('value', 'false')
 						   .closest('.attributes')
@@ -411,7 +411,7 @@ $(function() {
 						    	$(this).parent('.field-type').removeClass('in');
 						   });
 				}
-				$(this).toggleClass('disabled');
+				$(this).toggleClass('disable');
 			};
 			if($(this).hasClass('delete')) {
 				$(this).closest('.attributes').fadeOut(300, function() {
diff --git a/app/assets/javascripts/lib/site_set.js b/app/assets/javascripts/lib/site_set.js
index 83e7bd1bd..5afac7b33 100644
--- a/app/assets/javascripts/lib/site_set.js
+++ b/app/assets/javascripts/lib/site_set.js
@@ -51,7 +51,7 @@ $(function() {
 	}
 	if($('.set-sidebar-state').length) {
 		if(window.localStorage.getItem('sidebarState') == 1) {
-			$('.set-sidebar-state').prop('checked',true).parent('.togglebox').removeClass('disabled');
+			$('.set-sidebar-state').prop('checked',true).parent('.togglebox').removeClass('disable');
 		}
 		$('.set-sidebar-state').on({
 			change: function() {
diff --git a/app/views/admin/users_new_interface/_role.html.erb b/app/views/admin/users_new_interface/_role.html.erb
index 09008daee..18dbfdb72 100644
--- a/app/views/admin/users_new_interface/_role.html.erb
+++ b/app/views/admin/users_new_interface/_role.html.erb
@@ -5,12 +5,7 @@
 
   <div class="attributes <%= role_disable ? 'disabled' : '' %>">
   <div class="attributes-header clearfix">
-    <div class="toggle-control" style="float: right;">
-      <div class="togglebox <%= role_disable ? 'disabled' : '' %>">
-        <%= hidden_field_tag("user[disable_role][id][#{role.id}]",role_disable,:for=>@form_index,"data-deploy"=>"right",:class=>"toggle-check",:value=>role_disable)%>
-        <label><b></b></label>
-      </div>
-    </div>
+    <%= hidden_field_tag("user[disable_role][id][#{role.id}]",role_disable,:for=>@form_index,"data-deploy"=>"right",:class=>"toggle-check",:value=>role_disable)%>
     <h4><%= role.title %><%= t(:role_info)%></h4>
   </div>