usman 0.1.0 → 0.1.1

data/app/models/role.rb

@@ -0,0 +1,62 @@
+class Role < Usman::ApplicationRecord
+  
+  require 'import_error_handler.rb'
+  extend Usman::ImportErrorHandler
+  
+  # Associations
+  has_and_belongs_to_many :users
+
+	# Validations
+	validates :name, presence: true
+	
+  # ------------------
+  # Class Methods
+  # ------------------
+
+  # return an active record relation object with the search query in its where clause
+  # Return the ActiveRecord::Relation object
+  # == Examples
+  #   >>> role.search(query)
+  #   => ActiveRecord::Relation object
+  scope :search, lambda {|query| where("LOWER(name) LIKE LOWER('%#{query}%')")
+                        }
+
+  def self.save_row_data(row, base_path)
+
+    row.headers.each{ |cell| row[cell] = row[cell].to_s.strip }
+
+    return if row[:name].blank?
+
+    role = Role.find_by_name(row[:name]) || Role.new
+    role.name = row[:name]
+    
+    # Initializing error hash for displaying all errors altogether
+    error_object = Usman::ErrorHash.new
+
+    if role.valid?
+      role.save!
+    else
+      summary = "Error while saving role: #{role.name}"
+      details = "Error! #{role.errors.full_messages.to_sentence}"
+      error_object.errors << { summary: summary, details: details }
+    end
+    return error_object
+  end
+
+  # * Return full name
+  # == Examples
+  #   >>> role.display_name
+  #   => "Products"
+  def display_name
+    "#{name}"
+  end
+
+  def can_be_edited?
+    true
+  end
+
+  def can_be_deleted?
+    self.users.count > 0 ? false : true
+  end
+	
+end

data/app/models/user.rb

@@ -1,5 +1,7 @@
-class User < ActiveRecord::Base
+class User < Usman::ApplicationRecord
 
+  require 'import_error_handler.rb'
+  extend Usman::ImportErrorHandler
   extend KuppayamValidators
   
   # including Password Methods
@@ -27,7 +29,7 @@ class User < ActiveRecord::Base
   SESSION_TIME_OUT = 30.minutes
 
   # Validations
-  validate_string :name, mandatory: true
+  validates :name, presence: true
   validate_username :username
   validate_email :email
   validate_password :password, condition_method: :should_validate_password?
@@ -41,6 +43,7 @@ class User < ActiveRecord::Base
   has_one :profile_picture, :as => :imageable, :dependent => :destroy, :class_name => "Image::ProfilePicture"
   has_many :permissions
   has_many :features, through: :permissions
+  has_and_belongs_to_many :users
 
   
   # ------------------
@@ -68,6 +71,67 @@ class User < ActiveRecord::Base
   scope :approved, -> { where(status: APPROVED) }
   scope :suspended, -> { where(status: SUSPENDED) }
 
+  def self.save_row_data(row, base_path)
+
+    image_base_path = base_path + "images/"
+
+    row.headers.each{ |cell| row[cell] = row[cell].to_s.strip }
+
+    return if row[:name].blank?
+
+    user = User.find_by_username(row[:username]) || User.new
+    user.name = row[:name]
+    user.username = row[:username]
+    user.designation = row[:designation]
+    user.email = row[:email]
+    user.phone = row[:phone]
+
+    user.super_admin = ["true", "t","1","yes","y"].include?(row[:super_admin].to_s.downcase.strip)
+
+    user.status = row[:status]
+    user.assign_default_password
+
+    # Initializing error hash for displaying all errors altogether
+    error_object = Usman::ErrorHash.new
+
+    if user.valid?
+      user.save!
+    else
+      summary = "Error while saving user: #{user.name}"
+      details = "Error! #{user.errors.full_messages.to_sentence}"
+      error_object.errors << { summary: summary, details: details }
+    end
+
+    ## Adding a profile picture
+    begin
+      image_path = image_base_path + "users/#{user.username}.png"
+      image_path = image_base_path + "users/#{user.username}.jpg" unless File.exists?(image_path)
+      if File.exists?(image_path)
+        user.build_profile_picture
+        user.profile_picture.image = File.open(image_path)
+        if user.profile_picture.valid?
+          user.profile_picture.save
+        else
+          summary = "Error while saving user: #{user.name}"
+          details = "Error! #{user.errors.full_messages.to_sentence}"
+          details << ", #{user.profile_picture.errors.full_messages.to_sentence}" if user.profile_picture
+          error_object.errors << { summary: summary, details: details }
+        end
+      else
+        summary = "Profile Picture not found for user: #{user.name}"
+        details = "#{image_path}/png doesn't exists"
+        error_object.warnings << { summary: summary, details: details }
+      end
+    rescue => e
+      summary = "Error during processing: #{$!}"
+      details = "User: #{user.name}, Image Path: #{image_path}"
+      stack_trace = "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
+      error_object.errors << { summary: summary, details: details, stack_trace: stack_trace }
+    end if user.profile_picture.blank?
+
+    return error_object
+  end
+
   # ------------------
   # Instance variables
   # ------------------
@@ -155,6 +219,14 @@ class User < ActiveRecord::Base
     self.update_attributes auth_token: SecureRandom.hex, token_created_at: nil
   end
 
+  def update_token
+    self.update_attribute(:token_created_at, Time.now)
+  end
+
+  def token_about_to_expire?
+    return self.token_created_at.nil? || (Time.now > self.token_created_at + (SESSION_TIME_OUT - 1.minute))
+  end
+
   def assign_default_password
     self.password = DEFAULT_PASSWORD
     self.password_confirmation = DEFAULT_PASSWORD
@@ -216,10 +288,26 @@ class User < ActiveRecord::Base
     permission && permission.can_delete?
   end
 
-  def can_be_destroyed?
+  def can_be_approved?
+    pending? or suspended?
+  end
+
+  def can_be_marked_as_pending?
+    approved? or suspended?
+  end
+
+  def can_be_suspended?
+    approved? or pending?
+  end
+
+  def can_be_deleted?
     return true
   end
 
+  def can_be_edited?
+    !suspended?
+  end
+
   private
 
   def should_validate_password?
@@ -244,4 +332,25 @@ class User < ActiveRecord::Base
     return feature
   end
 
+  def get_role(role_name)
+    self.roles.find_by_id(role_name) || self.roles.find_by_name(role_name)
+  end
+
+  def add_role(role_name)
+    role = self.get_role(role_name)
+    self.roles << role if role && role.persists?
+  end
+
+  def remove_role(role_name)
+    role = self.get_role(role_name)
+    if role
+      self.roles.delete(role)
+    end
+  end
+
+  def has_role?(role_name)
+    role = self.get_role(role_name)
+    role && role.persists?
+  end
+
 end

data/app/models/usman/application_record.rb

@@ -1,5 +1,5 @@
 module Usman
   class ApplicationRecord < ActiveRecord::Base
-    self.abstract_class = true
-  end
+	  self.abstract_class = true
+	end
 end

data/app/views/layouts/kuppayam/_sidebar.html.erb

@@ -38,7 +38,7 @@
 			<!-- class "auto-inherit-active-class" will automatically add "active" class for parent elements who are marked already with class "active" -->
 			
 			<li class="<%= nav_active?('admin/dashboard') ? 'active' : ''  %>">
-				<%= link_to raw("<i class=\"linecons-desktop\"></i> <span class='title'>Dashboard</span>"), admin_dashboard_url %>
+				<%= link_to raw("<i class=\"linecons-desktop\"></i> <span class='title'>Dashboard</span>"), usman.admin_dashboard_url %>
 			</li>
 
 			<li class="<%= nav_active?('admin/users') ? 'active' : ''  %>">
@@ -50,11 +50,11 @@
 
 				<ul>
 					<li class="<%= nav_class("admin/users") %>">
-				    <%= link_to raw("<i class=\"linecons-user\"></i> <span class='title'>Manage Users</span>"), admin_users_url %>
+				    <%= link_to raw("<i class=\"linecons-user\"></i> <span class='title'>Manage Users</span>"), usman.admin_users_url %>
 				  </li>
 					
 					<li class="<%= nav_class("admin/users") %>">
-						<%= link_to raw("<i class=\"linecons-lock\"></i> <span class='title'>Manage Permissions</span>"), admin_permissions_url %>
+						<%= link_to raw("<i class=\"linecons-lock\"></i> <span class='title'>Manage Permissions</span>"), usman.admin_permissions_url %>
 					</li>
 				</ul>
 
@@ -67,7 +67,11 @@
 				</a>
 				<ul>
 					<li class="">
-						<%= link_to raw("<i class=\"linecons-diamond\"></i> <span class='title'>Manage Features</span>"), admin_features_url %>
+						<%= link_to raw("<i class=\"linecons-diamond\"></i> <span class='title'>Manage Features</span>"), usman.admin_features_url %>
+					</li>
+
+					<li class="">
+						<%= link_to raw("<i class=\"linecons-diamond\"></i> <span class='title'>Manage Roles</span>"), usman.admin_roles_url %>
 					</li>
 				</ul>
 			</li>

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

@@ -18,7 +18,7 @@
 				<i class="linecons-lightbulb"></i>
 			</div>
 			<div class="xe-label">
-				<strong class="num"><%= time_ago_in_words(Dummy::BOOTED_AT) %></strong>
+				<strong class="num">2 Hours Ago</strong>
 				<span>Server Up Since</span>
 			</div>
 		</div>

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

@@ -1,11 +0,0 @@
-<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>
-	<div class="col-md-8">
-		<%= search_form_kuppayam(Feature, admin_features_path, text: @filters[:query]) %>
-	</div>
-</div>
-
-
-

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

@@ -17,9 +17,9 @@
 		    <tr id="tr_feature_<%= feature.id %>">
 		      
 		      <td class="feature-image">
-		        <a href="#">
-		        	<%= display_image(feature, "profile_picture.image.small.url", width: "32", height: "auto", class: "img-circle", alt: feature.display_name) %>
-		        </a>
+		        <%= 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) %>
+		        <% end %>
 		      </td>
 
 					<td class="feature-name"><%= link_to feature.name, admin_feature_path(feature), remote: true %></td>

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

@@ -4,9 +4,9 @@
 <tr id="tr_feature_<%= feature.id %>">
 
   <td class="feature-image">
-    <a href="#">
-      <%= display_image(feature, "profile_picture.image.small.url", width: "32", height: "auto", class: "img-circle", alt: feature.display_name) %>
-    </a>
+    <%= 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) %>
+    <% end %>
   </td>
 
   <td class="feature-name"><%= link_to feature.name, admin_feature_path(feature), remote: true %></td>

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

@@ -3,7 +3,11 @@
 <div class="media <%= status_hash[@feature.status.to_sym] %>">
 
   <div class="pull-left pt-10 pr-10 pb-10" style="width:30%;">
-  	<%= edit_image(@feature, "feature_image.image.large.url", upload_image_link(@feature, :feature_image)) %>
+  	<%= edit_image(@feature, 
+	                  "feature_image.image.large.url",
+	                  upload_image_link(@feature, :feature_image, nil ),
+	                  remove_image_link(@feature, :feature_image, nil ),
+	                  image_options: {assoc_name: :feature_image }) %>
   </div>
 
   <div class="pull-left ml-10" style="width:65%;">

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

@@ -8,7 +8,14 @@
       <div class="tab-pane active">
 
         <div id="div_feature_action_buttons">
-          <%= render :partial=>"usman/admin/features/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>
+            <div class="col-md-8">
+              <%= search_form_kuppayam(Feature, admin_features_path, text: @filters[:query]) %>
+            </div>
+          </div>
         </div>
         <%= clear_tag(10) %>
 

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/{index.js.erb → temp/index.js.erb}

@@ -3,6 +3,6 @@ closeGenericModal();
   // 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('forms.no_results')))%>";
+	var noResultsText = "<%= escape_javascript(theme_panel_message(I18n.translate('success.no_results_found')))%>";
   $('#div_feature_index').html(noResultsText);
 <% end %>

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

@@ -1,11 +0,0 @@
-<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>
-	<div class="col-md-8">
-		<%= search_form_kuppayam(Permission, admin_permissions_path, text: @filters[:query]) %>
-	</div>
-</div>
-
-
-

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

@@ -8,7 +8,14 @@
       <div class="tab-pane active">
 
       <div id="div_permission_action_buttons">
-          <%= render :partial=>"usman/admin/permissions/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>
+            <div class="col-md-8">
+              <%= search_form_kuppayam(Permission, admin_permissions_path, text: @filters[:query]) %>
+            </div>
+          </div>
         </div>
         <%= clear_tag(10) %>
 

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/{index.js.erb → temp/index.js.erb}

@@ -1,8 +1,14 @@
-closeGenericModal();
+// Close Modal if it is opened
+closeLargeModal();
+
 <% if @permissions.any? %>
-  // Fill the right box with first enquiry details in the list
+  
+  // 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('forms.no_results')))%>";
+
+	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

@@ -0,0 +1,23 @@
+<%= form_for([:admin, @role], :html => {:id=>"form_role", :class=>"mb-0 form-horizontal", :role => "form", :method => (@role.new_record? ? :post : :put), :remote=>true}) do |f| %>
+
+      <div id="role_form_error">
+        <%= @role.errors[:base].to_sentence %>
+      </div>
+
+      <div class="form-inputs mb-30 mt-30">
+        <%= theme_form_field(@role, :name) %>
+      </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/roles/_index.html.erb

@@ -0,0 +1,48 @@
+<div class="table-responsive"> 
+	<table class="table table-hover members-table middle-align">
+	  <thead> 
+			<tr> 
+				<th style="text-align: center;width:20px">#</th> 
+				<th>Name</th>
+				<th style="text-align: center;">Actions</th>
+			</tr> 
+		</thead>
+		
+	  <tbody>
+	  	<% @roles.each_with_index do |role, i| %>
+	  		
+	  		<% 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>
+		  <% end %>
+	  </tbody>
+	</table>
+</div>
+
+<div class="row">
+  <div class="col-sm-12">
+    <%= paginate_kuppayam(@roles) %>
+  </div>
+</div>
+