usman 0.1.4 → 0.1.5dev

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

@@ -9,8 +9,11 @@
       </div>
     
       <div>
-        <%= 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") %>
+        
+        <%= 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" %>
+
       </div>
       <%= clear_tag(10) %>
   </div>

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

@@ -2,7 +2,8 @@
 	<table class="table table-hover members-table middle-align">
 	  <thead> 
 			<tr> 
-				<th style="text-align: center;width:30px">#</th> 
+				<th style="text-align: center;width:60px">#</th> 
+				<th style="text-align: center;width:100px"><i class="fa fa-photo"></i></th> 
 				<th>Name</th>
 				<th style="width:100px;">Status</th>
 				<th style="text-align: center;" colspan="2">Actions</th>
@@ -16,6 +17,8 @@
 				
 		    <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,10 +9,27 @@
 
         <div id="div_feature_action_buttons">
           <div class="row">
-            <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 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>
-            <div class="col-md-8">
+            <div class="col-md-6">
               <%= search_form_kuppayam(Feature, admin_features_path, text: @filters[:query]) %>
             </div>
           </div>

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

@@ -1,17 +1,9 @@
-<% 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="media">
 
   <div class="pull-left ml-10" style="width:65%;">
 
-  	<h1><%= @permission.name %></h1>
+  	<h1><%= @permission.id %></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,10 +9,27 @@
 
       <div id="div_permission_action_buttons">
           <div class="row">
-            <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 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>
-            <div class="col-md-8">
+            <div class="col-md-6">
               <%= search_form_kuppayam(Permission, admin_permissions_path, text: @filters[:query]) %>
             </div>
           </div>

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: "closeGenericModal();", class: "pull-right ml-10 btn btn-white" %>
+        <%= link_to raw("<i class='fa fa-close mr-5'></i><span>Cancel</span>"), "#", onclick: "closeLargeModal();", 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:20px">#</th> 
+				<th style="text-align: center;width:60px">#</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" %>
+		      	<%= 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-trash\"></i> Delete"), delete_link, method: :delete, role: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "delete" %>
+		        <%= 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? %>
 
 		      </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" %>
+    <%= 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-trash\"></i> Delete"), delete_link, method: :delete, role: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "delete" %>
+    <%= 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? %>
 
   </td>
 

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

@@ -1,3 +1,5 @@
+<% @users = @role.users.page(@current_page).per(@per_page) %>
+
 <div id="div_role_show">
 	
 	<div class="row">
@@ -19,9 +21,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 @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 @current_user.super_admin? and @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 @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 @current_user.super_admin? and @role.can_be_deleted? %>
 
 	    <div class="visible-sm visible-xs mb-50"></div>
 
@@ -32,7 +34,15 @@
 	<%= clear_tag(50) %>
 
 	<ul class="nav nav-pills">
-	  <li class="active">
+
+		<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="">
 	    <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>
@@ -41,7 +51,32 @@
 	</ul>
 
 	<div class="tab-content">
-	  <div class="tab-pane active" id="technical_details">
+
+		<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">
 	    
 	    <%= clear_tag(20) %>
 
@@ -60,13 +95,12 @@
 
 					</tbody>
 				</table>
-				
 			</div>
-
 	  </div>
+
 	</div>
 
-	<%= link_to "Close", "#", onclick: "closeGenericModal();", class: "btn btn-primary pull-right" %>
+	<%= link_to "Close", "#", onclick: "closeLargeModal();", class: "btn btn-primary pull-right" %>
 
 	<%= clear_tag %>
 </div>

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

@@ -9,10 +9,29 @@
 
         <div id="div_role_action_buttons">
           <div class="row">
-            <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 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>
-            <div class="col-md-8">
+            <div class="col-md-6">
               <%= search_form_kuppayam(Role, admin_roles_path, text: @filters[:query]) %>
             </div>
           </div>

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

@@ -0,0 +1,24 @@
+<%= form_for([:admin, @role, @user], :html => {:id=>"form_user", :class=>"mb-0 form-horizontal", :user => "form", :method => (@user.new_record? ? :post : :put), :remote=>true}) do |f| %>
+
+      <div id="user_form_error">
+        <%= @user.errors[:base].to_sentence %>
+      </div>
+
+      <div class="form-inputs mb-30 mt-30">
+        <% options = {assoc_collection: User.approved.normal_users.select("id, name").order("name ASC").all, required: false, editable: true, assoc_display_method: :name} %>
+        <%= theme_form_assoc_group(@user, :id, label: "Select User", **options) %>
+      </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" %>
+        
+      </div>
+      <%= clear_tag(10) %>
+
+  </div>
+
+<% end %>
+

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

@@ -0,0 +1,59 @@
+<div class="table-responsive"> 
+	<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>Name</th>
+				<th>Roles</th>
+				<th style="text-align: center;" colspan="2">Actions</th>
+			</tr>  
+		</thead>
+		
+	  <tbody>
+	  	<% @users.each_with_index do |user, i| %>
+	  			
+	  		<% delete_link = admin_role_user_path(@role, user) %>
+				
+		    <tr id="tr_user_<%= user.id %>">
+		      
+		      <th scope="row" style="text-align: center;">
+						<% if i < 0 %>
+							<i class="fa fa-check text-success"></i>
+						<% else %>
+							<%= i + 1 + (@per_page.to_i * (@current_page.to_i - 1)) %>
+						<% end %>
+					</th>
+
+					<td class="user-image">
+		        <%= link_to(admin_user_path(user), remote: true) do %>
+		        	<%= display_image(user, "profile_picture.image.small.url", width: "120", height: "auto", class: "img-rectangle", alt: user.display_name) %>
+		        <% end %>
+		      </td>
+
+					<td class="user-name"><%= user.display_name %></td>
+
+		      <td class="user-name">
+		      	<% user.roles.collect(&:name).each do |r| %>
+		      		<span class="ml-5 label label-primary"><%= r %></span>
+		      	<% end %>
+		      </td>
+
+		      <td class="action-links" style="width:10%">
+
+		      	<%= link_to raw("<i class=\"linecons-trash\"></i> Remove Role"), delete_link, method: :delete, user: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "delete" %>
+
+		      </td>
+
+		    </tr>
+		  <% end %>
+	  </tbody>
+	</table>
+</div>
+
+<div class="row">
+  <div class="col-sm-12">
+    <%= paginate_kuppayam(@users) %>
+  </div>
+</div>
+

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

@@ -0,0 +1,30 @@
+<% edit_link = edit_admin_role_user_path(@role, user) %>
+<% delete_link = admin_role_user_path(@role, user) %>
+
+<tr id="tr_user_<%= user.id %>">
+
+  <th scope="row" style="text-align: center;">
+    <% if i < 0 %>
+      <i class="fa fa-check text-success"></i>
+    <% else %>
+      <%= i + 1 + (@per_page.to_i * (@current_page.to_i - 1)) %>
+    <% end %>
+  </th>
+
+  <td class="user-image">
+    <%= link_to(admin_user_path(user), remote: true) do %>
+      <%= display_image(user, "profile_picture.image.small.url", width: "120", height: "auto", class: "img-rectangle", alt: user.display_name) %>
+    <% end %>
+  </td>
+
+  <td class="user-name"><%= user.display_name %></td>
+
+  <td class="user-name"><%= user.roles.collect(&:name) %></td>
+
+  <td class="action-links" style="width:10%">
+
+    <%= link_to raw("<i class=\"linecons-trash\"></i> Remove Role"), delete_link, method: :delete, user: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "delete" %>
+
+  </td>
+
+</tr>

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

@@ -0,0 +1,74 @@
+<div id="div_user_show">
+	
+	<div class="row">
+
+	  <div class="col-md-9 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
+
+	  	<div class="visible-sm visible-xs mt-50"></div>
+
+	  	<%= theme_panel_heading(@user.display_name) %>
+	  	<%= theme_panel_sub_heading(@user.code, "#") %>
+	  	<%= theme_panel_description(@user.role.name) if @user.role %>
+
+	    <%= clear_tag(10) %>
+
+	   	<div class="visible-sm visible-xs mb-50"></div>
+
+	    </div>
+
+	  <div class="col-md-3 col-sm-12 col-xs-12">
+
+	  	<% edit_link = edit_admin_role_user_path(@user.role, @user) %>
+			<% delete_link = admin_role_user_path(@user.role, @user) %>
+
+			<%= link_to raw("<i class=\"linecons-pencil\"></i> Edit"), edit_link, :remote=>true, class: "btn btn-block btn-success" if @user.can_be_edited? %>
+
+	    <%= link_to raw("<i class=\"linecons-trash\"></i> Delete"), delete_link, method: :delete, user: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "btn btn-block btn-danger btn-only-hover" if @user.can_be_deleted? %>
+
+	    <div class="visible-sm visible-xs mb-50"></div>
+
+	  </div>
+
+	</div>
+
+	<%= clear_tag(50) %>
+
+	<ul class="nav nav-pills">
+	  <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>
+	    </a>
+	  </li>
+	</ul>
+
+	<div class="tab-content">
+	  <div class="tab-pane active" id="technical_details">
+	    
+	    <%= clear_tag(20) %>
+
+	    <div class="table-responsive"> 
+				<table class="table table-striped table-condensed table-bordered mb-30"> 
+					<tbody>
+						
+						<tr>
+							<th>ID</th><td colspan="3"><%= @user.id %></td>
+						</tr>
+						
+						<tr>
+							<th>Created At</th><td><%= @user.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @user.created_at %></td>
+							<th>Updated At</th><td><%= @user.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @user.updated_at %></td>
+						</tr>
+
+					</tbody>
+				</table>
+				
+			</div>
+
+	  </div>
+	</div>
+
+	<%= link_to "Close", "#", onclick: "closeGenericModal();", class: "btn btn-primary pull-right" %>
+
+	<%= clear_tag %>
+</div>

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

@@ -2,14 +2,12 @@
 	<table class="table table-hover members-table middle-align">
 	  <thead> 
 			<tr> 
-				<th style="text-align: center;width:10px">#</th> 
-				<th style="text-align: center;width:30px">Image</th> 
+				<th style="text-align: center;width:60px">#</th> 
+				<th style="text-align: center;width:100px"><i class="fa fa-photo"></i></th> 
 				<th>Name</th>
 				<th class="hidden-xs hidden-sm">Username</th>
 				<th class="hidden-xs hidden-sm">Email</th>
-				<% if @current_user.is_super_admin? %>
-					<th class="hidden-xs hidden-sm">Role</th>
-				<% end %>
+				<th class="hidden-xs hidden-sm">Roles</th>
 				<th>Status</th>
 				<th style="text-align: center;" colspan="2">Actions</th>
 			</tr> 
@@ -47,13 +45,21 @@
 					<td class="hidden-xs hidden-sm"><%= link_to user.email, admin_user_path(user), remote: true, class: "email" %></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>
+						<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>
 					<% end %>
 
 					<td>
@@ -77,13 +83,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? %>
+				    <%= 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) %>
 
 				    <!-- 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? %>
+				    <%= 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) %>
 				      
 				    <!-- 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? %>
+				    <%= 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) %>
 
 		      </td>
 

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

@@ -58,13 +58,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? %>
+    <%= 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) %>
 
     <!-- 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? %>
+    <%= 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) %>
       
     <!-- 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? %>
+    <%= 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) %>
 
   </td>
   

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

@@ -61,7 +61,7 @@
 	    <% end %>
 
 	    <!-- 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", :class=>"btn btn-block btn-success btn-only-hover" if @user.can_be_approved? %>
+	    <%= 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", :class=>"btn btn-block btn-success btn-only-hover" if @user.can_be_approved? && (@current_user != @user) %>
 
 	    <!-- 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", :class=>"btn btn-block btn-gray btn-only-hover" if @user.can_be_marked_as_pending? && (@current_user != @user) %>

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

@@ -30,8 +30,10 @@
 
               <%= theme_button('Refresh', 'refresh', admin_users_path(), classes: "pull-left ml-10", btn_type: "white") %>
 
+              <%= theme_button('Manage Roles', 'nothing linecons-graduation-cap', admin_roles_path(), classes: "pull-left ml-10", btn_type: "white", remote: false) %>
+
               <!-- Single button -->
-              <div class="ml-10 btn-group">
+              <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>

data/app/views/usman/sessions/_form.html.erb

@@ -1,10 +1,22 @@
-<%= form_tag create_session_path, :role=>"form", id: "form_sign_in", class: "login-form fade-in-effect" do %>
+<%= form_tag usman.create_session_path, :role=>"form", id: "form_sign_in", class: "login-form" do %>
   
-  <%= hidden_field_tag :customer_app, params[:customer_app] if params[:customer_app] %>
-
-  <%= hidden_field_tag :redirect_back_url, params[:redirect_back_url] if params[:redirect_back_url] %>
-
-  <%= hidden_field_tag :requested_url, params[:requested_url] if params[:requested_url] %>  
+  <% if params[:customer_app] %>
+    <%= hidden_field_tag :customer_app, params[:customer_app] %>
+  <% elsif @params_hsh && @params_hsh[:customer_app] %>
+    <%= hidden_field_tag :customer_app, @params_hsh[:customer_app] %>
+  <% end %>
+
+  <% if params[:redirect_back_url] %>
+    <%= hidden_field_tag :redirect_back_url, params[:redirect_back_url] %>
+  <% elsif @params_hsh && @params_hsh[:redirect_back_url] %>
+    <%= hidden_field_tag :redirect_back_url, @params_hsh[:redirect_back_url] %>
+  <% end %>
+
+  <% if params[:requested_url] %>
+    <%= hidden_field_tag :requested_url, params[:requested_url] %>
+  <% elsif @params_hsh && @params_hsh[:requested_url] %>
+    <%= hidden_field_tag :requested_url, @params_hsh[:requested_url] %>
+  <% end %>
 
   <div class="row pt-10">
     <div class="col-sm-offset-3 col-sm-4">

data/config/locales/kuppayam/authentication.en.yml

@@ -21,5 +21,5 @@ en:
     logged_out:
         heading: "Signed Out"
         message: "You have successfully signed out"
-    masquerade: "لقد سجلت الدخول بنجاح - %{user}"
+    masquerade: "You have successfully logged in as - %{user}"
     sign_in_back: "You have successfully signed in back as %{user}"

data/config/routes.rb

@@ -24,7 +24,9 @@ Usman::Engine.routes.draw do
       end
     end
 
-    resources :roles
+    resources :roles do
+      resources :users, :controller => "user_roles"
+    end
 
     resources :features do
       member do