dhatu 0.2.0 → 0.2.1

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

@@ -0,0 +1,53 @@
+<div class="table-responsive"> 
+	<table class="table table-hover table-condensed 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 style="width:50%;">Title</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_section_0"></tr>
+	  	<% @sections.each_with_index do |section, i| %>
+	  		
+	  		<tr id="tr_section_<%= section.id %>">
+
+					<th scope="row" style="text-align: center;">
+						<%= serial_number(i) %>
+					</th>
+
+					<!-- <td class="display-image">
+						<%#= display_thumbnail(section) %>
+					</td> -->
+
+					<td>
+						<strong><%= section.title %></strong><br>
+						<%= section.sub_title %><br>
+					</td>
+
+					<td class="hidden-sm hidden-xs"><%= display_publishable_status(section) %></td>
+
+		      <% if display_manage_links? %>
+			    <td class="action-links hidden-sm hidden-xs" style="width:10%"><%= display_publishable_links(section) %></td>
+
+			    <td class="action-links hidden-sm hidden-xs" style="width:10%">
+			      <%= display_manage_links(section, @current_user) %>
+			    </td>
+			    <% end %>
+
+		    </tr>
+		  <% end %>
+	  </tbody>
+	</table>
+</div>
+
+<div class="row">
+  <div class="col-sm-12">
+    <%= paginate_kuppayam(@sections) %>
+  </div>
+</div>

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

@@ -0,0 +1,26 @@
+<tr id="tr_section_<%= section.id %>">
+
+  <th scope="row" style="text-align: center;">
+    <%= serial_number(i) %>
+  </th>
+
+  <!-- <td class="display-image">
+    <%#= display_thumbnail(section) %>
+  </td> -->
+
+  <td>
+    <strong><%= section.title %></strong><br>
+    <%= section.sub_title %><br>
+  </td>
+
+  <td class="hidden-sm hidden-xs"><%= display_publishable_status(section) %></td>
+
+  <% if display_manage_links? %>
+  <td class="action-links hidden-sm hidden-xs" style="width:10%"><%= display_publishable_links(section) %></td>
+
+  <td class="action-links hidden-sm hidden-xs" style="width:10%">
+    <%= display_manage_links(section, @current_user) %>
+  </td>
+  <% end %>
+
+</tr>

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

@@ -0,0 +1,208 @@
+<div id="div_section_show">
+
+  <% if @current_user.super_admin? %>
+  <div class="row">
+    
+    <div class="col-md-9 col-sm-12 col-xs-12">
+      <%= theme_panel_heading(@section.name) %>
+      <%= theme_panel_sub_heading(@section.page.try(:name), "#") %>
+      <%= clear_tag(10) %>
+      <%= display_publishable_status(@section) %>
+    </div>
+
+    <% if display_manage_links? %>
+    <div class="col-md-3 col-sm-12 col-xs-12">
+      <%= display_manage_buttons(@section) %>
+      <%= display_publishable_buttons(@section) if @current_user.super_admin? %>
+    </div>
+    <% end %>
+
+  </div>
+  
+  <%= clear_tag(20) %>
+  <div><strong class="fs-18">Section Texts</strong></div>
+  <hr>
+  <% end %>
+      
+  <%= clear_tag(20) %>
+  
+  <div class="row tabular-item">
+    <% if @section.enable_title %>
+    <div class="col-sm-12 mb-40">
+      <div class="item-title">Title</div>
+      <div class="item-detail"><%= @section.title %></div>
+    </div>
+    <% end %>
+
+    <% if @section.enable_sub_title %>
+    <div class="col-sm-12 mb-40">
+      <div class="item-title">Sub Title</div>
+      <div class="item-detail"><%= @section.sub_title.blank? ? "-" : @section.sub_title %></div>
+    </div>
+    <% end %>
+  </div>
+
+  <div class="row tabular-item">
+    <% if @section.enable_button_one %>
+    <div class="col-sm-3 mb-40">
+      <div class="item-title">Button Text One</div>
+      <div class="item-detail"><%= @section.button_one_text.blank? ? "-" : @section.button_one_text %></div>
+    </div>
+    <div class="col-sm-3 mb-40">
+      <div class="item-title">Button Link One</div>
+      <div class="item-detail"><%= @section.button_one_link.blank? ? "-" : @section.button_one_link %></div>
+    </div>
+    <% end %>
+
+    <% if @section.enable_button_two %>
+    <div class="col-sm-3 mb-40">
+      <div class="item-title">Button Text Two</div>
+      <div class="item-detail"><%= @section.button_two_text.blank? ? "-" : @section.button_two_text %></div>
+    </div>
+    <div class="col-sm-3 mb-40">
+      <div class="item-title">Button Link Two</div>
+      <div class="item-detail"><%= @section.button_two_link.blank? ? "-" : @section.button_two_link %></div>
+    </div>
+    <% end %>
+  </div>
+
+  <div class="row tabular-item">
+    <% if @section.enable_short_description %>
+    <div class="col-sm-12 mb-40">
+      <div class="item-title">Short Description</div>
+      <div class="item-detail pt-20 pb-20">
+        <% if @section.short_description.blank? %>
+          &ltNot Specified&gt
+        <% else %>
+          <%= raw(@section.short_description) %>
+        <% end %>
+      </div>
+    </div>
+    <% end %>
+    
+    <% if @section.enable_long_description %>
+    <div class="col-sm-12 mb-40">
+      <div class="item-title">Long Description</div>
+      <div class="item-detail pt-20 pb-20">
+        <% if @section.long_description.blank? %>
+          &ltNot Specified&gt
+        <% else %>
+          <%= raw(@section.long_description) %>
+        <% end %>
+      </div>
+    </div>
+    <% end %>
+  </div>
+
+  <% if @section.enable_cover_image %>
+    <%= clear_tag(30) %>
+    <div class="row">
+      <div class="col-md-6">
+        <div><strong class="fs-18">Section Image (Optional)</strong></div>
+      </div>
+    </div>
+    <hr style="margin-top:0px;">
+    <div class="row">
+      <div class="col-md-3">
+        <%= clear_tag(10) %>
+        <% if display_edit_links? %>
+          <%= edit_image(@section, 
+              "cover_image.image.large.url",
+              upload_image_link(@section, :cover_image, nil ),
+              remove_image_link(@section, :cover_image, nil ),
+              image_options: {assoc_name: :cover_image }) %>
+        <% else %>
+          <%= display_image(@section, "cover_image.image.large.url", class: "img-inline", alt: @section.display_name) %>
+        <% end %>
+      </div>
+    </div>
+    <%= clear_tag(30) %>
+  <% end %>
+
+  <% if @section.enable_gallery_images %>
+    <%= clear_tag(30) %>
+    <div class="row">
+      <div class="col-md-6">
+        <div><strong class="fs-18">Section Images (Optional)</strong></div>
+      </div>
+      <div class="col-md-6">
+        <%= theme_button('Upload a New Image', 'plus', upload_multiple_image_link(@section, :gallery_images, nil ), classes: "pull-right", btn_type: "success") %>
+      </div>
+    </div>
+    <hr style="margin-top:0px;">
+    <%= clear_tag(10) %>
+    <div id="div_multiple_images">
+      <%= render :partial=>"kuppayam/images/multiple_images", locals: { images: @section.gallery_images } %>
+    </div>
+    <%= clear_tag(30) %>
+  <% end %>
+
+  <% if @current_user.super_admin? %>
+  <%= clear_tag(30) %>
+  <div><strong class="fs-18">Technical Details</strong></div>
+  <hr>
+  <div class="table-responsive"> 
+    <table class="table table-striped table-condensed table-bordered mb-60"> 
+      <tbody>
+        
+        <tr>
+          <th>ID</th><td><%= @section.id %></td>
+          <th style="width:25%">Page</th>
+          <td style="width:25%"><%= "#{@section.page.name} (#{@section.page.id})" if @section.page %></td>
+        </tr>
+
+        <tr>
+          <th>CODE</th><td><%= @section.code %></td>
+          <th></th><td></td>
+        </tr>
+
+        <tr>
+          <th>Status</th><td><%= @section.status %></td>
+          <th>Priority</th><td><%= @section.priority %></td>
+        </tr>
+
+        <tr>
+          <th style="width:25%">Enable Title</th>
+          <td style="width:25%"><%=@section.enable_title %></td>
+          <th style="width:25%">Enable Sub Title</th>
+          <td style="width:25%"><%=@section.enable_sub_title %></td>
+        </tr>
+
+        <tr>
+          <th style="width:25%">Enable Button One</th>
+          <td style="width:25%"><%=@section.enable_button_one %></td>
+          <th style="width:25%">Enable Button Two</th>
+          <td style="width:25%"><%=@section.enable_button_two %></td>
+        </tr>
+
+        <tr>
+          <th style="width:25%">Enable Short Description</th>
+          <td style="width:25%"><%=@section.enable_short_description %></td>
+          <th style="width:25%">Enable Long Description</th>
+          <td style="width:25%"><%=@section.enable_long_description %></td>
+        </tr>
+
+        <tr>
+          <th style="width:25%">Enable Cover Image</th>
+          <td style="width:25%"><%=@section.enable_cover_image %></td>
+          <th style="width:25%">Enable Gallery Images</th>
+          <td style="width:25%"><%=@section.enable_gallery_images %></td>
+        </tr>
+
+        <tr>
+          <th>Created At</th><td><%= @section.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @section.created_at %></td>
+          <th>Updated At</th><td><%= @section.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @section.updated_at %></td>
+        </tr>
+        
+      </tbody>
+    </table>
+  </div>
+  <% end %>
+
+  <%= link_to "Close", "#", onclick: "closeLargeModal();", class: "btn btn-primary pull-right ml-10", style: "width:120px;" %>
+
+  <%= link_to "Edit", edit_section_path(@section), remote: true, class: "btn btn-success pull-right", style: "width:180px;" if display_manage_links? %>
+
+  <%= clear_tag %>
+
+</div>

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

@@ -0,0 +1,52 @@
+<div class="row">
+      
+  <div class="col-md-12">
+    
+    <ul class="nav nav-tabs nav-tabs-justified">
+      <% Dhatu::Section::STATUS.each do |key, value| %>
+      <li class="<%= @status == value ? 'active' : '' %>">
+        <%= link_to dhatu.sections_path(st: value), "aria-expanded" => "#{ @status == value ? 'true' : 'false' }" do %>
+          <span class="mr-5"><i class="<%= Dhatu::Section::STATUS_UI_ICON[value] %>"></i></span>
+          <span class="hidden-xs"><%= key %></span>
+        <% end %>
+      </li>
+      <% end %>
+    </ul>
+
+    <div class="tab-content">
+      <div class="tab-pane active">
+
+        <div id="div_section_action_buttons">
+          <div class="row">
+            <div class="col-sm-6">
+              <%= theme_button('Add a Section', 'plus', dhatu.new_section_path(), classes: "pull-left mr-10", btn_type: "success") if @current_user.has_create_permission?(Dhatu::Section) %>
+
+              <%= theme_button('Refresh', 'refresh', dhatu.sections_path(st: @status), classes: "pull-left mr-10", btn_type: "white") %>
+            </div>
+            <div class="col-sm-6">
+              <%= search_form_kuppayam(Dhatu::Section, dhatu.sections_path(st: @status), text: @filters[:query]) %>
+            </div>
+          </div>
+
+        </div>
+        <%= clear_tag(10) %>
+
+        <div id="div_section_index">
+          <%= render :partial=>"dhatu/sections/index" %>
+        </div>
+        <%= clear_tag(10) %>
+
+      </div>
+    </div>
+
+  </div>
+
+</div>
+
+<script type="text/javascript">
+  $('body').on('change', '#inp_title', function() {
+    var sectionCode = $(this).val().replace(/ /g, '_').toUpperCase().slice(0, 63);
+    console.log("hello");
+    $('#inp_code').val(sectionCode);
+  });
+</script>

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

@@ -24,6 +24,12 @@
 			url: dhatu.services_url,
 			has_permission: @current_user.has_read_permission?(Dhatu::Service)
 		},
+		photo_albums: {
+			text: "Photo Gallery",
+			icon_class: "fa-image",
+			url: dhatu.photo_albums_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::PhotoAlbum)
+		},
 		prices: {
 			text: "Prices",
 			icon_class: "fa-dollar",

data/config/routes.rb

@@ -136,6 +136,15 @@ Dhatu::Engine.routes.draw do
       end
     end
 
+    resources :photo_albums do
+      member do
+        put :make_parent, as:  :make_parent
+        put :update_status, as:  :update_status
+        put :mark_as_featured, as:  :mark_as_featured
+        put :remove_from_featured, as:  :remove_from_featured
+      end
+    end
+
   end
 
 end

data/db/migrate/20180101093437_create_photo_albums.rb

@@ -0,0 +1,24 @@
+class CreatePhotoAlbums < ActiveRecord::Migration[5.1]
+  def change
+    create_table :photo_albums do |t|
+      t.string :name, :null => false, limit: 128
+      t.string :code, :null => false, limit: 128
+      t.string :one_liner
+      t.string :permalink, :null => false, limit: 128
+      t.text   :description
+      
+      t.references :parent, references: :category
+      t.references :top_parent, references: :category
+      t.boolean :end_node, default: true
+      
+      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 :photo_albums, :permalink, :unique => true
+    add_index :photo_albums, :status
+  end
+end

data/lib/dhatu/version.rb

@@ -1,5 +1,5 @@
 module Dhatu
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
   # The old version to migrate existing applications
   # VERSION = '0.1.25'
 end

data/spec/dummy/spec/factories/photo_album.rb

@@ -0,0 +1,28 @@
+FactoryBot.define do
+
+  factory :photo_album, class: Dhatu::Category do
+    name "Photo Album Name"
+    code "PHOTO_ALBUM_CODE"
+    one_liner "Photo Album One Liner"
+    description "Photo Album Short Description"
+    status "published"
+    featured false
+    end_node true
+  end
+
+  factory :published_photo_album, parent: :photo_album do
+    status "published"
+  end
+
+  factory :unpublished_photo_album, parent: :photo_album do
+    status "unpublished"
+  end
+
+  factory :removed_photo_album, parent: :photo_album do
+    status "removed"
+  end
+
+  factory :featured_photo_album, parent: :published_photo_album do
+    featured true
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhatu
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-27 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -419,6 +419,7 @@ files:
 - app/controllers/dhatu/meta_tags_controller.rb
 - app/controllers/dhatu/offers_controller.rb
 - app/controllers/dhatu/pages_controller.rb
+- app/controllers/dhatu/photo_albums_controller.rb
 - app/controllers/dhatu/prices_controller.rb
 - app/controllers/dhatu/projects_controller.rb
 - app/controllers/dhatu/promotion_attributes_controller.rb
@@ -441,6 +442,7 @@ files:
 - app/models/dhatu/meta_tag.rb
 - app/models/dhatu/offer.rb
 - app/models/dhatu/page.rb
+- app/models/dhatu/photo_album.rb
 - app/models/dhatu/price.rb
 - app/models/dhatu/project.rb
 - app/models/dhatu/promotion.rb
@@ -471,10 +473,9 @@ files:
 - app/views/dhatu/branches/index.html.erb
 - app/views/dhatu/categories/_category_types.html.erb
 - app/views/dhatu/categories/_form.html.erb
+- app/views/dhatu/categories/_header.html.erb
 - app/views/dhatu/categories/_index.html.erb
-- app/views/dhatu/categories/_index_list.html.erb
 - app/views/dhatu/categories/_row.html.erb
-- app/views/dhatu/categories/_row_list.html.erb
 - app/views/dhatu/categories/_show.html.erb
 - app/views/dhatu/categories/choose_category_type.html.erb
 - app/views/dhatu/categories/index.html.erb
@@ -501,6 +502,12 @@ files:
 - app/views/dhatu/pages/_show.html.erb
 - app/views/dhatu/pages/index.html.erb
 - app/views/dhatu/pages/show.html.erb
+- app/views/dhatu/photo_albums/_form.html.erb
+- app/views/dhatu/photo_albums/_header.html.erb
+- app/views/dhatu/photo_albums/_index.html.erb
+- app/views/dhatu/photo_albums/_row.html.erb
+- app/views/dhatu/photo_albums/_show.html.erb
+- app/views/dhatu/photo_albums/index.html.erb
 - app/views/dhatu/prices/_form.html.erb
 - app/views/dhatu/prices/_index.html.erb
 - app/views/dhatu/prices/_row.html.erb
@@ -532,6 +539,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/sections_old/_form.html.erb
+- app/views/dhatu/sections_old/_index.html.erb
+- app/views/dhatu/sections_old/_row.html.erb
+- app/views/dhatu/sections_old/_show.html.erb
+- app/views/dhatu/sections_old/index.html.erb
 - app/views/dhatu/services/_form.html.erb
 - app/views/dhatu/services/_index.html.erb
 - app/views/dhatu/services/_row.html.erb
@@ -585,6 +597,7 @@ files:
 - db/migrate/20171120145548_create_promotion_and_promotion_enquiries.rb
 - db/migrate/20180101093434_create_projects.rb
 - db/migrate/20180101093436_create_meta_tags.rb
+- db/migrate/20180101093437_create_photo_albums.rb
 - lib/dhatu.rb
 - lib/dhatu/engine.rb
 - lib/dhatu/factories.rb
@@ -602,6 +615,7 @@ files:
 - spec/dummy/spec/factories/offer.rb
 - spec/dummy/spec/factories/offer_cover_image.rb
 - spec/dummy/spec/factories/offer_gallery_image.rb
+- spec/dummy/spec/factories/photo_album.rb
 - spec/dummy/spec/factories/promotion.rb
 - spec/dummy/spec/factories/promotion_attributes.rb
 - spec/dummy/spec/factories/promotion_cover_image.rb