dhatu 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 015370c1e69610f80d01420fbf7404edd1f34a35f34f61dc66f0b999070bef30
-  data.tar.gz: 441b0a9e0d92d720e0ccbb46c6b8660b2df998588f71d80ee8b1deb6c333cc02
+  metadata.gz: 772976e588fc8350ad7f5d811b3bcdfd66c5b94ddb4b1bb6ae5509a6e9c53942
+  data.tar.gz: ccf828b3ff63233d9f804594804fff61f14a1ce3f26180fa8b29cdf7cd673a7c
 SHA512:
-  metadata.gz: b7cf2c4c109292b1cf62395dfbdf74cff942300d48429550fafd53a1928dce1b4d860fea0e77c3e67095794688948509b262f0a4dff8b1af84e624cc49763fd9
-  data.tar.gz: 0fa5a988ec17486de750ed4ac66adbf6cf027ccba989a2120d6b3b779ec2f86dc84354d41272cd0abdfbe006f8368e4706fde0881efb486e66d78fdee1c1a51d
+  metadata.gz: 0eb0a29894e4d1a4a10c02eeab83c4d1ccaaa1d16caf8f0ed364f4ef17d8545660c0e4319c324ab1ee747ba1e404a9a19510392f01e48f5a11b48c442680d673
+  data.tar.gz: 208b25447aa574358c8aef658bf6ca53c7d15970c5d1fde29a292cb970338c5c65401f159acc08ca087b4b920233c0bf5fa02e3876614c930c337706ce450e6a

data/app/controllers/dhatu/sections_controller.rb

@@ -77,6 +77,24 @@ module Dhatu
         # table uses html tables and feed uses div based boxes
         layout: :feed,
 
+        # Mention all checkbox fields so that it will resource controller will set that value to be false when the update action is called
+        # if @resource_options[:checkbox_fields] && @resource_options[:checkbox_fields].any?
+        #  @resource_options[:checkbox_fields].each do |field|
+        #    @r_object.write_attribute(field, false)
+        #  end
+        # end
+        # This is a tricky solution to update bolean fields which are shown as checkbox.
+        checkbox_fields: [
+          :enable_title,
+          :enable_sub_title,
+          :enable_short_description,
+          :enable_long_description,
+          :enable_button_one,
+          :enable_button_two,
+          :enable_cover_image,
+          :enable_gallery_images
+        ],
+
         # "/kuppayam/workflows/default"
         # 
         # Default partial opens show and form partial according to the model_size configuration
@@ -91,7 +109,7 @@ module Dhatu
 
         # Rendering Paths
         view_path: "dhatu/sections",
-        js_view_path: "/kuppayam/workflows/default",
+        js_view_path: "dhatu/sections",
 
         # Additional Configurations
         load_rich_text_editor: true,

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

@@ -25,7 +25,7 @@
 		</div>
 
 		<%= clear_tag(20) %>
-		<div id="div_section_list">
+		<div id="div_section_list_for_page_<%= page.id %>">
 			<%= render partial: "dhatu/sections/index", locals: {page: page} %>
 		</div>
 

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

@@ -17,13 +17,27 @@
 	</div>
 <% end %>
 
-<div class="row mt-30">
+<div class="row mt-10">
 	<div class="col-md-12">
-	<% if page.feature %>
-		<%#= theme_button("Manage #{page.feature.display_name}", 'list', dhatu.new_section_path(page_id: page), classes: "btn btn-success btn-xs ml-30 mb-5", btn_type: "success") if @current_user.super_admin? %>
-		<p class="ml-30"> Go to <%= page.feature.display_name %> section to edit the contents on this page. </p>
-	<% else %>
+		<% if page.sections.empty? %>
+			<p id="p_section_empty_message_for_page_<%= page.id %>" class="ml-30"> You have not added any sections for this page. Click on the below button to add one. </p>
+		<% end %>
 		<%= theme_button('Add a Section', 'plus', dhatu.new_section_path(page_id: page), classes: "btn btn-success btn-xs ml-30 mb-5", btn_type: "info") if @current_user.super_admin? %>
-	<% end %>
+
+		<% if page.feature %>
+			<%
+				begin 
+					url = url_for(page.feature.name.constantize)
+				rescue
+					url = nil
+				end
+			%>
+			<% if page.sections.any? %>
+				<p class="mt-60 ml-30"> Go to <%= page.feature.display_name %> section to edit rest of the contents on this page. </p>
+			<% else %>
+				<p class="mt-60 ml-30"> Go to <%= page.feature.display_name %> section to edit the contents on this page. </p>
+			<% end %>
+			<%= theme_button("Click Here to go to 'Manage #{page.feature.display_name}'", 'list', url, classes: "btn btn-primary btn-xs ml-30 mb-5", btn_type: "default", remote: false) if url %>
+		<% end %>
 	</div>
 </div>

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

@@ -30,14 +30,14 @@
     <% 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 class="item-detail"><%= raw @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 class="item-detail"><%= @section.sub_title.blank? ? "-" : raw(@section.sub_title) %></div>
     </div>
     <% end %>
   </div>

data/app/views/dhatu/sections/create.js.erb

@@ -0,0 +1,76 @@
+<% 
+  item_id = "#div_#{@resource_options[:item_name]}_#{@r_object.try(:id)}"
+  parent_id = "#div_#{@resource_options[:item_name]}_list_for_page_#{@r_object.page_id}"
+  show_id = "#div_#{@resource_options[:item_name]}_show"
+%>
+
+<% if @r_object.errors.blank? %>
+  
+  <% 
+    locals = {@resource_options[:item_name].to_sym => @r_object, i: -1}
+    if @row_partial_locals && @row_partial_locals.is_a?(Hash) && !@row_partial_locals.empty?
+      locals.merge!(@row_partial_locals)
+    end
+  %>
+
+  // Inserting the row on top of the table and highlighting it
+  $("<%= parent_id %>").prepend("<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/row", locals: locals)) %>");
+  $("<%= item_id %>").css("background-color", "#fffddd");
+  $("#p_section_empty_message_for_page_<%= @r_object.page_id %>").hide();
+
+  <% if @resource_options[:show_modal_after_create] %>
+    
+    // Showing the saved data in the modal
+    var heading = "<%= raw @r_object.try(:display_name) %>";
+    var bodyContent = "<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/show")) %>";
+    <% if @resource_options[:show_model_size] == :generic %>
+      showGenericModal(heading, bodyContent, true);
+    <% elsif @resource_options[:show_model_size] == :large %>
+      showLargeModal(heading, bodyContent, true);
+    <% end %>
+
+  <% else %>
+    // Closing the modal if it is opened
+    <% if @resource_options[:form_model_size] == :generic %>
+      closeGenericModal();
+    <% elsif @resource_options[:form_model_size] == :large %>
+      closeLargeModal();
+    <% end %>
+  <% end %>
+
+  // Showing Growl Like Message
+  notifySuccess("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(@notification[:message]) %>");
+
+<% else %>
+
+  // Reload the form with errors
+	var heading = "Add an <%= @resource_options[:collection_name] %>";
+	var bodyContent = "<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/form")) %>";
+	<% if @resource_options[:form_model_size] == :generic %>
+    showGenericModal(heading, bodyContent, true);
+  <% elsif @resource_options[:form_model_size] == :large %>
+    showLargeModal(heading, bodyContent, true);
+  <% end %>
+
+  // Show Main Error Message on the form
+  <% error_message = content_tag(:div, I18n.t('errors.errors_highlighted'), class: "alert alert-danger mt-20") %>
+  $("#<%= @resource_options[:item_name] %>_form_error").html("<%= escape_javascript(error_message) %>");
+  
+  <% if @resource_options[:load_rich_text_editor] %>
+  // Initialize WYSIHTML Editor
+  $(".wysihtml5").wysihtml5(
+    {"stylesheets": '/assets/wysiwyg-color.css'}
+  );
+  <% end %>
+
+  <% if @resource_options[:tagsinput] %>
+  // Initialize WYSIHTML Editor
+  $('input.kuppayam-tagsinput').tagsinput();
+  <% end %>
+
+  // Showing Growl Like Message
+  notifyError("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(raw(@notification[:message])) %>");
+
+<% end %>
+
+

data/app/views/dhatu/sections/destroy.js.erb

@@ -0,0 +1,32 @@
+<% 
+  if @resource_options[:layout] == :table
+    item_id = "#tr_#{@resource_options[:item_name]}_#{@r_object.id}"
+  elsif @resource_options[:layout] == :feed
+    item_id = "#div_#{@resource_options[:item_name]}_#{@r_object.id}"
+  end
+%>
+
+<% if @destroyed %>
+  
+  // Removing the item from the list
+  $("<%= item_id %>").remove();
+
+  // Closing the modal if it is opened
+  <% if @resource_options[:show_model_size] == :generic %>
+    closeGenericModal();
+  <% elsif @resource_options[:show_model_size] == :large %>
+    closeLargeModal();
+  <% end %>
+
+  // Showing Growl Like Message
+  notifySuccess("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(@notification[:message]) %>");
+  
+<% else %>
+  
+  // Show the error in a modal
+	showMessageModal("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(@notification[:message]) %>");
+
+  // Showing Growl Like Message
+  notifyError("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(@notification[:message]) %>");
+
+<% end %>

data/app/views/dhatu/sections/edit.js.erb

@@ -0,0 +1,21 @@
+// Load the form
+var heading = "Edit '<%= raw @r_object.try(:display_name) %>'";
+var bodyContent = "<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/form")) %>";
+<% if @resource_options[:form_model_size] == :generic %>
+	showGenericModal(heading, bodyContent, true);
+<% elsif @resource_options[:form_model_size] == :large %>
+	showLargeModal(heading, bodyContent, true);
+<% end %>
+
+// Initialize WYSIHTML Editor
+<% if @resource_options[:load_rich_text_editor] %>
+$(".wysihtml5").wysihtml5(
+	{"stylesheets": '/assets/wysiwyg-color.css'}
+);
+<% end %>
+
+// Initialize WYSIHTML Editor
+<% if @resource_options[:tagsinput] %>
+$('input.kuppayam-tagsinput').tagsinput();
+<% end %>
+

data/app/views/dhatu/sections/index.js.erb

@@ -0,0 +1,29 @@
+<% 
+  if @resource_options[:layout] == :table
+    list_id = "#div_#{@resource_options[:item_name]}_index"
+  elsif @resource_options[:layout] == :feed
+    list_id = "#div_#{@resource_options[:item_name]}_list"
+  end
+%>
+
+// Close Modal if it is opened
+<% if @resource_options[:show_model_size] == "generic" %>
+  closeGenericModal();
+<% elsif @resource_options[:show_model_size] == "large" %>
+  closeLargeModal();
+<% end %>
+
+<% if @r_objects.any? %>
+  <% 
+    if @row_partial_locals && @row_partial_locals.is_a?(Hash) && !@row_partial_locals.empty?
+      locals = @row_partial_locals
+    else
+    	locals = {}
+    end
+  %>
+  // Refresh the list
+  $("<%= list_id %>").html("<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/index", locals: locals)) %>");
+<% else %>
+  var noResultsText = "<%= escape_javascript(theme_panel_message(I18n.translate('success.no_results_found')))%>";
+  $("<%= list_id %>").html(noResultsText);
+<% end %>

data/app/views/dhatu/sections/new.js.erb

@@ -0,0 +1,21 @@
+// Load the form
+var heading = "Add <%= @resource_options[:item_name].to_s.titleize %>";
+var bodyContent = "<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/form")) %>";
+
+<% if @resource_options[:form_model_size] == :generic %>
+	showGenericModal(heading, bodyContent, true);
+<% elsif @resource_options[:form_model_size] == :large %>
+	showLargeModal(heading, bodyContent, true);
+<% end %>
+
+// Initialize WYSIHTML Editor
+<% if @resource_options[:load_rich_text_editor] %>
+$(".wysihtml5").wysihtml5(
+	{"stylesheets": '/assets/wysiwyg-color.css'}
+);
+<% end %>
+
+// Initialize WYSIHTML Editor
+<% if @resource_options[:tagsinput] %>
+$('input.kuppayam-tagsinput').tagsinput();
+<% end %>

data/app/views/dhatu/sections/row.js.erb

@@ -0,0 +1,49 @@
+<% 
+  if @resource_options[:layout] == :table
+    item_id = "#tr_#{@resource_options[:item_name]}_#{@r_object.id}"
+  elsif @resource_options[:layout] == :feed
+    item_id = "#div_#{@resource_options[:item_name]}_#{@r_object.id}"
+  end
+  show_id = "#div_#{@resource_options[:item_name]}_show"
+%>
+
+<% if @r_object && @r_object.errors.blank? %>
+	
+	<% 
+    locals = {@resource_options[:item_name].to_sym => @r_object, i: -1}
+    if @row_partial_locals && @row_partial_locals.is_a?(Hash) && !@row_partial_locals.empty?
+      locals.merge!(@row_partial_locals)
+    end
+  %>
+
+  // Updating the edited row and highlighting it
+  $("<%= item_id %>").replaceWith("<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/row", locals: locals)) %>");
+	$("<%= item_id %>").css("background-color", "#fffddd");
+  
+  <% if @resource_options[:show_modal_after_update] %>
+    // Refresh the modal content if it is open
+	  $("<%= show_id %>").replaceWith("<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/show")) %>")
+  <% else %>
+    // Closing the modal if it is opened
+    <% if @resource_options[:form_model_size] == :generic %>
+      closeGenericModal();
+    <% elsif @resource_options[:form_model_size] == :large %>
+      closeLargeModal();
+    <% end %>
+	<% end %>
+	
+  // Closing the modal
+  showAndHideModals();
+
+  // Showing Growl Like Message
+  notifySuccess("<%= @notification[:title] %>", "<%= @notification[:message] %>");
+
+<% else %>
+	
+	// Updating the row which got errored and highlighting it
+	$("<%= item_id %>").css("background-color", "#ffefef");
+	
+	// Showing Growl Like Message
+  notifyError("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(raw(@notification[:message])) %>");
+  
+<% end %>

data/app/views/dhatu/sections/show.js.erb

@@ -0,0 +1,17 @@
+<% if @r_object %>
+	
+	// Show the details in the large modal
+	var heading = "<%= raw @r_object.try(:display_name) %>";
+	var bodyContent = "<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/show")) %>";
+	<% if @resource_options[:show_model_size] == :generic %>
+		showGenericModal(heading, bodyContent, true);
+	<% elsif @resource_options[:show_model_size] == :large %>
+		showLargeModal(heading, bodyContent, true);
+	<% end %>
+
+<% else %>
+
+	// Showing Growl Like Message
+  notifyError("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(raw(@notification[:message])) %>");
+
+<% end %>

data/app/views/dhatu/sections/update.js.erb

@@ -0,0 +1,73 @@
+<% 
+  if @resource_options[:layout] == :table
+    item_id = "#tr_#{@resource_options[:item_name]}_#{@r_object.id}"
+  elsif @resource_options[:layout] == :feed
+    item_id = "#div_#{@resource_options[:item_name]}_#{@r_object.id}"
+  end
+%>
+
+<% if @r_object.errors.blank? %>
+  
+  <% 
+    locals = {@resource_options[:item_name].to_sym => @r_object, i: -1}
+    if @row_partial_locals && @row_partial_locals.is_a?(Hash) && !@row_partial_locals.empty?
+      locals.merge!(@row_partial_locals)
+    end
+  %>
+
+  // Updating the edited row and highlighting it
+  $("<%= item_id %>").replaceWith("<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/row", locals: locals)) %>");
+  $("<%= item_id %>").css("background-color", "#fffddd");
+  
+  // Showing the saved data in the modal
+  <% if @resource_options[:show_modal_after_update] %>
+    var heading = "<%= raw @r_object.try(:display_name) %>";
+    var bodyContent = "<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/show")) %>";
+    <% if @resource_options[:show_model_size] == :generic %>
+      showGenericModal(heading, bodyContent, true);
+    <% elsif @resource_options[:show_model_size] == :large %>
+      showLargeModal(heading, bodyContent, true);
+    <% end %>
+  <% else %>
+    // Closing the modal if it is opened
+    <% if @resource_options[:form_model_size] == :generic %>
+      closeGenericModal();
+    <% elsif @resource_options[:form_model_size] == :large %>
+      closeLargeModal();
+    <% end %>
+  <% end %>
+
+  // Showing Growl Like Message
+  notifySuccess("<%= @notification[:title] %>", "<%= @notification[:message] %>");
+
+<% else %>
+
+	// Reload the form with errors
+	var heading = "Edit '<%= raw @r_object.try(:display_name) %>'";
+	var bodyContent = "<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/form")) %>";
+	<% if @resource_options[:form_model_size] == :generic %>
+    showGenericModal(heading, bodyContent, true);
+  <% elsif @resource_options[:form_model_size] == :large %>
+    showLargeModal(heading, bodyContent, true);
+  <% end %>
+
+	// Show Main Error Message on the form
+  <% error_message = content_tag(:div, I18n.t('errors.errors_highlighted'), class: "alert alert-danger mt-20") %>
+  $("#<%= @resource_options[:item_name] %>_form_error").html("<%= escape_javascript(error_message) %>");
+  
+  // Initialize WYSIHTML Editor
+  <% if @resource_options[:load_rich_text_editor] %>
+  $(".wysihtml5").wysihtml5(
+    {"stylesheets": '/assets/wysiwyg-color.css'}
+  );
+  <% end %>
+
+  // Initialize WYSIHTML Editor
+  <% if @resource_options[:tagsinput] %>
+  $('input.kuppayam-tagsinput').tagsinput();
+  <% end %>
+
+  // Showing Growl Like Message
+  notifyError("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(raw(@notification[:message])) %>");
+  
+<% end %>

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

@@ -165,8 +165,12 @@
 		<header class="logo-env">
 			<!-- logo -->
 			<div class="logo">
-				<a href="/" class="logo-expanded"><img src="/assets/logo-white.png" width="180" alt="" /></a>
-				<a href="/" class="logo-collapsed"><img src="/assets/logo-small.png" width="40" alt="" /></a>
+				<a href="/" class="logo-expanded">
+					<%= image_tag("logo-white.png", width: "180") %>
+				</a>
+				<a href="/" class="logo-collapsed">
+					<%= image_tag("logo-small.png", width: "40") %>
+				</a>
 			</div>
 			
 			<!-- This will toggle the mobile menu and will be visible only on mobile devices -->

data/lib/dhatu/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhatu
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-02-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.35
+        version: 0.1.39
   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.35
+        version: 0.1.39
 - !ruby/object:Gem::Dependency
   name: pattana
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.23
+        version: 0.1.25
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.23
+        version: 0.1.25
 - !ruby/object:Gem::Dependency
   name: usman
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +147,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.34
+        version: 0.3.38
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -157,7 +157,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.34
+        version: 0.3.38
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -538,7 +538,15 @@ files:
 - app/views/dhatu/sections/_index.html.erb
 - app/views/dhatu/sections/_row.html.erb
 - app/views/dhatu/sections/_show.html.erb
+- app/views/dhatu/sections/create.js.erb
+- app/views/dhatu/sections/destroy.js.erb
+- app/views/dhatu/sections/edit.js.erb
 - app/views/dhatu/sections/index.html.erb
+- app/views/dhatu/sections/index.js.erb
+- app/views/dhatu/sections/new.js.erb
+- app/views/dhatu/sections/row.js.erb
+- app/views/dhatu/sections/show.js.erb
+- app/views/dhatu/sections/update.js.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