dhatu 0.1.19 → 0.1.20

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

@@ -3,14 +3,6 @@
   <div class="col-md-12">
     
     <ul class="nav nav-tabs nav-tabs-justified">
-      <% Dhatu::Promotion::STATUS.each do |key, value| %>
-      <li class="<%= @status == value ? 'active' : '' %>">
-        <%= link_to promotions_path(st: value), "aria-expanded" => "#{ @status == value ? 'true' : 'false' }", title: key.titleize do %>
-          <span class="visible-xs"><i class="fa-gift">  <%= key[0].upcase %></i></span>
-          <span class="hidden-xs"><%= key %></span>
-        <% end %>
-      </li>
-      <% end %>
     </ul>
 
     <div class="tab-content">

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

@@ -1,3 +1,15 @@
+<% 
+  if @section.new_record?
+    @section.page_id = params[:page_id]
+    @section.enable_title = true
+    @section.enable_sub_title = true
+    @section.enable_button_one = true
+    @section.enable_button_two = true
+    @section.enable_short_description = true
+    @section.enable_long_description = true
+  end
+%>
+
 <%= form_for(@section,
           :url => (@section.new_record? ? dhatu.sections_path : dhatu.section_path),
           :method => (@section.new_record? ? :post : :put),
@@ -10,19 +22,35 @@
 
     <div class="form-inputs">
 
+      <!-- Hidden field tag to carry page_id -->
+      <%= hidden_field_tag :page_id, params[:page_id] %>
+
       <div class="row">
-        <div class="col-md-8 pr-20">
+
+        <% if @current_user.super_admin? %>
+        <!-- Name -->
+        <div class="col-md-12">
+          <%= theme_form_field(@section, :name, form_style: "top-bottom", html_options: { placeholder: "", id: "inp_section_name"}) %>
+        </div>
+        <% end %>
+
+        <!-- Title -->
+        <% if @section.enable_title %>
+        <div class="col-md-12">
           <%= theme_form_field(@section, :title, form_style: "top-bottom", html_options: { placeholder: ""}) %>
+        </div>
+        <% end %>
+
+        <!-- Sub Title -->
+        <% if @section.enable_sub_title %>
+        <div class="col-md-12">
           <%= theme_form_field(@section, :sub_title, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
-          <%= theme_form_field(@section, :short_description, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
         </div>
-        <div class="col-md-4 pl-20">
-          <div class="row">
-            <div class="col-md-12">
-              <% options = {assoc_collection: Dhatu::SectionType.select("id, name").order("name ASC").all, editable: true, assoc_display_method: :name} %>
-              <%= theme_form_assoc_group(@section, :section_type_id, label: "Type", form_style: "top-bottom", **options) %>
-            </div>
-          </div>
+        <% end %>
+
+        <!-- Button One -->
+        <% if @section.enable_button_one %>
+        <div class="col-md-4">
           <div class="row">
             <div class="col-md-6 pr-20">
               <%= theme_form_field(@section, :button_one_text, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
@@ -31,7 +59,12 @@
               <%= theme_form_field(@section, :button_one_link, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
             </div>
           </div>
+        </div>
+        <% end %>
 
+        <!-- Button Two -->
+        <% if @section.enable_button_one %>
+        <div class="col-md-4">
           <div class="row">
             <div class="col-md-6 pr-20">
               <%= theme_form_field(@section, :button_two_text, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
@@ -40,18 +73,90 @@
               <%= theme_form_field(@section, :button_two_link, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
             </div>
           </div>
+        </div>
+        <% end %>
+
+      </div>
 
+      <!-- Short Description -->
+      <% if @section.enable_short_description %>
+      <div class="row">
+        <div class="col-md-12">
+          <%#= theme_form_field(@section, :short_description, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
+          <%= theme_form_field(@section, :short_description, required: true, html_options: {type: :textarea, class: "form-control"}, form_style: "top-bottom") %>
         </div>
       </div>
-      
+      <% end %>
+
+      <!-- Long Description -->
+      <% if @section.enable_long_description %>
       <div class="row">
-        <div class="col-md-12 pr-20">
+        <div class="col-md-12">
           <%= theme_form_field(@section, :long_description, required: true, html_options: {type: :textarea, class: "form-control wysihtml5", "data-stylesheet-url": "assets/wysiwyg-color.css"}, form_style: "top-bottom") %>
         </div>
       </div>
+      <% end %>
 
+      <% if @current_user.super_admin? %>
+      <div class="row">
+
+        <!-- Page -->
+        <div class="col-md-4">
+          <% options = {assoc_collection: Dhatu::Page.select("id, name").order("name ASC").all, editable: true, assoc_display_method: :name, include_blank: true} %>
+          <%= theme_form_assoc_group(@section, :page_id, label: "Page", form_style: "top-bottom", **options) %>
+        </div>
+
+        <!-- Code -->
+        <% if @current_user.super_admin? %>
+        <div class="col-md-4">
+          <%= theme_form_field(@section, :code, label: "Code", form_style: "top-bottom") %>
+        </div>
+        <% end %>
+
+        <!-- Priority -->
+        <div class="col-md-4">
+          <%= theme_form_field(@section, :priority, required: false, form_style: "top-bottom") %>
+        </div>
+
+      </div>
+      <% end %>
+
+    </div>
+
+    <% if @current_user.super_admin? %>
+    <%= clear_tag(30) %>
+    <div><strong class="fs-18">Configuration</strong></div>
+    <hr>
+
+    <div class="row">
+      <div class="col-md-3">
+        <%= theme_form_field(@section, :enable_title, required: false, html_options: {type: :checkbox}, form_style: "top-bottom")  %>
+      </div>
+      <div class="col-md-3">
+        <%= theme_form_field(@section, :enable_sub_title, required: false, html_options: {type: :checkbox}, form_style: "top-bottom")  %>
+      </div>
+      <div class="col-md-3">
+        <%= theme_form_field(@section, :enable_short_description, required: false, html_options: {type: :checkbox}, form_style: "top-bottom")  %>
+      </div>
+      <div class="col-md-3">
+        <%= theme_form_field(@section, :enable_long_description, required: false, html_options: {type: :checkbox}, form_style: "top-bottom")  %>
+      </div>
+      <div class="col-md-3">
+        <%= theme_form_field(@section, :enable_button_one, required: false, html_options: {type: :checkbox}, form_style: "top-bottom")  %>
+      </div>
+      <div class="col-md-3">
+        <%= theme_form_field(@section, :enable_button_two, required: false, html_options: {type: :checkbox}, form_style: "top-bottom")  %>
+      </div>
+      <div class="col-md-3">
+        <%= theme_form_field(@section, :enable_cover_image, required: false, html_options: {type: :checkbox}, form_style: "top-bottom")  %>
+      </div>
+      <div class="col-md-3">
+        <%= theme_form_field(@section, :enable_gallery_images, required: false, html_options: {type: :checkbox}, form_style: "top-bottom")  %>
+      </div>
     </div>
+    <% end %>
 
+    <%= clear_tag(50) %>
     <div class="row">
       <div class="col-md-12 pr-20">
         <%= submit_tag("Save", :class=>"btn btn-primary pull-right ml-10") %>

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

@@ -4,7 +4,7 @@
 			<tr> 
 				<th style="text-align: center;width:5%">#</th> 
 				<!-- <th style="text-align: center;width:100px"><i class="fa fa-photo"></i></th>  -->
-				<th>Section Type</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>
@@ -22,10 +22,13 @@
 					</th>
 
 					<!-- <td class="display-image">
-						<%#= display_thumbnail_small(section) %>
+						<%#= display_thumbnail(section) %>
 					</td> -->
 
-					<td class="display-link"><%= link_to section.section_type.try(:name), section_path(section), remote: true %></td>
+					<td>
+						<strong><%= section.title %></strong><br>
+						<%= section.sub_title %><br>
+					</td>
 
 					<td class="hidden-sm hidden-xs"><%= display_publishable_status(section) %></td>
 

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

@@ -5,10 +5,13 @@
   </th>
 
   <!-- <td class="display-image">
-    <%#= display_thumbnail_small(section) %>
+    <%#= display_thumbnail(section) %>
   </td> -->
 
-  <td class="display-link"><%= link_to section.section_type.try(:name), section_path(section), remote: true %></td>
+  <td>
+    <strong><%= section.title %></strong><br>
+    <%= section.sub_title %><br>
+  </td>
 
   <td class="hidden-sm hidden-xs"><%= display_publishable_status(section) %></td>
 

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

@@ -2,164 +2,200 @@
 
   <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(@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 class="col-md-6 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
-
-      <%= theme_panel_heading(@section.section_type.try(:name)) %>
-
+    <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) %>
-      
-      <%#= display_featured(@section) %>
-
-      <%= clear_tag(20) %>
-
-      <table class="table table-condensed table-bordered mb-20"> 
-        <tbody>
-          
-          <tr>
-            <th style="width:25%" colspan="2">Title</th>
-            <td style="width:25%" colspan="2"><%=@section.title %></td>
-          </tr>
-
-          <tr>
-            <th style="width:25%" colspan="2">Sub Title</th>
-            <td style="width:25%" colspan="2"><%=@section.sub_title %></td>
-          </tr>
-
-          <tr>
-            <th style="width:25%">Button Text One</th>
-            <td style="width:25%"><%=@section.button_one_text %></td>
-            <th style="width:25%">Button Link One</th>
-            <td style="width:25%"><%=@section.button_one_link %></td>
-          </tr>
-
-          <tr>
-            <th style="width:25%">Button Text Two</th>
-            <td style="width:25%"><%=@section.button_two_text %></td>
-            <th style="width:25%">Button Link Two</th>
-            <td style="width:25%"><%=@section.button_two_link %></td>
-          </tr>
-          
-        </tbody>
-      </table>
     </div>
 
     <% if display_manage_links? %>
     <div class="col-md-3 col-sm-12 col-xs-12">
       <%= display_manage_buttons(@section) %>
-      <%= display_publishable_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>
-
-  <div class="visible-sm visible-xs mb-50"></div>
-
+      
   <%= 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 %>
 
-  <ul class="nav nav-pills">
-    <li class="active">
-      <a href="#section_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>
-
-    <li class="">
-      <a href="#section_images" data-toggle="tab" aria-expanded="false">
-        <span class="visible-xs"><i class="fa-database"></i></span>
-        <span class="hidden-xs">Images</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="section_details" style="border: 1px solid #000;min-height:200px;padding:20px;margin-bottom:20px;max-height: 400px;overflow-y: auto;">
-      
-      <%= clear_tag(20) %>
-      <strong>Short Description</strong>
-      <%= raw(@section.short_description) %>
+    <% 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>
 
-      <%= clear_tag(20) %>
+  <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 %>
 
-      <strong>Long Description</strong>
-      <%= raw(@section.long_description) %>
-      <%= clear_tag(20) %>
-        
+    <% 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="tab-pane" id="section_images" style="border: 1px solid #000;min-height:200px;padding:20px;margin-bottom:20px;max-height: 400px;overflow-y: auto;">
-      
-      <%= clear_tag(20) %>
-
-      <div id="div_section_images_buttons">
-        <div class="row">
-          <div class="col-md-6">
-            <%= theme_button('Upload a New Image', 'refresh', upload_multiple_image_link(@section, :gallery_images, nil ), classes: "pull-left", btn_type: "white") %>
-          </div>
-          <div class="col-md-6">
-          </div>
-        </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>
-      <%= clear_tag(10) %>
+    </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 %>
 
-    <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) %>
-
-      <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>Status</th><td><%= @section.status %></td>
-            </tr>
-
-            <tr>
-              <th style="width:25%">Section Code</th>
-              <td style="width:25%"><%=@section.section_type.try(:code) %></td>
-              <th></th><td></td>
-              <th></th><td></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>
+  <% 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>
         
-    </div>
+        <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" %>