usman 0.1.0 → 0.1.1

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

@@ -0,0 +1,24 @@
+<% edit_link = edit_admin_role_path(id: role.id) %>
+<% delete_link = admin_role_path(id: role.id) %>
+
+<tr id="tr_role_<%= role.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="role-name"><%= link_to role.name, admin_role_path(role), remote: true %></td>
+
+  <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-trash\"></i> Delete"), delete_link, method: :delete, role: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "delete" %>
+
+  </td>
+
+</tr>

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

@@ -0,0 +1,72 @@
+<div id="div_role_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(@role.name) %>
+
+	    <%= 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_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-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>
+
+	  </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"><%= @role.id %></td>
+						</tr>
+						
+						<tr>
+							<th>Created At</th><td><%= @role.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @role.created_at %></td>
+							<th>Updated At</th><td><%= @role.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @role.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/roles/index.html.erb

@@ -0,0 +1,32 @@
+<div class="row">
+      
+  <div class="col-md-12">
+    
+    <ul class="nav nav-tabs">
+    </ul>
+    <div class="tab-content">
+      <div class="tab-pane active">
+
+        <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>
+            <div class="col-md-8">
+              <%= search_form_kuppayam(Role, admin_roles_path, text: @filters[:query]) %>
+            </div>
+          </div>
+        </div>
+        <%= clear_tag(10) %>
+
+        <div id="div_role_index">
+          <%= render :partial=>"usman/admin/roles/index" %>
+        </div>
+        <%= clear_tag(10) %>
+
+      </div>
+    </div>
+
+  </div>
+
+</div>

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

@@ -26,8 +26,11 @@
       </div>
     
       <div>
-        <%= link_to raw("<i class='fa fa-close mr-5'></i><span>Cancel</span>"), "#", onclick: "closeLargeModal();", 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: "closeLargeModal();", class: "pull-right ml-10 btn btn-white" %>
+        
       </div>
       <%= clear_tag(10) %>
   </div>

data/app/views/usman/admin/users/_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: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>
@@ -25,25 +26,25 @@
 		        <input type="checkbox" class="cbr" name="users[]" value="1" checked />
 		      </td> -->
 
-		    	<!-- <th scope="row" style="text-align: center;">
-						<%# if i < 0 %>
+		    	<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> -->
+						<% else %>
+							<%= i + 1 + (@per_page.to_i * (@current_page.to_i - 1)) %>
+						<% end %>
+					</th>
 
 					<td class="user-image">
-		        <a href="#">
-		        	<%= display_image(user, "profile_picture.image.small.url", width: "32", height: "auto", class: "img-circle", alt: user.display_name) %>
-		        </a>
+		        <%= 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"><%= link_to user.name, admin_user_path(user), remote: true %></td>
 
-					<td class="hidden-xs hidden-sm"><%= link_to user.username, "#" %></td>
+					<td class="hidden-xs hidden-sm"><%= link_to user.username, admin_user_path(user), remote: true %></td>
 
-					<td class="hidden-xs hidden-sm"><%= link_to user.email, "#", class: "email" %></td>
+					<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">
@@ -67,42 +68,22 @@
 
 					<td class="action-links" style="width:15%">
 
-		      	<%= link_to raw("<i class=\"linecons-pencil\"></i> Edit User"), 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 != user %>
+		      	<%= link_to raw("<i class=\"linecons-pencil\"></i> Edit User"), edit_link, :remote=>true, class: "edit" if user.can_be_edited? %>
 
-		        <% if @current_user.super_admin? %>
-					    <%= link_to raw("<i class=\"linecons-paper-plane\"></i> Masquerade"), masquerade_admin_user_path(user), method: :put, data: { confirm: "Are you sure? Do you really want to logout current session and login as #{user.name}?" } %>
-					  <% end %>
+		        <%= 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 user.can_be_deleted? && (@current_user != user) %>
 		        
 		      </td>
 
 		      <td class="action-links" style="width:15%">
 
-		      	<% if @current_user.super_admin? %>
-			        <% if user.super_admin? %>
-			          <!-- Remove Super Admin -->
-			          <%= link_to raw("<i class=\"fa fa-remove mr-5\"></i> Remove Super Admin"), remove_super_admin_admin_user_path(id: user.id), method: :put, :remote=>true, role: "menuitem", tabindex: "-1" %>
-			        <% else %>
-			          <!-- Make Super Admin -->
-			          <%= link_to raw("<i class=\"fa fa-plus-square mr-5\"></i> Make Super Admin"), make_super_admin_admin_user_path(id: user.id), method: :put, remote: true, role: "menuitem", tabindex: "-1" %>
-			        <% end %>
-			      <% 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" if user.can_be_approved? %>
 
-			      <% case user.status %>
-			      <% when "approved" %>
-		        	<!-- 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=>"user_status" %>
-		        	
-		        	<!-- 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", :class=>"user_status" %>
-			      <% when "pending" %>
-		        	<!-- 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=>"user_status" %>
-			      <% when "suspended" %>
-		        	<!-- 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=>"user_status" %>
-			      <% end %>
+				    <!-- 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? %>
+				      
+				    <!-- 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? %>
 
 		      </td>
 

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

@@ -7,25 +7,25 @@
     <input type="checkbox" class="cbr" name="users[]" value="1" checked />
   </td> -->
 
-  <!-- <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> -->
+  <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 hidden-xs hidden-sm">
-    <a href="#">
-    	<%= display_image(user, "profile_picture.image.small.url", width: "32", height: "auto", class: "img-circle", alt: user.display_name) %>
-    </a>
+    <%= 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"><%= link_to user.name, admin_user_path(user), remote: true %></td>
 
-  <td class="hidden-xs hidden-sm"><%= link_to user.username, "#" %></td>
+  <td class="hidden-xs hidden-sm"><%= link_to user.username, admin_user_path(user), remote: true %></td>
 
-  <td class="hidden-xs hidden-sm"><%= link_to user.email, "#", class: "email" %></td>
+  <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">
@@ -49,42 +49,22 @@
 
   <td class="action-links" style="width:15%">
 
-  	<%= link_to raw("<i class=\"linecons-pencil\"></i> Edit User"), 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 != user %>
+  	<%= link_to raw("<i class=\"linecons-pencil\"></i> Edit User"), edit_link, :remote=>true, class: "edit" if @user.can_be_edited? %>
 
-    <% if @current_user.super_admin? %>
-      <%= link_to raw("<i class=\"linecons-paper-plane\"></i> Masquerade"), masquerade_admin_user_path(user), method: :put, data: { confirm: "Are you sure? Do you really want to logout current session and login as #{user.name}?" } %>
-    <% end %>
+    <%= 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 @user.can_be_deleted? && (@current_user != user) %>
     
   </td>
 
   <td class="action-links" style="width:15%">
 
-  	<% if @current_user.super_admin? %>
-      <% if user.super_admin? %>
-        <!-- Remove Super Admin -->
-        <%= link_to raw("<i class=\"fa fa-remove mr-5\"></i> Remove Super Admin"), remove_super_admin_admin_user_path(id: user.id), method: :put, :remote=>true, role: "menuitem", tabindex: "-1" %>
-      <% else %>
-        <!-- Make Super Admin -->
-        <%= link_to raw("<i class=\"fa fa-plus-square mr-5\"></i> Make Super Admin"), make_super_admin_admin_user_path(id: user.id), method: :put, remote: true, role: "menuitem", tabindex: "-1" %>
-      <% end %>
-    <% 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" if user.can_be_approved? %>
 
-    <% case user.status %>
-    <% when "approved" %>
-    	<!-- 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=>"user_status" %>
-    	
-    	<!-- 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", :class=>"user_status" %>
-    <% when "pending" %>
-    	<!-- 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=>"user_status" %>
-    <% when "suspended" %>
-    	<!-- 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=>"user_status" %>
-    <% end %>
+    <!-- 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? %>
+      
+    <!-- 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? %>
 
   </td>