usman 0.1.5dev4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 908dce0296be6976f2db177e9586962af623052d
-  data.tar.gz: b5b7162ad3de55dc217bdb1057d27c2a87b0ca9d
+  metadata.gz: a630b45bb4de548d1b215cce4650ee42985682a1
+  data.tar.gz: b634c8f8410fc48d28e622f823efdfb546f86b15
 SHA512:
-  metadata.gz: f27ef6f08daeeade4c7d67e6f4408f9cd78cb275c4590388258f26eec4e0e0c7316f9a5c09b7aa3cb5d5c34b5518a296af2591813033989f2832350e1af9d5b7
-  data.tar.gz: a7e54900294fd49152a56307ad33725837f39b9ed1794ac747036650df08621ae3e7012d0eb310df8e4493e029c33d3ab197e51279613e60319eea2cc74de15f
+  metadata.gz: 190ac35f562e78b71ed702b800c543a307155fd558d0014b5ad38480335d799f305e0fdd12a35b3bcac7c03160222b0c590226c2859eea8af9ac69a1c7169bbc
+  data.tar.gz: e018c0a66b0b40fe71e42d9251cfa3017aef88584460b39b5ba9f61886d4f1f1ad57f91ce1205c8da83bedc12e9dfa585e39b8a38d17a992d2316d4cfc34e047

data/app/controllers/usman/admin/dashboard_controller.rb

@@ -10,7 +10,7 @@ module Usman
 
 	    def breadcrumbs_configuration
 	      {
-	        heading: "User Dashboard",
+	        heading: "Usman Dashboard",
 	        description: "A Quick view of users and roles",
 	        links: [{name: "Dashboard", link: admin_dashboard_path, icon: 'fa-dashboard'}]
 	      }

data/app/controllers/usman/admin/features_controller.rb

@@ -54,8 +54,6 @@ module Usman
 
       def resource_controller_configuration
         {
-          page_title: "Features",
-          js_view_path: "/kuppayam/workflows/parrot",
           view_path: "/usman/admin/features"
         }
       end

data/app/controllers/usman/admin/permissions_controller.rb

@@ -2,20 +2,29 @@ module Usman
   module Admin
     class PermissionsController < ResourceController
 
+      def index
+        @heading = "Manage Permissions"
+        @description = "Listing all permissions"
+        @links = [{name: "Dashboard", link: admin_dashboard_path, icon: 'fa-home'}, 
+                  {name: "Manage Permissions", link: admin_permissions_path, icon: 'fa-user', active: true}]
+        super
+      end
+
       def create
-        @permission = @r_object = Permission.where(" user_id = ? AND feature_id = ? ", permitted_params[:user_id], permitted_params[:feature_id]).first || Permission.new
+        @permission = Permission.where(" user_id = ? AND feature_id = ? ", permitted_params[:user_id], permitted_params[:feature_id]).first || Permission.new
         @permission.assign_attributes(permitted_params)
-        save_resource
+        save_resource(@permission)
+
         get_collections
       end
 
       def update
-        @permission = @r_object = Permission.find_by_id(params[:id])
+        @permission = Permission.find_by_id(params[:id])
         # The form will not submit can_create 0 if it is not selected
         # hence making it false by default and letting it update by itself.
         @permission.assign_attributes({"can_create": "0", "can_read": "0", "can_update": "0", "can_delete": "0"})
         @permission.assign_attributes(permitted_params)
-        save_resource
+        save_resource(@permission)
         get_collections
       end
 
@@ -27,7 +36,7 @@ module Usman
         parse_filters
         apply_filters
         
-        @permissions = @r_objects = @relation.includes(:user, :feature).page(@current_page).per(@per_page)
+        @permissions = @relation.includes(:user, :feature).page(@current_page).per(@per_page)
 
         return true
       end
@@ -56,9 +65,7 @@ module Usman
 
       def resource_controller_configuration
         {
-          page_title: "Permissions",
-          js_view_path: "/kuppayam/workflows/parrot",
-          view_path: "/usman/admin/permissions"
+          view_path: "/demo/permissions"
         }
       end
 

data/app/controllers/usman/admin/roles_controller.rb

@@ -18,7 +18,7 @@ module Usman
       def apply_filters
         @relation = @relation.search(@query) if @query
         
-        @order_by = "name ASC" unless @order_by
+        @order_by = "created_at desc" unless @order_by
         @relation = @relation.order(@order_by)
       end
 
@@ -39,8 +39,7 @@ module Usman
 
       def resource_controller_configuration
         {
-          page_title: "Roles",
-          js_view_path: "/kuppayam/workflows/peacock",
+          js_view_path: "/kuppayam/workflows/parrot",
           view_path: "/usman/admin/roles"
         }
       end

data/app/controllers/usman/admin/users_controller.rb

@@ -59,7 +59,7 @@ module Usman
         
         # Normal users should not be able to view super admins
         # He should not be seeing admins even while searching
-        if @current_user.super_admin?
+        if @current_user.is_super_admin?
           @relation = @relation.where("super_admin IS #{@super_admin.to_s.upcase}") if @super_admin.nil? == false && @query.nil?
         else
           @relation = @relation.where("super_admin IS FALSE")
@@ -104,9 +104,7 @@ module Usman
 
       def resource_controller_configuration
         {
-          page_title: "Users",
-          js_view_path: "/kuppayam/workflows/peacock",
-          view_path: "/usman/admin/users"
+          view_path: "usman/admin/users"
         }
       end
 

data/app/helpers/usman/authentication_helper.rb

@@ -10,14 +10,7 @@ module Usman
     
     # Returns the default URL to which the system should redirect the user after successful authentication
     def default_redirect_url_after_sign_in
-      main_app.user_landing_url
-      # if @current_user.has_role?("Admin")
-      #   main_app.admin_dashboard_url
-      # elsif @current_user.has_role?("Admin")
-      #   main_app.store_dashboard_url
-      # else
-      #   main_app.admin_dashboard_url
-      # end
+      usman.admin_dashboard_url    
     end
 
     # Returns the default URL to which the system should redirect the user after an unsuccessful attempt to authorise a resource/page
@@ -29,11 +22,11 @@ module Usman
     # This method should also handle the redirection if it has come through a client appliction for authentication
     # In that case, it should persist the params passed by the client application
     def redirect_after_unsuccessful_authentication
-      @params_hsh = {}
-      @params_hsh[:client_app] = params[:client_app] if params[:client_app]
-      @params_hsh[:redirect_back_url] = params[:redirect_back_url] if params[:redirect_back_url]
-      @params_hsh[:requested_url] = request.original_url if request.get?
-      redirect_to add_query_params(default_sign_in_url, @params_hsh)
+      params_hsh = {}
+      params_hsh[:client_app] = params[:client_app] if params[:client_app]
+      params_hsh[:redirect_back_url] = params[:redirect_back_url] if params[:redirect_back_url]
+      params_hsh[:requested_url] = request.original_url if request.get?
+      redirect_to add_query_params(default_sign_in_url, params_hsh)
       return
     end
 
@@ -56,11 +49,6 @@ module Usman
           redirect_after_unsuccessful_authentication
         }
         format.js {
-          @params_hsh = {}
-          @params_hsh[:client_app] = params[:client_app] if params[:client_app]
-          @params_hsh[:redirect_back_url] = params[:redirect_back_url] if params[:redirect_back_url]
-          @params_hsh[:requested_url] = request.original_url if request.get?
-          
           render(:partial => 'usman/sessions/sign_in.js.erb', :handlers => [:erb], :formats => [:js])
         }
       end
@@ -89,7 +77,7 @@ module Usman
           redirect_or_popup_to_default_sign_in_page
           return
         else
-          @current_user.update_token! if @current_user.token_about_to_expire?
+          @current_user.update_token if @current_user.token_about_to_expire?
         end
       else
         text = "#{I18n.t("authentication.permission_denied.heading")}: #{I18n.t("authentication.permission_denied.message")}"
@@ -102,7 +90,7 @@ module Usman
 
     # This method is usually used as a before filter from admin controllers to ensure that the logged in user is a super admin
     def require_super_admin
-      unless @current_user.super_admin?
+      unless @current_user.is_super_admin?
         text = "#{I18n.t("authentication.permission_denied.heading")}: #{I18n.t("authentication.permission_denied.message")}"
         set_flash_message(text, :error, false) if defined?(flash) && flash
 
@@ -130,6 +118,7 @@ module Usman
       session[:last_user_id] = current_user.id if current_user
       user.start_session
       session[:id] = user.id
+      default_redirect_url_after_sign_in
       redirect_to default_redirect_url_after_sign_in
     end
 

data/app/models/feature.rb

@@ -1,5 +1,8 @@
 class Feature < Usman::ApplicationRecord
   
+  require 'import_error_handler.rb'
+  extend Usman::ImportErrorHandler
+  
   # Constants
   UNPUBLISHED = "unpublished"
   PUBLISHED = "published"
@@ -23,7 +26,7 @@ class Feature < Usman::ApplicationRecord
   has_one :feature_image, :as => :imageable, :dependent => :destroy, :class_name => "Image::FeatureImage"
 
 	# Validations
-	validates :name, presence: true, length: {minimum: 3, maximum: 250}
+	validates :name, presence: true
 	validates :status, :presence => true, :inclusion => {:in => STATUS.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
 
   # ------------------
@@ -44,7 +47,9 @@ class Feature < Usman::ApplicationRecord
   scope :published, -> { where(status: PUBLISHED) }
   scope :disabled, -> { where(status: DISABLED) }
 
-  def self.save_row_data(row)
+  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 }
 
@@ -55,24 +60,45 @@ class Feature < Usman::ApplicationRecord
     feature.status = Feature::UNPUBLISHED
     
     # Initializing error hash for displaying all errors altogether
-    error_object = Kuppayam::Importer::ErrorHash.new
-
-    if feature.valid?
+    error_object = Usman::ErrorHash.new
+
+    ## Adding a profile picture
+    begin
+      image_path = image_base_path + "features/#{feature.name.parameterize}.png"
+      image_path = image_base_path + "features/#{feature.name.parameterize}}.jpg" unless File.exists?(image_path)
+      if File.exists?(image_path)
+        feature.build_feature_image
+        feature.feature_image.image = File.open(image_path)
+      else
+        summary = "Feature Image not found for feature: #{feature.name}"
+        details = "#{image_path}/png doesn't exists"
+        error_object.warnings << { summary: summary, details: details }
+      end
+    rescue => e
+      summary = "Error during processing: #{$!}"
+      details = "Feature: #{feature.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 feature.feature_image.blank?
+
+    if feature.valid? && (feature.feature_image.blank? || feature.feature_image.valid?)
       feature.save!
     else
       summary = "Error while saving feature: #{feature.name}"
       details = "Error! #{feature.errors.full_messages.to_sentence}"
+      details << ", #{feature.feature_image.errors.full_messages.to_sentence}" if feature.feature_image
       error_object.errors << { summary: summary, details: details }
     end
     return error_object
   end
 
-  # ------------------
-  # Instance Methods
-  # ------------------
-
-  # Status Methods
-  # --------------
+  # * Return full name
+  # == Examples
+  #   >>> feature.display_name
+  #   => "Products"
+  def display_name
+    "#{name}"
+  end
 
   # * Return true if the user is not published, else false.
   # == Examples
@@ -125,34 +151,8 @@ class Feature < Usman::ApplicationRecord
     self.update_attribute(:status, DISABLED)
   end
 
-  # Permission Methods
-  # ------------------
-
   def can_be_destroyed?
     return true
   end
-
-  def can_be_published?
-    unpublished? or disabled?
-  end
-
-  def can_be_unpublished?
-    published? or disabled?
-  end
-
-  def can_be_removed?
-    published? or unpublished? or disabled?
-  end
-
-  # Other Methods
-  # -------------
-
-  # * Return full name
-  # == Examples
-  #   >>> feature.display_name
-  #   => "Products"
-  def display_name
-    "#{name}"
-  end
 	
 end

data/app/models/permission.rb

@@ -1,6 +1,9 @@
 class Permission < Usman::ApplicationRecord
   
-  # Associations
+  require 'import_error_handler.rb'
+  extend Usman::ImportErrorHandler
+
+	# Associations
   belongs_to :user
   belongs_to :feature
 
@@ -27,14 +30,16 @@ class Permission < Usman::ApplicationRecord
                                         LOWER(f.name) LIKE LOWER('%#{query}%')")}
 
 
-  def self.save_row_data(row)
+  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[:user].blank? || row[:feature].blank?
 
     # Initializing error hash for displaying all errors altogether
-    error_object = Kuppayam::Importer::ErrorHash.new
+    error_object = Usman::ErrorHash.new
 
     user = User.find_by_username(row[:user])
     unless user

data/app/models/role.rb

@@ -1,5 +1,8 @@
 class Role < Usman::ApplicationRecord
   
+  require 'import_error_handler.rb'
+  extend Usman::ImportErrorHandler
+  
   # Associations
   has_and_belongs_to_many :users
 
@@ -15,10 +18,10 @@ class Role < Usman::ApplicationRecord
   # == Examples
   #   >>> role.search(query)
   #   => ActiveRecord::Relation object
-  scope :search, lambda {|query| where("LOWER(roles.name) LIKE LOWER('%#{query}%')")
+  scope :search, lambda {|query| where("LOWER(name) LIKE LOWER('%#{query}%')")
                         }
 
-  def self.save_row_data(row)
+  def self.save_row_data(row, base_path)
 
     row.headers.each{ |cell| row[cell] = row[cell].to_s.strip }
 
@@ -28,7 +31,7 @@ class Role < Usman::ApplicationRecord
     role.name = row[:name]
     
     # Initializing error hash for displaying all errors altogether
-    error_object = Kuppayam::Importer::ErrorHash.new
+    error_object = Usman::ErrorHash.new
 
     if role.valid?
       role.save!

data/app/models/user.rb

@@ -1,5 +1,9 @@
 class User < Usman::ApplicationRecord
 
+  require 'import_error_handler.rb'
+  extend Usman::ImportErrorHandler
+  extend KuppayamValidators
+  
   # including Password Methods
   has_secure_password
 
@@ -22,10 +26,10 @@ class User < Usman::ApplicationRecord
 
   EXCLUDED_JSON_ATTRIBUTES = [:confirmation_token, :password_digest, :reset_password_token, :unlock_token, :status, :reset_password_sent_at, :remember_created_at, :sign_in_count, :current_sign_in_at, :last_sign_in_at, :current_sign_in_ip, :last_sign_in_ip, :confirmed_at, :confirmation_sent_at, :unconfirmed_email, :failed_attempts, :locked_at, :created_at, :updated_at]
   DEFAULT_PASSWORD = "Password@1"
-  SESSION_TIME_OUT = 120.minutes
+  SESSION_TIME_OUT = 30.minutes
 
   # Validations
-  validates :name, presence: true, length: {minimum: 3, maximum: 250}
+  validates :name, presence: true
   validate_username :username
   validate_email :email
   validate_password :password, condition_method: :should_validate_password?
@@ -39,7 +43,7 @@ class User < Usman::ApplicationRecord
   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 :roles
+  has_and_belongs_to_many :users
 
   
   # ------------------
@@ -55,10 +59,10 @@ class User < Usman::ApplicationRecord
   # == Examples
   #   >>> user.search(query)
   #   => ActiveRecord::Relation object
-  scope :search, lambda {|query| where("LOWER(users.name) LIKE LOWER('%#{query}%') OR\
-                                        LOWER(users.username) LIKE LOWER('%#{query}%') OR\
-                                        LOWER(users.email) LIKE LOWER('%#{query}%') OR\
-                                        LOWER(users.designation) LIKE LOWER('%#{query}%')")
+  scope :search, lambda {|query| where("LOWER(name) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(username) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(email) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(designation) LIKE LOWER('%#{query}%')")
                         }
 
   scope :status, lambda { |status| where("LOWER(status)='#{status}'") }
@@ -66,11 +70,10 @@ class User < Usman::ApplicationRecord
   scope :pending, -> { where(status: PENDING) }
   scope :approved, -> { where(status: APPROVED) }
   scope :suspended, -> { where(status: SUSPENDED) }
-  
-  scope :super_admins, -> { where(super_admin: TRUE) }
-  scope :normal_users, -> { where(super_admin: FALSE) }
 
-  def self.save_row_data(row)
+  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 }
 
@@ -89,7 +92,7 @@ class User < Usman::ApplicationRecord
     user.assign_default_password
 
     # Initializing error hash for displaying all errors altogether
-    error_object = Kuppayam::Importer::ErrorHash.new
+    error_object = Usman::ErrorHash.new
 
     if user.valid?
       user.save!
@@ -99,15 +102,47 @@ class User < Usman::ApplicationRecord
       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
   # ------------------
-  
-  # Status Methods
-  # --------------
+
+  # * Return full name
+  # == Examples
+  #   >>> user.display_name
+  #   => "Joe Black"
+  def display_name
+    "#{name}"
+  end
 
   # * Return true if the user is not approved, else false.
   # == Examples
@@ -160,8 +195,9 @@ class User < Usman::ApplicationRecord
     self.update_attribute(:status, SUSPENDED)
   end
 
-  # Authentication Methods
-  # ----------------------
+  def is_super_admin?
+    super_admin
+  end
 
   def start_session
     # FIX ME - specs are not written to ensure that all these data are saved
@@ -179,19 +215,14 @@ class User < Usman::ApplicationRecord
 
   def end_session
     # Reseting the auth token for user when he logs out.
-    # Resetting the token_created_at to nil
     # (Time.now - 1.second)
     self.update_attributes auth_token: SecureRandom.hex, token_created_at: nil
   end
 
-  def update_token!
+  def update_token
     self.update_attribute(:token_created_at, Time.now)
   end
 
-  def expire_token!
-    self.update_attribute(:token_created_at, (Time.now - (SESSION_TIME_OUT + 1.minute)))
-  end
-
   def token_about_to_expire?
     return self.token_created_at.nil? || (Time.now > self.token_created_at + (SESSION_TIME_OUT - 1.minute))
   end
@@ -210,8 +241,9 @@ class User < Usman::ApplicationRecord
      self.reset_password_sent_at = Time.now unless self.reset_password_sent_at
   end
 
-  # Permission Methods
-  # ------------------
+  def default_image_url(size="small")
+    "/assets/kuppayam/defaults/user-#{size}.png"
+  end
 
   def set_permission(feature_name, **options)
     options.reverse_merge!(
@@ -269,57 +301,13 @@ class User < Usman::ApplicationRecord
   end
 
   def can_be_deleted?
-    suspended?
+    return true
   end
 
   def can_be_edited?
     !suspended?
   end
 
-  # Role Methods
-  # ------------
-
-  def add_role(role)
-    return false unless self.approved?
-    role = Role.find_by_name(role) if role.is_a?(String)
-    if role
-      self.roles << role unless self.has_role?(role)
-      return true
-    else
-      return false
-    end
-  end
-
-  def remove_role(role)
-    role = Role.find_by_name(role) if role.is_a?(String)
-    self.roles.delete(role) if role
-  end
-
-  def has_role?(role)
-    role = Role.find_by_name(role) if role.is_a?(String)
-    if role && role.persisted?
-      return true if self.super_admin
-      self.roles.exists?(:id => [role.id])
-    else
-      return false
-    end
-  end
-
-  # Other Methods
-  # -------------
-
-  # * Return full name
-  # == Examples
-  #   >>> user.display_name
-  #   => "Joe Black"
-  def display_name
-    "#{name}"
-  end
-
-  def default_image_url(size="small")
-    "/assets/kuppayam/defaults/user-#{size}.png"
-  end
-
   private
 
   def should_validate_password?
@@ -344,4 +332,25 @@ class User < Usman::ApplicationRecord
     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,8 +1,5 @@
 module Usman
   class ApplicationRecord < ActiveRecord::Base
 	  self.abstract_class = true
-
-	  extend Kuppayam::Importer
-	  extend Kuppayam::Validators
 	end
 end

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

@@ -37,7 +37,6 @@
 			
 			<!-- class "auto-inherit-active-class" will automatically add "active" class for parent elements who are marked already with class "active" -->
 			
-			<!-- Admin Dashboard -->
 			<li class="<%= nav_active?('admin/dashboard') ? 'active' : ''  %>">
 				<%= link_to raw("<i class=\"linecons-desktop\"></i> <span class='title'>Dashboard</span>"), usman.admin_dashboard_url %>
 			</li>
@@ -53,29 +52,29 @@
 					<li class="<%= nav_class("admin/users") %>">
 				    <%= 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>"), usman.admin_permissions_url %>
+					</li>
 				</ul>
+
 			</li>
 
-			<% if @current_user.super_admin? %>
 			<li class="">
 				<a href="/xenon/xenon-files/html/dashboard-1.html">
 					<i class="linecons-database"></i>
 					<span class="title">Master Data</span>
 				</a>
-
 				<ul>
 					<li class="">
 						<%= link_to raw("<i class=\"linecons-diamond\"></i> <span class='title'>Manage Features</span>"), usman.admin_features_url %>
 					</li>
 
-					<li class="<%= nav_class("admin/users") %>">
-						<%= link_to raw("<i class=\"linecons-lock\"></i> <span class='title'>Manage Permissions</span>"), usman.admin_permissions_url %>
+					<li class="">
+						<%= link_to raw("<i class=\"linecons-diamond\"></i> <span class='title'>Manage Roles</span>"), usman.admin_roles_url %>
 					</li>
 				</ul>
-
 			</li>
-			<% end %>
-
 		</ul>
 		
 	</div>