ish_manager 0.1.8.314 → 0.1.8.316

Sign up to get free protection for your applications and to get access to all the features.
Files changed (46) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/ish_manager/application.js +13 -39
  3. data/app/assets/stylesheets/ish_manager/application.scss +107 -155
  4. data/app/assets/stylesheets/ish_manager/galleries.scss +30 -18
  5. data/app/assets/stylesheets/ish_manager/maps.scss +45 -32
  6. data/app/assets/stylesheets/ish_manager/markers.scss +8 -0
  7. data/app/assets/stylesheets/ish_manager/pagination.scss +54 -0
  8. data/app/assets/stylesheets/ish_manager/photos.scss +39 -2
  9. data/app/assets/stylesheets/ish_manager/{tags.css → tags.scss} +0 -0
  10. data/app/assets/stylesheets/ish_manager/{bootstrap.css → trash/bootstrap.css} +0 -0
  11. data/app/assets/stylesheets/ish_manager/{materialize.css → trash/materialize.css} +0 -0
  12. data/app/assets/stylesheets/ish_manager/{reset.css → trash/reset.css} +0 -0
  13. data/app/controllers/ish_manager/leads_controller.rb +0 -1
  14. data/app/controllers/ish_manager/maps_controller.rb +0 -2
  15. data/app/controllers/ish_manager/markers_controller.rb +0 -2
  16. data/app/controllers/ish_manager/meetings_controller.rb +0 -2
  17. data/app/controllers/ish_manager/newsitems_controller.rb +4 -5
  18. data/app/helpers/ish_manager/application_helper.rb +12 -1
  19. data/app/views/ish_manager/application/_debug.haml +8 -6
  20. data/app/views/ish_manager/application/_main_footer.haml +7 -6
  21. data/app/views/ish_manager/application/_main_header.haml +1 -1
  22. data/app/views/ish_manager/application/_main_header_admin.haml +3 -7
  23. data/app/views/ish_manager/application/_main_header_guy.haml +1 -1
  24. data/app/views/ish_manager/application/_main_header_manager.haml +1 -1
  25. data/app/views/ish_manager/application/_search.haml +5 -10
  26. data/app/views/ish_manager/application/home.haml +8 -7
  27. data/app/views/ish_manager/galleries/_index.haml +19 -19
  28. data/app/views/ish_manager/galleries/_menu.haml +12 -14
  29. data/app/views/ish_manager/galleries/_menu_secondary.haml +12 -0
  30. data/app/views/ish_manager/galleries/_title.haml +12 -14
  31. data/app/views/ish_manager/galleries/{index_ajax.haml → index_ajax.haml-trash} +0 -0
  32. data/app/views/ish_manager/galleries/show.haml +24 -33
  33. data/app/views/ish_manager/markers/_index.haml +1 -1
  34. data/app/views/ish_manager/newsitems/_form.haml +3 -0
  35. data/app/views/ish_manager/photos/_index_thumbs.haml +7 -0
  36. data/app/views/ish_manager/photos/_meta_manager.haml +5 -5
  37. data/app/views/ish_manager/photos/_multinew.haml +4 -6
  38. data/app/views/ish_manager/videos/_index.haml +1 -1
  39. data/app/views/layouts/ish_manager/application.haml +53 -0
  40. data/app/views/layouts/ish_manager/{application2.haml → application.haml-trash} +0 -0
  41. metadata +12 -12
  42. data/app/assets/stylesheets/ish_manager/trash/bootstrap.min.css +0 -6
  43. data/app/assets/stylesheets/ish_manager/trash/bootstrap.min.css.map +0 -1
  44. data/app/views/ish_manager/galleries/_index_thumbs.haml +0 -1
  45. data/app/views/layouts/ish_manager/application.haml +0 -1
  46. data/app/views/layouts/ish_manager/application_no_material.haml +0 -53
@@ -1 +0,0 @@
1
- = render 'ish_manager/galleries/index'
@@ -1 +0,0 @@
1
- app/views/layouts/ish_manager/application2.haml
@@ -1,53 +0,0 @@
1
- !!!
2
- %html
3
- %head
4
- %title Ish Manager
5
- %link{ :rel => 'icon', :href => "/favicon_#{ENV['RAILS_ENV']}.gif" }
6
- %meta{ :name => :viewport, :content => 'width=device-width, initial-scale=1.0' }
7
- %meta{ :charset => 'UTF-8' }
8
- %meta{ :description => 'some description' }
9
-
10
- = javascript_include_tag "//code.jquery.com/jquery-3.3.1.min.js"
11
-
12
- %script{ :src => "//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js" }
13
- = stylesheet_link_tag "//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"
14
-
15
- %script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/jquery.tinymce.min.js" }
16
- %script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/tinymce.min.js" }
17
-
18
- = stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", :media => 'all'
19
- = stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
20
-
21
- = stylesheet_link_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
22
- = javascript_include_tag "//cdn.jsdelivr.net/npm/popper.js@1.14.7/dist/umd/popper.min.js"
23
- = javascript_include_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/js/bootstrap.min.js"
24
-
25
- = stylesheet_link_tag "//cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css"
26
- = javascript_include_tag "//cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"
27
-
28
- = stylesheet_link_tag "ish_manager/application", media: "all"
29
- = javascript_include_tag "ish_manager/application"
30
-
31
- = csrf_meta_tags
32
- %body{ class: [ params[:controller].gsub("ish_manager/",""), "#{params[:controller].gsub("ish_manager/","")}-#{params[:action]}", params[:action]] }
33
- .bg-white
34
- = render :partial => "ish_manager/application/main_header_#{current_user.profile.role_name}"
35
- .container
36
- .row
37
- .col.s12
38
- - if notice
39
- - if notice.class == Array
40
- %ul
41
- - notice.map do |n|
42
- %li
43
- - n.map do |k,v|
44
- <b>#{k} :</b> #{v}
45
- %p.notice= notice
46
- - if alert
47
- %p.alert= alert
48
- .container
49
- = yield
50
- = render 'ish_manager/application/main_footer'
51
- = render 'analytics' if Rails.env.production?
52
- = render 'debug' if !Rails.env.production?
53
-