dhatu 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24065cc8a1cebfc4fdf42546f5a1f2c9b7be6fa1e04ee9f58ff61d7f913ba9c8
-  data.tar.gz: 8914e1a60b9d33a86dfbc38a1618c61fff0cc9fee61e7aa4ea3d95a8699f5e4e
+  metadata.gz: 0062d1f5401183ec441d6b9c1e8ee9f8f3dfc98d12a56c4b9f2de55264526574
+  data.tar.gz: 7296b4b1ee4e9164c166ea38d339a07c8d86107152aa527e365a4183758797dd
 SHA512:
-  metadata.gz: ec26f5027eabf1d3c5b72a063c7ea46a8d3d51728377e2ede4ad96b4bb4ff4bdbef3ef9001cdcd7609cfeeadda0de413b2c1d2a25d6fd9b383512e4a6d42ce50
-  data.tar.gz: e823a72be6dd1ef8b2d4b6966bcbd949aa86b31045155027bafebd2cac985725fd2a6c95d16fe4796f693c42af76eb3d89dbd9bb4c200857fddd57f9ed0dbca6
+  metadata.gz: f443caeb5d1cb12bc0db74a25af8a2708c278d0d9537d89629c48f86500a6f173a623ae35fc01ebc914ab73fa39026e728a8688b55480f2d1340e43eb49c498c
+  data.tar.gz: e5717a63115cb3bf926d887106ef74e66b7818c037a558a4cdd5815deb83c7b24dfbe63648214792807a221bfbdbde629b3a7b4f103f5c09bd966f00f81196de

data/app/models/dhatu/blog_post.rb

@@ -64,7 +64,7 @@ class Dhatu::BlogPost < Dhatu::ApplicationRecord
 
     blog_post.category = category
 
-    blog_post.featured = ["true", "t","1","yes","y"].include?(hsh[:featured].to_s.strip)
+    blog_post.featured = ["true", "t","1","yes","y"].include?(hsh[:featured].to_s.downcase.strip)
     blog_post.status = hsh[:status].to_s.strip.blank? ? PUBLISHED : hsh[:status].to_s.strip
 
     if blog_post.valid?

data/app/models/dhatu/branch.rb

@@ -85,8 +85,8 @@ class Dhatu::Branch < Dhatu::ApplicationRecord
     branch.blog = hsh[:blog].to_s.strip
     branch.status = hsh[:status].to_s.strip.blank? ? PUBLISHED : hsh[:status].to_s.strip
 
-    branch.featured = ["true", "t","1","yes","y"].include?(hsh[:featured].to_s.strip)
-    branch.main_branch = ["true", "t","1","yes","y"].include?(hsh[:main_branch].to_s.strip)
+    branch.featured = ["true", "t","1","yes","y"].include?(hsh[:featured].to_s.downcase.strip)
+    branch.main_branch = ["true", "t","1","yes","y"].include?(hsh[:main_branch].to_s.downcase.strip)
 
     if branch.valid?
       begin

data/app/models/dhatu/promotion.rb

@@ -43,15 +43,15 @@ class Dhatu::Promotion < Dhatu::ApplicationRecord
     promotion.code = hsh[:code].to_s.strip
     promotion.short_description = hsh[:short_description].to_s.strip
 
-    promotion.display_name = ["true", "t","1","yes","y"].include?(hsh[:display_name].to_s.strip)
-    promotion.display_email = ["true", "t","1","yes","y"].include?(hsh[:display_email].to_s.strip)
-    promotion.display_phone = ["true", "t","1","yes","y"].include?(hsh[:display_phone].to_s.strip)
+    promotion.display_name = ["true", "t","1","yes","y"].include?(hsh[:display_name].to_s.downcase.strip)
+    promotion.display_email = ["true", "t","1","yes","y"].include?(hsh[:display_email].to_s.downcase.strip)
+    promotion.display_phone = ["true", "t","1","yes","y"].include?(hsh[:display_phone].to_s.downcase.strip)
 
-    promotion.name_mandatory = ["true", "t","1","yes","y"].include?(hsh[:name_mandatory].to_s.strip)
-    promotion.email_mandatory = ["true", "t","1","yes","y"].include?(hsh[:email_mandatory].to_s.strip)
-    promotion.phone_mandatory = ["true", "t","1","yes","y"].include?(hsh[:phone_mandatory].to_s.strip)
+    promotion.name_mandatory = ["true", "t","1","yes","y"].include?(hsh[:name_mandatory].to_s.downcase.strip)
+    promotion.email_mandatory = ["true", "t","1","yes","y"].include?(hsh[:email_mandatory].to_s.downcase.strip)
+    promotion.phone_mandatory = ["true", "t","1","yes","y"].include?(hsh[:phone_mandatory].to_s.downcase.strip)
     
-    promotion.featured = ["true", "t","1","yes","y"].include?(hsh[:featured].to_s.strip)
+    promotion.featured = ["true", "t","1","yes","y"].include?(hsh[:featured].to_s.downcase.strip)
     promotion.status = hsh[:status].to_s.strip.blank? ? PUBLISHED : hsh[:status].to_s.strip
     promotion.priority = hsh[:priority].to_s.strip.blank? ? 1000 : hsh[:priority].to_s.strip
 

data/app/models/dhatu/section.rb

@@ -88,7 +88,7 @@ class Dhatu::Section < Dhatu::ApplicationRecord
   end
 
   def display_name
-    "#{title_was}"
+    "#{name_was}"
   end
 
   # Permission Methods

data/app/uploaders/category_image_uploader.rb

@@ -5,19 +5,19 @@ class CategoryImageUploader < ImageUploader
   end
 
   version :large do
-    process :resize_to_fill => [400, 400]
+    process :resize_to_fill => [800, 800]
   end
 
   version :medium do
-    process :resize_to_fill => [200, 200]
+    process :resize_to_fill => [400, 400]
   end
 
 	version :small do
-    process :resize_to_fill => [100, 100]
+    process :resize_to_fill => [200, 200]
   end
 
   version :tiny do
-    process :resize_to_fill => [40, 40]
+    process :resize_to_fill => [100, 100]
   end
   
 end

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

@@ -119,6 +119,12 @@
     </div>
   </div>
 
+  <!-- Display Meta Tags -->
+  <% if @current_user.has_read_permission?(Dhatu::MetaTag) %>
+  <%= clear_tag(40) %>
+  <%= render :partial=>"dhatu/meta_tags/list", locals: {meta_taggable: @blog_post } %>
+  <% end %>
+
   <%= link_to "Close", "#", onclick: "closeLargeModal();", class: "btn btn-primary pull-right" %>
 
   <%= clear_tag %>

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

@@ -66,7 +66,6 @@
 
   <div><strong class="fs-18">Category Image</strong></div>
   <hr>
-
   <div class="row">
     <div class="col-md-6 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
       <% if display_edit_links? %>

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

@@ -87,27 +87,10 @@
   </div>
   <%= render :partial=>"kuppayam/images/multiple_images", locals: { images: @event.gallery_images } %>
 
+  <!-- Display Meta Tags -->
   <% if @current_user.has_read_permission?(Dhatu::MetaTag) %>
   <%= clear_tag(40) %>
-  <div><strong class="fs-18">Meta Tags</strong></div>
-  <hr>
-  <div id="div_meta_tags_action_buttons">
-    <div class="row">
-      <div class="col-md-6">
-        <%= theme_button('Add a Meta Tag', 'plus', new_meta_tag_path(meta_taggable_id: @event.id, meta_taggable_type: @event.class.name), classes: "pull-left mr-10", btn_type: "success") if @current_user.has_create_permission?(Dhatu::MetaTag) %>
-
-        <%= theme_button('Refresh', 'refresh', meta_tags_path(meta_taggable_id: @event.id, meta_taggable_type: @event.class.name), classes: "pull-left mr-10", btn_type: "white") %>
-      </div>
-      <div class="col-md-6">
-        <%= search_form_kuppayam(User, meta_tags_path(meta_taggable_id: @event.id, meta_taggable_type: @event.class.name), text: "") %>
-      </div>
-    </div>
-  </div>
-  <%= clear_tag(10) %>
-  <div id="div_meta_tag_index">
-    <% meta_tags = @event.meta_tags.page(@current_page).per(@per_page) %>
-    <%= render :partial=>"dhatu/meta_tags/index", locals: {meta_tags: meta_tags, meta_taggable: @event } %>
-  </div>
+  <%= render :partial=>"dhatu/meta_tags/list", locals: {meta_taggable: @event } %>
   <% end %>
 
   <% if @current_user.super_admin? %>

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

@@ -13,7 +13,7 @@
 		</thead>
 		
 	  <tbody>
-	  	<% meta_tags.each_with_index do |meta_tag, i| %>
+	  	<% meta_taggable.meta_tags.each_with_index do |meta_tag, i| %>
 	  		<tr id="tr_meta_tag_<%= meta_tag.id %>">
 		      
 		      <th scope="row" style="" class="hidden-sm hidden-xs">

data/app/views/dhatu/meta_tags/_list.html.erb

@@ -0,0 +1,22 @@
+<div><strong class="fs-18">Meta Tags</strong></div>
+<hr>
+<div class="alert alert-default">
+  <strong>Meta Tags</strong> are html tags used in HTML and XHTML documents to provide structured metadata about a Web page. <br>
+  They are part of a web page's head section. Multiple Meta elements with different attributes can be used on the same page.
+</div>
+<div id="div_meta_tags_action_buttons">
+  <div class="row">
+    <div class="col-md-6">
+      <%= theme_button('Add a Meta Tag', 'plus', new_meta_tag_path(meta_taggable_id: meta_taggable.id, meta_taggable_type: meta_taggable.class.name), classes: "pull-left mr-10", btn_type: "success") if @current_user.has_create_permission?(Dhatu::MetaTag) %>
+
+      <%= theme_button('Refresh', 'refresh', meta_tags_path(meta_taggable_id: meta_taggable.id, meta_taggable_type: meta_taggable.class.name), classes: "pull-left mr-10", btn_type: "white") %>
+    </div>
+    <div class="col-md-6">
+      <%= search_form_kuppayam(User, meta_tags_path(meta_taggable_id: meta_taggable.id, meta_taggable_type: meta_taggable.class.name), text: "") %>
+    </div>
+  </div>
+</div>
+<%= clear_tag(10) %>
+<div id="div_meta_tag_index">
+  <%= render :partial=>"dhatu/meta_tags/index", locals: { meta_taggable: meta_taggable } %>
+</div>

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

@@ -64,27 +64,10 @@
     </div>
   </div>
 
+  <!-- Display Meta Tags -->
   <% if @current_user.has_read_permission?(Dhatu::MetaTag) %>
   <%= clear_tag(40) %>
-  <div><strong class="fs-18">Meta Tags</strong></div>
-  <hr>
-  <div id="div_meta_tags_action_buttons">
-    <div class="row">
-      <div class="col-md-6">
-        <%= theme_button('Add a Meta Tag', 'plus', new_meta_tag_path(meta_taggable_id: @offer.id, meta_taggable_type: @offer.class.name), classes: "pull-left mr-10", btn_type: "success") if @current_user.has_create_permission?(Dhatu::MetaTag) %>
-
-        <%= theme_button('Refresh', 'refresh', meta_tags_path(meta_taggable_id: @offer.id, meta_taggable_type: @offer.class.name), classes: "pull-left mr-10", btn_type: "white") %>
-      </div>
-      <div class="col-md-6">
-        <%= search_form_kuppayam(User, meta_tags_path(meta_taggable_id: @offer.id, meta_taggable_type: @offer.class.name), text: "") %>
-      </div>
-    </div>
-  </div>
-  <%= clear_tag(10) %>
-  <div id="div_meta_tag_index">
-    <% meta_tags = @offer.meta_tags.page(@current_page).per(@per_page) %>
-    <%= render :partial=>"dhatu/meta_tags/index", locals: {meta_tags: meta_tags, meta_taggable: @offer } %>
-  </div>
+  <%= render :partial=>"dhatu/meta_tags/list", locals: {meta_taggable: @offer } %>
   <% end %>
   
   <% if @current_user.super_admin? %>

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

@@ -2,30 +2,14 @@
 
   <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(@page, 
-          "cover_image.image.large.url",
-          upload_image_link(@page, :cover_image, nil ),
-          remove_image_link(@page, :cover_image, nil ),
-          image_options: {assoc_name: :cover_image }) %>
-      <%# else %>
-        <%#= display_image(@page, "cover_image.image.large.url", class: "img-inline", alt: @page.display_name) %>
-      <%# end %>
-    <!-- </div> -->
-
     <div class="col-md-9 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
 
       <%= theme_panel_heading(@page.name) %>
-
       <%= theme_panel_sub_heading(@page.code, "#") if @page.code %>
-      
       <%= clear_tag(10) %>
       <span class="mr-5 mt-5 badge badge-warning"><%= @page.feature.try(:name) %></span>
       <%= clear_tag(10) %>
-
       <%= display_publishable_status(@page) %>
-      
       <%= clear_tag(10) %>
       
     </div>
@@ -40,30 +24,8 @@
   </div>
 
   <%= clear_tag(40) %>
-
-  <div><strong class="fs-18">Meta Tags</strong></div>
-  <hr>
-  <% if @page.feature %>
-    <div class="alert alert-default"><%= @page.feature.try(:display_name) %> module has a built in meta tag manager. Manage Meta Tags for this page there.</div>
-  <% else %>
-  <div id="div_meta_tags_action_buttons">
-    <div class="row">
-      <div class="col-md-6">
-        <%= theme_button('Add a Meta Tag', 'plus', new_meta_tag_path(meta_taggable_id: @page.id, meta_taggable_type: @page.class.name), classes: "pull-left mr-10", btn_type: "success") if @current_user.has_create_permission?(Dhatu::MetaTag) %>
-
-        <%= theme_button('Refresh', 'refresh', meta_tags_path(meta_taggable_id: @page.id, meta_taggable_type: @page.class.name), classes: "pull-left mr-10", btn_type: "white") %>
-      </div>
-      <div class="col-md-6">
-        <%= search_form_kuppayam(User, meta_tags_path(meta_taggable_id: @page.id, meta_taggable_type: @page.class.name), text: "") %>
-      </div>
-    </div>
-  </div>
-  <%= clear_tag(10) %>
-  <div id="div_meta_tag_index">
-    <% meta_tags = @page.meta_tags.page(@current_page).per(@per_page) %>
-    <%= render :partial=>"dhatu/meta_tags/index", locals: {meta_tags: meta_tags, meta_taggable: @page } %>
-  </div>
-  <% end %>
+  <!-- Display Meta Tags -->
+  <%= render :partial=>"dhatu/meta_tags/list", locals: {meta_taggable: @page } %>
 
   <% if @current_user.super_admin? %>
   <%= clear_tag(40) %>
@@ -92,6 +54,8 @@
   </div>
   <% end %>
 
+  <%= clear_tag(40) %>
+
   <%= link_to "Close", "#", onclick: "closeLargeModal();", class: "btn btn-primary pull-right" %>
 
   <%= clear_tag %>

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

@@ -78,27 +78,10 @@
   </div>
   <%= render :partial=>"kuppayam/images/multiple_images", locals: { images: @project.gallery_images } %>
   
+  <!-- Display Meta Tags -->
   <% if @current_user.has_read_permission?(Dhatu::MetaTag) %>
   <%= clear_tag(40) %>
-  <div><strong class="fs-18">Meta Tags</strong></div>
-  <hr>
-  <div id="div_meta_tags_action_buttons">
-    <div class="row">
-      <div class="col-md-6">
-        <%= theme_button('Add a Meta Tag', 'plus', new_meta_tag_path(meta_taggable_id: @project.id, meta_taggable_type: @project.class.name), classes: "pull-left mr-10", btn_type: "success") if @current_user.has_create_permission?(Dhatu::MetaTag) %>
-
-        <%= theme_button('Refresh', 'refresh', meta_tags_path(meta_taggable_id: @project.id, meta_taggable_type: @project.class.name), classes: "pull-left mr-10", btn_type: "white") %>
-      </div>
-      <div class="col-md-6">
-        <%= search_form_kuppayam(User, meta_tags_path(meta_taggable_id: @project.id, meta_taggable_type: @project.class.name), text: "") %>
-      </div>
-    </div>
-  </div>
-  <%= clear_tag(10) %>
-  <div id="div_meta_tag_index">
-    <% meta_tags = @project.meta_tags.page(@current_page).per(@per_page) %>
-    <%= render :partial=>"dhatu/meta_tags/index", locals: {meta_tags: meta_tags, meta_taggable: @project } %>
-  </div>
+  <%= render :partial=>"dhatu/meta_tags/list", locals: {meta_taggable: @project } %>
   <% end %>
 
   <% if @current_user.super_admin? %>

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

@@ -1,5 +1,6 @@
 <div id="div_section_show">
 
+  <% if @current_user.super_admin? %>
   <div class="row">
     
     <div class="col-md-9 col-sm-12 col-xs-12">
@@ -17,10 +18,11 @@
     <% end %>
 
   </div>
-
+  
   <%= clear_tag(20) %>
   <div><strong class="fs-18">Section Texts</strong></div>
   <hr>
+  <% end %>
       
   <%= clear_tag(20) %>
   
@@ -197,7 +199,9 @@
   </div>
   <% end %>
 
-  <%= link_to "Close", "#", onclick: "closeLargeModal();", class: "btn btn-primary pull-right" %>
+  <%= 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 %>
 

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

@@ -78,27 +78,10 @@
   </div>
   <%= render :partial=>"kuppayam/images/multiple_images", locals: { images: @service.gallery_images } %>
   
+  <!-- Display Meta Tags -->
   <% if @current_user.has_read_permission?(Dhatu::MetaTag) %>
-  <%= clear_tag(60) %>
-  <div><strong class="fs-18">Meta Tags</strong></div>
-  <hr>
-  <div id="div_meta_tags_action_buttons">
-    <div class="row">
-      <div class="col-md-6">
-        <%= theme_button('Add a Meta Tag', 'plus', new_meta_tag_path(meta_taggable_id: @service.id, meta_taggable_type: @service.class.name), classes: "pull-left mr-10", btn_type: "success") if @current_user.has_create_permission?(Dhatu::MetaTag) %>
-
-        <%= theme_button('Refresh', 'refresh', meta_tags_path(meta_taggable_id: @service.id, meta_taggable_type: @service.class.name), classes: "pull-left mr-10", btn_type: "white") %>
-      </div>
-      <div class="col-md-6">
-        <%= search_form_kuppayam(User, meta_tags_path(meta_taggable_id: @service.id, meta_taggable_type: @service.class.name), text: "") %>
-      </div>
-    </div>
-  </div>
-  <%= clear_tag(10) %>
-  <div id="div_meta_tag_index">
-    <% meta_tags = @service.meta_tags.page(@current_page).per(@per_page) %>
-    <%= render :partial=>"dhatu/meta_tags/index", locals: {meta_tags: meta_tags, meta_taggable: @service } %>
-  </div>
+  <%= clear_tag(40) %>
+  <%= render :partial=>"dhatu/meta_tags/list", locals: {meta_taggable: @service } %>
   <% end %>
 
   <% if @current_user.super_admin? %>

data/db/master_data/features.csv

@@ -22,4 +22,5 @@ Dhatu::Promotion,published,FALSE,1
 Dhatu::PromotionAttribute,published,FALSE,1
 Dhatu::PromotionEnquiry,published,FALSE,1
 Dhatu::Service,published,TRUE,1
-Dhatu::Product,published,TRUE,1
+Dhatu::Product,published,TRUE,1
+Dhatu::Page,published,TRUE,1

data/lib/dhatu/version.rb

@@ -1,3 +1,3 @@
 module Dhatu
-  VERSION = '0.1.23'
+  VERSION = '0.1.24'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhatu
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -489,6 +489,7 @@ files:
 - app/views/dhatu/events/index.html.erb
 - app/views/dhatu/meta_tags/_form.html.erb
 - app/views/dhatu/meta_tags/_index.html.erb
+- app/views/dhatu/meta_tags/_list.html.erb
 - app/views/dhatu/meta_tags/_row.html.erb
 - app/views/dhatu/meta_tags/create.js.erb
 - app/views/dhatu/offers/_form.html.erb