ish_manager 0.1.8.426 → 0.1.8.428

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 873763e62f82d25aebc1ecee3361aae94eeae90b70ba2147836be99083f3ca6f
4
- data.tar.gz: 10356d458981cc8287da48bc6314453cd3d871afeb911ccd8ab19f15002dd754
3
+ metadata.gz: b9f691435726734a9202b8266f28b7fb9c62b8090f9f75ea1ba7c706c474a68c
4
+ data.tar.gz: 873c4604a16c7612130fe758882aa97e6485fcbe74c391399a6ea10f39fb1b3a
5
5
  SHA512:
6
- metadata.gz: 1b4a34dd8c6db5649dddcc0138530842771aa1ec1cd147b70ab10f30d93c96797c76b90d694b81ac1feb2ce9784425313b5805bce95d88cec02335975518bc94
7
- data.tar.gz: 82bface07eb16718c492f93267e00acbdaa6440a6498026abb3ec31cb8ebcf54d03ca6040b00187b122af1271f0dbe7dd49dacf159fc903cc0ce1b4d59b261c9
6
+ metadata.gz: afb5335ab24acfccd4dab998bd8c56e0418376208687ca06f93fc04d4842e385814c4b73c36bf261eff750687df4709fba794fc1bf36995db5761e103865dc27
7
+ data.tar.gz: 23fe9362978d688d0fb6576b6fde208155dd48748889b9f2bb437ab10976ca47ce4f9822bea5511f51cd0817139b472ab1acbcf4373193a058f04c272c1b2b41
@@ -23,6 +23,11 @@ class IshManager::ApplicationController < ActionController::Base
23
23
  render 'home'
24
24
  end
25
25
 
26
+ def tinymce
27
+ authorize! :home, IshManager::Ability
28
+ render layout: false
29
+ end
30
+
26
31
  ##
27
32
  ## private
28
33
  ##
@@ -35,7 +35,8 @@ class ::IshManager::EmailTemplatesController < ::IshManager::ApplicationControll
35
35
  Ish::EmailTemplate.find_by({ slug: params[:id] })
36
36
  authorize! :iframe_src, @email_template
37
37
 
38
- @ctx = Ctx.new({ email_template: @tmpl, lead_id: 999 })
38
+ pox = Lead.find_by({ email: 'poxlovi@gmail.com' })
39
+ @ctx = Ctx.new({ email_template: @tmpl, lead_id: pox.id })
39
40
 
40
41
  @utm_tracking_str = {
41
42
  'cid' => @ctx.lead_id,
@@ -1,9 +1,16 @@
1
- <!-- Global site tag (gtag.js) - Google Analytics -->
2
- <script async src="https://www.googletagmanager.com/gtag/js?id=UA-53077236-7"></script>
3
- <script>
4
- window.dataLayer = window.dataLayer || [];
5
- function gtag(){dataLayer.push(arguments);}
6
- gtag('js', new Date());
7
1
 
8
- gtag('config', 'UA-53077236-7'); // manager.piousbox.com, _vp_ 20171203
2
+ <!-- Matomo -->
3
+ <script>
4
+ var _paq = window._paq = window._paq || [];
5
+ /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
6
+ _paq.push(['trackPageView']);
7
+ _paq.push(['enableLinkTracking']);
8
+ (function() {
9
+ var u="//analytics.wasya.co/";
10
+ _paq.push(['setTrackerUrl', u+'matomo.php']);
11
+ _paq.push(['setSiteId', '4']);
12
+ var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
13
+ g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
14
+ })();
9
15
  </script>
16
+ <!-- End Matomo Code -->
@@ -28,6 +28,7 @@
28
28
  = f.label :per_page
29
29
  = f.select :per_page, options_for_select([ 10, 25, 50, 100, 250, 500, 1000], selected: @current_profile.per_page)
30
30
  = f.submit 'Go'
31
+ = link_to 'RTEditor', application_tinymce_path, target: :_blank
31
32
 
32
33
  .c
33
34
  = render 'debug' if !Rails.env.production?
@@ -0,0 +1,33 @@
1
+
2
+ <html>
3
+ <head>
4
+ <!-- include libraries(jQuery, bootstrap) -->
5
+ <link href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css" rel="stylesheet">
6
+ <script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
7
+ <script src="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
8
+
9
+ <!-- include codemirror (codemirror.css, codemirror.js, xml.js, formatting.js) -->
10
+ <link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/codemirror.css">
11
+ <link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/theme/monokai.css">
12
+ <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/codemirror.js"></script>
13
+ <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/mode/xml/xml.js"></script>
14
+ <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/codemirror/2.36.0/formatting.js"></script>
15
+
16
+ <!-- include summernote css/js-->
17
+ <link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote.min.css">
18
+ <script type="text/javascript" src="//cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote.min.js"></script>
19
+ </head>
20
+ <body>
21
+
22
+ <textarea class='tinymce'>
23
+ </textarea>
24
+
25
+ <script>
26
+ $('.tinymce').summernote({
27
+ height: 150, //set editable area's height
28
+ codemirror: { // codemirror options
29
+ theme: 'monokai'
30
+ }
31
+ });
32
+ </script>
33
+ </body></html>
@@ -30,7 +30,7 @@
30
30
  .label-save-preview= f.submit 'Save & Preview'
31
31
  .tabs
32
32
  .tab-raw
33
- = f.text_area :body, class: 'tinymce'
33
+ = f.text_area :body
34
34
  .tab-preview
35
35
  - if email_template.persisted?
36
36
  -# .descr= render "ish_manager/email_templates/#{email_template.layout}", ctx: Ish::EmailContext.new, tmpl: email_template
@@ -760,5 +760,7 @@
760
760
  </tr>
761
761
  </table>
762
762
  </center>
763
- <img src="https://www.google-analytics.com/collect?<%= @pixel_tracking %>" />
763
+ <!-- Matomo Image Tracker-->
764
+ <img referrerpolicy="no-referrer-when-downgrade" src="https://analytics.wasya.co/matomo.php?idsite=2&amp;rec=1" style="border:0" alt="" />
765
+ <!-- End Matomo -->
764
766
  </html>
@@ -102,245 +102,164 @@
102
102
  .mcnDividerBlock{
103
103
  table-layout:fixed !important;
104
104
  }
105
- /*
106
- @tab Page
107
- @section Background Style
108
- @tip Set the background color and top border for your email. You may want to choose colors that match your company's branding.
109
- */
105
+
110
106
  body,#bodyTable{
111
- /*@editable*/background-color:#FAFAFA;
107
+ background-color:#FAFAFA;
112
108
  }
113
- /*
114
- @tab Page
115
- @section Background Style
116
- @tip Set the background color and top border for your email. You may want to choose colors that match your company's branding.
117
- */
109
+
118
110
  #bodyCell{
119
- /*@editable*/border-top:0;
111
+ border-top:0;
120
112
  }
121
- /*
122
- @tab Page
123
- @section Email Border
124
- @tip Set the border for your email.
125
- */
113
+
126
114
  .templateContainer{
127
- /*@editable*/border:0;
128
- }
129
- /*
130
- @tab Page
131
- @section Heading 1
132
- @tip Set the styling for all first-level headings in your emails. These should be the largest of your headings.
133
- @style heading 1
134
- */
115
+ border:0;
116
+ }
135
117
  h1{
136
- /*@editable*/color:#202020;
137
- /*@editable*/font-family:Helvetica;
138
- /*@editable*/font-size:26px;
139
- /*@editable*/font-style:normal;
140
- /*@editable*/font-weight:bold;
141
- /*@editable*/line-height:125%;
142
- /*@editable*/letter-spacing:normal;
143
- /*@editable*/text-align:left;
144
- }
145
- /*
146
- @tab Page
147
- @section Heading 2
148
- @tip Set the styling for all second-level headings in your emails.
149
- @style heading 2
150
- */
118
+ color:#202020;
119
+ font-family:Helvetica;
120
+ font-size:26px;
121
+ font-style:normal;
122
+ font-weight:bold;
123
+ line-height:125%;
124
+ letter-spacing:normal;
125
+ text-align:left;
126
+ }
127
+
151
128
  h2{
152
- /*@editable*/color:#202020;
153
- /*@editable*/font-family:Helvetica;
154
- /*@editable*/font-size:22px;
155
- /*@editable*/font-style:normal;
156
- /*@editable*/font-weight:bold;
157
- /*@editable*/line-height:125%;
158
- /*@editable*/letter-spacing:normal;
159
- /*@editable*/text-align:left;
160
- }
161
- /*
162
- @tab Page
163
- @section Heading 3
164
- @tip Set the styling for all third-level headings in your emails.
165
- @style heading 3
166
- */
129
+ color:#202020;
130
+ font-family:Helvetica;
131
+ font-size:22px;
132
+ font-style:normal;
133
+ font-weight:bold;
134
+ line-height:125%;
135
+ letter-spacing:normal;
136
+ text-align:left;
137
+ }
138
+
167
139
  h3{
168
- /*@editable*/color:#202020;
169
- /*@editable*/font-family:Helvetica;
170
- /*@editable*/font-size:20px;
171
- /*@editable*/font-style:normal;
172
- /*@editable*/font-weight:bold;
173
- /*@editable*/line-height:125%;
174
- /*@editable*/letter-spacing:normal;
175
- /*@editable*/text-align:left;
176
- }
177
- /*
178
- @tab Page
179
- @section Heading 4
180
- @tip Set the styling for all fourth-level headings in your emails. These should be the smallest of your headings.
181
- @style heading 4
182
- */
140
+ color:#202020;
141
+ font-family:Helvetica;
142
+ font-size:20px;
143
+ font-style:normal;
144
+ font-weight:bold;
145
+ line-height:125%;
146
+ letter-spacing:normal;
147
+ text-align:left;
148
+ }
149
+
183
150
  h4{
184
- /*@editable*/color:#202020;
185
- /*@editable*/font-family:Helvetica;
186
- /*@editable*/font-size:18px;
187
- /*@editable*/font-style:normal;
188
- /*@editable*/font-weight:bold;
189
- /*@editable*/line-height:125%;
190
- /*@editable*/letter-spacing:normal;
191
- /*@editable*/text-align:left;
192
- }
193
- /*
194
- @tab Preheader
195
- @section Preheader Style
196
- @tip Set the background color and borders for your email's preheader area.
197
- */
151
+ color:#202020;
152
+ font-family:Helvetica;
153
+ font-size:18px;
154
+ font-style:normal;
155
+ font-weight:bold;
156
+ line-height:125%;
157
+ letter-spacing:normal;
158
+ text-align:left;
159
+ }
160
+
198
161
  #templatePreheader{
199
- /*@editable*/background-color:#FAFAFA;
200
- /*@editable*/background-image:none;
201
- /*@editable*/background-repeat:no-repeat;
202
- /*@editable*/background-position:center;
203
- /*@editable*/background-size:cover;
204
- /*@editable*/border-top:0;
205
- /*@editable*/border-bottom:0;
206
- /*@editable*/padding-top:9px;
207
- /*@editable*/padding-bottom:9px;
208
- }
209
- /*
210
- @tab Preheader
211
- @section Preheader Text
212
- @tip Set the styling for your email's preheader text. Choose a size and color that is easy to read.
213
- */
162
+ background-color:#FAFAFA;
163
+ background-image:none;
164
+ background-repeat:no-repeat;
165
+ background-position:center;
166
+ background-size:cover;
167
+ border-top:0;
168
+ border-bottom:0;
169
+ padding-top:9px;
170
+ padding-bottom:9px;
171
+ }
172
+
214
173
  #templatePreheader .mcnTextContent,#templatePreheader .mcnTextContent p{
215
- /*@editable*/color:#656565;
216
- /*@editable*/font-family:Helvetica;
217
- /*@editable*/font-size:12px;
218
- /*@editable*/line-height:150%;
219
- /*@editable*/text-align:left;
220
- }
221
- /*
222
- @tab Preheader
223
- @section Preheader Link
224
- @tip Set the styling for your email's preheader links. Choose a color that helps them stand out from your text.
225
- */
174
+ color:#656565;
175
+ font-family:Helvetica;
176
+ font-size:12px;
177
+ line-height:150%;
178
+ text-align:left;
179
+ }
180
+
226
181
  #templatePreheader .mcnTextContent a,#templatePreheader .mcnTextContent p a{
227
- /*@editable*/color:#656565;
228
- /*@editable*/font-weight:normal;
229
- /*@editable*/text-decoration:underline;
230
- }
231
- /*
232
- @tab Header
233
- @section Header Style
234
- @tip Set the background color and borders for your email's header area.
235
- */
182
+ color:#656565;
183
+ font-weight:normal;
184
+ text-decoration:underline;
185
+ }
186
+
236
187
  #templateHeader{
237
- /*@editable*/background-color:#FFFFFF;
238
- /*@editable*/background-image:none;
239
- /*@editable*/background-repeat:no-repeat;
240
- /*@editable*/background-position:center;
241
- /*@editable*/background-size:cover;
242
- /*@editable*/border-top:0;
243
- /*@editable*/border-bottom:0;
244
- /*@editable*/padding-top:9px;
245
- /*@editable*/padding-bottom:0;
246
- }
247
- /*
248
- @tab Header
249
- @section Header Text
250
- @tip Set the styling for your email's header text. Choose a size and color that is easy to read.
251
- */
188
+ background-color:#FFFFFF;
189
+ background-image:none;
190
+ background-repeat:no-repeat;
191
+ background-position:center;
192
+ background-size:cover;
193
+ border-top:0;
194
+ border-bottom:0;
195
+ padding-top:9px;
196
+ padding-bottom:0;
197
+ }
198
+
252
199
  #templateHeader .mcnTextContent,#templateHeader .mcnTextContent p{
253
- /*@editable*/color:#202020;
254
- /*@editable*/font-family:Helvetica;
255
- /*@editable*/font-size:16px;
256
- /*@editable*/line-height:150%;
257
- /*@editable*/text-align:left;
258
- }
259
- /*
260
- @tab Header
261
- @section Header Link
262
- @tip Set the styling for your email's header links. Choose a color that helps them stand out from your text.
263
- */
200
+ color:#202020;
201
+ font-family:Helvetica;
202
+ font-size:16px;
203
+ line-height:150%;
204
+ text-align:left;
205
+ }
206
+
264
207
  #templateHeader .mcnTextContent a,#templateHeader .mcnTextContent p a{
265
- /*@editable*/color:#007C89;
266
- /*@editable*/font-weight:normal;
267
- /*@editable*/text-decoration:underline;
268
- }
269
- /*
270
- @tab Body
271
- @section Body Style
272
- @tip Set the background color and borders for your email's body area.
273
- */
208
+ color:#007C89;
209
+ font-weight:normal;
210
+ text-decoration:underline;
211
+ }
212
+
274
213
  #templateBody{
275
- /*@editable*/background-color:#FFFFFF;
276
- /*@editable*/background-image:none;
277
- /*@editable*/background-repeat:no-repeat;
278
- /*@editable*/background-position:center;
279
- /*@editable*/background-size:cover;
280
- /*@editable*/border-top:0;
281
- /*@editable*/border-bottom:2px solid #EAEAEA;
282
- /*@editable*/padding-top:0;
283
- /*@editable*/padding-bottom:9px;
284
- }
285
- /*
286
- @tab Body
287
- @section Body Text
288
- @tip Set the styling for your email's body text. Choose a size and color that is easy to read.
289
- */
214
+ background-color:#FFFFFF;
215
+ background-image:none;
216
+ background-repeat:no-repeat;
217
+ background-position:center;
218
+ background-size:cover;
219
+ border-top:0;
220
+ border-bottom:2px solid #EAEAEA;
221
+ padding-top:0;
222
+ padding-bottom:9px;
223
+ }
224
+
290
225
  #templateBody .mcnTextContent,#templateBody .mcnTextContent p{
291
- /*@editable*/color:#202020;
292
- /*@editable*/font-family:Helvetica;
293
- /*@editable*/font-size:16px;
294
- /*@editable*/line-height:150%;
295
- /*@editable*/text-align:left;
296
- }
297
- /*
298
- @tab Body
299
- @section Body Link
300
- @tip Set the styling for your email's body links. Choose a color that helps them stand out from your text.
301
- */
226
+ color:#202020;
227
+ font-family:Helvetica;
228
+ font-size:16px;
229
+ line-height:150%;
230
+ text-align:left;
231
+ }
232
+
302
233
  #templateBody .mcnTextContent a,#templateBody .mcnTextContent p a{
303
- /*@editable*/color:#007C89;
304
- /*@editable*/font-weight:normal;
305
- /*@editable*/text-decoration:underline;
306
- }
307
- /*
308
- @tab Footer
309
- @section Footer Style
310
- @tip Set the background color and borders for your email's footer area.
311
- */
234
+ color:#007C89;
235
+ font-weight:normal;
236
+ text-decoration:underline;
237
+ }
238
+
312
239
  #templateFooter{
313
- /*@editable*/background-color:#FAFAFA;
314
- /*@editable*/background-image:none;
315
- /*@editable*/background-repeat:no-repeat;
316
- /*@editable*/background-position:center;
317
- /*@editable*/background-size:cover;
318
- /*@editable*/border-top:0;
319
- /*@editable*/border-bottom:0;
320
- /*@editable*/padding-top:9px;
321
- /*@editable*/padding-bottom:9px;
322
- }
323
- /*
324
- @tab Footer
325
- @section Footer Text
326
- @tip Set the styling for your email's footer text. Choose a size and color that is easy to read.
327
- */
240
+ background-color:#FAFAFA;
241
+ background-image:none;
242
+ background-repeat:no-repeat;
243
+ background-position:center;
244
+ background-size:cover;
245
+ border-top:0;
246
+ border-bottom:0;
247
+ padding-top:9px;
248
+ padding-bottom:9px;
249
+ }
250
+
328
251
  #templateFooter .mcnTextContent,#templateFooter .mcnTextContent p{
329
- /*@editable*/color:#656565;
330
- /*@editable*/font-family:Helvetica;
331
- /*@editable*/font-size:12px;
332
- /*@editable*/line-height:150%;
333
- /*@editable*/text-align:center;
334
- }
335
- /*
336
- @tab Footer
337
- @section Footer Link
338
- @tip Set the styling for your email's footer links. Choose a color that helps them stand out from your text.
339
- */
252
+ color:#656565;
253
+ font-family:Helvetica;
254
+ font-size:12px;
255
+ line-height:150%;
256
+ text-align:center;
257
+ }
258
+
340
259
  #templateFooter .mcnTextContent a,#templateFooter .mcnTextContent p a{
341
- /*@editable*/color:#656565;
342
- /*@editable*/font-weight:normal;
343
- /*@editable*/text-decoration:underline;
260
+ color:#656565;
261
+ font-weight:normal;
262
+ text-decoration:underline;
344
263
  }
345
264
  @media only screen and (min-width:768px){
346
265
  .templateContainer{
@@ -431,112 +350,72 @@
431
350
  }
432
351
 
433
352
  } @media only screen and (max-width: 480px){
434
- /*
435
- @tab Mobile Styles
436
- @section Heading 1
437
- @tip Make the first-level headings larger in size for better readability on small screens.
438
- */
353
+
439
354
  h1{
440
- /*@editable*/font-size:22px !important;
441
- /*@editable*/line-height:125% !important;
355
+ font-size:22px !important;
356
+ line-height:125% !important;
442
357
  }
443
358
 
444
359
  } @media only screen and (max-width: 480px){
445
- /*
446
- @tab Mobile Styles
447
- @section Heading 2
448
- @tip Make the second-level headings larger in size for better readability on small screens.
449
- */
360
+
450
361
  h2{
451
- /*@editable*/font-size:20px !important;
452
- /*@editable*/line-height:125% !important;
362
+ font-size:20px !important;
363
+ line-height:125% !important;
453
364
  }
454
365
 
455
366
  } @media only screen and (max-width: 480px){
456
- /*
457
- @tab Mobile Styles
458
- @section Heading 3
459
- @tip Make the third-level headings larger in size for better readability on small screens.
460
- */
367
+
461
368
  h3{
462
- /*@editable*/font-size:18px !important;
463
- /*@editable*/line-height:125% !important;
369
+ font-size:18px !important;
370
+ line-height:125% !important;
464
371
  }
465
372
 
466
373
  } @media only screen and (max-width: 480px){
467
- /*
468
- @tab Mobile Styles
469
- @section Heading 4
470
- @tip Make the fourth-level headings larger in size for better readability on small screens.
471
- */
374
+
472
375
  h4{
473
- /*@editable*/font-size:16px !important;
474
- /*@editable*/line-height:150% !important;
376
+ font-size:16px !important;
377
+ line-height:150% !important;
475
378
  }
476
379
 
477
380
  } @media only screen and (max-width: 480px){
478
- /*
479
- @tab Mobile Styles
480
- @section Boxed Text
481
- @tip Make the boxed text larger in size for better readability on small screens. We recommend a font size of at least 16px.
482
- */
381
+
483
382
  .mcnBoxedTextContentContainer .mcnTextContent,.mcnBoxedTextContentContainer .mcnTextContent p{
484
- /*@editable*/font-size:14px !important;
485
- /*@editable*/line-height:150% !important;
383
+ font-size:14px !important;
384
+ line-height:150% !important;
486
385
  }
487
386
 
488
387
  } @media only screen and (max-width: 480px){
489
- /*
490
- @tab Mobile Styles
491
- @section Preheader Visibility
492
- @tip Set the visibility of the email's preheader on small screens. You can hide it to save space.
493
- */
388
+
494
389
  #templatePreheader{
495
- /*@editable*/display:block !important;
390
+ display:block !important;
496
391
  }
497
392
 
498
393
  } @media only screen and (max-width: 480px){
499
- /*
500
- @tab Mobile Styles
501
- @section Preheader Text
502
- @tip Make the preheader text larger in size for better readability on small screens.
503
- */
394
+
504
395
  #templatePreheader .mcnTextContent,#templatePreheader .mcnTextContent p{
505
- /*@editable*/font-size:14px !important;
506
- /*@editable*/line-height:150% !important;
396
+ font-size:14px !important;
397
+ line-height:150% !important;
507
398
  }
508
399
 
509
400
  } @media only screen and (max-width: 480px){
510
- /*
511
- @tab Mobile Styles
512
- @section Header Text
513
- @tip Make the header text larger in size for better readability on small screens.
514
- */
401
+
515
402
  #templateHeader .mcnTextContent,#templateHeader .mcnTextContent p{
516
- /*@editable*/font-size:16px !important;
517
- /*@editable*/line-height:150% !important;
403
+ font-size:16px !important;
404
+ line-height:150% !important;
518
405
  }
519
406
 
520
407
  } @media only screen and (max-width: 480px){
521
- /*
522
- @tab Mobile Styles
523
- @section Body Text
524
- @tip Make the body text larger in size for better readability on small screens. We recommend a font size of at least 16px.
525
- */
408
+
526
409
  #templateBody .mcnTextContent,#templateBody .mcnTextContent p{
527
- /*@editable*/font-size:16px !important;
528
- /*@editable*/line-height:150% !important;
410
+ font-size:16px !important;
411
+ line-height:150% !important;
529
412
  }
530
413
 
531
414
  } @media only screen and (max-width: 480px){
532
- /*
533
- @tab Mobile Styles
534
- @section Footer Text
535
- @tip Make the footer content text larger in size for better readability on small screens.
536
- */
415
+
537
416
  #templateFooter .mcnTextContent,#templateFooter .mcnTextContent p{
538
- /*@editable*/font-size:14px !important;
539
- /*@editable*/line-height:150% !important;
417
+ font-size:14px !important;
418
+ line-height:150% !important;
540
419
  }
541
420
 
542
421
  }</style></head>
@@ -663,9 +542,9 @@
663
542
  <td width="100" >&nbsp;</td>
664
543
  <td align="center" style="padding-left: 50px; padding-right: 9px; ">
665
544
 
666
- <h3><a href="https://wasya.co/our-services-2?<%= @utm_tracking_str %>" style="color: #00c8cc;" target="_blank" >https://wasya.co/w/our-services</a></h3>
545
+ <h3><a href="https://wasya.co/our-services-2?<%= @utm_tracking_str %>" style="color: #00c8cc;" target="_blank" >Our Services</a></h3>
667
546
  <br />
668
- <h3><a href="https://wasya.co/contact-us-2?<%= @utm_tracking_str %>" style="color: #00c8cc;" target="_blank" >https://wasya.co/w/contact-us</a></h3>
547
+ <h3><a href="https://wasya.co/contact-us-2?<%= @utm_tracking_str %>" style="color: #00c8cc;" target="_blank" >Contact Us</a></h3>
669
548
 
670
549
  </td>
671
550
  </tr>
@@ -1,5 +1,7 @@
1
1
 
2
- <img src="https://www.google-analytics.com/collect?<%=@pixel_tracking%>" />
2
+ <!-- Matomo Image Tracker-->
3
+ <img referrerpolicy="no-referrer-when-downgrade" src="https://analytics.wasya.co/matomo.php?idsite=2&amp;rec=1" style="border:0" alt="" />
4
+ <!-- End Matomo -->
3
5
 
4
6
  <table align="center" border="0" cellpadding="0" cellspacing="0" height="100%" width="100%"
5
7
  style="border-collapse: collapse; height: 100%; margin: 0px; padding: 0px; width: 100%;">
@@ -555,7 +557,7 @@
555
557
  >
556
558
  <a
557
559
  title="Chat with Us!"
558
- href="https://wasya.co/contact-us?<%=@click_tracking%>"
560
+ href="https://wasya.co/contact-us?<%= @utm_tracking_str %>"
559
561
  style="font-weight: bold; letter-spacing: 1px; line-height: 100%; text-align: center; text-decoration: none; color: rgb(238, 238, 238); display: block;"
560
562
  target="_blank"
561
563
  > Chat with Us! </a>
@@ -0,0 +1,13 @@
1
+
2
+ <%= raw ERB.new( @ctx.body ).result %>
3
+
4
+ <br /><br />
5
+ <table class="footer-signature" border="0" >
6
+ <tr>
7
+ <td>
8
+ --<br />
9
+ Victor Pudeyev<br />
10
+ Software Engineering Lead<br />
11
+ <a href="mailto:victor@piousbox.com">victor@piousbox.com</a>
12
+ |
13
+ <a href="https://wasya.co/contact-us-4?<%= @utm_tracking_str %>">Book a chat</a><br />
@@ -12,8 +12,6 @@
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
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
15
 
18
16
  = stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", :media => 'all'
19
17
  = stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
@@ -25,6 +23,8 @@
25
23
  = stylesheet_link_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/css/select2.min.css"
26
24
  = javascript_include_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/js/select2.min.js"
27
25
 
26
+ -# %script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/jquery.tinymce.min.js" }
27
+ -# %script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/tinymce.min.js" }
28
28
  = stylesheet_link_tag "//cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote.min.css"
29
29
  = javascript_include_tag "//cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote.min.js"
30
30
 
data/config/routes.rb CHANGED
@@ -3,6 +3,8 @@ IshManager::Engine.routes.draw do
3
3
 
4
4
  root :to => 'application#home'
5
5
 
6
+ get 'application/tinymce', to: 'application#tinymce'
7
+
6
8
  # get 'categories', to: 'categories#index'
7
9
  resources :categories
8
10
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ish_manager
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8.426
4
+ version: 0.1.8.428
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox
@@ -534,6 +534,7 @@ files:
534
534
  - app/views/ish_manager/application/_profile_pic.haml
535
535
  - app/views/ish_manager/application/_search.haml
536
536
  - app/views/ish_manager/application/home.haml
537
+ - app/views/ish_manager/application/tinymce.html.erb
537
538
  - app/views/ish_manager/application_mailer/shared_galleries.html.erb
538
539
  - app/views/ish_manager/application_mailer/stock_alert.haml
539
540
  - app/views/ish_manager/application_mailer/test_email.html.erb
@@ -594,6 +595,7 @@ files:
594
595
  - app/views/ish_manager/email_templates/_slug-1.html.erb
595
596
  - app/views/ish_manager/email_templates/_slug-2.html.erb
596
597
  - app/views/ish_manager/email_templates/_slug-3.html.erb
598
+ - app/views/ish_manager/email_templates/_tracking_footer.html.erb
597
599
  - app/views/ish_manager/email_templates/_wasyaco_roundborders.html.erb
598
600
  - app/views/ish_manager/email_templates/_wasyaco_social.html.erb
599
601
  - app/views/ish_manager/email_templates/done/_form.haml