dhatu 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8a31c4186a8a046b6b45aedbc0e8b051b2e3ca94
-  data.tar.gz: 7828c199d77737380d93a7703eb6f3c6bfce9de3
+SHA256:
+  metadata.gz: f96798ea3a6687453e80d811e106c2b00d6724da2cd2ec7414a186681fb93df6
+  data.tar.gz: 91e348a89e091973132c6b255a5aa3d0ce9b38a9cfa432001db2d86ebd776bca
 SHA512:
-  metadata.gz: c2d5692673467bb172246ded35e8ee5d12cdd33e8333b2018c04eb2f78e04901e55ad65fffa86114a345a791d3ce9e3460f1ec6a08ef734d6460483ace234d1b
-  data.tar.gz: d69aa7af35ac67bd1149b00f2b535dd0f0dc20f62c61d79814f757942f7a5a90e73bc63f5138834b79ebfce5a98388447cdae18cf8c6c068f775073ae34bd0db
+  metadata.gz: 95c2d7ff1f07934e0fd7c2a7e1d35c2e869a521f5e67dce854d0c3a280f0215215a73b378d81baece6d5a03aa8b8c2b36163111f2c3ecaaf7efcdcb36c59a20e
+  data.tar.gz: bd5684b3f14d216d384f25b73c4b3dec8d317de91d319aa03d2cc110f946a36555699e1d31febfaa5bd035eb5080fc286b6f4a6c9efc1255ed7be9030894a490

data/app/controllers/dhatu/categories_controller.rb

@@ -46,7 +46,7 @@ module Dhatu
         if @r_object.parent_id != previous_parent_id
           @r_object.parent.set_end_node!
           previous_category = Dhatu::Category.find_by_id(previous_parent_id)
-          previous_category.set_end_node!
+          previous_category.set_end_node! if previous_category
         end
 
         get_collections if @resource_options[:layout] = :table

data/app/controllers/dhatu/projects_controller.rb

@@ -0,0 +1,93 @@
+module Dhatu
+  class ProjectsController < ResourceController
+
+    private
+
+    def permitted_params
+      params.require("dhatu/project").permit(:name, :meta_description, :permalink, :description, :client, :category_id, :priority)
+    end
+
+    def get_collections
+      category_ids = Dhatu::Project.distinct.pluck(:category_id)
+      @categories = Dhatu::Category.where(id: category_ids).to_a
+      @categories.unshift(Dhatu::Category.new(id: -1, name: "All"))
+
+      @relation = Dhatu::Project.includes(:cover_image).where("")
+      # params[:st] = "published" if params[:st].nil?
+
+      parse_filters
+      apply_filters
+
+      @projects = @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
+      @relation = @relation.order("priority ASC, name ASC")
+    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::Project::STATUS,
+          current_value: @status,
+          values: Dhatu::Project::STATUS_REVERSE,
+          current_filters: @filters,
+          filters_to_remove: [],
+          filters_to_add: {},
+          url_method_name: 'projects_url',
+          show_all_filter_on_top: true
+        }
+      }
+    end
+
+    def resource_controller_configuration
+      {
+        page_title: "Projects",
+        js_view_path: "/kuppayam/workflows/peacock",
+        view_path: "dhatu/projects",
+        collection_name: :projects,
+        item_name: :project,
+        class: Dhatu::Project
+      }
+    end
+
+    def breadcrumbs_configuration
+      {
+        heading: "Manage Projects",
+        icon: "fa-rocket",
+        description: "Listing all Projects",
+        links: [{name: "Dashboard", link: breadcrumb_home_path, icon: 'fa-dashboard'}, 
+                  {name: "Manage Projects", link: dhatu.projects_path, icon: 'fa-rocket', active: true}]
+      }
+    end
+
+    def set_navs
+      set_nav("project")
+    end
+  end
+end

data/app/models/dhatu/project.rb

@@ -0,0 +1,134 @@
+class Dhatu::Project < Dhatu::ApplicationRecord
+
+  # Set Table Name
+  self.table_name = "projects"
+
+  # Including the State Machine Methods
+  include Publishable
+  include Featureable
+
+  # Validations
+  validate_string :name, mandatory: true, min_length: 2, format: /.*/i
+  validate_string :meta_description, mandatory: false, format: /.*/i
+  validate_string :permalink, mandatory: true, format: /.*/i, min_length: 4, max_length: 128
+  
+  # Associations
+  belongs_to :category, optional: true
+  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(meta_description) 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) }
+
+  def self.save_row_data(hsh)
+    # Initializing error hash for displaying all errors altogether
+    error_object = Kuppayam::Importer::ErrorHash.new
+
+    return error_object if hsh[:name].to_s.strip.blank?
+
+    project = Dhatu::Project.find_by_name(hsh[:name].to_s.strip) || Dhatu::Project.new
+    project.name = hsh[:name].to_s.strip
+    project.meta_description = hsh[:meta_description].to_s.strip
+    project.description = hsh[:description].to_s.strip
+    project.client = hsh[:client].to_s.strip
+    project.category = Dhatu::Category.find_by_name(hsh[:category].to_s.strip)
+    project.status = hsh[:status].to_s.strip.blank? ? PUBLISHED : hsh[:status].to_s.strip
+    project.featured = hsh[:featured].to_s.strip || true
+    project.priority = hsh[:priority].to_s.strip || 1
+
+    project.generate_permalink
+
+    if project.valid?
+      begin
+        project.save!
+      rescue Exception => e
+        summary = "uncaught #{e} exception while handling connection: #{e.message}"
+        details = "Stack trace: #{e.backtrace.map {|l| "  #{l}\n"}.join}"
+        error_object.errors << { summary: summary, details: details }        
+      end
+    else
+      summary = "Error while saving project: #{project.name}"
+      details = "Error! #{project.errors.full_messages.to_sentence}"
+      error_object.errors << { summary: summary, details: details }
+    end
+    return error_object
+  end
+
+  # Image Configuration
+  # -------------
+  def self.image_configuration
+    {
+      "Image::CoverImage" => {
+        max_upload_limit: 10485760,
+        min_upload_limit: 1,
+        resolutions: [800, 400],
+        form_upload_image_label: "Upload a new Image",
+        form_title: "Upload an Image",
+        form_sub_title: "Please read the instructions below:",
+        form_instructions: [
+          "the filename should be in .jpg / .jpeg or .png format",
+          "the image resolutions should be <strong>800 x 400 Pixels</strong>",
+          "the file size should be greater than 100 Kb and or lesser than <strong>10 MB</strong>",
+          "Note: most cameras and camera phones will produce images bigger than this"
+        ]
+      },
+      "Image::GalleryImage" => {
+        max_upload_limit: 10485760,
+        min_upload_limit: 1,
+        resolutions: [800, 400],
+        form_upload_image_label: "Upload a new Image",
+        form_title: "Upload an Image",
+        form_sub_title: "Please read the instructions below:",
+        form_instructions: [
+          "the filename should be in .jpg / .jpeg or .png format",
+          "the image resolutions should be <strong>800 x 400 Pixels</strong>",
+          "the file size should be greater than 100 Kb and or lesser than <strong>10 MB</strong>",
+          "Note: most cameras and camera phones will produce images bigger than this"
+        ]
+      }  
+    }
+    
+  end
+
+  # ------------------
+  # Instance Methods
+  # ------------------
+
+  # Generic Methods
+  # ---------------
+  def to_param
+    "#{id}-#{name.parameterize[0..32]}"
+  end
+
+  def generate_permalink
+    self.permalink = self.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/models/dhatu/service.rb

@@ -12,10 +12,8 @@ class Dhatu::Service < Dhatu::ApplicationRecord
   validate_string :meta_description, 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
+  belongs_to :category, optional: true
   has_one :cover_image, :as => :imageable, :dependent => :destroy, :class_name => "Image::CoverImage"
   has_many :gallery_images, :as => :imageable, :dependent => :destroy, :class_name => "Image::GalleryImage"
 
@@ -48,7 +46,7 @@ class Dhatu::Service < Dhatu::ApplicationRecord
     service.price = hsh[:price].to_s.strip
     service.duration = hsh[:duration].to_s.strip
     service.category = Dhatu::Category.find_by_name(hsh[:category].to_s.strip)
-    service.status = hsh[:status].to_s.strip || PUBLISHED
+    service.status = hsh[:status].to_s.strip.blank? ? PUBLISHED : hsh[:status].to_s.strip
     service.featured = hsh[:featured].to_s.strip || true
     service.priority = hsh[:priority].to_s.strip || 1
 

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

@@ -27,7 +27,7 @@
 							<%= link_to booking.name, booking_path(booking), remote: true %>
 						<% end %>
 						&nbsp;<%= display_readable_status(booking) %><br>
-						<%= link_to time_ago_in_words(booking.created_at) + " ago", booking_path(booking), remote: true, style: "color:darkred;font-size:10px;" %>
+						<%= link_to time_ago_in_words(booking.created_at) + " ago", booking_path(booking), remote: true, style: "color:chocolate;font-size:10px;" %>
 					</td>
 
 					<td class=""><%= truncate booking.message, length: 30 %></td>

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

@@ -5,7 +5,7 @@
 
   <td class="display-link">
     <%= link_to booking.name, booking_path(booking), remote: true %><br>
-    <%#= link_to booking.category.try(:display_name), booking_path(booking), remote: true, style: "color:darkred" %>
+    <%#= link_to booking.category.try(:display_name), booking_path(booking), remote: true, style: "color:chocolate" %>
   </td>
 
   <td class=""><%= truncate booking.message, length: 30 %></td>

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

@@ -14,7 +14,6 @@
 	  <tbody>
 	  	<tr id="tr_branch_0"></tr>
 	  	<% @branches.each_with_index do |branch, i| %>
-	  		
 	  		<tr id="tr_branch_<%= branch.id %>">
 
 					<th scope="row" style="text-align: center;">
@@ -50,7 +49,6 @@
 						<%= display_manage_links(branch, @current_user) %>
 					</td>
 					<% end %>
-
 		    </tr>
 		  <% end %>
 	  </tbody>

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

@@ -14,7 +14,9 @@
   
   <td class="hidden-sm hidden-xs"><%= display_publishable_status(branch) %></td>
 
-  <td class="action-links hidden-sm hidden-xs" style="width:10%"><%= display_publishable_links(branch) %></td>
+  <td class="action-links hidden-sm hidden-xs" style="width:10%">
+    <%= display_publishable_links(branch) %>
+  </td>
 
   <% if display_manage_links? %>
   <td class="action-links hidden-sm hidden-xs" style="width:10%">

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

@@ -98,6 +98,15 @@
       <%= display_manage_buttons(@branch) %>
       <%= display_publishable_buttons(@branch) %>
       <%= display_featurable_buttons(@branch) %>
+      <% if display_edit_links? %>
+        <% if @branch.main_branch? %>
+          <!-- Remove Branch -->
+          <%= link_to raw("<i class=\"fa fa-check mr-5\"></i> Remove Main Branch"), remove_main_branch_path(:id =>@branch.id), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-danger btn-only-hover" %>
+        <% else %>
+          <!-- Main Branch -->
+          <%= link_to raw("<i class=\"fa fa-check mr-5\"></i> Make this Main Branch"), make_main_branch_path(:id =>@branch.id), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1", :class=>"btn btn-block btn-success btn-only-hover" %>
+        <% end %>
+      <% end %>
     </div>
     <% end %>
 

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

@@ -1,5 +1,35 @@
 <%
 	dhatu_items = {
+		section_types: {
+			text: "Section Types",
+			icon_class: "fa-reorder",
+			url: dhatu.section_types_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::SectionType)
+		},
+		sections: {
+			text: "Sections",
+			icon_class: "fa-reorder",
+			url: dhatu.sections_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Section)
+		},
+		categories: {
+			text: "Categories",
+			icon_class: "fa-sitemap",
+			url: dhatu.categories_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Category)
+		},
+		projects: {
+			text: "Projects",
+			icon_class: "fa-rocket",
+			url: dhatu.projects_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Project)
+		},
+		services: {
+			text: "Services",
+			icon_class: "fa-glass",
+			url: dhatu.services_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Service)
+		},
 		promotions: {
 			text: "Promotions",
 			icon_class: "fa-gift",
@@ -18,24 +48,12 @@
 			url: dhatu.bookings_url,
 			has_permission: @current_user.has_read_permission?(Dhatu::Booking)
 		},
-		sections: {
-			text: "Sections",
-			icon_class: "fa-reorder",
-			url: dhatu.sections_url,
-			has_permission: @current_user.has_read_permission?(Dhatu::Section)
-		},
 		blog_posts: {
 			text: "Blog",
 			icon_class: "fa-newspaper-o",
 			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)
-		},
 		prices: {
 			text: "Prices",
 			icon_class: "fa-dollar",
@@ -71,18 +89,6 @@
 			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)
-		},
-		section_types: {
-			text: "Section Types",
-			icon_class: "fa-reorder",
-			url: dhatu.section_types_url,
-			has_permission: @current_user.has_read_permission?(Dhatu::SectionType)
 		}
 	}
 %>

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

@@ -23,7 +23,7 @@
 
 					<td class="display-link">
 						<%= link_to price.title, price_path(price), remote: true %><br>
-						<%= link_to price.category.try(:display_name), price_path(price), remote: true, style: "color:darkred" %>
+						<%= link_to price.category.try(:display_name), price_path(price), remote: true, style: "color:chocolate" %>
 					</td>
 
 					<td class="hidden-sm hidden-xs"><%= price.price %></td>

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

@@ -5,7 +5,7 @@
 
   <td class="display-link">
     <%= link_to price.title, price_path(price), remote: true %><br>
-    <%= link_to price.category.try(:display_name), price_path(price), remote: true, style: "color:darkred" %>
+    <%= link_to price.category.try(:display_name), price_path(price), remote: true, style: "color:chocolate" %>
   </td>
 
   <td class="hidden-sm hidden-xs"><%= price.price %></td>

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

@@ -0,0 +1,54 @@
+<%= form_for(@project,
+          :url => (@project.new_record? ? dhatu.projects_path : dhatu.project_path),
+          :method => (@project.new_record? ? :post : :put),
+          :remote => true,
+          :html => {:id=>"form_project", :class=>"mb-0 form-horizontal"}) do |f| %>
+
+    <div id="project_form_error">
+      <%= @project.errors[:base].to_sentence %>
+    </div>
+
+    <div class="form-inputs m-15">
+
+      <%= theme_form_field(@project, :name, required: true, form_style: "top-bottom", html_options: { placeholder: "", "data-id": @project.id.to_s}) %>
+
+      <div class="row">
+        <div class="col-md-4 pr-20">
+          <% options = {assoc_collection: Dhatu::Category.filter_by_category_type("Dhatu::Project").published.select("id, name").order("priority ASC, name ASC").all, editable: true, assoc_display_method: :name, required: false} %>
+          <%= theme_form_assoc_group(@project, :category_id, label: "Choose Category", form_style: "top-bottom", **options) %>
+        </div>
+        <div class="col-md-4 pl-20">
+          <%= theme_form_field(@project, :meta_description, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
+        </div>
+        <div class="col-md-4 pl-20">
+          <% if @project.new_record? || @current_user.super_admin? %>
+            <%= theme_form_field(@project, :permalink, form_style: "top-bottom", html_options: { placeholder: ""}) %>
+          <% else %>
+            <%= theme_form_field(@project, :permalink, form_style: "top-bottom", html_options: { placeholder: "", readonly: true}) %>
+          <% end %>
+        </div>
+      </div>
+
+      <%= theme_form_field(@project, :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(@project, :client, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
+        </div>
+        <div class="col-md-4 pl-20">
+          <%= theme_form_field(@project, :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/projects/_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>Project Name</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_project_0"></tr>
+	  	<% @projects.each_with_index do |project, i| %>
+	  		
+	  		<tr id="tr_project_<%= project.id %>">
+
+					<th scope="row" style="text-align: center;">
+						<%= serial_number(i) %>
+					</th>
+
+					<td class="display-image">
+						<%= display_thumbnail_small(project) %>
+					</td>
+
+					<td class="display-link">
+						<%= link_to project.name, project_path(project), remote: true, style: "color: chocolate;font-size:16px;" %><br>
+						<%= link_to project.category.try(:display_name), project_path(project), remote: true %><br>
+						<p style="color:#898989;"><%= project.meta_description %></p>
+						<%= display_publishable_status(project) %>
+						<%= display_featured(project) %>
+					</td>
+
+					<% if display_manage_links? %>
+			    <td class="action-links hidden-sm hidden-xs" style="width:10%"><%= display_publishable_links(project) %></td>
+
+			    <td class="action-links hidden-sm hidden-xs" style="width:10%">
+			    	<%= display_featurable_links(project) %>
+			      <%= display_manage_links(project, @current_user) %>
+			    </td>
+			    <% end %>
+
+		    </tr>
+		  <% end %>
+	  </tbody>
+	</table>
+</div>
+
+<div class="row">
+  <div class="col-sm-12">
+    <%= paginate_kuppayam(@projects) %>
+  </div>
+</div>

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

@@ -0,0 +1,28 @@
+<tr id="tr_project_<%= project.id %>">
+
+  <th scope="row" style="text-align: center;">
+    <%= serial_number(i) %>
+  </th>
+
+  <td class="display-image">
+    <%= display_thumbnail_small(project) %>
+  </td>
+
+  <td class="display-link">
+    <%= link_to project.name, project_path(project), remote: true, style: "color: chocolate;font-size:16px;" %><br>
+    <%= link_to project.category.try(:display_name), project_path(project), remote: true %><br>
+    <p style="color:#898989;"><%= project.meta_description %></p>
+    <%= display_publishable_status(project) %>
+    <%= display_featured(project) %>
+  </td>
+
+  <% if display_manage_links? %>
+  <td class="action-links hidden-sm hidden-xs" style="width:10%"><%= display_publishable_links(project) %></td>
+
+  <td class="action-links hidden-sm hidden-xs" style="width:10%">
+    <%= display_featurable_links(project) %>
+    <%= display_manage_links(project, @current_user) %>
+  </td>
+  <% end %>
+
+</tr>

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

@@ -0,0 +1,135 @@
+<div id="div_project_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(@project, 
+            "cover_image.image.large.url",
+            upload_image_link(@project, :cover_image, nil ),
+            remove_image_link(@project, :cover_image, nil ),
+            image_options: {assoc_name: :cover_image }) %>
+      <% else %>
+        <%= display_image(@project, "cover_image.image.large.url", class: "img-inline", alt: @project.display_name) %>
+      <% end %>
+    </div>
+
+    <div class="col-md-6 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
+
+      <%= theme_panel_heading(@project.name) %>
+
+      <%= theme_panel_sub_heading(@project.category.try(:display_name), "#") if @project.category %>
+      
+      <%= clear_tag(10) %>
+
+      <div class="well">
+        <%= @project.meta_description %>
+      </div>
+
+      <%= clear_tag(10) %>
+
+      <%= display_publishable_status(@project) %>
+      
+      <%= display_featured(@project) %>
+
+      <%= clear_tag(20) %>
+      
+    </div>
+
+    <% if display_manage_links? %>
+    <div class="col-md-3 col-sm-12 col-xs-12">
+      <%= display_manage_buttons(@project) %>
+      <%= display_publishable_buttons(@project) %>
+      <%= display_featurable_buttons(@project) %>
+    </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="#project_details" data-toggle="tab" aria-expanded="false">
+        <span class="visible-xs"><i class="fa-database"></i></span>
+        <span class="hidden-xs">Project Details</span>
+      </a>
+    </li>
+
+    <li class="">
+      <a href="#project_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="project_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(@project.description) %>
+      <%= clear_tag(20) %>
+        
+    </div>
+
+    <div class="tab-pane" id="project_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_project_images_buttons">
+        <div class="row">
+          <div class="col-md-6">
+            <%= theme_button('Upload a New Image', 'refresh', upload_multiple_image_link(@project, :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: @project.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><%= @project.id %></td>
+              <th>Status</th><td><%= @project.status %></td>
+            </tr>
+            <tr>
+              <th>Created At</th><td><%= @project.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @project.created_at %></td>
+              <th>Updated At</th><td><%= @project.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @project.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/projects/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, projects_path(ct: ct.id) %>
+          </li>
+        <% end %>        
+      </ul>
+
+      <!-- <ul class="nav nav-tabs nav-tabs-justified">
+        <%# Dhatu::Project::STATUS.each do |key, value| %>
+        <li class="<%#= @status == value ? 'active' : '' %>">
+          <%#= link_to dhatu.projects_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_project_action_buttons">
+            <div class="row">
+              <div class="col-sm-6">
+                <%= theme_button('Add a Project', 'plus', dhatu.new_project_path(ct: @category.try(:id)), classes: "pull-left mr-10", btn_type: "success") if @current_user.has_create_permission?(Dhatu::Project) %>
+
+                <%= theme_button('Refresh', 'refresh', dhatu.projects_path(ct: @category.try(:id)), classes: "pull-left mr-10", btn_type: "white") %>
+              </div>
+              <div class="col-sm-6">
+                <%= search_form_kuppayam(Dhatu::Project, dhatu.projects_path(), text: @filters[:query]) %>
+              </div>
+            </div>
+
+          </div>
+          <%= clear_tag(10) %>
+
+          <div id="div_project_index">
+            <%= render :partial=>"dhatu/projects/index" %>
+          </div>
+          <%= clear_tag(10) %>
+
+        </div>
+      </div>
+
+    </div>
+    
+  </div>
+
+</div>
+
+<script type="text/javascript">
+  $('body').on('change', '#inp_name', function() {
+    var projectId = $('#inp_permalink').data("id");
+    if(projectId){
+    } else {
+      var permalink = convertToSlug($(this).val()).slice(0, 63);
+      $('#inp_permalink').val(permalink);
+    }
+  });
+</script>
+
+

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

@@ -30,7 +30,7 @@
 				      
 				      <td class="promotion_attribute-name">
 				      	<strong><%= link_to promotion_attribute.name, promotion_attribute_path(promotion_attribute), remote: true %></strong><br>
-				      	<%= content_tag :span, promotion_attribute.display_data_type, style: "color:darkred;" %><br>
+				      	<%= content_tag :span, promotion_attribute.display_data_type, style: "color:chocolate;" %><br>
 				      </td>
 
 				      <td style="text-align: center;">

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

@@ -10,7 +10,7 @@
   
   <td class="promotion_attribute-name">
     <strong><%= link_to promotion_attribute.name, promotion_attribute_path(promotion_attribute), remote: true %></strong><br>
-    <%= content_tag :span, promotion_attribute.display_data_type, style: "color:darkred;" %><br>
+    <%= content_tag :span, promotion_attribute.display_data_type, style: "color:chocolate;" %><br>
   </td>
 
   <td style="text-align: center;">

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

@@ -28,7 +28,7 @@
 							<%= link_to promotion_enquiry.name, promotion_enquiry_path(promotion_enquiry), remote: true %>
 						<% end %>
 						&nbsp;<%= display_readable_status(promotion_enquiry) %><br>
-						<%= link_to time_ago_in_words(promotion_enquiry.created_at) + " ago", promotion_enquiry_path(promotion_enquiry), remote: true, style: "color:darkred;font-size:10px;" %>
+						<%= link_to time_ago_in_words(promotion_enquiry.created_at) + " ago", promotion_enquiry_path(promotion_enquiry), remote: true, style: "color:chocolate;font-size:10px;" %>
 					</td>
 
 					<td class=""><%= promotion_enquiry.email %></td>

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

@@ -11,7 +11,7 @@
       <%= link_to promotion_enquiry.name, promotion_enquiry_path(promotion_enquiry), remote: true %>
     <% end %>
     &nbsp;<%= display_readable_status(promotion_enquiry) %><br>
-    <%= link_to time_ago_in_words(promotion_enquiry.created_at) + " ago", promotion_enquiry_path(promotion_enquiry), remote: true, style: "color:darkred;font-size:10px;" %>
+    <%= link_to time_ago_in_words(promotion_enquiry.created_at) + " ago", promotion_enquiry_path(promotion_enquiry), remote: true, style: "color:chocolate;font-size:10px;" %>
   </td>
 
   <td class=""><%= promotion_enquiry.email %></td>

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

@@ -5,8 +5,6 @@
 				<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 %>
@@ -27,17 +25,18 @@
 					</td>
 
 					<td class="display-link">
-						<%= link_to service.name, service_path(service), remote: true, style: "color: darkred;font-size:16px;" %><br>
+						<%= link_to service.name, service_path(service), remote: true, style: "color: chocolate;font-size:16px;" %><br>
 						<%= link_to service.category.try(:display_name), service_path(service), remote: true %><br>
-						<%= service.meta_description %>
+						<p style="color:#898989;"><%= service.meta_description %></p><br>
+						<%= display_publishable_status(service) %>
+						<%= display_featured(service) %>						
 					</td>
 
-					<td class="hidden-sm hidden-xs"><%= display_publishable_status(service) %></td>
-
-		      <% if display_manage_links? %>
+					<% 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_featurable_links(service) %>
 			      <%= display_manage_links(service, @current_user) %>
 			    </td>
 			    <% end %>

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

@@ -9,17 +9,18 @@
   </td>
 
   <td class="display-link">
-    <%= link_to service.name, service_path(service), remote: true, style: "color: darkred;font-size:16px;" %><br>
+    <%= link_to service.name, service_path(service), remote: true, style: "color: chocolate;font-size:16px;" %><br>
     <%= link_to service.category.try(:display_name), service_path(service), remote: true %><br>
-    <%= service.meta_description %>
+    <p style="color:#898989;"><%= service.meta_description %></p><br>
+    <%= display_publishable_status(service) %>
+    <%= display_featured(service) %>            
   </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_featurable_links(service) %>
     <%= display_manage_links(service, @current_user) %>
   </td>
   <% end %>

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

@@ -29,12 +29,12 @@
           <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('Add a Service', 'plus', dhatu.new_service_path(ct: @category.try(:id)), 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") %>
+                <%= theme_button('Refresh', 'refresh', dhatu.services_path(ct: @category.try(:id)), 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]) %>
+                <%= search_form_kuppayam(Dhatu::Service, dhatu.services_path(), text: @filters[:query]) %>
               </div>
             </div>
 

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

@@ -1,5 +1,29 @@
 <%
 	dhatu_items = {
+		sections: {
+			text: "Sections",
+			icon_class: "fa-reorder",
+			url: dhatu.sections_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Section)
+		},
+		categories: {
+			text: "Categories",
+			icon_class: "fa-sitemap",
+			url: dhatu.categories_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Category)
+		},
+		projects: {
+			text: "Projects",
+			icon_class: "fa-rocket",
+			url: dhatu.projects_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Project)
+		},
+		services: {
+			text: "Services",
+			icon_class: "fa-glass",
+			url: dhatu.services_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Service)
+		},
 		promotions: {
 			text: "Promotions",
 			icon_class: "fa-gift",
@@ -18,24 +42,12 @@
 			url: dhatu.bookings_url,
 			has_permission: @current_user.has_read_permission?(Dhatu::Booking)
 		},
-		sections: {
-			text: "Sections",
-			icon_class: "fa-reorder",
-			url: dhatu.sections_url,
-			has_permission: @current_user.has_read_permission?(Dhatu::Section)
-		},
 		blog_posts: {
 			text: "Blog",
 			icon_class: "fa-newspaper-o",
 			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)
-		},
 		prices: {
 			text: "Prices",
 			icon_class: "fa-dollar",
@@ -71,12 +83,6 @@
 			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

@@ -42,6 +42,14 @@ Dhatu::Engine.routes.draw do
 			end
 		end
 
+		resources :projects do
+			member do
+				put :update_status, as:  :update_status
+				put :mark_as_featured
+	      put :remove_from_featured
+			end
+		end
+
 		resources :prices do
 			member do
 				put :update_status, as:  :update_status

data/db/migrate/20180101093434_create_projects.rb

@@ -0,0 +1,23 @@
+class CreateProjects < ActiveRecord::Migration[5.1]
+  def change
+    create_table :projects do |t|
+      t.string :name, :null => false, limit: 128
+      t.string :permalink, :null => false, limit: 128
+
+      t.string :meta_description, :null => true, limit: 512
+      t.text   :description
+
+      t.string :client, :null => false, limit: 128
+      t.references :category
+      
+      t.string :status, :null => false, :default=>"unpublished", :limit=>16
+      t.boolean :featured, default: false
+      t.integer :priority, default: 1, null: false
+
+      t.timestamps null: false
+    end
+
+    add_index :projects, :permalink, :unique => true
+    add_index :projects, :status
+  end
+end

data/lib/dhatu/version.rb

@@ -1,3 +1,3 @@
 module Dhatu
-  VERSION = '0.1.18'
-end
+  VERSION = '0.1.19'
+end

data/lib/tasks/dhatu/data.rake

@@ -25,7 +25,7 @@ namespace 'dhatu' do
         puts " "
       end
 
-      ["Dhatu::Category", "Dhatu::Service", "Dhatu::Section", "Dhatu::SectionType", "Dhatu::Event", "Dhatu::Offer", "Dhatu::Price", "Dhatu::Testimonial", "Dhatu::TeamMember", "Dhatu::Branch", "Dhatu::Promotion", "Dhatu::PromotionAttribute", "Dhatu::BlogPost"].each do |cls_name|
+      ["Dhatu::Category", "Dhatu::Service", "Dhatu::Project", "Dhatu::Section", "Dhatu::SectionType", "Dhatu::Event", "Dhatu::Offer", "Dhatu::Price", "Dhatu::Testimonial", "Dhatu::TeamMember", "Dhatu::Branch", "Dhatu::Promotion", "Dhatu::PromotionAttribute", "Dhatu::BlogPost"].each do |cls_name|
         name = cls_name.underscore.pluralize
         desc "Import #{cls_name.pluralize}"
         task name => :environment do
@@ -49,7 +49,7 @@ namespace 'dhatu' do
         desc "Import all dummy data in sequence"
         task 'all' => :environment do
 
-          import_list = ["dhatu/services", "dhatu/sections", "dhatu/section_types", "dhatu/categories", "dhatu/events", "dhatu/offers", "dhatu/prices", "dhatu/testimonials", "dhatu/team_members"]
+          import_list = ["dhatu/services", "dhatu/projects", "dhatu/sections", "dhatu/section_types", "dhatu/categories", "dhatu/events", "dhatu/offers", "dhatu/prices", "dhatu/testimonials", "dhatu/team_members"]
           
           import_list.each do |item|
             print "Loading #{item.split(':').last.titleize} \t".yellow
@@ -65,7 +65,7 @@ namespace 'dhatu' do
           puts " "
         end
 
-        ["Dhatu::Category", "Dhatu::Service", "Dhatu::Section", "Dhatu::SectionType", "Dhatu::Event", "Dhatu::Offer", "Dhatu::Price", "Dhatu::Testimonial", "Dhatu::TeamMember", "Dhatu::Branch", "Dhatu::Promotion", "Dhatu::PromotionAttribute", "Dhatu::BlogPost"].each do |cls_name|
+        ["Dhatu::Category", "Dhatu::Service", "Dhatu::Project", "Dhatu::Section", "Dhatu::SectionType", "Dhatu::Event", "Dhatu::Offer", "Dhatu::Price", "Dhatu::Testimonial", "Dhatu::TeamMember", "Dhatu::Branch", "Dhatu::Promotion", "Dhatu::PromotionAttribute", "Dhatu::BlogPost"].each do |cls_name|
           name = cls_name.underscore.pluralize
           desc "Load Dummy #{cls_name.pluralize}"
           task name => :environment do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhatu
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-24 00:00:00.000000000 Z
+date: 2018-01-02 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.30
+        version: 0.1.32
   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.30
+        version: 0.1.32
 - !ruby/object:Gem::Dependency
   name: pattana
   requirement: !ruby/object:Gem::Requirement
@@ -418,6 +418,7 @@ files:
 - app/controllers/dhatu/events_controller.rb
 - app/controllers/dhatu/offers_controller.rb
 - app/controllers/dhatu/prices_controller.rb
+- app/controllers/dhatu/projects_controller.rb
 - app/controllers/dhatu/promotion_attributes_controller.rb
 - app/controllers/dhatu/promotion_enquiries_controller.rb
 - app/controllers/dhatu/promotions_controller.rb
@@ -438,6 +439,7 @@ files:
 - app/models/dhatu/event.rb
 - app/models/dhatu/offer.rb
 - app/models/dhatu/price.rb
+- app/models/dhatu/project.rb
 - app/models/dhatu/promotion.rb
 - app/models/dhatu/promotion_attribute.rb
 - app/models/dhatu/promotion_enquiry.rb
@@ -485,6 +487,11 @@ files:
 - app/views/dhatu/prices/_row.html.erb
 - app/views/dhatu/prices/_show.html.erb
 - app/views/dhatu/prices/index.html.erb
+- app/views/dhatu/projects/_form.html.erb
+- app/views/dhatu/projects/_index.html.erb
+- app/views/dhatu/projects/_row.html.erb
+- app/views/dhatu/projects/_show.html.erb
+- app/views/dhatu/projects/index.html.erb
 - app/views/dhatu/promotion_attributes/_form.html.erb
 - app/views/dhatu/promotion_attributes/_index.html.erb
 - app/views/dhatu/promotion_attributes/_row.html.erb
@@ -567,6 +574,7 @@ files:
 - db/migrate/20171203114528_change_default_status_of_promotion_enquiries.rb
 - db/migrate/20171203114529_add_meta_description_to_services.rb
 - db/migrate/20171203114530_add_control_fields_to_promotions.rb
+- db/migrate/20180101093434_create_projects.rb
 - lib/dhatu.rb
 - lib/dhatu/engine.rb
 - lib/dhatu/factories.rb
@@ -614,7 +622,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A simple CMS for your website