ish_manager 0.1.8.315 → 0.1.8.317

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (104) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/ish_manager/application.js +0 -4
  3. data/app/assets/stylesheets/ish_manager/application.scss +89 -150
  4. data/app/assets/stylesheets/ish_manager/email_templates.scss +47 -0
  5. data/app/assets/stylesheets/ish_manager/galleries.scss +32 -16
  6. data/app/assets/stylesheets/ish_manager/maps.scss +45 -32
  7. data/app/assets/stylesheets/ish_manager/markers.scss +8 -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/{campaigns_controller.rb → email_campaigns_controller.rb} +1 -1
  14. data/app/controllers/ish_manager/email_contexts_controller.rb +74 -0
  15. data/app/controllers/ish_manager/email_templates_controller.rb +43 -0
  16. data/app/controllers/ish_manager/galleries_controller.rb +1 -1
  17. data/app/controllers/ish_manager/invoices_controller.rb +2 -2
  18. data/app/controllers/ish_manager/leads_controller.rb +2 -2
  19. data/app/controllers/ish_manager/maps_controller.rb +0 -2
  20. data/app/controllers/ish_manager/markers_controller.rb +0 -2
  21. data/app/controllers/ish_manager/meetings_controller.rb +1 -3
  22. data/app/controllers/ish_manager/newsitems_controller.rb +0 -3
  23. data/app/controllers/ish_manager/{cities_controller.rb → trash/cities_controller.rb} +0 -0
  24. data/app/controllers/ish_manager/{orders_controller.rb → trash/orders_controller.rb} +0 -0
  25. data/app/controllers/ish_manager/{sites_controller.rb → trash/sites_controller.rb} +0 -0
  26. data/app/controllers/ish_manager/{venues_controller.rb → trash/venues_controller.rb} +0 -0
  27. data/app/controllers/ish_manager/unsubscribes_controller.rb +1 -1
  28. data/app/helpers/ish_manager/application_helper.rb +1 -1
  29. data/app/mailers/ish_manager/office_mailer.rb +22 -0
  30. data/app/views/ish_manager/application/_main_footer.haml +3 -1
  31. data/app/views/ish_manager/application/_main_header.haml +1 -1
  32. data/app/views/ish_manager/application/_main_header_admin.haml +16 -8
  33. data/app/views/ish_manager/application/_main_header_guy.haml +1 -1
  34. data/app/views/ish_manager/application/_main_header_manager.haml +1 -1
  35. data/app/views/ish_manager/email_contexts/_form.haml +26 -0
  36. data/app/views/ish_manager/email_contexts/edit.haml +3 -0
  37. data/app/views/ish_manager/email_contexts/iframe_src.haml +4 -0
  38. data/app/views/ish_manager/email_contexts/index.haml +21 -0
  39. data/app/views/ish_manager/email_contexts/new.haml +3 -0
  40. data/app/views/ish_manager/email_contexts/show.haml +16 -0
  41. data/app/views/ish_manager/email_templates/_form.haml +11 -0
  42. data/app/views/ish_manager/email_templates/_marketing_ror_1.html +0 -0
  43. data/app/views/ish_manager/email_templates/_marketing_ror_2.html +0 -0
  44. data/app/views/ish_manager/email_templates/_marketing_wordpress_1.html +0 -0
  45. data/app/views/ish_manager/email_templates/_marketing_wordpress_2.html +0 -0
  46. data/app/views/ish_manager/email_templates/_piousbox_roundborders.html.erb +1005 -0
  47. data/app/views/ish_manager/email_templates/_social.html.erb +181 -0
  48. data/app/views/ish_manager/email_templates/index.haml +18 -0
  49. data/app/views/ish_manager/email_templates/show.haml +4 -0
  50. data/app/views/ish_manager/galleries/_index.haml +4 -5
  51. data/app/views/ish_manager/galleries/_menu.haml +11 -12
  52. data/app/views/ish_manager/galleries/_menu_secondary.haml +12 -0
  53. data/app/views/ish_manager/galleries/_title.haml +12 -14
  54. data/app/views/ish_manager/galleries/{index_ajax.haml → index_ajax.haml-trash} +0 -0
  55. data/app/views/ish_manager/galleries/show.haml +24 -33
  56. data/app/views/ish_manager/{application_mailer → iron_warbler_mailer}/condor_followup_alerb.html.erb +0 -0
  57. data/app/views/ish_manager/{application_mailer → iron_warbler_mailer}/option_alert.html.erb +0 -0
  58. data/app/views/ish_manager/{application_mailer → iron_warbler_mailer}/stock_alert.html.erb +0 -0
  59. data/app/views/ish_manager/maps/_map_meta_row.haml +1 -1
  60. data/app/views/ish_manager/markers/_index.haml +1 -1
  61. data/app/views/ish_manager/{meeting_mailer → office_mailer}/morning_reminder.haml +0 -0
  62. data/app/views/ish_manager/office_mailer/render +1 -0
  63. data/app/views/ish_manager/{application_mailer → office_mailer}/test_email.html.haml +0 -0
  64. data/app/views/ish_manager/photos/_index_thumbs.haml +7 -0
  65. data/app/views/ish_manager/photos/_meta_manager.haml +5 -5
  66. data/app/views/ish_manager/photos/_multinew.haml +4 -6
  67. data/app/views/ish_manager/{cities → trash/cities}/_form.haml +0 -0
  68. data/app/views/ish_manager/{cities → trash/cities}/_header.haml +0 -0
  69. data/app/views/ish_manager/{cities → trash/cities}/edit.haml +0 -0
  70. data/app/views/ish_manager/{cities → trash/cities}/edit_feature.haml +0 -0
  71. data/app/views/ish_manager/{cities → trash/cities}/index.haml +0 -0
  72. data/app/views/ish_manager/{cities → trash/cities}/new.haml +0 -0
  73. data/app/views/ish_manager/{cities → trash/cities}/new_feature.haml +0 -0
  74. data/app/views/ish_manager/{cities → trash/cities}/new_newsitem.haml +0 -0
  75. data/app/views/ish_manager/{cities → trash/cities}/show.haml +0 -0
  76. data/app/views/ish_manager/{events → trash/events}/_form.haml +0 -0
  77. data/app/views/ish_manager/{events → trash/events}/_index.haml +0 -0
  78. data/app/views/ish_manager/{events → trash/events}/edit.haml +0 -0
  79. data/app/views/ish_manager/{events → trash/events}/index.haml +0 -0
  80. data/app/views/ish_manager/{events → trash/events}/new.haml +0 -0
  81. data/app/views/ish_manager/trash/meeting_mailer/README.txt +5 -0
  82. data/app/views/ish_manager/{sites → trash/sites}/_form.haml +0 -0
  83. data/app/views/ish_manager/{sites → trash/sites}/_header.haml +0 -0
  84. data/app/views/ish_manager/{sites → trash/sites}/edit.haml +0 -0
  85. data/app/views/ish_manager/{sites → trash/sites}/galleries.haml +0 -0
  86. data/app/views/ish_manager/{sites → trash/sites}/index.haml +0 -0
  87. data/app/views/ish_manager/{sites → trash/sites}/new.haml +0 -0
  88. data/app/views/ish_manager/{sites → trash/sites}/show.haml +0 -0
  89. data/app/views/ish_manager/{venues → trash/venues}/_form.haml +0 -0
  90. data/app/views/ish_manager/{venues → trash/venues}/_index.haml +0 -0
  91. data/app/views/ish_manager/{venues → trash/venues}/_search.haml +0 -0
  92. data/app/views/ish_manager/{venues → trash/venues}/edit.haml +0 -0
  93. data/app/views/ish_manager/{venues → trash/venues}/index.haml +0 -0
  94. data/app/views/ish_manager/{venues → trash/venues}/new.haml +0 -0
  95. data/app/views/ish_manager/{venues → trash/venues}/show.haml +0 -0
  96. data/app/views/ish_manager/videos/_index.haml +1 -1
  97. data/app/views/layouts/ish_manager/application.haml +28 -21
  98. data/app/views/layouts/ish_manager/{application_no_material.haml → application.haml-trash} +8 -15
  99. data/config/routes.rb +24 -7
  100. metadata +70 -50
  101. data/app/assets/stylesheets/ish_manager/trash/bootstrap.min.css +0 -6
  102. data/app/assets/stylesheets/ish_manager/trash/bootstrap.min.css.map +0 -1
  103. data/app/views/ish_manager/features/_index.haml-trash +0 -36
  104. data/app/views/ish_manager/galleries/_index_thumbs.haml +0 -1
@@ -0,0 +1,181 @@
1
+ <table border="0" cellpadding="0" cellspacing="0" width="100%" class="mcnFollowBlock" style="min-width:100%;">
2
+ <tbody class="mcnFollowBlockOuter">
3
+ <tr>
4
+ <td align="center" valign="top" style="padding:9px" class="mcnFollowBlockInner">
5
+ <table border="0" cellpadding="0" cellspacing="0" width="100%" class="mcnFollowContentContainer"
6
+ style="min-width:100%;">
7
+ <tbody>
8
+ <tr>
9
+ <td align="center" style="padding-left:9px;padding-right:9px;">
10
+ <table border="0" cellpadding="0" cellspacing="0" width="100%" style="min-width:100%;"
11
+ class="mcnFollowContent">
12
+ <tbody>
13
+ <tr>
14
+ <td align="center" valign="top" style="padding-top:9px; padding-right:9px; padding-left:9px;">
15
+ <table align="center" border="0" cellpadding="0" cellspacing="0">
16
+ <tbody>
17
+ <tr>
18
+ <td align="center" valign="top">
19
+ <!--[if mso]>
20
+ <table align="center" border="0" cellspacing="0" cellpadding="0">
21
+ <tr>
22
+ <![endif]-->
23
+
24
+ <!--[if mso]>
25
+ <td align="center" valign="top">
26
+ <![endif]-->
27
+
28
+
29
+ <table align="left" border="0" cellpadding="0" cellspacing="0" style="display:inline;">
30
+ <tbody>
31
+ <tr>
32
+ <td valign="top" style="padding-right:10px; padding-bottom:9px;"
33
+ class="mcnFollowContentItemContainer">
34
+ <table border="0" cellpadding="0" cellspacing="0" width="100%"
35
+ class="mcnFollowContentItem">
36
+ <tbody>
37
+ <tr>
38
+ <td align="left" valign="middle"
39
+ style="padding-top:5px; padding-right:10px; padding-bottom:5px; padding-left:9px;">
40
+ <table align="left" border="0" cellpadding="0" cellspacing="0" width="">
41
+ <tbody>
42
+ <tr>
43
+
44
+ <td align="center" valign="middle" width="24"
45
+ class="mcnFollowIconContent">
46
+ <a href="mailto:victor@piousbox.com" target="_blank"><img
47
+ src="https://cdn-images.mailchimp.com/icons/social-block-v2/color-forwardtofriend-48.png"
48
+ alt="Mail" style="display:block;" height="24" width="24"
49
+ class=""></a>
50
+ </td>
51
+
52
+
53
+ </tr>
54
+ </tbody>
55
+ </table>
56
+ </td>
57
+ </tr>
58
+ </tbody>
59
+ </table>
60
+ </td>
61
+ </tr>
62
+ </tbody>
63
+ </table>
64
+
65
+ <!--[if mso]>
66
+ </td>
67
+ <![endif]-->
68
+
69
+ <!--[if mso]>
70
+ <td align="center" valign="top">
71
+ <![endif]-->
72
+
73
+
74
+ <table align="left" border="0" cellpadding="0" cellspacing="0" style="display:inline;">
75
+ <tbody>
76
+ <tr>
77
+ <td valign="top" style="padding-right:10px; padding-bottom:9px;"
78
+ class="mcnFollowContentItemContainer">
79
+ <table border="0" cellpadding="0" cellspacing="0" width="100%"
80
+ class="mcnFollowContentItem">
81
+ <tbody>
82
+ <tr>
83
+ <td align="left" valign="middle"
84
+ style="padding-top:5px; padding-right:10px; padding-bottom:5px; padding-left:9px;">
85
+ <table align="left" border="0" cellpadding="0" cellspacing="0" width="">
86
+ <tbody>
87
+ <tr>
88
+
89
+ <td align="center" valign="middle" width="24"
90
+ class="mcnFollowIconContent">
91
+ <a href="https://github.com/piousbox" target="_blank"><img
92
+ src="https://cdn-images.mailchimp.com/icons/social-block-v2/color-github-48.png"
93
+ alt="Git" style="display:block;" height="24" width="24"
94
+ class=""></a>
95
+ </td>
96
+
97
+
98
+ </tr>
99
+ </tbody>
100
+ </table>
101
+ </td>
102
+ </tr>
103
+ </tbody>
104
+ </table>
105
+ </td>
106
+ </tr>
107
+ </tbody>
108
+ </table>
109
+
110
+ <!--[if mso]>
111
+ </td>
112
+ <![endif]-->
113
+
114
+ <!--[if mso]>
115
+ <td align="center" valign="top">
116
+ <![endif]-->
117
+
118
+
119
+ <table align="left" border="0" cellpadding="0" cellspacing="0" style="display:inline;">
120
+ <tbody>
121
+ <tr>
122
+ <td valign="top" style="padding-right:0; padding-bottom:9px;"
123
+ class="mcnFollowContentItemContainer">
124
+ <table border="0" cellpadding="0" cellspacing="0" width="100%"
125
+ class="mcnFollowContentItem">
126
+ <tbody>
127
+ <tr>
128
+ <td align="left" valign="middle"
129
+ style="padding-top:5px; padding-right:10px; padding-bottom:5px; padding-left:9px;">
130
+ <table align="left" border="0" cellpadding="0" cellspacing="0" width="">
131
+ <tbody>
132
+ <tr>
133
+
134
+ <td align="center" valign="middle" width="24"
135
+ class="mcnFollowIconContent">
136
+ <a href="https://www.instagram.com/piousbox/"
137
+ target="_blank"><img
138
+ src="https://cdn-images.mailchimp.com/icons/social-block-v2/color-instagram-48.png"
139
+ alt="IG" style="display:block;" height="24"
140
+ width="24" class=""></a>
141
+ </td>
142
+
143
+
144
+ </tr>
145
+ </tbody>
146
+ </table>
147
+ </td>
148
+ </tr>
149
+ </tbody>
150
+ </table>
151
+ </td>
152
+ </tr>
153
+ </tbody>
154
+ </table>
155
+
156
+ <!--[if mso]>
157
+ </td>
158
+ <![endif]-->
159
+
160
+ <!--[if mso]>
161
+ </tr>
162
+ </table>
163
+ <![endif]-->
164
+
165
+ </td>
166
+ </tr>
167
+ </tbody>
168
+ </table>
169
+ </td>
170
+ </tr>
171
+ </tbody>
172
+ </table>
173
+ </td>
174
+ </tr>
175
+ </tbody>
176
+ </table>
177
+
178
+ </td>
179
+ </tr>
180
+ </tbody>
181
+ </table>
@@ -0,0 +1,18 @@
1
+
2
+
3
+ .email-templates-index
4
+ %h3 Email Templates
5
+ = render 'ish_manager/email_templates/form', email_template: ::Ish::EmailTemplate.new
6
+
7
+
8
+
9
+ %ul
10
+ - @templates.each do |tmpl|
11
+ %li
12
+ = link_to 'Use', new_email_context_path({ email_template_id: tmpl.id })
13
+ = link_to email_template_path({ id: tmpl }), target: :_blank, class: 'external' do
14
+ View
15
+ %i.fa.fa-external-link
16
+ = tmpl.slug
17
+ = button_to '[x]', email_template_path({ id: tmpl }), method: :delete, :data => { :confirm => 'Are you sure?' }, form_class: 'inline'
18
+
@@ -0,0 +1,4 @@
1
+
2
+ %p This view of an email_template has an empty context:
3
+
4
+ = render @template.slug
@@ -5,16 +5,15 @@
5
5
  -#
6
6
 
7
7
  - n_thumbs ||= 8
8
- - param_name ||= :galleries_page
9
8
 
10
- .galleries--index.-index
9
+ .galleries--index
11
10
 
12
- = render 'ish_manager/galleries/menu'
11
+ = render 'ish_manager/galleries/menu', count: @galleries.count
13
12
 
14
13
  - if @galleries.length > 0
15
14
 
16
15
  - if @galleries.respond_to? :total_pages
17
- = paginate @galleries, :param_name => param_name, :views_prefix => 'ish_manager'
16
+ = paginate @galleries, :param_name => :galleries_page, :views_prefix => 'ish_manager'
18
17
 
19
18
  .row
20
19
  - @galleries.each do |g|
@@ -33,7 +32,7 @@
33
32
  = link_to image_tag(photo.photo.url(:thumb), :alt => g.name), gallery_path(g.slug)
34
33
 
35
34
  - if @galleries.respond_to? :total_pages
36
- = paginate @galleries, :param_name => param_name, :views_prefix => 'ish_manager'
35
+ = paginate @galleries, :param_name => :galleries_page, :views_prefix => 'ish_manager'
37
36
 
38
37
  - else
39
38
  %h5 No Galleries
@@ -1,15 +1,14 @@
1
1
 
2
2
  .galleries--menu
3
- .flex-row
4
- .title Galleries (#{@galleries.count}) #{link_to '[+]', new_gallery_path}
5
- = render 'search', path: galleries_path
6
- %ul.menu-secondary
7
- %li{ class: "#{params[:render_type] == 'index_titles' ? 'active' : ''}" }
8
- = link_to 'titles list', galleries_index_titles_path( :render_type => Gallery::RENDER_THUMBS )
9
- %li{ class: "#{params[:render_type] == 'index_thumbs' ? 'active' : ''}" }
10
- = link_to 'thumbs list', galleries_index_thumbs_path( :render_type => Gallery::RENDER_TITLES )
11
- %li{ class: "#{params[:render_type] == 'index_thumbs' ? 'active' : ''}" }
12
- = link_to 'shared with me (thumbs)', galleries_shared_path( :render_type => Gallery::RENDER_THUMBS )
13
- %li{ class: "#{params[:render_type] == 'index_titles' ? 'active' : ''}" }
14
- = link_to 'shared with me (titles)', galleries_shared_titles_path
15
3
 
4
+ -# .title Galleries (#{@galleries.count}) #{link_to '[+]', new_gallery_path}
5
+ = link_to 'Galleries', galleries_path
6
+ - if defined?(count)
7
+ (#{count})
8
+
9
+ -# = render 'search', path: galleries_path
10
+ .inline-search
11
+ = form_tag galleries_path, method: :get do
12
+ = text_field_tag :q
13
+
14
+ = link_to '[+]', new_gallery_path
@@ -0,0 +1,12 @@
1
+
2
+ .galleries--menu-secondary
3
+ %ul
4
+ %li{ class: "#{params[:render_type] == 'index_titles' ? 'active' : ''}" }
5
+ = link_to 'titles list', galleries_index_titles_path( :render_type => Gallery::RENDER_THUMBS )
6
+ %li{ class: "#{params[:render_type] == 'index_thumbs' ? 'active' : ''}" }
7
+ = link_to 'thumbs list', galleries_index_thumbs_path( :render_type => Gallery::RENDER_TITLES )
8
+ %li{ class: "#{params[:render_type] == 'index_thumbs' ? 'active' : ''}" }
9
+ = link_to 'shared with me (thumbs)', galleries_shared_path( :render_type => Gallery::RENDER_THUMBS )
10
+ %li{ class: "#{params[:render_type] == 'index_titles' ? 'active' : ''}" }
11
+ = link_to 'shared with me (titles)', galleries_shared_titles_path
12
+
@@ -1,15 +1,13 @@
1
1
 
2
- .row
3
- .col.s12
4
- .center
5
- %h2
6
- = link_to gallery.name, gallery_path(gallery)
7
- (#{gallery.photos.length})
8
- = link_to '[~]', edit_gallery_path( gallery )
9
- [x]
10
- - if gallery.is_public && !gallery.is_trash && !gallery.is_done
11
- %i.material-icons visibility
12
- - else
13
- %i.material-icons visibility_off
14
- slug :: #{gallery.slug}
15
- = render 'meta', :item => gallery
2
+ .galleries--title
3
+ %h2
4
+ = link_to gallery.name, gallery_path(gallery)
5
+ (#{gallery.photos.length})
6
+ = link_to '[~]', edit_gallery_path( gallery )
7
+ [x]
8
+ - if gallery.is_public && !gallery.is_trash && !gallery.is_done
9
+ %i.material-icons visibility
10
+ - else
11
+ %i.material-icons visibility_off
12
+ slug :: #{gallery.slug}
13
+ = render 'meta', :item => gallery
@@ -1,41 +1,32 @@
1
1
  -#
2
- -# ish_manager / galleries / show.haml
2
+ -# ish_manager / galleries / show
3
3
  -#
4
4
 
5
- = render 'title', :gallery => @gallery
6
- = render 'ish_manager/photos/multinew', :gallery => @gallery
5
+ .galleries-show
6
+ = render 'title', :gallery => @gallery
7
7
 
8
- -# deleted
9
- .row
10
- %p.addToggle Deleted [<>]
11
- .a
12
- %ul.inline
13
- - @deleted_photos.each do |ph|
14
- %li.border-red= image_tag ph.photo.url( :mini )
15
- %hr
8
+ = render 'ish_manager/photos/multinew', :gallery => @gallery
16
9
 
17
- -# mini
18
- .row
19
- %ul
20
- - @photos.each do |photo|
21
- %li.col.s1
22
- = link_to image_tag(photo.photo.url( :mini ), :alt => ''), "#large_#{photo.id}"
10
+ .row.row-deleted
11
+ %p.collapse-expand#rowDeleted Deleted
12
+ = render 'ish_manager/photos/index_thumbs', photos: @deleted_photos
23
13
 
24
- .spacer{ :style => 'height: 500px' }
14
+ .row.row-mini
15
+ %p.collapse-expand#rowMinis Mini's
16
+ .flex-row
17
+ - @photos.each do |photo|
18
+ .item
19
+ = link_to image_tag(photo.photo.url( :mini ), :alt => ''), "#large_#{photo.id}"
25
20
 
26
- -# thumb
27
- .row.row-thumbs
28
- - @photos.each do |photo|
29
- .col.s3
30
- .item
31
- = render 'ish_manager/photos/meta_manager', photo: photo
32
- = image_tag photo.photo.url( :thumb ), :alt => ''
33
- .spacer{ :style => 'height: 100px' }
21
+ .row.row-thumbs
22
+ %p.collapse-expand#rowThumbs Thumbs
23
+ = render 'ish_manager/photos/index_thumbs', photos: @photos
34
24
 
35
- -# large
36
- .row.row-large
37
- - @photos.each do |photo|
38
- .item
39
- %a{id: "large_#{photo.id}" }
40
- = render 'ish_manager/photos/meta_manager', photo: photo
41
- .wrapper{ style: "background-image: url('#{photo.photo.url( :large )}')" }
25
+ .row.row-large
26
+ %p.collapse-expand#rowLarge Large
27
+ .a
28
+ - @photos.each do |photo|
29
+ .item
30
+ %a{id: "large_#{photo.id}" }
31
+ = render 'ish_manager/photos/meta_manager', photo: photo
32
+ .wrapper{ style: "background-image: url('#{photo.photo.url( :large )}')" }
@@ -6,6 +6,6 @@
6
6
  .a= button_to 'map editor', location_map_editor_path(map.id), method: :get
7
7
  .a= button_to '+marker', new_map_marker_path(map), method: :get
8
8
  .a= button_to '+newsitem', new_map_newsitem_path(map), method: :get
9
- .a= link_to '[api]', api_map_path(map)
9
+ .a= link_to '[api]', api_map_path(map), target: :_blank
10
10
  .a= button_to 'x', map_path(map), method: :delete, data: { confirm: 'Are you sure?' }
11
11
  .a slug:#{map.slug}
@@ -12,7 +12,7 @@
12
12
  .a= button_to 'x', marker_path(marker), method: :delete, data: { confirm: 'Are you sure?' }
13
13
  .flex-row
14
14
  .a= link_to '[api]', api_marker_path(marker)
15
- .a= link_to '[this map]', edit_map_path(marker.slug)
15
+ .a= link_to '[this map]', edit_map_path(marker.destination.slug)
16
16
  .hide
17
17
  %ul.bullets
18
18
  %li <b>item_type:</b> #{marker.item_type}
@@ -0,0 +1 @@
1
+ ../email_templates
@@ -0,0 +1,7 @@
1
+
2
+ .photos--index-thumbs
3
+ .flex-row
4
+ - photos.each do |photo|
5
+ .item
6
+ = render 'ish_manager/photos/meta_manager', photo: photo
7
+ = image_tag photo.photo.url( :thumb )
@@ -1,7 +1,7 @@
1
1
 
2
- .--meta-manager
3
- = button_to '[x]', photo_path( :id => photo.id ), :method => :delete, :data => { :confirm => 'Are you sure?' }
2
+ .photos--meta-manager
3
+ = button_to '[x]', photo_path( :id => photo.id ), class: 'x', :method => :delete, :data => { :confirm => 'Are you sure?' }
4
4
  .right-hand
5
- = link_to "go to", "#large_#{photo.id}", class: 'goto'
6
- = link_to "large", photo.photo.url(:large)
7
- = link_to "original", photo.photo.url(:original)
5
+ = link_to "Goto", "#large_#{photo.id}", class: 'goto'
6
+ = link_to "Lg", photo.photo.url(:large)
7
+ = link_to "Orig", photo.photo.url(:original)
@@ -1,7 +1,5 @@
1
1
 
2
- .container.photos--multinew
3
- .row
4
- .small-12.columns
5
- %h3.center Add Photos
6
- %ul{ :id => 'photos', :class => 'thumbnails' }
7
- %input{ :id => 'fileupload', :type => 'file', :name => 'photo[photo]', 'data-url' => gallery_multiadd_path( gallery.id ), :multiple => '' }
2
+ .photos--multinew
3
+ %h3 Add Photos
4
+ %ul{ :id => 'photos', :class => 'thumbnails' }
5
+ %input{ :id => 'fileupload', :type => 'file', :name => 'photo[photo]', 'data-url' => gallery_multiadd_path( gallery.id ), :multiple => '' }
@@ -0,0 +1,5 @@
1
+
2
+
3
+ it was meeting_mailer, not meetings_mailer.
4
+
5
+ moved everything into office_mailer
@@ -1,7 +1,7 @@
1
1
 
2
2
  - videos ||= @videos
3
3
 
4
- .videos--index.-index
4
+ .videos--index
5
5
 
6
6
  %h5
7
7
  Videos (#{videos.count})
@@ -6,41 +6,48 @@
6
6
  %meta{ :name => :viewport, :content => 'width=device-width, initial-scale=1.0' }
7
7
  %meta{ :charset => 'UTF-8' }
8
8
  %meta{ :description => 'some description' }
9
- %script{ :src => "//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js" }
10
- %script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/jquery.tinymce.min.js" }
11
- %script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/tinymce.min.js" }
9
+
10
+ = javascript_include_tag "//code.jquery.com/jquery-3.3.1.min.js"
11
+
12
12
  %script{ :src => "//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js" }
13
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
+
14
18
  = stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", :media => 'all'
15
19
  = stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
16
20
 
17
- = stylesheet_link_tag "ish_manager/materialize", media: "all"
18
- = stylesheet_link_tag "ish_manager/application", media: "all"
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"
19
27
 
28
+ = stylesheet_link_tag "ish_manager/application", media: "all"
20
29
  = javascript_include_tag "ish_manager/application"
21
- = javascript_include_tag "ish_manager/materialize"
22
- = javascript_include_tag "ish_manager/application_materialize"
23
30
 
24
31
  = csrf_meta_tags
25
32
  %body{ class: [ params[:controller].gsub("ish_manager/",""), "#{params[:controller].gsub("ish_manager/","")}-#{params[:action]}", params[:action]] }
26
33
  .bg-white
27
34
  = render :partial => "ish_manager/application/main_header_#{current_user.profile.role_name}"
28
35
  .container
29
- .row
30
- .col.s12
31
- - if notice
32
- - if notice.class == Array
33
- %ul
34
- - notice.map do |n|
35
- %li
36
- - n.map do |k,v|
37
- <b>#{k} :</b> #{v}
38
- %p.notice= notice
39
- - if alert
40
- %p.alert= alert
41
-
36
+ - if notice || alert
37
+ .row
38
+ .col.s12
39
+ - if notice
40
+ - if notice.class == Array
41
+ %ul
42
+ - notice.map do |n|
43
+ %li
44
+ - n.map do |k,v|
45
+ <b>#{k} :</b> #{v}
46
+ %p.notice= notice
47
+ - if alert
48
+ %p.alert= alert
42
49
  = yield
43
50
  = render 'ish_manager/application/main_footer'
44
51
  = render 'analytics' if Rails.env.production?
45
- = render 'debug' if !Rails.env.production?
52
+
46
53