dhatu 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 310d2306a14f602500128b494f6ee13378836145
-  data.tar.gz: ffad0ed3f1b05f4a582c282c359b827fc2dfca13
+  metadata.gz: 5aa15ef1778f28fd3c9a4c2e5fa38c70a04691fb
+  data.tar.gz: db924144919db1ce6795890dac67ec1e969d4aa8
 SHA512:
-  metadata.gz: 4d206c07bb298481e3b79fb2367735f4c9525f90a856e6c0be8414452b63866b411653c63db43bab70472fc639e7c9ed8e1289b4a7dfd089ff1221ec56de73c1
-  data.tar.gz: 86edc9cd171fdeba5e76515bf0986e1fa9d89da322bb40e85d56abba41a35665255de707db64ea60a4cb8124ab25c9aaaad4d33eeef7f319d5e13c62714957f4
+  metadata.gz: 06ee7c08dfed11f1b3c2c753b0f3fce3bf64ae2aa043ad9dde093fc9c8cd7cbd90f927345632161c6907c203e5c4e710c027e2b2ab026a15bd0b985a53e36159
+  data.tar.gz: 7d3a7f3177d7df229009a8cc9f9dc313e19bd230061c5ab6a86be036e0e68bc11321d9cce89573d2c28dda3b7c7cc085829e2801d988b48ba2b1a48a72f1313a

data/app/controllers/dhatu/blog_posts_controller.rb

@@ -4,7 +4,7 @@ module Dhatu
     private
 
     def permitted_params
-      params.require("dhatu/blog_post").permit(:title, :slug, :author, :meta_description, :description, :posted_at, :tags)
+      params.require("dhatu/blog_post").permit(:title, :slug, :author, :meta_description, :description, :posted_at, :tags, :category_id)
     end
 
     def get_collections

data/app/controllers/dhatu/categories_controller.rb

@@ -42,15 +42,13 @@ module Dhatu
       params[:category].permit(:name, :permalink, :one_liner, :description, :parent_id, :priority)
     end
 
-    def resource_url(obj)
-      url_for([:admin, obj])
-    end
-
     def set_navs
       set_nav("admin/categories")
     end
 
     def get_collections
+      @category_types = Dhatu::Category.distinct.pluck(:category_type)
+      @category_types.unshift('All')
 
       @current_category = Dhatu::Category.find_by_id(params[:parent_id])
 
@@ -77,6 +75,12 @@ module Dhatu
     end
 
     def apply_filters
+
+      @category_type = params[:category_type] || "All"
+      if @category_type && @category_type != "All"
+        @relation = @relation.where("category_type = ?", params[:category_type])
+      end
+
       @relation = @relation.search(@query) if @query
       @relation = @relation.status(@status) if @status
       @relation = @relation.featured(@featured) unless @featured.nil?
@@ -118,7 +122,7 @@ module Dhatu
     end
 
     def permitted_params
-      params.require(:category).permit(:name, :one_liner, :description, :priority, :parent_id)
+      params.require("dhatu/category").permit(:name, :one_liner, :description, :priority, :parent_id, :category_type)
     end
 
     def set_navs

data/app/controllers/dhatu/services_controller.rb

@@ -0,0 +1,94 @@
+module Dhatu
+  class ServicesController < ResourceController
+
+    private
+
+    def permitted_params
+      params.require("dhatu/service").permit(:name, :one_liner, :permalink, :description, :price, :duration, :category_id, :priority)
+    end
+
+    def get_collections
+      category_ids = Dhatu::Service.distinct.pluck(:category_id)
+      @categories = Dhatu::Category.where(id: category_ids).to_a
+      @categories.unshift(Dhatu::Category.new(id: -1, name: "All"))
+
+      @relation = Dhatu::Service.includes(:cover_image).where("")
+      # params[:st] = "published" if params[:st].nil?
+
+      parse_filters
+      apply_filters
+      @services = @r_objects = @relation.page(@current_page).per(@per_page)
+      return true
+    end
+
+    def apply_filters
+      @category = Dhatu::Category.find_by_id(params[:ct]) || Dhatu::Category.new(id: -1, name: "All")
+      
+      if @category && @category.id != -1
+        @relation = @relation.where("category_id = ?", @category.id)
+      end
+
+      @relation = @relation.search(@query) if @query
+      @relation = @relation.status(@status) if @status
+      
+      @order_by = "created_at desc" unless @order_by
+      @relation = @relation.order(@order_by)
+    end
+
+    def configure_filter_settings
+      @filter_settings = {
+        string_filters: [
+          { filter_name: :query },
+          { filter_name: :status }
+        ],
+
+        boolean_filters: [],
+
+        reference_filters: [],
+        variable_filters: [],
+      }
+    end
+
+    def configure_filter_ui_settings
+      @filter_ui_settings = {
+        status: {
+          object_filter: false,
+          select_label: "Select Status",
+          display_hash: Dhatu::Service::STATUS,
+          current_value: @status,
+          values: Dhatu::Service::STATUS_REVERSE,
+          current_filters: @filters,
+          filters_to_remove: [],
+          filters_to_add: {},
+          url_method_name: 'services_url',
+          show_all_filter_on_top: true
+        }
+      }
+    end
+
+    def resource_controller_configuration
+      {
+        page_title: "Services",
+        js_view_path: "/kuppayam/workflows/peacock",
+        view_path: "dhatu/services",
+        collection_name: :services,
+        item_name: :service,
+        class: Dhatu::Service
+      }
+    end
+
+    def breadcrumbs_configuration
+      {
+        heading: "Manage services",
+        icon: "fa-reorder",
+        description: "Listing all services",
+        links: [{name: "Dashboard", link: dashboard_path, icon: 'fa-dashboard'}, 
+                  {name: "Manage services", link: dhatu.services_path, icon: 'fa-calendar', active: true}]
+      }
+    end
+
+    def set_navs
+      set_nav("service")
+    end
+  end
+end

data/app/models/dhatu/blog_post.rb

@@ -14,8 +14,11 @@ class Dhatu::BlogPost < Dhatu::ApplicationRecord
   validates :description, presence: true
   validates :posted_at, presence: true
   validates :meta_description, presence: true, length: {minimum: 10, maximum: 500}, allow_blank: false
+
+  validates :category, presence: true
   
   # Associations
+  belongs_to :category
   has_one :cover_image, :as => :imageable, :dependent => :destroy, :class_name => "Image::CoverImage"
   has_many :gallery_images, :as => :imageable, :dependent => :destroy, :class_name => "Image::GalleryImage"
 

data/app/models/dhatu/category.rb

@@ -18,8 +18,7 @@ class Dhatu::Category < Dhatu::ApplicationRecord
   validate_string :one_liner, mandatory: false, format: /.*/i
   validate_string :permalink, mandatory: true, format: /.*/i, min_length: 4, max_length: 128
   validates :category_type, :presence=> true, length: {maximum: 64}
-  validates :status, :presence=> true, :inclusion => {:in => STATUS.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
-
+  
   # Associations
   belongs_to :parent, :class_name => 'Dhatu::Category', optional: true
   belongs_to :top_parent, :class_name => 'Dhatu::Category', optional: true
@@ -41,6 +40,8 @@ class Dhatu::Category < Dhatu::ApplicationRecord
                                         LOWER(description) LIKE LOWER('%#{query}%')")
                         }
 
+  scope :filter_by_category_type, lambda { |ctype| where("category_type = ?", ctype) }
+
   scope :status, lambda { |status| where("LOWER(status)='#{status}'") }
   scope :featured, lambda { |val| where(featured: val) }
 
@@ -127,6 +128,22 @@ class Dhatu::Category < Dhatu::ApplicationRecord
     true
   end
 
+  def can_be_published?
+    unpublished? or archived?
+  end
+
+  def can_be_unpublished?
+    published? or archived?
+  end
+
+  def can_be_archived?
+    unpublished?
+  end
+
+  def can_be_removed?
+    unpublished? or archived?
+  end
+
   # Callback methods
   # ------------------
 

data/app/models/dhatu/service.rb

@@ -0,0 +1,75 @@
+class Dhatu::Service < Dhatu::ApplicationRecord
+
+  # Set Table Name
+  self.table_name = "services"
+
+  # Including the State Machine Methods
+  include Publishable
+
+  # Constants
+  COVER_IMAGE_INSTRUCTIONS = [
+    "the file extension should be .jpg / .jpeg or .png format",
+    "the image should be in resolution 750 pixels by 368 pixels, (Portrait Format). (most cameras and camera phones will produce images bigger than this)",
+    "the file size should not be less than 20 Kb, or bigger than <strong>1 MB</strong>"
+  ]
+  
+  # Constants
+  GALLERY_IMAGE_INSTRUCTIONS = [
+    "the file extension should be .jpg / .jpeg or .png format",
+    "the image should be in resolution 750 pixels by 368 pixels, (Portrait Format). (most cameras and camera phones will produce images bigger than this)",
+    "the file size should not be less than 20 Kb, or bigger than <strong>1 MB</strong>"
+  ]
+  
+  # Validations
+  validate_string :name, mandatory: true, min_length: 2, format: /.*/i
+  validate_string :one_liner, mandatory: false, format: /.*/i
+  validate_string :permalink, mandatory: true, format: /.*/i, min_length: 4, max_length: 128
+  
+  validates :category, presence: true
+  
+  # Associations
+  belongs_to :category
+  has_one :cover_image, :as => :imageable, :dependent => :destroy, :class_name => "Image::CoverImage"
+  has_many :gallery_images, :as => :imageable, :dependent => :destroy, :class_name => "Image::GalleryImage"
+
+  # ------------------
+  # Class Methods
+  # ------------------
+
+  scope :search, lambda {|query| where("LOWER(name) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(one_liner) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(permalink) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(description) LIKE LOWER('%#{query}%')")
+  }
+  
+  scope :filter_by_category, lambda { |c| where("category_id = ?", (c.is_a? Dhatu::Category ? c.id : c)) }
+
+  scope :upcoming, lambda { where("created_at >= ?", Time.now) }
+  scope :past, lambda { where("created_at < ?", Time.now) }
+
+  # ------------------
+  # Instance variables
+  # ------------------
+
+  # Generic Methods
+  # ---------------
+  def to_param
+    "#{id}-#{name.parameterize[0..32]}"
+  end
+
+  def display_name
+    "#{name_was}"
+  end
+
+  # Permission Methods
+  # ------------------
+
+  def can_be_edited?
+    status?(:published) or status?(:unpublished)
+  end
+
+  def can_be_deleted?
+    status?(:removed)
+  end
+
+end

data/app/views/dhatu/blog_posts/_form.html.erb

@@ -12,7 +12,15 @@
 
         <%= theme_form_field(@blog_post, :title, form_style: "top-bottom") %>
 
-        <%= theme_form_field(@blog_post, :slug, form_style: "top-bottom", html_options: {"data-id": @blog_post.id.to_s}) %>
+        <div class="row">
+          <div class="col-md-6 pr-20">
+            <% options = {assoc_collection: Dhatu::Category.filter_by_category_type("Blog").published.select("id, name").order("name ASC").all, editable: true, assoc_display_method: :name} %>
+            <%= theme_form_assoc_group(@blog_post, :category_id, label: "Choose Category", form_style: "top-bottom", **options) %>
+          </div>
+          <div class="col-md-6 pl-20">
+            <%= theme_form_field(@blog_post, :slug, form_style: "top-bottom", html_options: {"data-id": @blog_post.id.to_s}) %>
+          </div>
+        </div>
         
         <%= theme_form_field(@blog_post, :meta_description, required: true, html_options: {type: :textarea, class: "form-control", style: "height: 80px;"}, form_style: "top-bottom") %>
         

data/app/views/dhatu/categories/_form.html.erb

@@ -1,12 +1,16 @@
-<%= form_for([:admin, @category], :html => {:id=>"form_category", :class=>"mb-0 form-horizontal", :role => "form", :method => (@category.new_record? ? :post : :put), :remote=>true}) do |f| %>
+<%= form_for(@category, :html => {:id=>"form_category", :class=>"mb-0 form-horizontal", :role => "form", :method => (@category.new_record? ? :post : :put), :remote=>true}) do |f| %>
 
       <div id="category_form_error">
         <%= @category.errors[:base].to_sentence %>
       </div>
 
       <div class="form-inputs mb-30 mt-30">
+
+        <% @category.category_type = params[:category_type] if @category.category_type.blank? && params[:category_type] != "All" %>
+
         <%= theme_form_field(@category, :name) %>
 
+        <%= theme_form_field(@category, :category_type, required: true) %>
         <%= theme_form_field(@category, :one_liner, required: false) %>
         <%= theme_form_field(@category, :description, required: false, html_options: {type: :textarea}) %>
         <%= theme_form_field(@category, :priority, required: false, html_options: {type: :number, style: "width:70px;"}) %>
@@ -20,7 +24,7 @@
         <%= theme_form_assoc_group(@category, :parent_id, **options) %>
       </div>
 
-
+      
     
       <div>
         

data/app/views/dhatu/categories/_index.html.erb

@@ -6,10 +6,10 @@
         <%= theme_button('Back', 'arrow-left', categories_path(parent_id: @current_category.parent_id), classes: "pull-left mr-10", btn_type: "white") %>
       <% end %>
       
-      <%= theme_button('Refresh', 'refresh', categories_path(parent_id: @current_category.try(:id)), classes: "pull-left mr-10", btn_type: "white") %>
+      <%= theme_button('Refresh', 'refresh', categories_path(parent_id: @current_category.try(:id), category_type: @category_type), classes: "pull-left mr-10", btn_type: "white") %>
 
-      <%  if @current_category.try(:id) && @current_user.has_create_permission?(Dhatu::Category) %>
-      <%= theme_button('Add a Category', 'plus', new_category_path(parent_id: @current_category.try(:id)), classes: "pull-left mr-10", btn_type: "success") %>
+      <% if @current_user.has_create_permission?(Dhatu::Category) %>
+      <%= theme_button('Add a Category', 'plus', new_category_path(parent_id: @current_category.try(:id), category_type: @category_type), classes: "pull-left mr-10", btn_type: "success") %>
       <% end %>
 
     </div>
@@ -48,11 +48,11 @@
 			<tr> 
 				<th style="text-align: center;width:60px">#</th> 
 				<th>Name</th>
-				<th>Parent</th>
-				<th>Top Parent</th>
+				<!-- <th>Parent</th>
+				<th>Top Parent</th> -->
 				<th style="text-align: center;width:100px;">Status</th>
-				<th style="text-align: center;width:100px;">Priority</th>
-				<th style="text-align: center;width:120px;">End Node?</th>
+				<!-- <th style="text-align: center;width:100px;">Priority</th>
+				<th style="text-align: center;width:120px;">End Node?</th> -->
 				<% if display_manage_links? %>
 				<th style="text-align: center;" colspan="2">Actions</th>
 				<% end %>
@@ -77,17 +77,19 @@
 		      		<%= link_to raw("<i class=\"fa fa-caret-right\"></i> #{category.display_name}"), categories_path(parent_id: category.id), remote: true %></td>
 		      <% end %>
 
-		      <% if category.parent == @current_category %>
-		      	<td class="category-name"><%= category.parent.display_name if category.parent  %></td>
-		      <% else %>
-		      	<td class="category-name"><%= link_to category.parent.display_name, categories_path(parent_id: category.parent.id), remote: true if category.parent %></td>
-		      <% end %>
+		      <!--
+		      <%# if category.parent == @current_category %>
+		      	<td class="category-name"><%#= category.parent.display_name if category.parent  %></td>
+		      <%# else %>
+		      	<td class="category-name"><%#= link_to category.parent.display_name, categories_path(parent_id: category.parent.id), remote: true if category.parent %></td>
+		      <%# end %>
 
-		      <% if category.top_parent == @current_category %>
-		      	<td class="category-name"><%= category.top_parent.display_name if category.top_parent %></td>
-		      <% else %>
-		      	<td class="category-name"><%= link_to category.top_parent.display_name, categories_path(parent_id: category.top_parent.id), remote: true if category.top_parent  %></td>
-		     	<% end %>
+		      <%# if category.top_parent == @current_category %>
+		      	<td class="category-name"><%#= category.top_parent.display_name if category.top_parent %></td>
+		      <%# else %>
+		      	<td class="category-name"><%#= link_to category.top_parent.display_name, categories_path(parent_id: category.top_parent.id), remote: true if category.top_parent  %></td>
+		     	<%# end %>
+		     	-->
 
 		      <td style="text-align: center;width:100px;">
 						<% if category.unpublished? %>
@@ -99,8 +101,10 @@
 						<% end %>
 					</td>
 
-					<td style="text-align: center;width:100px;"><%= category.priority if category.priority %></td>
-					<td style="text-align: center;width:120px;"><%= category.end_node.to_s.titleize %></td>
+					<!-- 
+					<td style="text-align: center;width:100px;"><%#= category.priority if category.priority %></td>
+					<td style="text-align: center;width:120px;"><%#= category.end_node.to_s.titleize %></td>
+					-->
 
 					<% if display_manage_links? %>
 	  			<% edit_link = edit_category_path(id: category.id) %>

data/app/views/dhatu/categories/_row.html.erb

@@ -15,17 +15,19 @@
       <%= link_to raw("<i class=\"fa fa-caret-right\"></i> #{category.display_name}"), categories_path(parent_id: category.id), remote: true %></td>
   <% end %>
 
-  <% if category.parent == @current_category %>
-    <td class="category-name"><%= category.parent.display_name if category.parent  %></td>
-  <% else %>
-    <td class="category-name"><%= link_to category.parent.display_name, categories_path(parent_id: category.parent.id), remote: true if category.parent %></td>
-  <% end %>
+  <!--
+  <%# if category.parent == @current_category %>
+    <td class="category-name"><%#= category.parent.display_name if category.parent  %></td>
+  <%# else %>
+    <td class="category-name"><%#= link_to category.parent.display_name, categories_path(parent_id: category.parent.id), remote: true if category.parent %></td>
+  <%# end %>
 
-  <% if category.top_parent == @current_category %>
-    <td class="category-name"><%= category.top_parent.display_name if category.top_parent %></td>
-  <% else %>
-    <td class="category-name"><%= link_to category.top_parent.display_name, categories_path(parent_id: category.top_parent.id), remote: true if category.top_parent  %></td>
-  <% end %>
+  <%# if category.top_parent == @current_category %>
+    <td class="category-name"><%#= category.top_parent.display_name if category.top_parent %></td>
+  <%# else %>
+    <td class="category-name"><%#= link_to category.top_parent.display_name, categories_path(parent_id: category.top_parent.id), remote: true if category.top_parent  %></td>
+  <%# end %>
+  -->
 
   <td style="text-align: center;width:100px;">
     <% if category.unpublished? %>
@@ -37,8 +39,10 @@
     <% end %>
   </td>
 
-  <td style="text-align: center;width:100px;"><%= category.priority if category.priority %></td>
-  <td style="text-align: center;width:120px;"><%= category.end_node.to_s.titleize %></td>
+  <!-- 
+  <td style="text-align: center;width:100px;"><%#= category.priority if category.priority %></td>
+  <td style="text-align: center;width:120px;"><%#= category.end_node.to_s.titleize %></td>
+  -->
 
   <% if display_manage_links? %>
   <% edit_link = edit_category_path(id: category.id) %>

data/app/views/dhatu/categories/_show.html.erb

@@ -1,100 +1,99 @@
-<% status_hash = {published: "success", unpublished: "default", disabled: "danger"} %>
+<div id="div_category_show">
 
-<div class="media <%= status_hash[@category.status.to_sym] %>">
-
-  <!-- <div class="pull-left pt-10 pr-10 pb-10" style="width:30%;"> -->
-  	<%#= edit_image(@category, 
-	                  "category_image.image.small.url",
-	                  upload_image_link(@category, :category_image, nil ),
-	                  remove_image_link(@category, :category_image, nil ),
-	                  image_options: {assoc_name: :category_image }) %>
-  <!-- </div> -->
-
-  <!-- <div class="pull-left ml-10" style="width:65%;"> -->
-  <div class="">
-
-  	<h1><%= @category.name %></h1>
-
-    <% if @category.one_liner %>
-      <strong><%= @category.one_liner %></strong>
-    <% end %>
+  <div class="row">
+    
+    <!-- <div class="col-md-3 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;"> -->
+      <%# if display_edit_links? %>
+      <%#= edit_image(@category, 
+          "cover_image.image.large.url",
+          upload_image_link(@category, :cover_image, nil ),
+          remove_image_link(@category, :cover_image, nil ),
+          image_options: {assoc_name: :cover_image }) %>
+      <%# else %>
+        <%#= display_image(@category, "cover_image.image.large.url", class: "img-inline", alt: @category.display_name) %>
+      <%# end %>
+    <!-- </div> -->
+
+    <div class="col-md-9 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
+
+      <%= theme_panel_heading(@category.name) %>
+
+      <%= theme_panel_sub_heading(@category.category_type, "#") if @category.one_liner %>
+      
+      <%= clear_tag(10) %>
+      <%= display_publishable_status(@category) %>
+      <%= clear_tag(10) %>
+      <%= theme_panel_description(@category.one_liner) %>
+      <%= clear_tag(5) %>
+      <%= theme_panel_description(@category.description) %>
+      <%= clear_tag(20) %>
+      
+    </div>
 
-    <% if @category.description %>
-      <p><%= @category.description %></p>
+    <% if display_manage_links? %>
+    <div class="col-md-3 col-sm-12 col-xs-12">
+      <%= display_manage_buttons(@category) %>
+      <%= display_publishable_buttons(@category) %>
+      <%= display_featurable_buttons(@category) %>
+    </div>
     <% end %>
-    
-    <span class="label label-<%= status_hash[@category.status.to_sym] %>"><%= @category.status.titleize %></span>
 
-    <%= clear_tag %>
   </div>
 
-</div>
-
-<%= clear_tag(30) %>
-
-<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" style="border: 1px solid #000;min-height:200px;padding:20px;margin-bottom:20px;max-height: 400px;overflow-y: auto;">
-    
-    <%= clear_tag(20) %>
-
-    <div class="table-responsive mb-50"> 
-    	<table class="table table-striped table-condensed table-bordered"> 
-    		<tbody>
-
-          <tr>
-            <th>ID</th><td><%= @category.id %></td>
-            <th>Permalink</th><td><%= @category.permalink %></td>
-          </tr>
-
-          <tr>
-            <th>Parent</th><td><%= @category.parent.try(:display_name) %> (<%= @category.parent.try(:id) %>)</td>
-            <th>Top Parent</th><td><%= @category.top_parent.try(:display_name) %> (<%= @category.top_parent.try(:id) %>)</td>
-          </tr>
-
-          <tr>
-            <th>Status</th><td><%= @category.status %></td>
-            <th>Featured</th><td><%= @category.featured? ? "Yes" : "No" %></td>
-          </tr>
-
-          <tr>
-            <th>Priority</th><td><%= @category.priority %></td>
-            <th>End Node</th><td><%= @category.end_node? ? "Yes" : "No" %></td>
-          </tr>
-
-    			<tr>
-    				<th>Created At</th><td><%= @category.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @category.created_at %></td>
-    				<th>Updated At</th><td><%= @category.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @category.updated_at %></td>
-    			</tr>
-    			
-    		</tbody>
-    	</table>
+  <%= clear_tag(20) %>
+
+  <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" style="border: 1px solid #000;min-height:200px;padding:20px;margin-bottom:20px;max-height: 400px;overflow-y: auto;">
+      
+      <%= clear_tag(20) %>
+
+      <div class="table-responsive"> 
+        <table class="table table-striped table-condensed table-bordered mb-60"> 
+          <tbody>
+
+            <tr>
+              <th>ID</th><td><%= @category.id %></td>
+              <th>Permalink</th><td><%= @category.permalink %></td>
+            </tr>
+
+            <tr>
+              <th>Parent</th><td><%= @category.parent.try(:display_name) %> (<%= @category.parent.try(:id) %>)</td>
+              <th>Top Parent</th><td><%= @category.top_parent.try(:display_name) %> (<%= @category.top_parent.try(:id) %>)</td>
+            </tr>
+
+            <tr>
+              <th>Status</th><td><%= @category.status %></td>
+              <th>Featured</th><td><%= @category.featured? ? "Yes" : "No" %></td>
+            </tr>
+
+            <tr>
+              <th>Priority</th><td><%= @category.priority %></td>
+              <th>End Node</th><td><%= @category.end_node? ? "Yes" : "No" %></td>
+            </tr>
+
+            <tr>
+              <th>Created At</th><td><%= @category.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @category.created_at %></td>
+              <th>Updated At</th><td><%= @category.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @category.updated_at %></td>
+            </tr>
+            
+          </tbody>
+        </table>
+      </div>
+        
     </div>
-
   </div>
-</div>
-
-<div>
-	<% 
-		edit_link = edit_category_url(id: @category.id)
-		delete_link = category_url(id: @category.id) 
-	%>
-	
-	<%= link_to raw("<i class=\"fa fa-close mr-5\"></i> <span>Cancel</span>"), "#", onclick: "closeGenericModal();", class: "btn btn-white pull-left" %>
 
-	<%= link_to raw("<i class=\"fa fa-trash mr-5\"></i> <span>Delete</span>"), delete_link, method: :delete, :remote=>true, class: "btn btn-gray pull-right" %>
+  <%= link_to "Close", "#", onclick: "closeLargeModal();", class: "btn btn-primary pull-right" %>
 
-	<%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Edit"), edit_link, method: :get, :remote=>true, class: "btn btn-gray pull-right mr-10" %>
-</div>
+  <%= clear_tag %>
 
-<%= clear_tag %>
+</div>

data/app/views/dhatu/categories/index.html.erb

@@ -1,20 +1,26 @@
 <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_category_index">
-          <%= render :partial=>"dhatu/categories/index" %>
+    <div class="tabs-vertical-env">
+          
+      <ul id="div_category_types" class="nav tabs-vertical">
+        <% @category_types.each do |ctype| %>
+          <li class="<%= ctype == @category_type ? 'active' : '' %>">
+            <%= link_to ctype, categories_path(category_type: ctype) %>
+          </li>
+        <% end %>        
+      </ul>
+      
+      <div class="tab-content">
+        <div class="tab-pane active" id="v-home">
+          <div id="div_category_index">
+            <%= render :partial=>"dhatu/categories/index" %>
+          </div>
+          <%= clear_tag(10) %>
         </div>
-        <%= clear_tag(10) %>
-
       </div>
+      
     </div>
-
   </div>
 
 </div>

data/app/views/dhatu/dashboard/_index.html.erb

@@ -12,6 +12,12 @@
 			url: dhatu.blog_posts_url,
 			has_permission: @current_user.has_read_permission?(Dhatu::BlogPost)
 		},
+		services: {
+			text: "Services",
+			icon_class: "fa-glass",
+			url: dhatu.services_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Service)
+		},
 		branches: {
 			text: "Branches",
 			icon_class: "fa-location-arrow",
@@ -41,6 +47,12 @@
 			icon_class: "fa-group",
 			url: dhatu.team_members_url,
 			has_permission: @current_user.has_read_permission?(Dhatu::TeamMember)
+		},
+		categories: {
+			text: "Categories",
+			icon_class: "fa-sitemap",
+			url: dhatu.categories_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Category)
 		}
 	}
 %>

data/app/views/dhatu/services/_form.html.erb

@@ -0,0 +1,57 @@
+<%= form_for(@service,
+          :url => (@service.new_record? ? dhatu.services_path : dhatu.service_path),
+          :method => (@service.new_record? ? :post : :put),
+          :remote => true,
+          :html => {:id=>"form_service", :class=>"mb-0 form-horizontal"}) do |f| %>
+
+    <div id="service_form_error">
+      <%= @service.errors[:base].to_sentence %>
+    </div>
+
+    <div class="form-inputs m-15">
+
+      <%= theme_form_field(@service, :name, required: true, form_style: "top-bottom", html_options: { placeholder: "", "data-id": @service.id.to_s}) %>
+
+      <div class="row">
+        <div class="col-md-4 pr-20">
+          <% options = {assoc_collection: Dhatu::Category.filter_by_category_type("Service").published.select("id, name").order("name ASC").all, editable: true, assoc_display_method: :name} %>
+          <%= theme_form_assoc_group(@service, :category_id, label: "Choose Category", form_style: "top-bottom", **options) %>
+        </div>
+        <div class="col-md-4 pl-20">
+          <%= theme_form_field(@service, :one_liner, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
+        </div>
+        <div class="col-md-4 pl-20">
+          <% if @service.new_record? || @current_user.super_admin? %>
+            <%= theme_form_field(@service, :permalink, form_style: "top-bottom", html_options: { placeholder: ""}) %>
+          <% else %>
+            <%= theme_form_field(@service, :permalink, form_style: "top-bottom", html_options: { placeholder: "", readonly: true}) %>
+          <% end %>
+        </div>
+      </div>
+
+      <%= theme_form_field(@service, :description, required: true, html_options: {type: :textarea, class: "form-control wysihtml5", "data-stylesheet-url": "assets/wysiwyg-color.css"}, form_style: "top-bottom") %>
+
+      <div class="row">
+        <div class="col-md-4 pr-20">
+          <%= theme_form_field(@service, :price, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
+        </div>
+        <div class="col-md-4 pl-20">
+          <%= theme_form_field(@service, :duration, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
+        </div>
+        <div class="col-md-4 pl-20">
+          <%= theme_form_field(@service, :priority, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
+        </div>
+      </div>
+      
+    </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: "closeLargeModal();", class: "pull-right btn btn-white" %>
+    </div>
+
+    <%= clear_tag %>
+
+<% end %>
+

data/app/views/dhatu/services/_index.html.erb

@@ -0,0 +1,54 @@
+<div class="table-responsive"> 
+	<table class="table table-hover members-table middle-align">
+	  <thead> 
+			<tr> 
+				<th style="text-align: center;width:5%">#</th> 
+				<th style="text-align: center;width:100px"><i class="fa fa-photo"></i></th> 
+				<th>Service Name</th>
+				<th style="width:200px">Category</th>
+				<th style="width:100px;" class="hidden-sm hidden-xs">Status</th>
+				<% if display_manage_links? %>
+				<th style="text-align: center;" colspan="2" class="hidden-sm hidden-xs">Actions</th>
+				<% end %>
+			</tr> 
+		</thead>
+	  <tbody>
+	  	<tr id="tr_service_0"></tr>
+	  	<% @services.each_with_index do |service, i| %>
+	  		
+	  		<tr id="tr_service_<%= service.id %>">
+
+					<th scope="row" style="text-align: center;">
+						<%= serial_number(i) %>
+					</th>
+
+					<td class="display-image">
+						<%= display_thumbnail_small(service) %>
+					</td>
+
+					<td class="display-link">
+						<%= link_to service.name, service_path(service), remote: true %><br>
+						<%= link_to service.category.try(:display_name), service_path(service), remote: true %>
+					</td>
+
+					<td class="hidden-sm hidden-xs"><%= display_publishable_status(service) %></td>
+
+		      <% if display_manage_links? %>
+			    <td class="action-links hidden-sm hidden-xs" style="width:10%"><%= display_publishable_links(service) %></td>
+
+			    <td class="action-links hidden-sm hidden-xs" style="width:10%">
+			      <%= display_manage_links(service, @current_user) %>
+			    </td>
+			    <% end %>
+
+		    </tr>
+		  <% end %>
+	  </tbody>
+	</table>
+</div>
+
+<div class="row">
+  <div class="col-sm-12">
+    <%= paginate_kuppayam(@services) %>
+  </div>
+</div>

data/app/views/dhatu/services/_row.html.erb

@@ -0,0 +1,26 @@
+<tr id="tr_service_<%= service.id %>">
+
+  <th scope="row" style="text-align: center;">
+    <%= serial_number(i) %>
+  </th>
+
+  <td class="display-image">
+    <%= display_thumbnail_small(service) %>
+  </td>
+
+  <td class="display-link">
+    <%= link_to service.name, service_path(service), remote: true %><br>
+    <%= link_to service.category.try(:display_name), service_path(service), remote: true %>
+  </td>
+
+  <td class="hidden-sm hidden-xs"><%= display_publishable_status(service) %></td>
+
+  <% if display_manage_links? %>
+  <td class="action-links hidden-sm hidden-xs" style="width:10%"><%= display_publishable_links(service) %></td>
+
+  <td class="action-links hidden-sm hidden-xs" style="width:10%">
+    <%= display_manage_links(service, @current_user) %>
+  </td>
+  <% end %>
+
+</tr>

data/app/views/dhatu/services/_show.html.erb

@@ -0,0 +1,128 @@
+<div id="div_service_show">
+
+  <div class="row">
+    
+    <div class="col-md-3 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
+      <% if display_edit_links? %>
+      <%= edit_image(@service, 
+            "cover_image.image.large.url",
+            upload_image_link(@service, :cover_image, nil ),
+            remove_image_link(@service, :cover_image, nil ),
+            image_options: {assoc_name: :cover_image }) %>
+      <% else %>
+        <%= display_image(@service, "cover_image.image.large.url", class: "img-inline", alt: @service.display_name) %>
+      <% end %>
+    </div>
+
+    <div class="col-md-6 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
+
+      <%= theme_panel_heading(@service.name) %>
+
+      <%= theme_panel_sub_heading(@service.category.try(:display_name), "#") if @service.category %>
+      
+      <%= clear_tag(10) %>
+
+      <%= display_publishable_status(@service) %>
+      
+      <%= display_featured(@service) %>
+
+      <%= clear_tag(20) %>
+      
+    </div>
+
+    <% if display_manage_links? %>
+    <div class="col-md-3 col-sm-12 col-xs-12">
+      <%= display_manage_buttons(@service) %>
+      <%= display_publishable_buttons(@service) %>
+    </div>
+    <% end %>
+
+  </div>
+
+  <hr>
+
+  <div class="visible-sm visible-xs mb-50"></div>
+
+  <%= clear_tag(20) %>
+
+  <ul class="nav nav-pills">
+    <li class="active">
+      <a href="#service_details" data-toggle="tab" aria-expanded="false">
+        <span class="visible-xs"><i class="fa-database"></i></span>
+        <span class="hidden-xs">Service Details</span>
+      </a>
+    </li>
+
+    <li class="">
+      <a href="#service_images" data-toggle="tab" aria-expanded="false">
+        <span class="visible-xs"><i class="fa-database"></i></span>
+        <span class="hidden-xs">Images</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>
+      </a>
+    </li>
+  </ul>
+
+  <div class="tab-content">
+    <div class="tab-pane active" id="service_details" style="border: 1px solid #000;min-height:200px;padding:20px;margin-bottom:20px;max-height: 400px;overflow-y: auto;">
+      
+      <%= clear_tag(20) %>
+      <strong>Description</strong>
+      <%= raw(@service.description) %>
+      <%= clear_tag(20) %>
+        
+    </div>
+
+    <div class="tab-pane" id="service_images" 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_service_images_buttons">
+        <div class="row">
+          <div class="col-md-6">
+            <%= theme_button('Upload a New Image', 'refresh', upload_multiple_image_link(@service, :gallery_images, nil ), classes: "pull-left", btn_type: "white") %>
+          </div>
+          <div class="col-md-6">
+          </div>
+        </div>
+      </div>
+      <%= clear_tag(10) %>
+
+      <%= render :partial=>"kuppayam/images/multiple_images", locals: { images: @service.gallery_images } %>
+
+    </div>
+
+    <div class="tab-pane" id="technical_details" style="border: 1px solid #000;min-height:200px;padding:20px;margin-bottom:20px;max-height: 400px;overflow-y: auto;">
+      
+      <%= clear_tag(20) %>
+
+      <div class="table-responsive"> 
+        <table class="table table-striped table-condensed table-bordered mb-60"> 
+          <tbody>
+            
+            <tr>
+              <th>ID</th><td><%= @service.id %></td>
+              <th>Status</th><td><%= @service.status %></td>
+            </tr>
+            <tr>
+              <th>Created At</th><td><%= @service.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @service.created_at %></td>
+              <th>Updated At</th><td><%= @service.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @service.updated_at %></td>
+            </tr>
+            
+          </tbody>
+        </table>
+      </div>
+        
+    </div>
+  </div>
+
+  <%= link_to "Close", "#", onclick: "closeLargeModal();", class: "btn btn-primary pull-right" %>
+
+  <%= clear_tag %>
+
+</div>

data/app/views/dhatu/services/index.html.erb

@@ -0,0 +1,69 @@
+<div class="row">
+      
+  <div class="col-md-12">
+    
+    <div class="tabs-vertical-env">
+
+      <ul id="div_category_types" class="nav tabs-vertical">
+        <% @categories.each do |ct| %>
+          <li class="<%= ct == @category ? 'active' : '' %>">
+            <%= link_to ct.name, services_path(ct: ct.id) %>
+          </li>
+        <% end %>        
+      </ul>
+
+      <!-- <ul class="nav nav-tabs nav-tabs-justified">
+        <%# Dhatu::Service::STATUS.each do |key, value| %>
+        <li class="<%#= @status == value ? 'active' : '' %>">
+          <%#= link_to dhatu.services_path(st: value), "aria-expanded" => "#{ @status == value ? 'true' : 'false' }" do %>
+            <span class="visible-xs"><i class="fa-gift"></i></span>
+            <span class="hidden-xs"><%#= key %></span>
+          <%# end %>
+        </li>
+        <%# end %>
+      </ul> -->
+
+      <div class="tab-content">
+        <div class="tab-pane active">
+
+          <div id="div_service_action_buttons">
+            <div class="row">
+              <div class="col-sm-6">
+                <%= theme_button('Add a Service', 'plus', dhatu.new_service_path(), classes: "pull-left mr-10", btn_type: "success") if @current_user.has_create_permission?(Dhatu::Service) %>
+
+                <%= theme_button('Refresh', 'refresh', dhatu.services_path(st: @status), classes: "pull-left mr-10", btn_type: "white") %>
+              </div>
+              <div class="col-sm-6">
+                <%= search_form_kuppayam(Dhatu::Service, dhatu.services_path(st: @status), text: @filters[:query]) %>
+              </div>
+            </div>
+
+          </div>
+          <%= clear_tag(10) %>
+
+          <div id="div_service_index">
+            <%= render :partial=>"dhatu/services/index" %>
+          </div>
+          <%= clear_tag(10) %>
+
+        </div>
+      </div>
+
+    </div>
+    
+  </div>
+
+</div>
+
+<script type="text/javascript">
+  $('body').on('change', '#inp_name', function() {
+    var serviceId = $('#inp_permalink').data("id");
+    if(serviceId){
+    } else {
+      var permalink = convertToSlug($(this).val()).slice(0, 63);
+      $('#inp_permalink').val(permalink);
+    }
+  });
+</script>
+
+

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

@@ -12,6 +12,12 @@
 			url: dhatu.blog_posts_url,
 			has_permission: @current_user.has_read_permission?(Dhatu::BlogPost)
 		},
+		services: {
+			text: "Services",
+			icon_class: "fa-glass",
+			url: dhatu.services_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Service)
+		},
 		branches: {
 			text: "Branches",
 			icon_class: "fa-location-arrow",
@@ -41,6 +47,12 @@
 			icon_class: "fa-group",
 			url: dhatu.team_members_url,
 			has_permission: @current_user.has_read_permission?(Dhatu::TeamMember)
+		},
+		categories: {
+			text: "Categories",
+			icon_class: "fa-sitemap",
+			url: dhatu.categories_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Category)
 		}
 	}
 %>

data/config/routes.rb

@@ -4,6 +4,14 @@ Dhatu::Engine.routes.draw do
 
 	scope :admin do
 
+		resources :services do
+			member do
+				put :update_status, as:  :update_status
+				put :mark_as_featured
+	      put :remove_from_featured
+			end
+		end
+
 		resources :branches do
 			member do
 				put :make_main, as:  :make_main

data/lib/dhatu/version.rb

@@ -1,3 +1,3 @@
 module Dhatu
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhatu
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2017-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -107,7 +107,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.18
+        version: 0.1.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.18
+        version: 0.1.19
 - !ruby/object:Gem::Dependency
   name: pattana
   requirement: !ruby/object:Gem::Requirement
@@ -414,6 +414,7 @@ files:
 - app/controllers/dhatu/offers_controller.rb
 - app/controllers/dhatu/resource_controller.rb
 - app/controllers/dhatu/sections_controller.rb
+- app/controllers/dhatu/services_controller.rb
 - app/controllers/dhatu/team_members_controller.rb
 - app/controllers/dhatu/testimonials_controller.rb
 - app/helpers/dhatu/application_helper.rb
@@ -426,6 +427,7 @@ files:
 - app/models/dhatu/event.rb
 - app/models/dhatu/offer.rb
 - app/models/dhatu/section.rb
+- app/models/dhatu/service.rb
 - app/models/dhatu/team_member.rb
 - app/models/dhatu/testimonial.rb
 - app/models/image/category_image.rb
@@ -462,6 +464,11 @@ files:
 - app/views/dhatu/sections/_row.html.erb
 - app/views/dhatu/sections/_show.html.erb
 - app/views/dhatu/sections/index.html.erb
+- app/views/dhatu/services/_form.html.erb
+- app/views/dhatu/services/_index.html.erb
+- app/views/dhatu/services/_row.html.erb
+- app/views/dhatu/services/_show.html.erb
+- app/views/dhatu/services/index.html.erb
 - app/views/dhatu/team_members/_form.html.erb
 - app/views/dhatu/team_members/_index.html.erb
 - app/views/dhatu/team_members/_row.html.erb