dhatu 0.1.19 → 0.1.20

Sign up to get free protection for your applications and to get access to all the features.
Files changed (126) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/dhatu/blog_posts_controller.rb +81 -14
  3. data/app/controllers/dhatu/bookings_controller.rb +51 -5
  4. data/app/controllers/dhatu/branches_controller.rb +42 -8
  5. data/app/controllers/dhatu/categories_controller.rb +86 -47
  6. data/app/controllers/dhatu/events_controller.rb +79 -9
  7. data/app/controllers/dhatu/meta_tags_controller.rb +96 -0
  8. data/app/controllers/dhatu/offers_controller.rb +83 -10
  9. data/app/controllers/dhatu/pages_controller.rb +130 -0
  10. data/app/controllers/dhatu/prices_controller.rb +78 -12
  11. data/app/controllers/dhatu/projects_controller.rb +78 -22
  12. data/app/controllers/dhatu/promotion_enquiries_controller.rb +69 -7
  13. data/app/controllers/dhatu/promotions_controller.rb +46 -2
  14. data/app/controllers/dhatu/resource_controller.rb +4 -0
  15. data/app/controllers/dhatu/sections_controller.rb +41 -8
  16. data/app/controllers/dhatu/services_controller.rb +78 -18
  17. data/app/controllers/dhatu/team_members_controller.rb +41 -8
  18. data/app/controllers/dhatu/testimonials_controller.rb +41 -9
  19. data/app/models/dhatu/blog_post.rb +6 -2
  20. data/app/models/dhatu/category.rb +3 -3
  21. data/app/models/dhatu/event.rb +4 -0
  22. data/app/models/dhatu/meta_tag.rb +48 -0
  23. data/app/models/dhatu/offer.rb +4 -0
  24. data/app/models/dhatu/page.rb +50 -0
  25. data/app/models/dhatu/project.rb +7 -3
  26. data/app/models/dhatu/promotion.rb +1 -0
  27. data/app/models/dhatu/section.rb +8 -12
  28. data/app/models/dhatu/service.rb +7 -3
  29. data/app/models/image/og_image.rb +3 -0
  30. data/app/uploaders/og_image_uploader.rb +15 -0
  31. data/app/views/dhatu/blog_posts/_form.html.erb +1 -1
  32. data/app/views/dhatu/blog_posts/_index.html.erb +1 -1
  33. data/app/views/dhatu/blog_posts/_row.html.erb +1 -1
  34. data/app/views/dhatu/blog_posts/_show.html.erb +1 -1
  35. data/app/views/dhatu/bookings/_index.html.erb +7 -8
  36. data/app/views/dhatu/bookings/_row.html.erb +11 -7
  37. data/app/views/dhatu/bookings/index.html.erb +20 -12
  38. data/app/views/dhatu/branches/_index.html.erb +8 -12
  39. data/app/views/dhatu/branches/_show.html.erb +75 -69
  40. data/app/views/dhatu/branches/index.html.erb +13 -8
  41. data/app/views/dhatu/categories/_category_types.html.erb +27 -0
  42. data/app/views/dhatu/categories/_form.html.erb +2 -2
  43. data/app/views/dhatu/categories/_index.html.erb +114 -89
  44. data/app/views/dhatu/categories/_index_list.html.erb +118 -0
  45. data/app/views/dhatu/categories/_row.html.erb +27 -31
  46. data/app/views/dhatu/categories/_row_list.html.erb +34 -0
  47. data/app/views/dhatu/categories/_show.html.erb +101 -74
  48. data/app/views/dhatu/categories/choose_category_type.html.erb +20 -0
  49. data/app/views/dhatu/categories/index.html.erb +1 -19
  50. data/app/views/dhatu/dashboard/_index.html.erb +53 -42
  51. data/app/views/dhatu/events/_index.html.erb +1 -1
  52. data/app/views/dhatu/events/_row.html.erb +1 -1
  53. data/app/views/dhatu/events/_show.html.erb +99 -75
  54. data/app/views/dhatu/events/index.html.erb +14 -9
  55. data/app/views/dhatu/meta_tags/_form.html.erb +48 -0
  56. data/app/views/dhatu/meta_tags/_index.html.erb +59 -0
  57. data/app/views/dhatu/meta_tags/_row.html.erb +32 -0
  58. data/app/views/dhatu/meta_tags/create.js.erb +29 -0
  59. data/app/views/dhatu/offers/_index.html.erb +8 -8
  60. data/app/views/dhatu/offers/_row.html.erb +1 -1
  61. data/app/views/dhatu/offers/_show.html.erb +85 -81
  62. data/app/views/dhatu/offers/index.html.erb +14 -8
  63. data/app/views/dhatu/pages/_form.html.erb +44 -0
  64. data/app/views/dhatu/pages/_index.html.erb +57 -0
  65. data/app/views/dhatu/pages/_row.html.erb +47 -0
  66. data/app/views/dhatu/pages/_show.html.erb +99 -0
  67. data/app/views/dhatu/pages/index.html.erb +59 -0
  68. data/app/views/dhatu/pages/show.html.erb +12 -0
  69. data/app/views/dhatu/prices/_index.html.erb +6 -6
  70. data/app/views/dhatu/prices/_row.html.erb +3 -2
  71. data/app/views/dhatu/prices/_show.html.erb +34 -45
  72. data/app/views/dhatu/prices/index.html.erb +14 -25
  73. data/app/views/dhatu/projects/_form.html.erb +15 -16
  74. data/app/views/dhatu/projects/_index.html.erb +6 -7
  75. data/app/views/dhatu/projects/_row.html.erb +4 -4
  76. data/app/views/dhatu/projects/_show.html.erb +108 -97
  77. data/app/views/dhatu/projects/index.html.erb +13 -19
  78. data/app/views/dhatu/projects/show.html.erb +12 -0
  79. data/app/views/dhatu/promotion_attributes/_index.html.erb +1 -7
  80. data/app/views/dhatu/promotion_attributes/_row.html.erb +1 -4
  81. data/app/views/dhatu/promotion_enquiries/_index.html.erb +11 -11
  82. data/app/views/dhatu/promotion_enquiries/_row.html.erb +7 -5
  83. data/app/views/dhatu/promotion_enquiries/_show.html.erb +35 -43
  84. data/app/views/dhatu/promotion_enquiries/index.html.erb +20 -12
  85. data/app/views/dhatu/promotions/_index.html.erb +13 -15
  86. data/app/views/dhatu/promotions/_row.html.erb +10 -9
  87. data/app/views/dhatu/promotions/_show.html.erb +190 -93
  88. data/app/views/dhatu/promotions/index.html.erb +0 -8
  89. data/app/views/dhatu/{section_types → section_types1}/_form.html.erb +0 -0
  90. data/app/views/dhatu/{section_types → section_types1}/_index.html.erb +0 -0
  91. data/app/views/dhatu/{section_types → section_types1}/_row.html.erb +0 -0
  92. data/app/views/dhatu/{section_types → section_types1}/_show.html.erb +0 -0
  93. data/app/views/dhatu/{section_types → section_types1}/index.html.erb +0 -0
  94. data/app/views/dhatu/sections/_form.html.erb +116 -11
  95. data/app/views/dhatu/sections/_index.html.erb +6 -3
  96. data/app/views/dhatu/sections/_row.html.erb +5 -2
  97. data/app/views/dhatu/sections/_show.html.erb +168 -132
  98. data/app/views/dhatu/sections/index.html.erb +10 -2
  99. data/app/views/dhatu/services/_form.html.erb +16 -17
  100. data/app/views/dhatu/services/_index.html.erb +6 -7
  101. data/app/views/dhatu/services/_row.html.erb +4 -4
  102. data/app/views/dhatu/services/_show.html.erb +107 -96
  103. data/app/views/dhatu/services/index.html.erb +13 -19
  104. data/app/views/dhatu/team_members/_index.html.erb +5 -6
  105. data/app/views/dhatu/team_members/_row.html.erb +3 -3
  106. data/app/views/dhatu/team_members/_show.html.erb +70 -58
  107. data/app/views/dhatu/team_members/index.html.erb +13 -8
  108. data/app/views/dhatu/testimonials/_index.html.erb +3 -6
  109. data/app/views/dhatu/testimonials/_row.html.erb +2 -3
  110. data/app/views/dhatu/testimonials/_show.html.erb +63 -93
  111. data/app/views/dhatu/testimonials/index.html.erb +13 -8
  112. data/app/views/layouts/kuppayam/_sidebar.html.erb +63 -48
  113. data/app/views/usman/dashboard/_super_admin_index.html.erb +22 -0
  114. data/config/routes.rb +12 -1
  115. data/db/data/dummy/services.csv +1 -1
  116. data/db/migrate/20180101093435_create_pages.rb +14 -0
  117. data/db/migrate/20180101093436_create_meta_tags.rb +19 -0
  118. data/db/migrate/20180101093437_add_page_id_to_sections.rb +5 -0
  119. data/db/migrate/20180101093438_add_priority_to_pages_and_sections.rb +6 -0
  120. data/db/migrate/20180101093439_add_a_ton_of_boolean_fields_to_sections.rb +34 -0
  121. data/db/migrate/20180101093440_add_code_to_sections.rb +19 -0
  122. data/db/migrate/20180101093441_rename_meta_description_all_over.rb +7 -0
  123. data/db/migrate/20180101093442_add_name_to_sections.rb +19 -0
  124. data/lib/dhatu/version.rb +1 -1
  125. metadata +43 -14
  126. data/db/migrate/20171203114529_add_meta_description_to_services.rb +0 -7
data/app/views/dhatu/prices/index.html.erb CHANGED
@@ -4,31 +4,6 @@
4
4
 
5
5
  <div class="tabs-vertical-env">
6
6
 
7
- <ul id="div_category_types" class="nav tabs-vertical">
8
- <li class="<%= @category.blank? ? 'active' : '' %>">
9
- <%= link_to "All", prices_path, style: "text-align:left;" %>
10
- </li>
11
- <% @categories.each do |ct| %>
12
- <li class="<%= @category && @category == ct ? 'active' : '' %>">
13
- <%= link_to ct.name, prices_path(ct: ct.id), style: "text-align:left;" %>
14
- </li>
15
- <% end %>
16
- <li class="<%= @category && @category.id == -1 ? 'active' : '' %>">
17
- <%= link_to "None", prices_path(ct: -1), style: "text-align:left;" %>
18
- </li>
19
- </ul>
20
-
21
- <!-- <ul class="nav nav-tabs nav-tabs-justified">
22
- <%# Dhatu::Price::STATUS.each do |key, value| %>
23
- <li class="<%#= @status == value ? 'active' : '' %>">
24
- <%#= link_to dhatu.prices_path(st: value), "aria-expanded" => "#{ @status == value ? 'true' : 'false' }" do %>
25
- <span class="visible-xs"><i class="fa-gift"></i></span>
26
- <span class="hidden-xs"><%#= key %></span>
27
- <%# end %>
28
- </li>
29
- <%# end %>
30
- </ul> -->
31
-
32
7
  <div class="tab-content">
33
8
  <div class="tab-pane active">
34
9
 
@@ -44,6 +19,20 @@
44
19
  </div>
45
20
  </div>
46
21
 
22
+ <div class="row">
23
+ <div class="col-md-12 visible-sm visible-xs mt-10">
24
+ </div>
25
+ <div class="col-md-12">
26
+ <% @filter_ui_settings.each do |filter_name, options| %>
27
+ <% if options[:object_filter] == true %>
28
+ <%= report_object_filter(filter_name, options) %>
29
+ <% else %>
30
+ <%= report_filter(filter_name, options) %>
31
+ <% end %>
32
+ <% end %>
33
+ </div>
34
+ </div>
35
+
47
36
  </div>
48
37
  <%= clear_tag(10) %>
49
38
 
data/app/views/dhatu/projects/_form.html.erb CHANGED
@@ -13,33 +13,32 @@
13
13
  <%= theme_form_field(@project, :name, required: true, form_style: "top-bottom", html_options: { placeholder: "", "data-id": @project.id.to_s}) %>
14
14
 
15
15
  <div class="row">
16
- <div class="col-md-4 pr-20">
17
- <% options = {assoc_collection: Dhatu::Category.filter_by_category_type("Dhatu::Project").published.select("id, name").order("priority ASC, name ASC").all, editable: true, assoc_display_method: :name, required: false} %>
16
+ <div class="col-md-3 pr-20">
17
+ <% options = {assoc_collection: Dhatu::Category.filter_by_category_type("Dhatu::Project").published.select("id, name").order("priority ASC, name ASC").all, editable: true, assoc_display_method: :name, required: false, include_blank: true} %>
18
18
  <%= theme_form_assoc_group(@project, :category_id, label: "Choose Category", form_style: "top-bottom", **options) %>
19
19
  </div>
20
- <div class="col-md-4 pl-20">
21
- <%= theme_form_field(@project, :meta_description, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
22
- </div>
23
- <div class="col-md-4 pl-20">
24
- <% if @project.new_record? || @current_user.super_admin? %>
25
- <%= theme_form_field(@project, :permalink, form_style: "top-bottom", html_options: { placeholder: ""}) %>
26
- <% else %>
27
- <%= theme_form_field(@project, :permalink, form_style: "top-bottom", html_options: { placeholder: "", readonly: true}) %>
28
- <% end %>
20
+ <div class="col-md-3 pl-20">
21
+ <%= theme_form_field(@project, :client, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
29
22
  </div>
30
23
  </div>
31
24
 
25
+ <%= theme_form_field(@project, :short_description, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
26
+
32
27
  <%= theme_form_field(@project, :description, required: true, html_options: {type: :textarea, class: "form-control wysihtml5", "data-stylesheet-url": "assets/wysiwyg-color.css"}, form_style: "top-bottom") %>
33
28
 
34
29
  <div class="row">
35
- <div class="col-md-4 pr-20">
36
- <%= theme_form_field(@project, :client, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
37
- </div>
38
- <div class="col-md-4 pl-20">
30
+ <div class="col-md-3 pl-20">
39
31
  <%= theme_form_field(@project, :priority, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
40
32
  </div>
33
+ <div class="col-md-3 pl-20">
34
+ <% if @project.new_record? || @current_user.super_admin? %>
35
+ <%= theme_form_field(@project, :permalink, form_style: "top-bottom", html_options: { placeholder: ""}) %>
36
+ <% else %>
37
+ <%= theme_form_field(@project, :permalink, form_style: "top-bottom", html_options: { placeholder: "", readonly: true}) %>
38
+ <% end %>
39
+ </div>
41
40
  </div>
42
-
41
+
43
42
  </div>
44
43
 
45
44
  <div>
data/app/views/dhatu/projects/_index.html.erb CHANGED
@@ -1,8 +1,8 @@
1
- <div class="table-responsive">
1
+ <div class="table-responsive1">
2
2
  <table class="table table-hover members-table middle-align">
3
3
  <thead>
4
4
  <tr>
5
- <th style="text-align: center;width:5%">#</th>
5
+ <th style="text-align: center;width:5%" class="hidden-sm hidden-xs">#</th>
6
6
  <th style="text-align: center;width:100px"><i class="fa fa-photo"></i></th>
7
7
  <th>Project Name</th>
8
8
  <% if display_manage_links? %>
@@ -13,21 +13,20 @@
13
13
  <tbody>
14
14
  <tr id="tr_project_0"></tr>
15
15
  <% @projects.each_with_index do |project, i| %>
16
-
17
16
  <tr id="tr_project_<%= project.id %>">
18
17
 
19
- <th scope="row" style="text-align: center;">
18
+ <th scope="row" style="text-align: center;" class="hidden-sm hidden-xs">
20
19
  <%= serial_number(i) %>
21
20
  </th>
22
21
 
23
- <td class="display-image">
24
- <%= display_thumbnail_small(project) %>
22
+ <td class="display-image" class="hidden-sm hidden-xs">
23
+ <%= display_thumbnail(project) %>
25
24
  </td>
26
25
 
27
26
  <td class="display-link">
28
27
  <%= link_to project.name, project_path(project), remote: true, style: "color: chocolate;font-size:16px;" %><br>
29
28
  <%= link_to project.category.try(:display_name), project_path(project), remote: true %><br>
30
- <p style="color:#898989;"><%= project.meta_description %></p>
29
+ <p style="color:#898989;" class="hidden-sm hidden-xs"><%= project.short_description %></p>
31
30
  <%= display_publishable_status(project) %>
32
31
  <%= display_featured(project) %>
33
32
  </td>
data/app/views/dhatu/projects/_row.html.erb CHANGED
@@ -1,17 +1,17 @@
1
1
  <tr id="tr_project_<%= project.id %>">
2
2
 
3
- <th scope="row" style="text-align: center;">
3
+ <th scope="row" style="text-align: center;" class="hidden-sm hidden-xs">
4
4
  <%= serial_number(i) %>
5
5
  </th>
6
6
 
7
- <td class="display-image">
8
- <%= display_thumbnail_small(project) %>
7
+ <td class="display-image" class="hidden-sm hidden-xs">
8
+ <%= display_thumbnail(project) %>
9
9
  </td>
10
10
 
11
11
  <td class="display-link">
12
12
  <%= link_to project.name, project_path(project), remote: true, style: "color: chocolate;font-size:16px;" %><br>
13
13
  <%= link_to project.category.try(:display_name), project_path(project), remote: true %><br>
14
- <p style="color:#898989;"><%= project.meta_description %></p>
14
+ <p style="color:#898989;" class="hidden-sm hidden-xs"><%= project.short_description %></p>
15
15
  <%= display_publishable_status(project) %>
16
16
  <%= display_featured(project) %>
17
17
  </td>
data/app/views/dhatu/projects/_show.html.erb CHANGED
@@ -1,39 +1,24 @@
1
1
  <div id="div_project_show">
2
2
 
3
3
  <div class="row">
4
-
5
- <div class="col-md-3 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
6
- <% if display_edit_links? %>
7
- <%= edit_image(@project,
8
- "cover_image.image.large.url",
9
- upload_image_link(@project, :cover_image, nil ),
10
- remove_image_link(@project, :cover_image, nil ),
11
- image_options: {assoc_name: :cover_image }) %>
12
- <% else %>
13
- <%= display_image(@project, "cover_image.image.large.url", class: "img-inline", alt: @project.display_name) %>
14
- <% end %>
15
- </div>
16
-
17
- <div class="col-md-6 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
18
-
4
+ <div class="col-md-9 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
19
5
  <%= theme_panel_heading(@project.name) %>
20
-
21
6
  <%= theme_panel_sub_heading(@project.category.try(:display_name), "#") if @project.category %>
22
-
23
7
  <%= clear_tag(10) %>
24
-
25
- <div class="well">
26
- <%= @project.meta_description %>
27
- </div>
28
-
29
- <%= clear_tag(10) %>
30
-
31
8
  <%= display_publishable_status(@project) %>
32
-
33
9
  <%= display_featured(@project) %>
34
-
35
10
  <%= clear_tag(20) %>
36
-
11
+ <div class="row">
12
+ <div class="col-md-8">
13
+ <table class="table table-condensed table-bordered mb-60">
14
+ <tbody>
15
+ <tr><th>Client</th><td><%= @project.client %></td></tr>
16
+ <tr><th>Priority</th><td><%= @project.priority %></td></tr>
17
+ </tbody>
18
+ </table>
19
+ </div>
20
+ </div>
21
+ <%= clear_tag(20) %>
37
22
  </div>
38
23
 
39
24
  <% if display_manage_links? %>
@@ -43,93 +28,119 @@
43
28
  <%= display_featurable_buttons(@project) %>
44
29
  </div>
45
30
  <% end %>
46
-
47
31
  </div>
48
32
 
49
- <hr>
50
-
51
- <div class="visible-sm visible-xs mb-50"></div>
52
-
53
- <%= clear_tag(20) %>
54
-
55
- <ul class="nav nav-pills">
56
- <li class="active">
57
- <a href="#project_details" data-toggle="tab" aria-expanded="false">
58
- <span class="visible-xs"><i class="fa-database"></i></span>
59
- <span class="hidden-xs">Project Details</span>
60
- </a>
61
- </li>
62
-
63
- <li class="">
64
- <a href="#project_images" data-toggle="tab" aria-expanded="false">
65
- <span class="visible-xs"><i class="fa-database"></i></span>
66
- <span class="hidden-xs">Images</span>
67
- </a>
68
- </li>
69
-
70
- <li class="">
71
- <a href="#technical_details" data-toggle="tab" aria-expanded="false">
72
- <span class="visible-xs"><i class="fa-database"></i></span>
73
- <span class="hidden-xs">Technical Details</span>
74
- </a>
75
- </li>
76
- </ul>
77
-
78
- <div class="tab-content">
79
- <div class="tab-pane active" id="project_details" style="border: 1px solid #000;min-height:200px;padding:20px;margin-bottom:20px;max-height: 400px;overflow-y: auto;">
80
-
33
+ <div class="row">
34
+
35
+ <div class="col-md-6 col-xs-12">
36
+ <%= clear_tag(40) %>
37
+ <div><strong class="fs-18">Project Details</strong></div>
38
+ <hr>
39
+ <strong>Short Description</strong><br><br>
40
+ <%= @project.short_description %>
81
41
  <%= clear_tag(20) %>
82
- <strong>Description</strong>
42
+
43
+ <strong>Description</strong><br><br>
83
44
  <%= raw(@project.description) %>
84
45
  <%= clear_tag(20) %>
85
-
86
46
  </div>
87
47
 
88
- <div class="tab-pane" id="project_images" style="border: 1px solid #000;min-height:200px;padding:20px;margin-bottom:20px;max-height: 400px;overflow-y: auto;">
89
-
90
- <%= clear_tag(20) %>
91
-
92
- <div id="div_project_images_buttons">
93
- <div class="row">
94
- <div class="col-md-6">
95
- <%= theme_button('Upload a New Image', 'refresh', upload_multiple_image_link(@project, :gallery_images, nil ), classes: "pull-left", btn_type: "white") %>
96
- </div>
97
- <div class="col-md-6">
98
- </div>
99
- </div>
48
+ <div class="col-md-6 col-xs-12">
49
+ <%= clear_tag(40) %>
50
+ <div><strong class="fs-18">Cover Image</strong></div>
51
+ <hr>
52
+ <div class="col-md-6 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
53
+ <% if display_edit_links? %>
54
+ <%= edit_image(@project,
55
+ "cover_image.image.large.url",
56
+ upload_image_link(@project, :cover_image, nil ),
57
+ remove_image_link(@project, :cover_image, nil ),
58
+ image_options: {assoc_name: :cover_image }) %>
59
+ <% else %>
60
+ <%= display_image(@project, "cover_image.image.large.url", class: "img-inline", alt: @project.display_name) %>
61
+ <% end %>
100
62
  </div>
101
- <%= clear_tag(10) %>
63
+ </div>
102
64
 
103
- <%= render :partial=>"kuppayam/images/multiple_images", locals: { images: @project.gallery_images } %>
65
+ </div>
104
66
 
67
+ <%= clear_tag(40) %>
68
+ <div><strong class="fs-18">Gallery Images</strong></div>
69
+ <hr>
70
+ <div id="div_project_images_buttons">
71
+ <div class="row">
72
+ <div class="col-md-6">
73
+ <%= theme_button('Upload a New Image', 'plus', upload_multiple_image_link(@project, :gallery_images, nil ), classes: "pull-left", btn_type: "white") %>
74
+ </div>
75
+ <div class="col-md-6">
76
+ </div>
105
77
  </div>
78
+ </div>
79
+ <%= render :partial=>"kuppayam/images/multiple_images", locals: { images: @project.gallery_images } %>
80
+
81
+ <% if @current_user.has_read_permission?(Dhatu::MetaTag) %>
82
+ <%= clear_tag(40) %>
83
+ <div><strong class="fs-18">Meta Tags</strong></div>
84
+ <hr>
85
+ <div id="div_meta_tags_action_buttons">
86
+ <div class="row">
87
+ <div class="col-md-6">
88
+ <%= theme_button('Add a Meta Tag', 'plus', new_meta_tag_path(meta_taggable_id: @project.id, meta_taggable_type: @project.class.name), classes: "pull-left mr-10", btn_type: "success") if @current_user.has_create_permission?(Dhatu::MetaTag) %>
106
89
 
107
- <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;">
108
-
109
- <%= clear_tag(20) %>
110
-
111
- <div class="table-responsive">
112
- <table class="table table-striped table-condensed table-bordered mb-60">
113
- <tbody>
114
-
115
- <tr>
116
- <th>ID</th><td><%= @project.id %></td>
117
- <th>Status</th><td><%= @project.status %></td>
118
- </tr>
119
- <tr>
120
- <th>Created At</th><td><%= @project.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @project.created_at %></td>
121
- <th>Updated At</th><td><%= @project.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @project.updated_at %></td>
122
- </tr>
123
-
124
- </tbody>
125
- </table>
90
+ <%= theme_button('Refresh', 'refresh', meta_tags_path(meta_taggable_id: @project.id, meta_taggable_type: @project.class.name), classes: "pull-left mr-10", btn_type: "white") %>
91
+ </div>
92
+ <div class="col-md-6">
93
+ <%= search_form_kuppayam(User, meta_tags_path(meta_taggable_id: @project.id, meta_taggable_type: @project.class.name), text: "") %>
126
94
  </div>
127
-
128
95
  </div>
129
96
  </div>
97
+ <%= clear_tag(10) %>
98
+ <div id="div_meta_tag_index">
99
+ <% meta_tags = @project.meta_tags.page(@current_page).per(@per_page) %>
100
+ <%= render :partial=>"dhatu/meta_tags/index", locals: {meta_tags: meta_tags, meta_taggable: @project } %>
101
+ </div>
102
+ <% end %>
103
+
104
+ <% if @current_user.super_admin? %>
105
+ <%= clear_tag(40) %>
106
+ <div><strong class="fs-18">Technical Details</strong></div>
107
+ <hr>
108
+ <div class="table-responsive">
109
+ <table class="table table-striped table-condensed table-bordered mb-60">
110
+ <tbody>
111
+
112
+ <tr>
113
+ <th>ID</th><td><%= @project.id %></td>
114
+ <th>Permalink</th><td><%= @project.permalink %></td>
115
+ </tr>
116
+
117
+ <tr>
118
+ <th>Status</th><td><%= @project.status %></td>
119
+ <th>Featured</th><td><%= @project.featured? ? "Yes" : "No" %></td>
120
+ </tr>
121
+
122
+ <tr>
123
+ <th>Client</th><td><%= @project.client %></td>
124
+ <th>Priority</th><td><%= @project.priority %></td>
125
+ </tr>
126
+
127
+ <tr>
128
+ <th>Category</th><td><%= "#{@project.category.name} (#{@project.category.id})" if @project.category %></td>
129
+ <th></th><td></td>
130
+ </tr>
131
+
132
+ <tr>
133
+ <th>Created At</th><td><%= @project.created_at.strftime("%m/%d/%Y - %H:%M:%S") if @project.created_at %></td>
134
+ <th>Updated At</th><td><%= @project.updated_at.strftime("%m/%d/%Y - %H:%M:%S") if @project.updated_at %></td>
135
+ </tr>
136
+
137
+ </tbody>
138
+ </table>
139
+ </div>
140
+ <% end %>
130
141
 
131
142
  <%= link_to "Close", "#", onclick: "closeLargeModal();", class: "btn btn-primary pull-right" %>
132
143
 
133
- <%= clear_tag %>
144
+ <%= clear_tag(20) %>
134
145
 
135
146
  </div>
data/app/views/dhatu/projects/index.html.erb CHANGED
@@ -4,25 +4,6 @@
4
4
 
5
5
  <div class="tabs-vertical-env">
6
6
 
7
- <ul id="div_category_types" class="nav tabs-vertical">
8
- <% @categories.each do |ct| %>
9
- <li class="<%= ct == @category ? 'active' : '' %>">
10
- <%= link_to ct.name, projects_path(ct: ct.id) %>
11
- </li>
12
- <% end %>
13
- </ul>
14
-
15
- <!-- <ul class="nav nav-tabs nav-tabs-justified">
16
- <%# Dhatu::Project::STATUS.each do |key, value| %>
17
- <li class="<%#= @status == value ? 'active' : '' %>">
18
- <%#= link_to dhatu.projects_path(st: value), "aria-expanded" => "#{ @status == value ? 'true' : 'false' }" do %>
19
- <span class="visible-xs"><i class="fa-gift"></i></span>
20
- <span class="hidden-xs"><%#= key %></span>
21
- <%# end %>
22
- </li>
23
- <%# end %>
24
- </ul> -->
25
-
26
7
  <div class="tab-content">
27
8
  <div class="tab-pane active">
28
9
 
@@ -37,6 +18,19 @@
37
18
  <%= search_form_kuppayam(Dhatu::Project, dhatu.projects_path(), text: @filters[:query]) %>
38
19
  </div>
39
20
  </div>
21
+ <div class="row">
22
+ <div class="col-md-12 visible-sm visible-xs mt-10">
23
+ </div>
24
+ <div class="col-md-12">
25
+ <% @filter_ui_settings.each do |filter_name, options| %>
26
+ <% if options[:object_filter] == true %>
27
+ <%= report_object_filter(filter_name, options) %>
28
+ <% else %>
29
+ <%= report_filter(filter_name, options) %>
30
+ <% end %>
31
+ <% end %>
32
+ </div>
33
+ </div>
40
34
 
41
35
  </div>
42
36
  <%= clear_tag(10) %>