Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

app/views/origami/addorders/detail.html.erb

@@ -5,7 +5,7 @@
 <% type = request.path_info.include?('quick_service')%>
 <% modify_order = request.path_info.include?('modify_order')%>
 
-<div class="container-fluid ">
+<div class="container-fluid " style="padding:0px 3px 0px 3px;">
   <div id="oqs_loading_wrapper" style="display:none;">
     <div id="oqs_loading"></div>
   </div>

app/views/settings/employees/_form.html.erb

@@ -7,6 +7,7 @@
 
         <div class="form-inputs p-l-15">
           <%= f.input :name %>
+          <%= f.input :is_active,:input_html=>{:class=>"col-md-9"} %>
           <% if current_user.role == "administrator" %>
             <%= f.input :role, :collection => Lookup.collection_of("employee_roles"),:class=>'form-group' %>
           <% else %>