dhatu 0.1.19 → 0.1.20

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

@@ -0,0 +1,34 @@
+<tr id="tr_category_<%= category.id %>">
+          
+  <th scope="row" style="text-align: center;">
+    <% if i < 0 %>
+      <i class="fa fa-check text-success"></i>
+    <% else %>
+      <%= i + 1 + (@per_page.to_i * (@current_page.to_i - 1)) %>
+    <% end %>
+  </th>
+  
+  <% if category.end_node? %>
+    <td class="category-name">
+      <%= link_to category.display_name, "#", remote: true, style: ";font-size:14px;" %> - <%= category.display_category_type %><br>
+      <%= display_publishable_status(category) %>
+      <div class="badge">Priority: <%= category.priority %></div>
+    </td>
+  <% else %>
+    <td class="category-name">
+      <%= link_to raw("<i class=\"fa fa-caret-right\"></i> #{category.display_name}"), categories_path(parent_id: category.id, category_type: @category_type), remote: true, style: "font-weight:bold;font-size:14px;" %> - <%= category.display_category_type %><br>
+      <%= display_publishable_status(category) %>
+      <div class="badge">Priority: <%= category.priority %></div>
+    </td>
+  <% end %>
+
+  <% if display_manage_links? %>
+  <td class="action-links hidden-sm hidden-xs" style="width:10%"><%= display_publishable_links(category) %></td>
+
+  <td class="action-links hidden-sm hidden-xs" style="width:10%">
+    <%= link_to raw("<i class=\"linecons-desktop\"></i> View Details"), category_path(category), :remote=>true, style: "color:#40bbea" %>
+    <%= display_manage_links(category, @current_user) %>
+  </td>
+  <% end %>
+
+</tr>

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

@@ -2,23 +2,11 @@
 
   <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(@category, 
-          "category_image.image.url",
-          upload_image_link(@category, :category_image, nil ),
-          remove_image_link(@category, :category_image, nil ),
-          image_options: {assoc_name: :category_image }) %>
-      <% else %>
-        <%= display_image(@category, "category_image.image.url", class: "img-inline", alt: @category.display_name) %>
-      <% end %>
-    </div>
-
-    <div class="col-md-5 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
+    <div class="col-md-8 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
 
       <%= theme_panel_heading(@category.name) %>
 
-      <%= theme_panel_sub_heading(@category.category_type, "#") if @category.one_liner %>
+      <%= theme_panel_sub_heading(@category.display_category_type, "#") if @category.one_liner %>
       
       <%= clear_tag(10) %>
       <%= display_publishable_status(@category) %>
@@ -27,6 +15,40 @@
       <%= clear_tag(5) %>
       <%= theme_panel_description(@category.description) %>
       <%= clear_tag(20) %>
+
+      <div class="table-responsive"> 
+      <table class="table table-striped table-condensed table-bordered mb-60"> 
+        <tbody>
+
+          <tr>
+            <th>Category Type</th><td><%= @category.display_category_type %></td>
+          </tr>
+
+          <tr>
+            <th>Parent</th><td>
+              <% if @category.parent %>
+              <%= @category.parent.try(:display_name) %> (<%= @category.parent.try(:id) %>)
+              <% end %>
+            </td>
+          </tr>
+
+          <tr>
+            <th>Top Parent</th><td>
+              <% if @category.top_parent %>
+              <%= @category.top_parent.try(:display_name) %> (<%= @category.top_parent.try(:id) %>)
+              <% end %>
+            </td>
+          </tr>
+
+          <tr>
+            <th>Priority</th><td><%= @category.priority %></td>
+          </tr>
+          
+        </tbody>
+      </table>
+    </div>
+
+      <%= clear_tag(20) %>
       
     </div>
 
@@ -42,70 +64,75 @@
 
   <%= clear_tag(20) %>
 
-  <ul class="nav nav-pills">
-    <li class="active">
-      <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="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><strong class="fs-18">Category Image</strong></div>
+  <hr>
 
-      <div class="table-responsive"> 
-        <table class="table table-striped table-condensed table-bordered mb-60"> 
-          <tbody>
-
-            <tr>
-              <th>ID</th><td><%= @category.id %></td>
-              <th>Permalink</th><td><%= @category.permalink %></td>
-            </tr>
-
-            <tr>
-              <th>Category Type</th><td><%= @category.category_type %></td>
-              <th></th><td></td>
-            </tr>
-
-            <tr>
-              <th>Parent</th><td>
-                <% if @category.parent %>
-                <%= @category.parent.try(:display_name) %> (<%= @category.parent.try(:id) %>)
-                <% end %>
-              </td>
-              <th>Top Parent</th><td>
-                <% if @category.top_parent %>
-                <%= @category.top_parent.try(:display_name) %> (<%= @category.top_parent.try(:id) %>)
-                <% end %>
-              </td>
-            </tr>
-
-            <tr>
-              <th>Status</th><td><%= @category.status %></td>
-              <th>Featured</th><td><%= @category.featured? ? "Yes" : "No" %></td>
-            </tr>
-
-            <tr>
-              <th>Priority</th><td><%= @category.priority %></td>
-              <th>End Node</th><td><%= @category.end_node? ? "Yes" : "No" %></td>
-            </tr>
-
-            <tr>
-              <th>Created At</th><td><%= @category.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @category.created_at %></td>
-              <th>Updated At</th><td><%= @category.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @category.updated_at %></td>
-            </tr>
-            
-          </tbody>
-        </table>
-      </div>
-        
+  <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(@category, 
+          "category_image.image.url",
+          upload_image_link(@category, :category_image, nil ),
+          remove_image_link(@category, :category_image, nil ),
+          image_options: {assoc_name: :category_image }) %>
+      <% else %>
+        <%= display_image(@category, "category_image.image.url", class: "img-inline", alt: @category.display_name) %>
+      <% end %>
     </div>
   </div>
 
-  <%= link_to "Close", "#", onclick: "closeLargeModal();", class: "btn btn-primary pull-right" %>
+  <% 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><%= @category.id %></td>
+          <th>Permalink</th><td><%= @category.permalink %></td>
+        </tr>
+
+        <tr>
+          <th>Category Type</th><td><%= @category.category_type %></td>
+          <th></th><td></td>
+        </tr>
+
+        <tr>
+          <th>Parent</th><td>
+            <% if @category.parent %>
+            <%= @category.parent.try(:display_name) %> (<%= @category.parent.try(:id) %>)
+            <% end %>
+          </td>
+          <th>Top Parent</th><td>
+            <% if @category.top_parent %>
+            <%= @category.top_parent.try(:display_name) %> (<%= @category.top_parent.try(:id) %>)
+            <% end %>
+          </td>
+        </tr>
+
+        <tr>
+          <th>Status</th><td><%= @category.status %></td>
+          <th>Featured</th><td><%= @category.featured? ? "Yes" : "No" %></td>
+        </tr>
+
+        <tr>
+          <th>Priority</th><td><%= @category.priority %></td>
+          <th>End Node</th><td><%= @category.end_node? ? "Yes" : "No" %></td>
+        </tr>
+
+        <tr>
+          <th>Created At</th><td><%= @category.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @category.created_at %></td>
+          <th>Updated At</th><td><%= @category.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @category.updated_at %></td>
+        </tr>
+        
+      </tbody>
+    </table>
+  </div>
+  <% end %>
+
+  <%= link_to "Close", "#", onclick: "closeGenericModal();", class: "btn btn-primary pull-right" %>
 
   <%= clear_tag %>
 

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

@@ -0,0 +1,20 @@
+<div class="row">
+      
+  <div class="col-md-12">
+    
+    <ul class="nav nav-tabs">
+    </ul>
+    <div class="tab-content">
+      <div class="tab-pane active">
+
+        <div id="div_category_types_index" class="row">
+          <%= render :partial=>"category_types" %>
+        </div>
+        <%= clear_tag(10) %>
+
+      </div>
+    </div>
+
+  </div>
+
+</div>

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

@@ -3,27 +3,9 @@
   <div class="col-md-12">
     <div class="tabs-vertical-env">
           
-      <ul id="div_category_types" class="nav tabs-vertical">
-        <li class="<%= @category_type == "All" ? 'active' : '' %>">
-          <%= link_to "All", categories_path %>
-        </li>
-        <% @features.each do |feature| %>
-          <li class="<%= @category_type == feature.name ? 'active' : '' %>">
-            <%= link_to feature.display_name, categories_path(category_type: feature.name) %>
-          </li>
-        <% end %>
-        <% if @current_user.super_admin? %>
-        <li class="<%= @category_type == "none" ? 'active' : '' %>">
-          <%= link_to "None", categories_path(category_type: :none) %>
-        </li>
-        <li class="<%= @category_type == "all_including_children" ? 'active' : '' %>">
-          <%= link_to "All Including Children", categories_path(category_type: :all_including_children) %>
-        </li>
-        <% end %>
-      </ul>
-      
       <div class="tab-content">
         <div class="tab-pane active" id="v-home">
+
           <div id="div_category_index">
             <%= render :partial=>"dhatu/categories/index" %>
           </div>

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

@@ -1,21 +1,15 @@
 <%
 	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)
+		pages: {
+			text: "Pages",
+			icon_class: "fa-file",
+			url: dhatu.pages_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Page)
 		},
 		categories: {
 			text: "Categories",
 			icon_class: "fa-sitemap",
-			url: dhatu.categories_url,
+			url: dhatu.choose_category_type_url,
 			has_permission: @current_user.has_read_permission?(Dhatu::Category)
 		},
 		projects: {
@@ -30,30 +24,6 @@
 			url: dhatu.services_url,
 			has_permission: @current_user.has_read_permission?(Dhatu::Service)
 		},
-		promotions: {
-			text: "Promotions",
-			icon_class: "fa-gift",
-			url: dhatu.promotions_url,
-			has_permission: @current_user.has_read_permission?(Dhatu::Promotion)
-		},
-		promotion_enquiries: {
-			text: "Promotional Enquiries",
-			icon_class: "linecons-sound",
-			url: dhatu.promotion_enquiries_url,
-			has_permission: @current_user.has_read_permission?(Dhatu::PromotionEnquiry)
-		},
-		bookings: {
-			text: "Bookings",
-			icon_class: "fa-calendar",
-			url: dhatu.bookings_url,
-			has_permission: @current_user.has_read_permission?(Dhatu::Booking)
-		},
-		blog_posts: {
-			text: "Blog",
-			icon_class: "fa-newspaper-o",
-			url: dhatu.blog_posts_url,
-			has_permission: @current_user.has_read_permission?(Dhatu::BlogPost)
-		},
 		prices: {
 			text: "Prices",
 			icon_class: "fa-dollar",
@@ -66,12 +36,6 @@
 			url: dhatu.branches_url,
 			has_permission: @current_user.has_read_permission?(Dhatu::Branch)
 		},
-		offers: {
-			text: "Offers",
-			icon_class: "fa-gift",
-			url: dhatu.offers_url,
-			has_permission: @current_user.has_read_permission?(Dhatu::Offer)
-		},
 		events: {
 			text: "Events",
 			icon_class: "fa-calendar",
@@ -102,5 +66,52 @@
 <hr class="mb-30" style="border-top:1px solid #ddd;">
 
 <%= render partial: "/layouts/dashboard/items", locals: { items: dhatu_items } %>
+<% end %>
+
+
+<%
+	dhatu_marketing_items = {
+		promotions: {
+			text: "Promotions",
+			icon_class: "fa-gift",
+			url: dhatu.promotions_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Promotion)
+		},
+		promotion_enquiries: {
+			text: "Promotional Enquiries",
+			icon_class: "linecons-sound",
+			url: dhatu.promotion_enquiries_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::PromotionEnquiry)
+		},
+		bookings: {
+			text: "Bookings",
+			icon_class: "fa-calendar",
+			url: dhatu.bookings_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Booking)
+		},
+		blog_posts: {
+			text: "Blog",
+			icon_class: "fa-newspaper-o",
+			url: dhatu.blog_posts_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::BlogPost)
+		},
+		offers: {
+			text: "Offers",
+			icon_class: "fa-gift",
+			url: dhatu.offers_url,
+			has_permission: @current_user.has_read_permission?(Dhatu::Offer)
+		}
+	}
+%>
+
+<% if (dhatu_marketing_items.map{|x, y| y[:has_permission] }).compact.uniq.any? %>
+
+<h3 class="text-gray mt-50 mb-10">
+	Marketing Elements <br>
+	<small class="text-muted">Manage All Elements of your websites and much more ...</small>
+</h3>
+<hr class="mb-30" style="border-top:1px solid #ddd;">
+
+<%= render partial: "/layouts/dashboard/items", locals: { items: dhatu_marketing_items } %>
 
 <% end %>

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

@@ -24,7 +24,7 @@
 					</th>
 
 					<td class="display-image">
-						<%= display_thumbnail_small(event) %>
+						<%= display_thumbnail(event) %>
 					</td>
 
 					<td class="display-link"><%= link_to event.title, event_path(event), remote: true %></td>

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

@@ -5,7 +5,7 @@
 	</th>
 
 	<td class="display-image">
-		<%= display_thumbnail_small(event) %>
+		<%= display_thumbnail(event) %>
 	</td>
 
 	<td class="event-name"><%= link_to event.title, event_path(event), remote: true %></td>

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

@@ -2,31 +2,33 @@
 
   <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(@event, 
-          "cover_image.image.large.url",
-          upload_image_link(@event, :cover_image, nil ),
-          remove_image_link(@event, :cover_image, nil ),
-          image_options: {assoc_name: :cover_image }) %>
-      <% else %>
-        <%= display_image(@event, "cover_image.image.large.url", class: "img-inline", alt: @event.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(@event.title) %>
-
       <%= theme_panel_sub_heading(@event.venue, "#") if @event.venue %>
-      
       <%= clear_tag(10) %>
-
       <%= display_publishable_status(@event) %>
-      
       <%= display_featured(@event) %>
-
       <%= clear_tag(20) %>
+    </div>
+
+    <% if display_manage_links? %>
+    <div class="col-md-3 col-sm-12 col-xs-12">
+      <%= display_manage_buttons(@event) %>
+      <%= display_publishable_buttons(@event) %>
+      <%= display_featurable_buttons(@event) %>
+    </div>
+    <% end %>
+
+  </div>
+
+  <div class="row">
+    
+    <div class="col-md-6 col-xs-12">
+      <%= clear_tag(40) %>
+      <div><strong class="fs-18">Service Details</strong></div>
+      <hr>  
+      <strong>Description</strong><br><br>
+      <%= raw(@event.description) %>
 
       <div class="table-responsive"> 
         <table class="table table-striped table-condensed table-bordered"> 
@@ -35,13 +37,15 @@
             <tr>
               <th style="width:25%">Starts At</th>
               <td style="width:25%"><%= time_tag(@event.starts_at) if @event.starts_at %></td>
+            <tr>
+              
+            </tr>
               <th style="width:25%">Ends At</th>
               <td style="width:25%"><%= time_tag(@event.ends_at) if @event.ends_at %></td>
             </tr>
 
             <tr>
               <th>Date</th><td><%= @event.date.strftime("%m/%d/%Y - %H:%M:%S") if @event.date %></td>
-              <th></th><td></td>
             </tr>
             
           </tbody>
@@ -49,69 +53,89 @@
       </div>
     </div>
 
-    <% if display_manage_links? %>
-    <div class="col-md-3 col-sm-12 col-xs-12">
-      <%= display_manage_buttons(@event) %>
-      <%= display_publishable_buttons(@event) %>
-      <%= display_featurable_buttons(@event) %>
+    <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(@event, 
+                "cover_image.image.large.url",
+                upload_image_link(@event, :cover_image, nil ),
+                remove_image_link(@event, :cover_image, nil ),
+                image_options: {assoc_name: :cover_image }) %>
+          <% else %>
+            <%= display_image(@event, "cover_image.image.large.url", class: "img-inline", alt: @event.display_name) %>
+          <% end %>
+        </div>
+      </div>
     </div>
-    <% end %>
-
   </div>
 
-  <%= clear_tag(20) %>
-
-  <ul class="nav nav-pills">
-    <li class="active">
-      <a href="#event_details" data-toggle="tab" aria-expanded="true">
-        <span class="visible-xs"><i class="fa-info"></i></span>
-        <span class="hidden-xs">Event Details</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="event_details" style="border: 1px solid #000;min-height:200px;padding:20px;margin-bottom:20px;max-height: 400px;overflow-y: auto;">
-      
-      <%= clear_tag(20) %>
-      <%= raw(@event.description) %>
-      <%= clear_tag(20) %>
-      
+  <%= clear_tag(40) %>
+  <div><strong class="fs-18">Gallery Images</strong></div>
+  <hr>
+  <div id="div_event_images_buttons">
+    <div class="row">
+      <div class="col-md-6">
+        <%= theme_button('Upload a New Image', 'plus', upload_multiple_image_link(@event, :gallery_images, nil ), classes: "pull-left", btn_type: "white") %>
+      </div>
+      <div class="col-md-6">
+      </div>
     </div>
+  </div>
+  <%= render :partial=>"kuppayam/images/multiple_images", locals: { images: @event.gallery_images } %>
+
+  <% 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>
+  <% end %>
 
-    <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) %>
+  <% 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><%= @event.id %></td>
-              <th>Permalink</th><td><%= @event.to_param %></td>
-            </tr>
-            <tr>
-              <th>Featured</th><td><%= @event.featured %></td>
-              <th>Status</th><td><%= @event.status %></td>
-            </tr>
-            <tr>
-              <th>Created At</th><td><%= @event.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @event.created_at %></td>
-              <th>Updated At</th><td><%= @event.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @event.updated_at %></td>
-            </tr>
-            
-          </tbody>
-        </table>
-      </div>
+  <div class="table-responsive"> 
+    <table class="table table-striped table-condensed table-bordered mb-60"> 
+      <tbody>
         
-    </div>
+        <tr>
+          <th>ID</th><td><%= @event.id %></td>
+          <th>Permalink</th><td><%= @event.to_param %></td>
+        </tr>
+        <tr>
+          <th>Featured</th><td><%= @event.featured %></td>
+          <th>Status</th><td><%= @event.status %></td>
+        </tr>
+        <tr>
+          <th>Created At</th><td><%= @event.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @event.created_at %></td>
+          <th>Updated At</th><td><%= @event.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @event.updated_at %></td>
+        </tr>
+        
+      </tbody>
+    </table>
   </div>
+  <% end %>
 
   <%= link_to "Close", "#", onclick: "closeLargeModal();", class: "btn btn-primary pull-right" %>