dhatu 0.1.19 → 0.1.20

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

@@ -2,15 +2,7 @@
       
   <div class="col-md-12">
     
-    <ul class="nav nav-tabs nav-tabs-justified">
-      <% Dhatu::Event::STATUS.each do |key, value| %>
-      <li class="<%= @status == value ? 'active' : '' %>">
-        <%= link_to events_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 class="nav nav-tabs nav-tabs-justified">      
     </ul>
     <div class="tab-content">
       <div class="tab-pane active">
@@ -27,6 +19,19 @@
               <%= search_form_kuppayam(Dhatu::Event, events_path, text: @filters[:query]) %>
             </div>
           </div>
+          <div class="row">
+              <div class="col-md-12 visible-sm visible-xs mt-10">
+              </div>
+              <div class="col-md-12">
+                <% @filter_ui_settings.each do |filter_name, options| %>
+                  <% if options[:object_filter] == true %>
+                    <%= report_object_filter(filter_name, options) %>
+                  <% else %>
+                    <%= report_filter(filter_name, options) %>
+                  <% end %>
+                <% end %>
+              </div>
+            </div>
 
         </div>
         <%= clear_tag(10) %>

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

@@ -0,0 +1,48 @@
+<%= form_for(@meta_tag,
+            :url => (@meta_tag.new_record? ? dhatu.meta_tags_path(meta_taggable_id: @meta_taggable.id, meta_taggable_type: @meta_taggable.class.name) : dhatu.meta_tag_path(meta_taggable_id: @meta_taggable.id, meta_taggable_type: @meta_taggable.class.name)),
+            :method => (@meta_tag.new_record? ? :post : :put),
+            :remote => true,
+            :html => {:id=>"form_page", :class=>"mb-0 form-horizontal"}) do |f| %>
+
+      <%= hidden_field_tag :meta_taggable_id, params[:meta_taggable_id] %>
+
+      <%= hidden_field_tag :meta_taggable_type, params[:meta_taggable_type] %>
+
+      <div id="page_form_error">
+        <%= @meta_tag.errors[:base].to_sentence %>
+      </div>
+
+      <div class="form-inputs m-15">
+
+        <div class="row">
+          <div class="col-md-12 pr-20">
+            <% options_list = Array[*Dhatu::MetaTag::META_TYPES.map {|i| [i,i] }] %>
+
+            <%= theme_form_select_group(@meta_tag, :meta_type, options_list, param_name: "dhatu/meta_tag[meta_type]", label: "Choose Type", prompt: "Select Type", include_blank: true, form_style: "top-bottom") %>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-md-12 pr-20">
+            <%= theme_form_field(@meta_tag, :meta_key, form_style: "top-bottom") %>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="col-md-12 pl-20">
+            <%= theme_form_field(@meta_tag, :meta_value, form_style: "top-bottom", html_options: {"data-id": @meta_tag.id.to_s, type: "textarea", height: "400px"}) %>
+          </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: "closeGenericModal();", class: "pull-right btn btn-white" %>
+      </div>
+
+      <%= clear_tag %>
+  </div>
+
+<% end %>
+

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

@@ -0,0 +1,59 @@
+<div class="table-responsive"> 
+	<table class="table table-hover members-table middle-align">
+	  <thead> 
+			<tr> 
+				<th style=";width:60px" class="hidden-sm hidden-xs">#</th> 
+				<th>Meta Key</th>
+				<th>Meta Value</th>
+				<th>Meta Type</th>
+				<% if display_manage_links? %>
+				<th style="text-align: center;" class="hidden-sm hidden-xs" colspan="2">Actions</th>
+				<% end %>
+			</tr>
+		</thead>
+		
+	  <tbody>
+	  	<% 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">
+						<% if i < 0 %>
+							<i class="fa fa-check text-success"></i>
+						<% else %>
+							<%= i + 1 + (@per_meta_tag.to_i * (@current_meta_tag.to_i - 1)) %>
+						<% end %>
+					</th>
+
+		      <td><%= link_to meta_tag.meta_key, "#" %></td>
+		      <td><%= link_to meta_tag.meta_value, "#" %></td>
+		      <td><%= link_to meta_tag.meta_type, "#", style: "color: darkred;" %></td>
+
+		      <% if display_manage_links? %>
+
+		      <td class="action-links hidden-sm hidden-xs" style="width:10%"><%= display_publishable_links(meta_tag,
+							publish_link: url_for(action: 'update_status', controller: 'dhatu/meta_tags', id: meta_tag.id, meta_taggable_id: meta_taggable.id, meta_taggable_type: meta_taggable.class.name, status: "published"),
+				      unpublish_link: url_for(action: 'update_status', controller: 'dhatu/meta_tags', id: meta_tag.id, meta_taggable_id: meta_taggable.id, meta_taggable_type: meta_taggable.class.name, status: "unpublished"),
+				      remove_link: url_for(action: 'update_status', controller: 'dhatu/meta_tags', id: meta_tag.id, meta_taggable_id: meta_taggable.id, meta_taggable_type: meta_taggable.class.name, status: "removed"),
+				      archive_link: url_for(action: 'update_status', controller: 'dhatu/meta_tags', id: meta_tag.id, meta_taggable_id: meta_taggable.id, meta_taggable_type: meta_taggable.class.name, status: "archived"))
+							 %></td>
+
+					<td class="action-links hidden-sm hidden-xs" style="width:10%">
+						<%= display_manage_links(
+							meta_tag, @current_user,
+							edit_link: url_for(action: "edit", controller: 'dhatu/meta_tags', id: meta_tag.id, meta_taggable_id: meta_taggable.id, meta_taggable_type: meta_taggable.class.name),
+      				delete_link: url_for(action: "destroy", controller: 'dhatu/meta_tags', id: meta_tag.id, meta_taggable_id: meta_taggable.id, meta_taggable_type: meta_taggable.class.name)) %>
+					</td>
+					<% end %>
+
+		    </tr>
+		  <% end %>
+	  </tbody>
+	</table>
+</div>
+
+<div class="row">
+  <div class="col-sm-12">
+  	<%= paginate_kuppayam(meta_tags, params: { controller: "dhatu/meta_tags", action: 'index', meta_taggable_id: meta_taggable.id, meta_taggable_type: meta_taggable.class.name } ) %>
+  </div>
+</div>
+

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

@@ -0,0 +1,32 @@
+<tr id="tr_meta_tag_<%= meta_tag.id %>">
+		      
+  <th scope="row" style="" class="hidden-sm hidden-xs">
+		<% if i < 0 %>
+			<i class="fa fa-check text-success"></i>
+		<% else %>
+			<%= i + 1 + (@per_meta_tag.to_i * (@current_meta_tag.to_i - 1)) %>
+		<% end %>
+	</th>
+
+  <td><%= link_to meta_tag.meta_key, "#" %></td>
+  <td><%= link_to meta_tag.meta_value, "#" %></td>
+  <td><%= link_to meta_tag.meta_type, "#", style: "color: darkred;" %></td>
+
+  <% if display_manage_links? %>
+
+  <td class="action-links hidden-sm hidden-xs" style="width:10%"><%= display_publishable_links(meta_tag,
+			publish_link: url_for(action: 'update_status', controller: 'dhatu/meta_tags', id: meta_tag.id, meta_taggable_id: meta_taggable.id, meta_taggable_type: meta_taggable.class.name, status: "published"),
+      unpublish_link: url_for(action: 'update_status', controller: 'dhatu/meta_tags', id: meta_tag.id, meta_taggable_id: meta_taggable.id, meta_taggable_type: meta_taggable.class.name, status: "unpublished"),
+      remove_link: url_for(action: 'update_status', controller: 'dhatu/meta_tags', id: meta_tag.id, meta_taggable_id: meta_taggable.id, meta_taggable_type: meta_taggable.class.name, status: "removed"),
+      archive_link: url_for(action: 'update_status', controller: 'dhatu/meta_tags', id: meta_tag.id, meta_taggable_id: meta_taggable.id, meta_taggable_type: meta_taggable.class.name, status: "archived"))
+			 %></td>
+
+	<td class="action-links hidden-sm hidden-xs" style="width:10%">
+		<%= display_manage_links(
+			meta_tag, @current_user,
+			edit_link: url_for(action: "edit", controller: 'dhatu/meta_tags', id: meta_tag.id, meta_taggable_id: meta_taggable.id, meta_taggable_type: meta_taggable.class.name),
+			delete_link: url_for(action: "destroy", controller: 'dhatu/meta_tags', id: meta_tag.id, meta_taggable_id: meta_taggable.id, meta_taggable_type: meta_taggable.class.name)) %>
+	</td>
+	<% end %>
+
+</tr>

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

@@ -0,0 +1,29 @@
+<% if @r_object.errors.blank? %>
+  
+  // Inserting the row on top of the table and highlighting it
+  $('#div_<%= @resource_options[:item_name] %>_index table > tbody').prepend("<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/row", locals: {@resource_options[:item_name].to_sym => @r_object, meta_taggable: @meta_taggable, i: -1})) %>");
+  $("#tr_<%= @resource_options[:item_name] %>_<%= @r_object.id %>").css("background-color", "#fffddd");
+
+  // Closing the modal if it is opened
+  closeLargeModal();
+
+  // Showing Growl Like Message
+  notifySuccess("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(@notification[:message]) %>");
+
+<% else %>
+
+  // Reload the form with errors
+	var heading = "Add <%= @resource_options[:item_name] %>";
+	var bodyContent = "<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/form", locals: {meta_taggable: @meta_taggable})) %>";
+	showLargeModal(heading, bodyContent, true);
+
+  // 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) %>");
+  
+  // Showing Growl Like Message
+  notifyError("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(raw(@notification[:message])) %>");
+
+<% end %>
+
+

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

@@ -2,9 +2,8 @@
   <thead> 
 		<tr> 
 			<th style="text-align: center;width:5%" class="hidden-sm hidden-xs">#</th> 
-			<th style="text-align: center;width:100px" class="hidden-sm hidden-xs"><i class="fa fa-photo"></i></th> 
-			<th>Offer Title</th>
-			<th class="hidden-sm hidden-xs">Offer Text</th>
+			<th style="text-align: center;width:100px"><i class="fa fa-photo"></i></th> 
+			<th>Offer</th>
 			<th style="width:100px;" class="hidden-sm hidden-xs">Featured</th>
 			<th style="width:100px;" class="hidden-sm hidden-xs">Status</th>
 			<% if display_manage_links? %>
@@ -21,13 +20,14 @@
 					<%= serial_number(i) %>
 				</th>
 
-				<td class="display-image hidden-sm hidden-xs">
-					<%= display_thumbnail_small(offer) %>
+				<td class="display-image">
+					<%= display_thumbnail(offer) %>
 				</td>
 
-				<td class="display-link"><%= link_to offer.title, offer_path(offer), remote: true %></td>
-
-				<td class="display-link hidden-sm hidden-xs"><%= link_to offer.offer_text, offer_path(offer), remote: true %></td>
+				<td class="display-link">
+					<%= link_to offer.title, offer_path(offer), remote: true, style: "font-weight:bold;color:#4b4b4b;" %><br>
+					<%= link_to offer.offer_text, offer_path(offer), remote: true %>
+				</td>
 
 				<td class="hidden-sm hidden-xs"><%= display_featured(offer) %></td>
 	      

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

@@ -5,7 +5,7 @@
   </th>
 
   <td class="display-image hidden-sm hidden-xs">
-    <%= display_thumbnail_small(offer) %>
+    <%= display_thumbnail(offer) %>
   </td>
 
   <td class="display-link"><%= link_to offer.title, offer_path(offer), remote: true %></td>

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

@@ -2,114 +2,118 @@
 
   <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(@offer, 
-          "cover_image.image.large.url",
-          upload_image_link(@offer, :cover_image, nil ),
-          remove_image_link(@offer, :cover_image, nil ),
-          image_options: {assoc_name: :cover_image }) %>
-      <% else %>
-        <%= display_image(@offer, "cover_image.image.large.url", class: "img-inline", alt: @offer.display_name) %>
-      <% end %>
-    </div>
-
-    <div class="col-md-6 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
+    <div class="col-md-9 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
 
       <%= theme_panel_heading(@offer.title) %>
-
       <%= theme_panel_sub_heading(@offer.offer_text, "#") if @offer.offer_text %>
-      
       <%= clear_tag(10) %>
-
       <%= display_publishable_status(@offer) %>
-      
       <%= display_featured(@offer) %>
-
       <%= clear_tag(20) %>
+    </div>
+
+    <% if display_manage_links? %>
+    <div class="col-md-3 col-sm-12 col-xs-12">
+      <%= display_manage_buttons(@offer) %>
+      <%= display_publishable_buttons(@offer) %>
+      <%= display_featurable_buttons(@offer) %>
+    </div>
+    <% end %>
+  </div>
 
+  <div class="row">
+    
+    <div class="col-md-6 col-xs-12">
+      <%= clear_tag(40) %>
+      <div><strong class="fs-18">Offer Details</strong></div>
+      <hr>
+      <strong>Description</strong><br><br>
+      <%= raw(@offer.description) %>
+      <%= clear_tag(20) %>
       <table class="table table-condensed table-bordered mb-20"> 
         <tbody>
-          
           <tr>
             <th style="width:25%">Starts At</th>
             <td style="width:25%"><%= time_tag(@offer.starts_at) if @offer.starts_at %></td>
-            <th style="width:25%">Ends At</th>
+          </tr>
+          <tr><th style="width:25%">Ends At</th>
             <td style="width:25%"><%= time_tag(@offer.ends_at) if @offer.ends_at %></td>
           </tr>
-          
         </tbody>
       </table>
+
     </div>
 
-    <% if display_manage_links? %>
-    <div class="col-md-3 col-sm-12 col-xs-12">
-      <%= display_manage_buttons(@offer) %>
-      <%= display_publishable_buttons(@offer) %>
-      <%= display_featurable_buttons(@offer) %>
+    <div class="col-md-6 col-xs-12">
+      <%= clear_tag(40) %>
+      <div><strong class="fs-18">Cover 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? %>
+            <%= edit_image(@offer, 
+              "cover_image.image.large.url",
+              upload_image_link(@offer, :cover_image, nil ),
+              remove_image_link(@offer, :cover_image, nil ),
+              image_options: {assoc_name: :cover_image }) %>
+          <% else %>
+            <%= display_image(@offer, "cover_image.image.large.url", class: "img-inline", alt: @offer.display_name) %>
+          <% end %>
+        </div>
+      </div>
     </div>
-    <% end %>
   </div>
 
+  <% 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) %>
 
-  <div class="visible-sm visible-xs mb-50"></div>
-
-  <ul class="nav nav-pills">
-    <li class="active">
-      <a href="#offer_details" data-toggle="tab" aria-expanded="false">
-        <span class="visible-xs"><i class="fa-database"></i></span>
-        <span class="hidden-xs">Offer Details</span>
-      </a>
-    </li>
-
-    <% if @current_user.has_role?("Technical Admin") %>
-    <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>
-    <% end %>
-  </ul>
-
-  <div class="tab-content">
-    <div class="tab-pane active" id="offer_details" style="border: 1px solid #f5f5f5;min-height:200px;padding:20px;margin-bottom:20px;max-height: 400px;overflow-y: auto;">
-      
-      <%= clear_tag(20) %>
-      <%= raw(@offer.description) %>
-      <%= clear_tag(20) %>
-    </div>
-
-    <% if @current_user.has_role?("Technical Admin") %>
-    <div class="tab-pane" id="technical_details" style="border: 1px solid #f5f5f5;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><%= @offer.id %></td>
-              <th>Permalink</th><td><%= @offer.to_param %></td>
-            </tr>
-            <tr>
-              <th>Featured</th><td><%= @offer.featured %></td>
-              <th>Status</th><td><%= @offer.status %></td>
-            </tr>
-            <tr>
-              <th>Created At</th><td><%= @offer.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @offer.created_at %></td>
-              <th>Updated At</th><td><%= @offer.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @offer.updated_at %></td>
-            </tr>
-            
-          </tbody>
-        </table>
+        <%= 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>
-    <% end %>
   </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>
+  <% end %>
+  
+  <% if @current_user.super_admin? %>
+  <%= clear_tag(40) %>
+  <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><%= @offer.id %></td>
+          <th>Permalink</th><td><%= @offer.to_param %></td>
+        </tr>
+
+        <tr>
+          <th>Status</th><td><%= @offer.status %></td>
+          <th>Featured</th><td><%= @offer.featured %></td>
+        </tr>
+
+        <tr>
+          <th>Created At</th><td><%= @offer.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @offer.created_at %></td>
+          <th>Updated At</th><td><%= @offer.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @offer.updated_at %></td>
+        </tr>
+        
+      </tbody>
+    </table>
+  </div>
+  <% end %>
 
   <%= link_to "Close", "#", onclick: "closeLargeModal();", class: "btn btn-primary pull-right" %>