dhatu 0.1.19 → 0.1.20

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

@@ -3,14 +3,6 @@
   <div class="col-md-12">
     
     <ul class="nav nav-tabs nav-tabs-justified">
-      <% Dhatu::Branch::STATUS.each do |key, value| %>
-      <li class="<%= @status == value ? 'active' : '' %>">
-        <%= link_to branches_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>
 
     <div class="tab-content">
@@ -28,6 +20,19 @@
               <%= search_form_kuppayam(Dhatu::Offer, branches_path(st: @status), 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/categories/_category_types.html.erb

@@ -0,0 +1,27 @@
+<h3 class="text-gray" style="text-align: center;">
+  Choose a Category Type <br>
+  <small class="text-muted">Click on Browse to see the categories.</small>
+</h3>
+<%= clear_tag(10) %>
+
+<% @features.each_with_index do |feature, i| %>
+<div class="col-lg-3 col-md-3 col-sm-6 col-xs-12" style="height:280px;">
+    
+  <div class="xe-widget xe-vertical-counter xe-vertical-counter-white" data-count=".num" data-from="0" data-to="128" data-duration="4">
+    <div class="xe-icon" style="padding:0px;">
+      <i class="<%= Feature::FEATURE_ICONS[feature.name] %>"></i>
+      <%#= display_image(feature, "feature_image.image.small_square.url", class: "img-inline", alt: feature.display_name) %>
+    </div>
+    
+    <div class="xe-label">
+      <strong class="num" style="font-size:16px;"><%= feature.display_name %></strong>
+    </div>
+
+    <div class="xe-label">
+      <% url = categories_url(ft: feature.try(:id)) %>
+      <span><%= link_to("Browse", url, class: "btn btn-sm btn-primary btn-block") %></span>
+    </div>
+  </div>
+  
+</div>
+<% end %>

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

@@ -26,14 +26,14 @@
           categories = relation.all
         %>
 
-        <% options = {assoc_collection: categories, required: false, editable: true, assoc_display_method: :name} %>
+        <% options = {assoc_collection: categories, required: false, editable: true, assoc_display_method: :name, label: "Parent Category", include_blank: true} %>
         <%= theme_form_assoc_group(@category, :parent_id, **options) %>
       </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: "closeLargeModal();", class: "pull-right ml-10 btn btn-white" %>
+        <%= link_to raw("<i class='fa fa-close mr-5'></i><span>Cancel</span>"), "#", onclick: "closeGenericModal();", class: "pull-right ml-10 btn btn-white" %>
       </div>
       <%= clear_tag(10) %>
   </div>

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

@@ -1,104 +1,129 @@
-<div id="div_category_action_buttons">
-  <div class="row">
-    <div class="col-md-6">
-
-      <% if @current_category %>
-        <%= theme_button('Back', 'arrow-left', categories_path(parent_id: @current_category.try(:parent_id), category_type: @category_type), classes: "pull-left mr-10", btn_type: "white") %>
-      <% end %>
-      
-      <%= theme_button('Refresh', 'refresh', categories_path(parent_id: @current_category.try(:id), category_type: @category_type), classes: "pull-left mr-10", btn_type: "white") %>
-
-      <% if @current_user.has_create_permission?(Dhatu::Category) %>
-      <%= theme_button('Add a Category', 'plus', new_category_path(parent_id: @current_category.try(:id), category_type: @category_type), classes: "pull-left mr-10", btn_type: "success") %>
-      <% end %>
-
+<div class="row">
+  <% if @current_category %>
+    <div class="col-md-12">
+      <h3 class="text-gray" style="text-align: center;">
+        <%= @current_category.display_name %> <br>
+        <small class="text-muted">Click on the name to view sub categories.</small>
+      </h3>
+    </div>
+  <% elsif @feature %>
+    <div class="col-md-12">
+      <h3 class="text-gray" style="text-align: center;">
+        Category Type: <%= @feature.display_name %> <br>
+        <small class="text-muted">Click on the name to view sub categories.</small>
+      </h3>
     </div>
-    <div class="col-md-6">
-      <%= search_form_kuppayam(Dhatu::Category, categories_path, text: @filters[:query]) %>
+  <% elsif @query %>
+    <div class="col-md-12">
+      <h3 class="text-gray" style="text-align: center;">
+        Search Results for '<%= @query %>'</small>
+      </h3>
+    </div>
+  <% end %>
+
+  <div class="col-md-12">
+    <div style="text-align: center;">
+    <%= link_to "(Change Category Type)", choose_category_type_path(ft: @feature.try(:id)), style: "color:#d42020;" %>
     </div>
   </div>
-</div>
-<%= clear_tag(10) %>
+  <%= clear_tag(40) %>
 
-<div id="div_category_breadcrumbs">
-	<% c_list = [] %>
-	<% c = @current_category %>
-	<% while c do %>
-		<% c_list << c %>
-	  <% c = c.parent %>
-	<% end %>
-		
-	<% if c_list.count >= 1 %>
-		<ol class="breadcrumb auto-hidden1 bc-3">
-		<% c_list.reverse.each do |c| %>
-			<% if c_list[0] == c %>
-				<li class="active"><strong><%= c.display_name %></strong></li>
-			<% else %>
-				<li><%= link_to c.display_name, categories_path(parent_id: c.id), remote: true, class: "collapsed" %></li>
-			<% end %>
-		<% end %>
-		</ol>
-	<% end %>
-</div>
-<%= clear_tag %>
+  <div id="div_category_action_buttons" class="col-md-12">
+    <div class="row">
+      <div class="col-md-6">
+
+        <% if @current_category %>
+          <%= theme_button('Back', 'arrow-left', categories_path(parent_id: @current_category.try(:parent_id), ft: @feature.try(:id)), classes: "pull-left mr-10", btn_type: "white") %>
+        <% else %>
+          <%= theme_button('Back', 'arrow-left', choose_category_type_path(ft: 1), classes: "pull-left mr-10", btn_type: "white", remote: false) %>
+        <% end %>
 
-<div class="table-responsive"> 
-	<table class="table table-hover members-table middle-align">
-	  <thead> 
-			<tr> 
-				<th style="text-align: center;width:60px">#</th> 
-				<th>Name</th>
-				<th>Category Type</th>
-				<th>Priority</th>
-				<!-- <th>Parent</th>
-				<th>Top Parent</th> -->
-				<th style="text-align: center;width:100px;">Status</th>
-				<!-- <th style="text-align: center;width:100px;">Priority</th>
-				<th style="text-align: center;width:120px;">End Node?</th> -->
-				<% if display_manage_links? %>
-				<th style="text-align: center;" colspan="2">Actions</th>
-				<% end %>
-			</tr> 
-		</thead>
-	  <tbody>
-	  	<% @categories.each_with_index do |category, i| %>
-	  		<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"><%= category.display_name %></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 %></td>
-		      <% end %>
+        <% if @current_user.has_create_permission?(Dhatu::Category) %>
+          <%= theme_button('Add a Category', 'plus', new_category_path(parent_id: @current_category.try(:id), category_type: @feature.try(:name), ft: @feature.try(:id)), classes: "pull-left mr-10", btn_type: "success") %>
+        <% end %>
 
-		      <td><%= category.display_category_type %></td>
-		      <td><%= category.priority %></td>
+        <%# binding.pry %>
 
-		      <td class="hidden-sm hidden-xs"><%= display_publishable_status(category) %></td>
+        <%= theme_button('Refresh', 'refresh', categories_path(parent_id: @current_category.try(:id), category_type: @feature.try(:name), ft: @feature.try(:id)), classes: "pull-left mr-10", btn_type: "white") %>
 
-		      <% if display_manage_links? %>
-			    <td class="action-links hidden-sm hidden-xs" style="width:10%"><%= display_publishable_links(category) %></td>
+      </div>
+      <div class="col-md-6">
+        <%= search_form_kuppayam(Dhatu::Category, categories_path(parent_id: @current_category.try(:id), category_type: @feature.try(:name), ft: @feature.try(:id)), text: @filters[:query]) %>
+      </div>
+    </div>
+  </div>
+  <%= clear_tag(10) %>
 
-			    <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 %>
+  <div class="col-md-12">
+    <div class="row">
+      <!-- <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 class="col-md-12" id="div_category_breadcrumbs">
+        <% c_list = [] %>
+        <% c = @current_category %>
+        <% while c do %>
+          <% c_list << c %>
+          <% c = c.parent %>
+        <% end %>
 
-		    </tr>
-		  <% end %>
-	  </tbody>
-	</table>
+        <% if c_list.count >= 1 %>
+          <ol class="breadcrumb auto-hidden1 bc-3">
+          <% c_list.reverse.each do |c| %>
+            <% if c_list[0] == c %>
+              <li class="active"><strong><%= c.display_name %></strong></li>
+            <% else %>
+              <li><%= link_to c.display_name, categories_path(parent_id: c.id), remote: true, class: "collapsed" %></li>
+            <% end %>
+          <% end %>
+          </ol>
+        <% end %> 
+      </div>
+    </div>
+  </div>
 </div>
 
+<div id="div_category_list" class="row mt-30">
+<% @categories.each_with_index do |category, i| %>
+  <div id="div_category_<%= category.id %>" class="col-lg-2 col-md-3 col-sm-6 col-xs-6">
+
+    <div style="text-align: center;border: 1px solid #f1f1f1;padding:10px;margin-bottom:15px;">
+      <div style="height:200px;">
+      	<i class="<%= Feature::FEATURE_ICONS[category.category_type] %>" style="font-size:60px;padding:20px;"></i><br>
+      	<% if category.end_node? %>
+      		<%= content_tag :span, category.display_name, style: ";font-size:14px;" %><br>
+      		<%= content_tag :span, category.display_category_type, style: "color: #ffba00;" %><br>
+      		<%= display_publishable_status(category) %>
+        <% else %>
+      		<%= 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;" %><br>
+      		<%= content_tag :span, category.display_category_type, style: "color: #cc3f44;" %><br>
+      		<%= display_publishable_status(category) %>
+        <% end %><br>
+      </div>
+      <% if display_manage_links? %>
+      	<div style="width: 90%;border: 1px solid #e0e0e0;margin:5%;">
+      		<%#= display_publishable_links(category) %>
+  	    	<%= link_to raw("<i class=\"fa-eye mr-5\"></i>"), category_path(category), :remote=>true, style: "color:#373e4a" %>
+          <% if @current_user.has_create_permission?(Dhatu::Category) %>
+          <%= link_to raw("<i class='fa-plus mr-5'></i>"), new_category_path(parent_id: category.try(:id),category_type: category.category_type, ft: @feature.try(:id)), class: "", remote: true, style: "color: #8dc63f"  %>
+          <% end %>
+  	      <%= display_manage_links(category, @current_user, edit_text: "", delete_text: "") %>
+        </div>
+  	    <% end %>
+    </div>
+    
+  </div>
+<% end %>
+</div>
+
+<%= clear_tag %>
+
 <div class="row">
   <div class="col-sm-12">
     <%= paginate_kuppayam(@categories) %>

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

@@ -0,0 +1,118 @@
+<div id="div_category_action_buttons">
+  <div class="row">
+    <div class="col-md-6">
+
+    	<%#= theme_button('Back to Category Types', 'arrow-left', choose_category_type_path, classes: "pull-left mr-10", btn_type: "white", remote: false) %>
+
+      <% if @current_category %>
+        <%= theme_button('Back', 'arrow-left', categories_path(parent_id: @current_category.try(:parent_id), category_type: @category_type), classes: "pull-left mr-10", btn_type: "white") %>
+      <% end %>
+      
+      <%= theme_button('Refresh', 'refresh', categories_path(parent_id: @current_category.try(:id), category_type: @feature.try(:name)), classes: "pull-left mr-10", btn_type: "white") %>
+
+      <% if @current_user.has_create_permission?(Dhatu::Category) %>
+      <%= theme_button('Add a Category', 'plus', new_category_path(parent_id: @current_category.try(:id), category_type: @feature.try(:name)), classes: "pull-left mr-10", btn_type: "success") %>
+      <% end %>
+
+    </div>
+    <div class="col-md-6">
+      <%= search_form_kuppayam(Dhatu::Category, categories_path, text: @filters[:query]) %>
+    </div>
+  </div>
+</div>
+<%= clear_tag(10) %>
+
+<div class="row">
+  <div class="col-md-3">
+    <% @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 class="col-md-9" id="div_category_breadcrumbs">
+  	<% c_list = [] %>
+		<% c = @current_category %>
+		<% while c do %>
+			<% c_list << c %>
+		  <% c = c.parent %>
+		<% end %>
+
+		<% if c_list.count >= 1 %>
+			<ol class="breadcrumb auto-hidden1 bc-3">
+			<% c_list.reverse.each do |c| %>
+				<% if c_list[0] == c %>
+					<li class="active"><strong><%= c.display_name %></strong></li>
+				<% else %>
+					<li><%= link_to c.display_name, categories_path(parent_id: c.id), remote: true, class: "collapsed" %></li>
+				<% end %>
+			<% end %>
+			</ol>
+		<% end %>	
+	</div>
+</div>
+
+<%= clear_tag %>
+
+<div class="table-responsive"> 
+	<table class="table table-hover members-table middle-align">
+	  <thead> 
+			<tr> 
+				<th style="text-align: center;width:60px" class="hidden-sm hidden-xs">#</th> 
+				<th>Category</th>
+				<% if display_manage_links? %>
+				<th style="text-align: center;" colspan="2" class="hidden-sm hidden-xs">Actions</th>
+				<% end %>
+			</tr> 
+		</thead>
+	  <tbody>
+	  	<% @categories.each_with_index do |category, i| %>
+	  		<tr id="tr_category_<%= category.id %>">
+		      
+		      <th scope="row" style="text-align: center;" class="hidden-sm hidden-xs">
+						<% 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">
+		      		<%= content_tag :span, category.display_name, style: ";font-size:14px;" %>
+		      		<%= display_publishable_status(category) %>
+		      		<div class="badge">Priority: <%= category.priority %></div><br>
+		      		<%= content_tag :span, category.display_category_type, style: "color: #ffba00;" %>
+		      	</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;" %>
+		      		<%= display_publishable_status(category) %>
+		      		<div class="badge">Priority: <%= category.priority %></div><br>
+		      		<%= content_tag :span, category.display_category_type, style: "color: #ffba00;" %>
+		      	</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>
+		  <% end %>
+	  </tbody>
+	</table>
+</div>
+
+<div class="row">
+  <div class="col-sm-12">
+    <%= paginate_kuppayam(@categories) %>
+  </div>
+</div>
+

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

@@ -1,32 +1,28 @@
-<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"><%= category.display_name %></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 %></td>
-  <% end %>
-
-  <td><%= category.display_category_type %></td>
-  <td><%= category.priority %></td>
-
-  <td class="hidden-sm hidden-xs"><%= display_publishable_status(category) %></td>
+<div id="div_category_<%= category.id %>" class="col-lg-2 col-md-3 col-sm-6 col-xs-6">
 
-  <% 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>
+  <div style="text-align: center;border: 1px solid #f1f1f1;padding:10px;margin-bottom:15px;">
+    <div style="height:200px;">
+      <i class="<%= Feature::FEATURE_ICONS[category.category_type] %>" style="font-size:60px;padding:20px;"></i><br>
+      <% if category.end_node? %>
+        <%= content_tag :span, category.display_name, style: ";font-size:14px;" %><br>
+        <%= content_tag :span, category.display_category_type, style: "color: #ffba00;" %><br>
+        <%= display_publishable_status(category) %>
+      <% else %>
+        <%= 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;" %><br>
+        <%= content_tag :span, category.display_category_type, style: "color: #cc3f44;" %><br>
+        <%= display_publishable_status(category) %>
+      <% end %><br>
+    </div>
+    <% if display_manage_links? %>
+      <div style="width: 90%;border: 1px solid #e0e0e0;margin:5%;">
+        <%#= display_publishable_links(category) %>
+        <%= link_to raw("<i class=\"fa-eye mr-5\"></i>"), category_path(category), :remote=>true, style: "color:#373e4a" %>
+        <% if @current_user.has_create_permission?(Dhatu::Category) %>
+        <%= link_to raw("<i class='fa-plus mr-5'></i>"), new_category_path(parent_id: category.try(:id),category_type: category.category_type, ft: @feature.try(:id)), class: "", remote: true, style: "color: #8dc63f"  %>
+        <% end %>
+        <%= display_manage_links(category, @current_user, edit_text: "", delete_text: "") %>
+      </div>
+      <% end %>
+  </div>
+  
+</div>