usman 0.1.5dev4 → 0.1.5

data/app/views/usman/admin/features/_form.html.erb

@@ -9,11 +9,8 @@
       </div>
     
       <div>
-        
-        <%= submit_tag("Save", :class=>"btn btn-primary pull-right ml-10") %>
-        
-        <%= link_to raw("<i class='fa fa-close mr-5'></i><span>Cancel</span>"), "#", onclick: "closeGenericModal();", class: "pull-right ml-10 btn btn-white" %>
-
+        <%= link_to raw("<i class='fa fa-close mr-5'></i><span>Cancel</span>"), "#", onclick: "closeGenericModal();", class: "pull-left btn btn-white" %>
+        <%= submit_tag("Save", :class=>"btn btn-secondary pull-right") %>
       </div>
       <%= clear_tag(10) %>
   </div>

data/app/views/usman/admin/features/_index.html.erb

@@ -2,8 +2,7 @@
 	<table class="table table-hover members-table middle-align">
 	  <thead> 
 			<tr> 
-				<th style="text-align: center;width:60px">#</th> 
-				<th style="text-align: center;width:100px"><i class="fa fa-photo"></i></th> 
+				<th style="text-align: center;width:30px">#</th> 
 				<th>Name</th>
 				<th style="width:100px;">Status</th>
 				<th style="text-align: center;" colspan="2">Actions</th>
@@ -17,8 +16,6 @@
 				
 		    <tr id="tr_feature_<%= feature.id %>">
 		      
-		      <td class="feature-image"></td>
-		      
 		      <td class="feature-image">
 		        <%= link_to(admin_feature_path(feature), remote: true) do %>
 		        	<%= display_image(feature, "feature_image.image.small.url", width: "32", height: "auto", class: "img-rectangle", alt: feature.display_name) %>

data/app/views/usman/admin/features/index.html.erb

@@ -9,27 +9,10 @@
 
         <div id="div_feature_action_buttons">
           <div class="row">
-            <div class="col-md-6">
-
-              <%= theme_button('Add a Feature', 'plus', new_admin_feature_path(), classes: "pull-left", btn_type: "success") %>
-
-              <%= theme_button('Refresh', 'refresh', admin_features_path(), classes: "pull-left ml-10", btn_type: "white") %>
-
-              <!-- Single button -->
-              <div class="ml-10 btn-group hidden">
-                <button type="button" class="btn btn-white dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                  More Actions <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu">
-                  <li><a href="#">Import Users</a></li>
-                  <li><a href="#">Import History</a></li>
-                  <li role="separator" class="divider"></li>
-                  <li><a href="#">Export Users</a></li>
-                </ul>
-              </div>
-
+            <div class="col-md-4">
+              <%= link_to raw("<i class='fa fa-plus mr-10'></i><span class='btn-text'> New Feature</span>"), new_admin_feature_path, :class=>"btn btn-primary pull-left mb-5", :remote=>true %>
             </div>
-            <div class="col-md-6">
+            <div class="col-md-8">
               <%= search_form_kuppayam(Feature, admin_features_path, text: @filters[:query]) %>
             </div>
           </div>

data/app/views/usman/admin/features/temp/create.js.erb

@@ -0,0 +1,29 @@
+<% if @feature.errors.blank? %>
+
+  // Inserting the row on top of the table and highlighting it
+  $('#tr_feature_index table > tbody > tr:first').before("<%= escape_javascript(render(:partial=>'/usman/admin/features/row', locals: {feature: @feature})) %>")
+  $("#tr_feature_<%= @feature.id %>").css("background-color", "#fffddd");
+
+  // Showing the saved data in the modal
+  var heading = "<%= raw @feature.name %>";
+  var bodyContent = "<%= escape_javascript(render(:partial=>'/usman/admin/features/show')) %>";
+  showLargeModal(heading, bodyContent, false);
+
+  // Showing Growl Like Message
+  notifySuccess("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(@notification[:message]) %>");
+
+<% else %>
+  
+  // Reload the form with errors
+  var heading = "Add a User";
+  var bodyContent = "<%= escape_javascript(render(:partial=>'/usman/admin/features/form')) %>";
+  showLargeModal(heading, bodyContent);
+
+  // Show Main Error Message on the form
+  <% error_message = content_tag(:div, I18n.t('errors.errors_highlighted'), class: "alert alert-danger mt-20") %>
+  $("#feature_form_error").html("<%= escape_javascript(error_message) %>");
+
+  // Showing Growl Like Message
+  notifyError("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(raw(@notification[:message])) %>");
+  
+<% end %>

data/app/views/usman/admin/features/temp/destroy.js.erb

@@ -0,0 +1,16 @@
+<% if @destroyed %>
+  closeGenericModal();
+  $('#div_feature_index').html("<%= escape_javascript(render(:partial=>'/usman/admin/features/index')) %>");
+<% else %>
+  // Show the error in a modal
+	<%
+    text = Feature::DELETE_MESSAGE
+    error_message = content_tag(:div, text, class: 'alert alert-danger')
+  %>
+  heading = "Remove '<%= @feature.name %>'";
+	bodyContent = "<%= escape_javascript(error_message) %>";
+	showGenericModal(heading, bodyContent);
+	var $div = $('<iframe id="iframe_feature" name="iframe_feature" width="100%" style="display:none"></iframe>').appendTo('body');
+<% end %>
+
+

data/app/views/usman/admin/features/temp/edit.js.erb

@@ -0,0 +1,7 @@
+// Show the new form in the right box.
+heading = "Edit '<%= raw @feature.name_was %>'";
+bodyContent = "<%= escape_javascript(render(:partial=>'/usman/admin/features/form')) %>";
+showGenericModal(heading, bodyContent);
+
+// When the image upload form is submitted, the server response will appear in this iframe -->
+var $div = $('<iframe id="iframe_feature" name="iframe_feature" width="100%" style="display:none"></iframe>').appendTo('body');

data/app/views/usman/admin/features/temp/index.js.erb

@@ -0,0 +1,8 @@
+closeGenericModal();
+<% if @features.any? %>
+  // Fill the right box with first enquiry details in the list
+  $('#div_feature_index').html("<%= escape_javascript(render(:partial=>'/usman/admin/features/index')) %>");
+<% else %>
+	var noResultsText = "<%= escape_javascript(theme_panel_message(I18n.translate('success.no_results_found')))%>";
+  $('#div_feature_index').html(noResultsText);
+<% end %>

data/app/views/usman/admin/features/temp/new.js.erb

@@ -0,0 +1,7 @@
+// Show the new form in the right box.
+heading = "Add a Feature";
+bodyContent = "<%= escape_javascript(render(:partial=>'/usman/admin/features/form')) %>";
+showGenericModal(heading, bodyContent);
+
+// When the image upload form is submitted, the server response will appear in this iframe -->
+var $div = $('<iframe id="iframe_feature" name="iframe_feature" width="100%" style="display:none"></iframe>').appendTo('body');

data/app/views/usman/admin/features/temp/row.js.erb

@@ -0,0 +1,10 @@
+<% if @feature.errors.blank? %>
+	<% status_hash = {approved: "success", pending: "default", suspeneded: "danger"} %>
+  $("#tr_feature_<%= @feature.id %>").replaceWith("<%= escape_javascript(render(:partial=>'/usman/admin/features/row', locals: {feature: @feature, i: -1})) %>")
+  // Close Modal
+  closeGenericModal();
+<% else %>
+  // Populate Server Side Errors
+  errorMessages = <%= @feature.errors.full_messages.to_json.html_safe %>;
+  populateServerSideErrors('feature', errorMessages);
+<% end %>

data/app/views/usman/admin/features/temp/show.js.erb

@@ -0,0 +1,8 @@
+// Show the new form in the right box.
+heading = "<%= raw @feature.name %>";
+bodyContent = "<%= escape_javascript(render(:partial=>'/usman/admin/features/show')) %>";
+closeGenericModal();
+showGenericModal(heading, bodyContent);
+
+// When the image upload form is submitted, the server response will appear in this iframe -->
+var $div = $('<iframe id="iframe_feature" name="iframe_feature" width="100%" style="display:none"></iframe>').appendTo('body');

data/app/views/usman/admin/features/temp/update.js.erb

@@ -0,0 +1,16 @@
+<% if @feature.errors.blank? %>
+  $('#tr_feature_<%= @feature.id %>').replaceWith("<%= escape_javascript(render(:partial=>'/usman/admin/features/row', locals: {feature: @feature})) %>");
+  $("#tr_feature_<%= @feature.id %>").css("background-color", "#fffddd");
+  closeGenericModal();
+<% else %>
+	// Show the form in the modal
+	heading = "Edit '<%= raw @feature.name_was %>'";
+	bodyContent = "<%= escape_javascript(render(:partial=>'/usman/admin/features/form')) %>";
+	showGenericModal(heading, bodyContent);
+	var $div = $('<iframe id="iframe_feature" name="iframe_feature" width="100%" style="display:none"></iframe>').appendTo('body');
+  <%
+    text = "You have few errors. They have been highlighted."
+    error_message = content_tag(:div, text, class: "alert alert-danger")
+  %>
+  $("#feature_form_error").html("<%= escape_javascript(error_message) %>");
+<% end %>

data/app/views/usman/admin/permissions/_show.html.erb

@@ -1,9 +1,17 @@
-<div class="media">
+<% status_hash = {published: "success", unpublished: "default", disabled: "danger"} %>
+
+<div class="media <%= status_hash[@permission.status.to_sym] %>">
+
+  <div class="pull-left pt-10 pr-10 pb-10" style="width:30%;">
+  	<%= edit_image(@permission, "permission_image.image.large.url", upload_image_link(@permission, :permission_image)) %>
+  </div>
 
   <div class="pull-left ml-10" style="width:65%;">
 
-  	<h1><%= @permission.id %></h1>
+  	<h1><%= @permission.name %></h1>
     
+    <span class="ml-5 mt-5 label label-<%= status_hash[@permission.status.to_sym] %>"><%= @permission.status.titleize %></span>
+
     <%= clear_tag %>
   </div>
 

data/app/views/usman/admin/permissions/index.html.erb

@@ -9,27 +9,10 @@
 
       <div id="div_permission_action_buttons">
           <div class="row">
-            <div class="col-md-6">
-
-              <%= theme_button('Add a Permission', 'plus', new_admin_permission_path(), classes: "pull-left", btn_type: "success") %>
-
-              <%= theme_button('Refresh', 'refresh', admin_permissions_path(), classes: "pull-left ml-10", btn_type: "white") %>
-
-              <!-- Single button -->
-              <div class="ml-10 btn-group hidden">
-                <button type="button" class="btn btn-white dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                  More Actions <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu">
-                  <li><a href="#">Import Users</a></li>
-                  <li><a href="#">Import History</a></li>
-                  <li role="separator" class="divider"></li>
-                  <li><a href="#">Export Users</a></li>
-                </ul>
-              </div>
-
+            <div class="col-md-4">
+              <%= link_to raw("<i class='fa fa-plus mr-10'></i><span class='btn-text'> New Permission</span>"), new_admin_permission_path, :class=>"btn btn-primary pull-left mb-5", :remote=>true %>
             </div>
-            <div class="col-md-6">
+            <div class="col-md-8">
               <%= search_form_kuppayam(Permission, admin_permissions_path, text: @filters[:query]) %>
             </div>
           </div>

data/app/views/usman/admin/permissions/temp/create.js.erb

@@ -0,0 +1,29 @@
+<% if @permission.errors.blank? %>
+
+  // Inserting the row on top of the table and highlighting it
+  $('#tr_permission_index table > tbody > tr:first').before("<%= escape_javascript(render(:partial=>'/usman/admin/permissions/row', locals: {permission: @permission})) %>")
+  $("#tr_permission_<%= @permission.id %>").css("background-color", "#fffddd");
+
+  // Showing the saved data in the modal
+  var heading = "<%= raw @permission.name %>";
+  var bodyContent = "<%= escape_javascript(render(:partial=>'/usman/admin/permissions/show')) %>";
+  showLargeModal(heading, bodyContent, false);
+
+  // Showing Growl Like Message
+  notifySuccess("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(@notification[:message]) %>");
+
+<% else %>
+  
+  // Reload the form with errors
+  var heading = "Add a Permission";
+  var bodyContent = "<%= escape_javascript(render(:partial=>'/usman/admin/permissions/form')) %>";
+  showLargeModal(heading, bodyContent);
+
+  // Show Main Error Message on the form
+  <% error_message = content_tag(:div, I18n.t('errors.errors_highlighted'), class: "alert alert-danger mt-20") %>
+  $("#permission_form_error").html("<%= escape_javascript(error_message) %>");
+
+  // Showing Growl Like Message
+  notifyError("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(raw(@notification[:message])) %>");
+  
+<% end %>

data/app/views/usman/admin/permissions/temp/destroy.js.erb

@@ -0,0 +1,22 @@
+<% if @destroyed %>
+  
+  // Removing the item from the list
+  $('#tr_permission_<%= @permission.id %>').remove();
+
+  // Closing the modal if it is opened
+  closeLargeModal();
+
+  // Showing Growl Like Message
+  notifySuccess("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(@notification[:message]) %>");
+
+<% else %>
+  
+  // Show the error in a modal
+  showMessageModal("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(@notification[:message]) %>");
+
+  // Showing Growl Like Message
+  notifyError("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(@notification[:message]) %>");
+  
+<% end %>
+
+

data/app/views/usman/admin/permissions/temp/edit.js.erb

@@ -0,0 +1,4 @@
+// Show the new form in the right box.
+var heading = "Edit Permission";
+var bodyContent = "<%= escape_javascript(render(:partial=>'/usman/admin/permissions/form')) %>";
+showLargeModal(heading, bodyContent);

data/app/views/usman/admin/permissions/temp/index.js.erb

@@ -0,0 +1,14 @@
+// Close Modal if it is opened
+closeLargeModal();
+
+<% if @permissions.any? %>
+  
+  // Refresh the list
+  $('#div_permission_index').html("<%= escape_javascript(render(:partial=>'/usman/admin/permissions/index')) %>");
+
+<% else %>
+
+	var noResultsText = "<%= escape_javascript(theme_panel_message(I18n.translate('success.no_results_found')))%>";
+  $('#div_permission_index').html(noResultsText);
+
+<% end %>

data/app/views/usman/admin/permissions/temp/new.js.erb

@@ -0,0 +1,4 @@
+// Load the form
+var heading = "Add a Permission";
+var bodyContent = "<%= escape_javascript(render(:partial=>'/usman/admin/permissions/form')) %>";
+showLargeModal(heading, bodyContent);

data/app/views/usman/admin/permissions/temp/row.js.erb

@@ -0,0 +1,24 @@
+<% if @permission && @permission.errors.blank? %>
+	
+	// Updating the edited row and highlighting it
+	$("#tr_permission_<%= @permission.id %>").replaceWith("<%= escape_javascript(render(:partial=>'/usman/admin/permissions/row', locals: {permission: @permission, i: -1})) %>")
+	$("#tr_permission_<%= @permission.id %>").css("background-color", "#fffddd");
+	
+	// Refresh the modal content if it is open
+	$("#div_permission_show").replaceWith("<%= escape_javascript(render(:partial=>'/usman/admin/permissions/show')) %>")
+
+  // Closing the modal
+  showAndHideModals();
+
+  // Showing Growl Like Message
+  notifySuccess("<%= @notification[:title] %>", "<%= @notification[:message] %>");
+
+<% else %>
+	
+	// Updating the row which got errored and highlighting it
+	$("#tr_permission_<%= params[:id] %>").css("background-color", "#ffefef");
+
+	// Showing Growl Like Message
+  notifyError("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(raw(@notification[:message])) %>");
+  
+<% end %>

data/app/views/usman/admin/permissions/temp/show.js.erb

@@ -0,0 +1,13 @@
+<% if @permission %>
+	
+	// Show the details in the large modal
+	var heading = "<%= raw @permission.name %>";
+	var bodyContent = "<%= escape_javascript(render(:partial=>'/usman/admin/permissions/show')) %>";
+	showLargeModal(heading, bodyContent, false);
+
+<% else %>
+
+	// Showing Growl Like Message
+  notifyError("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(raw(@notification[:message])) %>");
+
+<% end %>

data/app/views/usman/admin/permissions/temp/update.js.erb

@@ -0,0 +1,29 @@
+<% if @permission.errors.blank? %>
+  
+  // Updating the edited row and highlighting it
+  $('#tr_permission_<%= @permission.id %>').replaceWith("<%= escape_javascript(render(:partial=>'/usman/admin/permissions/row', locals: {permission: @permission})) %>");
+  $("#tr_permission_<%= @permission.id %>").css("background-color", "#fffddd");
+  
+  // Showing the saved data in the modal
+  var heading = "<%= raw @permission.name %>";
+  var bodyContent = "<%= escape_javascript(render(:partial=>'/usman/admin/permissions/show')) %>";
+  showLargeModal(heading, bodyContent, false);
+
+  // Showing Growl Like Message
+  notifySuccess("<%= @notification[:title] %>", "<%= @notification[:message] %>");
+
+<% else %>
+
+  // Reload the form with errors
+  var heading = "Edit Permission";
+  var bodyContent = "<%= escape_javascript(render(:partial=>'/usman/admin/permissions/form')) %>";
+  showLargeModal(heading, bodyContent);
+
+  // Show Main Error Message on the form
+  <% error_message = content_tag(:div, I18n.t('errors.errors_highlighted'), class: "alert alert-danger mt-20") %>
+  $("#permission_form_error").html("<%= escape_javascript(error_message) %>");
+  
+  // Showing Growl Like Message
+  notifyError("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(raw(@notification[:message])) %>");
+  
+<% end %>

data/app/views/usman/admin/roles/_form.html.erb

@@ -12,7 +12,7 @@
 
         <%= submit_tag("Save", :class=>"btn btn-primary pull-right ml-10") %>
         
-        <%= link_to raw("<i class='fa fa-close mr-5'></i><span>Cancel</span>"), "#", onclick: "closeLargeModal();", class: "pull-right ml-10 btn btn-white" %>
+        <%= link_to raw("<i class='fa fa-close mr-5'></i><span>Cancel</span>"), "#", onclick: "closeGenericModal();", class: "pull-right ml-10 btn btn-white" %>
         
       </div>
       <%= clear_tag(10) %>

data/app/views/usman/admin/roles/_index.html.erb

@@ -2,7 +2,7 @@
 	<table class="table table-hover members-table middle-align">
 	  <thead> 
 			<tr> 
-				<th style="text-align: center;width:60px">#</th> 
+				<th style="text-align: center;width:20px">#</th> 
 				<th>Name</th>
 				<th style="text-align: center;">Actions</th>
 			</tr> 
@@ -28,9 +28,9 @@
 
 					<td class="action-links" style="width:10%">
 
-		      	<%= link_to raw("<i class=\"linecons-pencil\"></i> Edit Role"), edit_link, :remote=>true, class: "edit" if @current_user.super_admin? and role.can_be_edited? %>
+		      	<%= link_to raw("<i class=\"linecons-pencil\"></i> Edit Role"), edit_link, :remote=>true, class: "edit" %>
 
-		        <%= link_to raw("<i class=\"linecons-trash\"></i> Delete"), delete_link, method: :delete, role: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "delete" if @current_user.super_admin? and role.can_be_deleted? %>
+		        <%= link_to raw("<i class=\"linecons-trash\"></i> Delete"), delete_link, method: :delete, role: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "delete" %>
 
 		      </td>
 

data/app/views/usman/admin/roles/_row.html.erb

@@ -15,9 +15,9 @@
 
   <td class="action-links" style="width:10%">
 
-    <%= link_to raw("<i class=\"linecons-pencil\"></i> Edit Role"), edit_link, :remote=>true, class: "edit" if @current_user.super_admin? and role.can_be_edited? %>
+    <%= link_to raw("<i class=\"linecons-pencil\"></i> Edit Role"), edit_link, :remote=>true, class: "edit" %>
 
-    <%= link_to raw("<i class=\"linecons-trash\"></i> Delete"), delete_link, method: :delete, role: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "delete" if @current_user.super_admin? and role.can_be_deleted? %>
+    <%= link_to raw("<i class=\"linecons-trash\"></i> Delete"), delete_link, method: :delete, role: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "delete" %>
 
   </td>
 

data/app/views/usman/admin/roles/_show.html.erb

@@ -1,5 +1,3 @@
-<% @users = @role.users.page(@current_page).per(@per_page) %>
-
 <div id="div_role_show">
 	
 	<div class="row">
@@ -21,9 +19,9 @@
 	  	<% edit_link = edit_admin_role_path(id: @role.id) %>
 			<% delete_link = admin_role_path(id: @role.id) %>
 
-			<%= link_to raw("<i class=\"linecons-pencil\"></i> Edit Role"), edit_link, :remote=>true, class: "btn btn-block btn-success" if @current_user.super_admin? and @role.can_be_edited? %>
+			<%= link_to raw("<i class=\"linecons-pencil\"></i> Edit Role"), edit_link, :remote=>true, class: "btn btn-block btn-success" if @role.can_be_edited? %>
 
-	    <%= link_to raw("<i class=\"linecons-trash\"></i> Delete Role"), delete_link, method: :delete, role: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "btn btn-block btn-danger btn-only-hover" if @current_user.super_admin? and @role.can_be_deleted? %>
+	    <%= link_to raw("<i class=\"linecons-trash\"></i> Delete Role"), delete_link, method: :delete, role: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "btn btn-block btn-danger btn-only-hover" if @role.can_be_deleted? %>
 
 	    <div class="visible-sm visible-xs mb-50"></div>
 
@@ -34,15 +32,7 @@
 	<%= clear_tag(50) %>
 
 	<ul class="nav nav-pills">
-
-		<li class="active">
-	    <a href="#user_roles" data-toggle="tab" aria-expanded="false">
-	      <span class="visible-xs"><i class="fa-database"></i></span>
-	      <span class="hidden-xs">Users</span>
-	    </a>
-	  </li>
-
-	  <li class="">
+	  <li class="active">
 	    <a href="#technical_details" data-toggle="tab" aria-expanded="false">
 	      <span class="visible-xs"><i class="fa-database"></i></span>
 	      <span class="hidden-xs">Technical Details</span>
@@ -51,32 +41,7 @@
 	</ul>
 
 	<div class="tab-content">
-
-		<div class="tab-pane active" id="user_roles" style="border: 1px solid #000;min-height:200px;padding:20px;margin-bottom:20px;max-height: 400px;overflow-y: auto;">
-	    
-	    <%= clear_tag(20) %>
-
-	    <div id="div_user_action_buttons">
-        <div class="row">
-          <div class="col-md-6">
-
-            <%= theme_button('Add a User', 'plus', new_admin_role_user_path(@role), classes: "pull-left", btn_type: "success") %>
-
-            <%= theme_button('Refresh', 'refresh', admin_role_users_path(@role), classes: "pull-left ml-10", btn_type: "white") %>
-          </div>
-          <div class="col-md-6">
-            <%= search_form_kuppayam(User, admin_role_users_path(@role), text: "") %>
-          </div>
-        </div>
-      </div>
-      <%= clear_tag(10) %>
-
-      <div id="div_user_index">
-      	<%= render :partial=>"usman/admin/user_roles/index" %>
-      </div>
-	  </div>
-
-	  <div class="tab-pane" id="technical_details">
+	  <div class="tab-pane active" id="technical_details">
 	    
 	    <%= clear_tag(20) %>
 
@@ -95,12 +60,13 @@
 
 					</tbody>
 				</table>
+				
 			</div>
-	  </div>
 
+	  </div>
 	</div>
 
-	<%= link_to "Close", "#", onclick: "closeLargeModal();", class: "btn btn-primary pull-right" %>
+	<%= link_to "Close", "#", onclick: "closeGenericModal();", class: "btn btn-primary pull-right" %>
 
 	<%= clear_tag %>
 </div>

data/app/views/usman/admin/roles/index.html.erb

@@ -9,29 +9,10 @@
 
         <div id="div_role_action_buttons">
           <div class="row">
-            <div class="col-md-6">
-              
-              <%= theme_button('Add a Role', 'plus', new_admin_role_path(), classes: "pull-left", btn_type: "success") if @current_user.super_admin? %>
-
-              <%= theme_button('Refresh', 'refresh', admin_roles_path(), classes: "pull-left ml-10", btn_type: "white") %>
-
-              <%= theme_button('Manage Users', 'nothing linecons-graduation-cap', admin_users_path(), classes: "pull-left ml-10", btn_type: "white", remote: false) %>
-
-              <!-- Single button -->
-              <div class="ml-10 btn-group hidden">
-                <button type="button" class="btn btn-white dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                  More Actions <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu">
-                  <li><a href="#">Import Users</a></li>
-                  <li><a href="#">Import History</a></li>
-                  <li role="separator" class="divider"></li>
-                  <li><a href="#">Export Users</a></li>
-                </ul>
-              </div>
-
+            <div class="col-md-4">
+              <%= link_to raw("<i class='fa fa-plus mr-10'></i><span class='btn-text'> New Role</span>"), new_admin_role_path, :class=>"btn btn-primary pull-left mb-5", :remote=>true %>
             </div>
-            <div class="col-md-6">
+            <div class="col-md-8">
               <%= search_form_kuppayam(Role, admin_roles_path, text: @filters[:query]) %>
             </div>
           </div>

data/app/views/usman/admin/users/_index.html.erb

@@ -2,12 +2,14 @@
 	<table class="table table-hover members-table middle-align">
 	  <thead> 
 			<tr> 
-				<th style="text-align: center;width:60px">#</th> 
-				<th style="text-align: center;width:100px"><i class="fa fa-photo"></i></th> 
+				<th style="text-align: center;width:10px">#</th> 
+				<th style="text-align: center;width:30px">Image</th> 
 				<th>Name</th>
 				<th class="hidden-xs hidden-sm">Username</th>
 				<th class="hidden-xs hidden-sm">Email</th>
-				<th class="hidden-xs hidden-sm">Roles</th>
+				<% if @current_user.is_super_admin? %>
+					<th class="hidden-xs hidden-sm">Role</th>
+				<% end %>
 				<th>Status</th>
 				<th style="text-align: center;" colspan="2">Actions</th>
 			</tr> 
@@ -44,22 +46,14 @@
 
 					<td class="hidden-xs hidden-sm"><%= link_to user.email, admin_user_path(user), remote: true, class: "email" %></td>
 					
-					<% if @current_user.super_admin? %>
-						<td class="hidden-xs hidden-sm">
-							<% if user.super_admin? %>
-				        <span class="mr-10 mt-5 label label-warning">Super Admin</span>
-				      <% else %>
-				      	<% user.roles.collect(&:name).each do |r| %>
-				      		<span class="ml-5 label label-primary"><%= r %></span>
-				      	<% end %>
-				      <% end %>
-						</td>
-					<% else %>
-						<td class="user-name">
-			      	<% user.roles.collect(&:name).each do |r| %>
-			      		<span class="ml-5 label label-primary"><%= r %></span>
-			      	<% end %>
-			      </td>
+					<% if @current_user.is_super_admin? %>
+					<td class="hidden-xs hidden-sm">
+						<% if user.super_admin %>
+			        <span class="mr-10 mt-5 label label-warning">Super Admin</span>
+			      <% else %>
+			      	<span class="mr-10 mt-5 label label-default">Normal</span>
+			      <% end %>
+					</td>
 					<% end %>
 
 					<td>
@@ -83,13 +77,13 @@
 		      <td class="action-links" style="width:15%">
 
 		      	<!-- Approve -->
-				    <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Approve"), update_status_admin_user_path(:id =>user.id, :status =>'approved'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" if user.can_be_approved? && (@current_user != user) %>
+				    <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Approve"), update_status_admin_user_path(:id =>user.id, :status =>'approved'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" if user.can_be_approved? %>
 
 				    <!-- Mark as Pending -->
-				    <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Mark as Pending"), update_status_admin_user_path(:id =>user.id, :status =>'pending'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" if user.can_be_marked_as_pending? && (@current_user != user) %>
+				    <%= link_to raw("<i class=\"fa fa-circle mr-5\"></i> Mark as Pending"), update_status_admin_user_path(:id =>user.id, :status =>'pending'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" if user.can_be_marked_as_pending? %>
 				      
 				    <!-- Suspend -->
-				    <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Suspend"), update_status_admin_user_path(:id =>user.id, :status =>'suspended'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" if user.can_be_suspended? && (@current_user != user) %>
+				    <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Suspend"), update_status_admin_user_path(:id =>user.id, :status =>'suspended'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1" if user.can_be_suspended? %>
 
 		      </td>