ish_manager 0.1.8.408 → 0.1.8.410

Sign up to get free protection for your applications and to get access to all the features.
Files changed (58) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/ish_manager/application.js +7 -1
  3. data/app/assets/stylesheets/ish_manager/application.scss +32 -17
  4. data/app/assets/stylesheets/ish_manager/iro.scss +229 -1
  5. data/app/controllers/ish_manager/application_controller.rb +11 -3
  6. data/app/controllers/ish_manager/email_campaigns_controller.rb +23 -23
  7. data/app/controllers/ish_manager/iro_positions_controller.rb +4 -5
  8. data/app/controllers/ish_manager/iro_purses_controller.rb +42 -4
  9. data/app/controllers/ish_manager/leads_controller.rb +1 -1
  10. data/app/mailers/ish_manager/office_mailer.rb +4 -1
  11. data/app/views/ish_manager/application/_alerts_notices.haml +7 -12
  12. data/app/views/ish_manager/application/_main_header_admin.haml +26 -18
  13. data/app/views/ish_manager/email_campaigns/_form.haml +33 -0
  14. data/app/views/ish_manager/email_campaigns/edit.haml +5 -0
  15. data/app/views/ish_manager/email_campaigns/index.haml +10 -0
  16. data/app/views/ish_manager/email_campaigns/new.haml +5 -0
  17. data/app/views/ish_manager/email_campaigns/show.haml +23 -0
  18. data/app/views/ish_manager/email_contexts/_index.haml +8 -0
  19. data/app/views/ish_manager/email_filters/_form.haml +6 -0
  20. data/app/views/ish_manager/email_filters/edit.haml +1 -1
  21. data/app/views/ish_manager/email_filters/index.haml +3 -1
  22. data/app/views/ish_manager/email_filters/new.haml +1 -1
  23. data/app/views/ish_manager/galleries/edit.haml +5 -4
  24. data/app/views/ish_manager/galleries/new.haml +5 -5
  25. data/app/views/ish_manager/iro_positions/_form.haml +3 -1
  26. data/app/views/ish_manager/iro_purses/_form.haml +11 -0
  27. data/app/views/ish_manager/iro_purses/edit.haml +3 -0
  28. data/app/views/ish_manager/iro_purses/new.haml +3 -0
  29. data/app/views/ish_manager/iro_purses/show.haml +12 -3
  30. data/app/views/ish_manager/iro_purses/show_gameui.haml +139 -0
  31. data/app/views/ish_manager/leads/index.haml +1 -1
  32. data/config/routes.rb +11 -9
  33. metadata +12 -27
  34. data/app/assets/javascripts/ish_manager/trash/application_materialize.js +0 -8
  35. data/app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/AUTHORS.txt +0 -333
  36. data/app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/LICENSE.txt +0 -43
  37. data/app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/external/jquery/jquery.js +0 -11008
  38. data/app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/images/ui-icons_444444_256x240.png +0 -0
  39. data/app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/images/ui-icons_555555_256x240.png +0 -0
  40. data/app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/images/ui-icons_777620_256x240.png +0 -0
  41. data/app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/images/ui-icons_777777_256x240.png +0 -0
  42. data/app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/images/ui-icons_cc0000_256x240.png +0 -0
  43. data/app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/images/ui-icons_ffffff_256x240.png +0 -0
  44. data/app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/index.html +0 -559
  45. data/app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.css +0 -1312
  46. data/app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.js +0 -18706
  47. data/app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.min.css +0 -7
  48. data/app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.min.js +0 -13
  49. data/app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.structure.css +0 -886
  50. data/app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.structure.min.css +0 -5
  51. data/app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.theme.css +0 -443
  52. data/app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.theme.min.css +0 -5
  53. data/app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/package.json +0 -74
  54. data/app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1.zip +0 -0
  55. data/app/assets/javascripts/ish_manager/trash/materialize.js +0 -10000
  56. data/app/assets/stylesheets/ish_manager/trash/bootstrap.css +0 -6757
  57. data/app/assets/stylesheets/ish_manager/trash/materialize.css +0 -9390
  58. data/app/assets/stylesheets/ish_manager/trash/reset.css +0 -96
@@ -27,18 +27,18 @@
27
27
  %ul
28
28
  %li= link_to '+Newsitem', new_newsitem_path
29
29
  %li
30
- = link_to 'Ish::UserProfiles', user_profiles_path
30
+ = link_to 'Profiles', user_profiles_path
31
31
  .inline-search
32
32
  = form_tag user_profiles_path, method: :get do
33
33
  = text_field_tag :q
34
- %li= link_to "Ish::ImageAsset's", image_assets_path
34
+
35
35
  %li
36
36
  = link_to 'Locations', maps_path
37
37
  .inline-search
38
38
  = form_tag maps_path, method: :get do
39
39
  = text_field_tag :q
40
40
  = link_to '[+]', new_map_path
41
- %ul
41
+
42
42
  %li
43
43
  = link_to 'Events', events_path
44
44
  .inline-search
@@ -58,30 +58,35 @@
58
58
  = link_to "Templates (#{Ish::EmailTemplate.all.count})", email_templates_path
59
59
  = link_to '[+]', new_email_template_path
60
60
  %li
61
- = link_to "Contexts (#{Ctx.notsent.length})", notsent_email_contexts_path
62
- = link_to '[+]', new_email_context_path
63
- -# %li
64
- -# = link_to 'Campaigns', email_campaigns_path
65
- -# = link_to '[+]', new_email_campaign_path
61
+ = link_to "Companies (#{Leadset.kept.length})", leadsets_path
62
+ = link_to '[+]', new_leadset_path
63
+
66
64
 
67
65
  %li
68
- = link_to "Sch (#{Sch.active.length})", scheduled_email_actions_path
69
- = link_to '[+]', new_scheduled_email_action_path
70
66
  = link_to "Email Actions (#{Office::EmailAction.all.length})", email_actions_path
71
67
  = link_to '[+]', new_email_action_path
72
68
  %ul
73
- %li  
74
-
75
69
  %li
76
- = link_to "Co's (#{Leadset.kept.length})", leadsets_path
77
- = link_to '[+]', new_leadset_path
70
+ = link_to "Filters (#{Office::EmailFilter.active.length})", email_filters_path
71
+ = link_to '[+]', new_email_filter_path
72
+ %li
73
+ = link_to "Contexts (#{Ctx.notsent.length})", notsent_email_contexts_path
74
+ = link_to '[+]', new_email_context_path
75
+
78
76
  %li
79
77
  = link_to "Leads (#{Lead.kept.length})", leads_path
80
78
  = link_to '[+]', new_lead_path
81
-
82
79
  %li
83
- = link_to "Filters (#{Office::EmailFilter.active.length})", email_filters_path
84
- = link_to '[+]', new_email_filter_path
80
+ = link_to "Schs (#{Sch.active.length})", scheduled_email_actions_path
81
+ = link_to '[+]', new_scheduled_email_action_path
82
+ %ul
83
+ %li  
84
+ %li  
85
+ %li
86
+ = link_to 'Campaigns', email_campaigns_path
87
+ = link_to '[+]', new_email_campaign_path
88
+ %li  
89
+
85
90
  .c
86
91
 
87
92
  %i.fa.fa-compress.collapse-expand#collapseHeaderIro
@@ -89,7 +94,10 @@
89
94
  .a
90
95
  %ul
91
96
  %li
92
- = link_to 'Purse', my_purse_path
97
+ %span.label Purses:
98
+ - Iro::Purse.all.map do |p|
99
+ = link_to "[#{p.id}]", iro_purse_path(p)
100
+ = link_to '[+]', new_iro_purse_path
93
101
  %li
94
102
  = link_to 'Watches', iro_watches_path
95
103
  %li
@@ -0,0 +1,33 @@
1
+
2
+ - url = campaign.new_record? ? email_campaigns_path : email_campaign_path(campaign)
3
+
4
+ .email-campaigns--form
5
+ = form_for campaign, as: :campaign, url: url do |f|
6
+ .field
7
+ = f.label :slug
8
+ = f.text_field :slug
9
+
10
+ -# .field
11
+ -# = f.label :send_at
12
+ -# = f.text_field :send_at
13
+
14
+ .field.field-template
15
+ = f.label "Template"
16
+ = f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || campaign.email_template_id ), {}, { class: 'select2' }
17
+ - if campaign.email_template_id
18
+ = link_to 'view', email_template_path( campaign.email_template_id ), target: :_blank, class: [ 'action-view' ]
19
+ = link_to '~', edit_email_template_path( campaign.email_template_id ), target: :_blank, class: [ 'action-view' ]
20
+ layout: #{campaign.tmpl.layout}
21
+
22
+ .field
23
+ = f.label "From"
24
+ = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: campaign.from_email)
25
+
26
+ .actions
27
+ = f.submit 'Submit'
28
+
29
+ -# = f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || campaign.email_template_id ), {}, { class: 'select2' }
30
+ -# - if campaign.email_template_id
31
+ -# = link_to 'view', email_template_path( campaign.email_template_id ), target: :_blank, class: [ 'action-view' ]
32
+ -# = link_to '~', edit_email_template_path( campaign.email_template_id ), target: :_blank, class: [ 'action-view' ]
33
+ -# layout: #{campaign.tmpl.layout}
@@ -0,0 +1,5 @@
1
+
2
+ .email-campaigns-new.max-width
3
+ .header
4
+ %h3.title Edit Email Campaign
5
+ = render 'form', campaign: @campaign
@@ -0,0 +1,10 @@
1
+
2
+ .email-campaigns-index.max-width
3
+ .header
4
+ .title
5
+ Email Campaigns (#{@campaigns.length})
6
+ = link_to '[+]', new_email_campaign_path
7
+
8
+ - @campaigns.each do |c|
9
+ = link_to c.slug, email_campaign_path(c)
10
+
@@ -0,0 +1,5 @@
1
+
2
+ .email-campaigns-new.max-width
3
+ .header
4
+ %h3.title New Email Campaign
5
+ = render 'form', campaign: @campaign
@@ -0,0 +1,23 @@
1
+
2
+ .email-campaigns-show.max-width
3
+ .header
4
+ %h5.title
5
+ Email Campaign `#{@campaign.slug}`
6
+ = link_to '[~]', edit_email_campaign_path(@campaign)
7
+ .inline-block
8
+ = form_for @campaign, as: :campaign, method: :post, url: send_email_campaign_path(@campaign) do |f|
9
+ = hidden_field_tag 'campaign[send_at]', Time.now
10
+ = f.submit 'Send', data: { confirm: 'Are you sure?' }
11
+
12
+ %ul.browser-default
13
+ %li Template: #{link_to @campaign.email_template.slug, edit_email_template_path(@campaign.email_template)}
14
+ -# %li Send At: #{@campaign.send_at}
15
+
16
+ .collapse-expand#campaignLeads Email Campaign leads (#{@campaign.campaign_leads.length})
17
+ %ul.email-campaign-leads.items.browser-default
18
+ - @campaign.leads.each do |lead|
19
+ %li.item
20
+ = lead.email
21
+ Ctxs:
22
+ = render 'ish_manager/email_contexts/index', ctxs: lead.email_contexts
23
+
@@ -0,0 +1,8 @@
1
+
2
+ %ul.ctxs--index.browser-default
3
+ - ctxs.each do |ctx|
4
+ -# %li id: #{ctx.id}
5
+ -# %li Slug: #{ctx.slug}
6
+ -# %li send at: #{pp_date ctx.send_at}
7
+ %li sent at: #{pp_date ctx.sent_at}
8
+
@@ -5,6 +5,12 @@
5
5
  .field
6
6
  %label From Regex
7
7
  = f.text_field :from_regex
8
+ .field
9
+ %label Subject Regex
10
+ = f.text_field :subject_regex
11
+ .field
12
+ %label Body Regex
13
+ = f.text_field :body_regex
8
14
  .field
9
15
  %label Kind
10
16
  = f.select :kind, options_for_select( ::Office::EmailFilter::KINDS, selected: email_filter.kind )
@@ -1,5 +1,5 @@
1
1
 
2
- .emails-ns.email-filters-new
2
+ .emails-ns.email-filters-edit.max-width
3
3
  .header
4
4
  %h2.title Edit Email Filter
5
5
  = render 'form', email_filter: @email_filter
@@ -1,5 +1,5 @@
1
1
 
2
- .email-filters-index
2
+ .email-filters-index.max-width
3
3
  .header
4
4
  %h2.title
5
5
  Email Filters (#{@email_filters.length})
@@ -10,6 +10,7 @@
10
10
  %th  
11
11
  %th  
12
12
  %th From Regex
13
+ %th Subject Regex
13
14
  %th Body Regex
14
15
  %th Kind
15
16
  - @email_filters.each do |ef|
@@ -18,6 +19,7 @@
18
19
  %td= check_box_tag 'checked'
19
20
  %td= link_to '[~]', edit_email_filter_path(ef)
20
21
  %td= ef.from_regex
22
+ %td= ef.subject_regex
21
23
  %td= ef.body_regex
22
24
  %td= ef.kind
23
25
 
@@ -1,5 +1,5 @@
1
1
 
2
- .emails-ns.email-filters-new
2
+ .emails-ns.email-filters-new.max-width
3
3
  .header
4
4
  %h2.title New Email Filter
5
5
  = render 'form', email_filter: @email_filter
@@ -1,5 +1,6 @@
1
1
 
2
- = render 'title', :gallery => @gallery
3
- = render 'form', :gallery => @gallery, :url => gallery_path( @gallery )
4
- = render 'thumbs', :gallery => @gallery
5
- = render 'ish_manager/photos/multinew', :gallery => @gallery
2
+ .galleries-edit.max-width
3
+ = render 'title', :gallery => @gallery
4
+ = render 'form', :gallery => @gallery, :url => gallery_path( @gallery )
5
+ = render 'thumbs', :gallery => @gallery
6
+ = render 'ish_manager/photos/multinew', :gallery => @gallery
@@ -1,6 +1,6 @@
1
1
 
2
- .row
3
- .large-12.columns
4
- %h3 New Gallery
5
-
6
- = render 'form', :gallery => @gallery
2
+ .galleries-new.max-width
3
+ .header
4
+ %h3.title New Gallery
5
+
6
+ = render 'form', :gallery => @gallery
@@ -2,7 +2,9 @@
2
2
  - url = position.new_record? ? iro_positions_path : iro_position_path( position )
3
3
 
4
4
  .iro-positions--form
5
- = form_for position, as: :position, url: url do |f|
5
+ = form_for position, as: :iro_position, url: url do |f|
6
+ - if params[:iro_purse_id]
7
+ = hidden_field_tag 'iro_position[iro_purse_id]', params[:iro_purse_id]
6
8
  .a
7
9
  .field Position ##{position.id}
8
10
  .field
@@ -0,0 +1,11 @@
1
+
2
+ - url = iro_purse.new_record? ? iro_purses_path : iro_purse_path(iro_purse)
3
+
4
+ .iro-purses--form
5
+ = form_for iro_purse, as: :iro_purse, url: url do |f|
6
+ .field
7
+ -# = f.label :config
8
+ = f.text_area :config
9
+ .actions
10
+ = f.submit 'Submit'
11
+
@@ -0,0 +1,3 @@
1
+
2
+ .iro-purses-edit.max-width
3
+ = render 'form', iro_purse: @iro_purse
@@ -0,0 +1,3 @@
1
+
2
+ .iro-purses-new.max-width
3
+ = render 'form', iro_purse: @iro_purse
@@ -2,10 +2,19 @@
2
2
  .iro-purses-show.padded
3
3
  .max-width
4
4
  .header
5
- %h4.title Purse value: $#{@purse.current_value}
5
+ %h4.title
6
+ Purse ##{@purse.id}.
7
+ #{link_to '[~]', edit_iro_purse_path(@purse)}
8
+ Value: $#{@purse.current_value}
6
9
 
10
+ %h5.collapse-expand#iroPurseConfig
11
+ Config
12
+ -# #{link_to '[~]', edit_iro_purse_path(@purse)}
13
+ .config
14
+ -# %pre= @purse.config
15
+ = render 'form', iro_purse: @purse
7
16
 
8
- %h5.collapse-expand#strategies Strategies #{link_to '[+]', new_iro_strategy_path}
17
+ %h5.collapse-expand#strategies Strategies (#{@strategies.length}) #{link_to '[+]', new_iro_strategy_path}
9
18
  .strategies.items
10
19
  - @strategies.each do |strat|
11
20
  -# .strategy.item
@@ -16,7 +25,7 @@
16
25
 
17
26
  %h5.collapse-expand#positions
18
27
  Positions (#{@positions.length})
19
- = link_to '[+]', new_iro_position_path
28
+ = link_to '[+]', new_iro_position_path({ iro_purse_id: @purse.id })
20
29
  .positions
21
30
 
22
31
 
@@ -0,0 +1,139 @@
1
+
2
+ .iro-purses-show.padded
3
+ .max-width
4
+ .header
5
+ %h4.title
6
+ GAMEUI::Purse ##{@purse.id}.
7
+ #{link_to '[~]', edit_iro_purse_path(@purse)}
8
+ Value: $#{@purse.current_value}
9
+
10
+ %h5.collapse-expand#iroPurseConfig
11
+ Config
12
+ -# #{link_to '[~]', edit_iro_purse_path(@purse)}
13
+ .config
14
+ -# %pre= @purse.config
15
+ = render 'form', iro_purse: @purse
16
+
17
+ %h5.collapse-expand#strategies Strategies (#{@strategies.length}) #{link_to '[+]', new_iro_strategy_path}
18
+ .strategies.items
19
+ - @strategies.each do |strat|
20
+ -# .strategy.item
21
+ -# = link_to '[~]', edit_iro_strategy_path( strat )
22
+ -# <pre>#{JSON.pretty_generate( strat.display_attrs )}</pre>
23
+ .strategy.item= render 'ish_manager/iro_strategies/form', strategy: strat
24
+
25
+ %h5.collapse-expand#gameuiPositions1
26
+ Gameui Positions (#{@positions.length})
27
+ = link_to '[+]', new_iro_position_path({ iro_purse_id: @purse.id })
28
+ .gameuiW
29
+ .gameui
30
+ .gameuiC
31
+
32
+
33
+ .elephant
34
+ .windW
35
+ .wind
36
+ .windC
37
+ .ground
38
+ .grid
39
+ .spearmanW
40
+ .spearman
41
+ .spearmanStart
42
+ .spearmanCurrent
43
+ .groundedW
44
+ .grounded
45
+ .groundedC
46
+ .groundedStart
47
+ .groundedCurrent
48
+
49
+ .elephant.elephantNext
50
+
51
+
52
+ %h5.collapse-expand#positions2
53
+ Positions (#{@positions.length})
54
+ = link_to '[+]', new_iro_position_path({ iro_purse_id: @purse.id })
55
+ .positions
56
+
57
+
58
+ %table.bordered
59
+ %thead
60
+ %tr
61
+ %td
62
+ .id id
63
+ %td
64
+ .strategy Strategy
65
+ %td
66
+ .ticker Ticker
67
+ %td
68
+ .type Kind/Type
69
+ %td
70
+ .strike Strike
71
+ %td
72
+ .expires_on ExpiresOn
73
+ %td
74
+ .days-left Days Left
75
+ %td
76
+ .q Q
77
+ %td
78
+ .begin-on Begin On
79
+ %td
80
+ .price Price
81
+ %td
82
+ .to-open To Open
83
+ %td
84
+ .begin-delta #{"\u0394"}
85
+ %td
86
+ .to-close Current $ <br />(To Close)
87
+ %td
88
+ .net Net
89
+ %td
90
+ .netp % Net
91
+ %td
92
+ .delta #{"\u0394"}
93
+ %td
94
+ .days-at-open Days@Open
95
+ %td
96
+ .must-roll Must roll?
97
+ %td
98
+ .should-roll Should roll?
99
+ %td
100
+ .next-symbol Next Symbol
101
+ %td
102
+ .next-delta Next Delta
103
+ %td
104
+ .next-outcome Next Outcome
105
+ %td
106
+ .state State
107
+ %tbody
108
+ - @positions.each do |p|
109
+ %tr
110
+ %td.id
111
+ = p.id
112
+ = link_to '[~]', edit_iro_position_path(p)
113
+ %td.strategy= link_to p.strategy, edit_iro_strategy_path(p.strategy)
114
+ %td= p.ticker
115
+ %td= p.type == "Iro::CoveredCall" ? "CALL" : "other"
116
+ %td= p.strike
117
+ %td= p.expires_on.strftime('%b %d')
118
+ %td.days-left= (p.expires_on.to_date - Time.now.to_date).to_i
119
+ %td.q= p.quantity
120
+ %td.begin-on= pp_date p.opened_on
121
+ %td.price= p.opened_price
122
+ %td.to-open= pp_amount( p.opened_price * 100 * p.quantity )
123
+ %td.begin-delta= sprintf('%.2f', p.opened_delta ) rescue nil
124
+ %td= pp_money p.current_price
125
+ %td.net= pp_money ( p.opened_price - p.current_price ) * 100 - 1.3
126
+ %td.netp= pp_percent ( p.opened_price - p.current_price ) / p.opened_price
127
+ %td= sprintf('%.2f', p.current_delta ) rescue nil
128
+ %td= (p.expires_on.to_date - p.opened_on).to_i
129
+ %td.must-roll= pp_bool p.must_roll?
130
+ %td.should-roll
131
+ .aC
132
+ .a= p.should_rollp ? p.should_rollp : '-'
133
+ .a= pp_bool p.should_roll?
134
+ %td.next-symbol= p.next_symbol
135
+ %td.next-delta= p.next_position[:delta]
136
+ %td.next-outcome= pp_money p.next_outcome
137
+ %td.state= p.status
138
+
139
+
@@ -8,7 +8,7 @@
8
8
  = form_tag leads_bulkop_path do
9
9
  = label_tag 'Act on Selected:'
10
10
  = select_tag :op, options_for_select( [[nil,nil]] + Lead::OPS )
11
- -# = select_tag :email_campaign_id, options_for_select( @email_campaigns_list )
11
+ = select_tag :email_campaign_id, options_for_select( @email_campaigns_list )
12
12
  = submit_tag 'Go'
13
13
 
14
14
  %table.bordered.data-table
data/config/routes.rb CHANGED
@@ -7,13 +7,12 @@ IshManager::Engine.routes.draw do
7
7
 
8
8
  resources 'events'
9
9
 
10
- patch 'galleries/:id/update_ordering', to: 'galleries#update_ordering'
11
- get 'galleries', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_THUMBS }
12
- get 'galleries/index_titles', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_TITLES }
13
- get 'galleries/index_thumbs', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_THUMBS }
14
- get 'galleries/shared', to: 'galleries#shared_with_me', defaults: { render_type: Gallery::RENDER_THUMBS }
15
- get 'galleries/shared_titles', to: 'galleries#shared_with_me', defaults: { render_type: Gallery::RENDER_TITLES
16
- }, as: :galleries_shared_titles
10
+ patch 'galleries/:id/update_ord', to: 'galleries#update_ordering'
11
+ get 'galleries', to: 'galleries#index', defaults: { render_type: Gallery::RENDER_THUMBS }
12
+ get 'galleries/index_titles', to: 'galleries#index', defaults: { render_type: Gallery::RENDER_TITLES }
13
+ get 'galleries/index_thumbs', to: 'galleries#index', defaults: { render_type: Gallery::RENDER_THUMBS }
14
+ get 'galleries/shared', to: 'galleries#shared_with_me', defaults: { render_type: Gallery::RENDER_THUMBS }
15
+ get 'galleries/shared_titles', to: 'galleries#shared_with_me', defaults: { render_type: Gallery::RENDER_TITLES }, as: :galleries_shared_titles
17
16
  resources :galleries do
18
17
  post 'multiadd', :to => 'photos#j_create', :as => :multiadd
19
18
  end
@@ -27,9 +26,9 @@ IshManager::Engine.routes.draw do
27
26
 
28
27
  resources :iro_positions
29
28
 
30
- # get 'iro_watches', to: 'iro_watches#index'
31
29
  resources :iro_watches
32
- get 'iro_purse', to: 'iro_purses#show', as: :my_purse
30
+
31
+ resources :iro_purses
33
32
 
34
33
  resources :iro_strategies
35
34
 
@@ -57,8 +56,11 @@ IshManager::Engine.routes.draw do
57
56
  post :email_actions, to: 'email_actions#update'
58
57
  resources :email_actions
59
58
 
59
+ post 'email_campaigns/:id/send', to: 'email_campaigns#do_send', as: :send_email_campaign
60
60
  resources :email_campaigns
61
+
61
62
  resources :email_campaign_leads, as: :campaign_leads
63
+
62
64
  resources :email_filters
63
65
 
64
66
  get 'email_messages/iframe/:id', to: 'email_messages#show_iframe', as: :email_message_iframe
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ish_manager
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8.408
4
+ version: 0.1.8.410
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-04-03 00:00:00.000000000 Z
11
+ date: 2023-04-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -253,28 +253,6 @@ files:
253
253
  - app/assets/javascripts/ish_manager/galleries.js
254
254
  - app/assets/javascripts/ish_manager/maps.js
255
255
  - app/assets/javascripts/ish_manager/shared.js
256
- - app/assets/javascripts/ish_manager/trash/application_materialize.js
257
- - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1.zip
258
- - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/AUTHORS.txt
259
- - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/LICENSE.txt
260
- - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/external/jquery/jquery.js
261
- - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/images/ui-icons_444444_256x240.png
262
- - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/images/ui-icons_555555_256x240.png
263
- - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/images/ui-icons_777620_256x240.png
264
- - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/images/ui-icons_777777_256x240.png
265
- - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/images/ui-icons_cc0000_256x240.png
266
- - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/images/ui-icons_ffffff_256x240.png
267
- - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/index.html
268
- - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.css
269
- - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.js
270
- - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.min.css
271
- - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.min.js
272
- - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.structure.css
273
- - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.structure.min.css
274
- - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.theme.css
275
- - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.theme.min.css
276
- - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/package.json
277
- - app/assets/javascripts/ish_manager/trash/materialize.js
278
256
  - app/assets/javascripts/ish_manager/vendor/bootstrap.min.js
279
257
  - app/assets/javascripts/ish_manager/vendor/jquery-3.2.1.min.js
280
258
  - app/assets/javascripts/ish_manager/vendor/jquery-3.6.0.min.js
@@ -300,9 +278,6 @@ files:
300
278
  - app/assets/stylesheets/ish_manager/photos.scss
301
279
  - app/assets/stylesheets/ish_manager/scheduled_email_actions.scss
302
280
  - app/assets/stylesheets/ish_manager/tags.scss
303
- - app/assets/stylesheets/ish_manager/trash/bootstrap.css
304
- - app/assets/stylesheets/ish_manager/trash/materialize.css
305
- - app/assets/stylesheets/ish_manager/trash/reset.css
306
281
  - app/assets/stylesheets/ish_manager/user_profiles.scss
307
282
  - app/assets/stylesheets/ish_manager/videos.scss
308
283
  - app/controllers/ish_manager/application_controller.rb
@@ -406,8 +381,14 @@ files:
406
381
  - app/views/ish_manager/email_actions/new.haml
407
382
  - app/views/ish_manager/email_actions/show.haml
408
383
  - app/views/ish_manager/email_campaign_leads/show.haml
384
+ - app/views/ish_manager/email_campaigns/_form.haml
385
+ - app/views/ish_manager/email_campaigns/edit.haml
386
+ - app/views/ish_manager/email_campaigns/index.haml
387
+ - app/views/ish_manager/email_campaigns/new.haml
388
+ - app/views/ish_manager/email_campaigns/show.haml
409
389
  - app/views/ish_manager/email_contexts/_form.haml
410
390
  - app/views/ish_manager/email_contexts/_form_reply.haml
391
+ - app/views/ish_manager/email_contexts/_index.haml
411
392
  - app/views/ish_manager/email_contexts/edit.haml
412
393
  - app/views/ish_manager/email_contexts/iframe_src.haml
413
394
  - app/views/ish_manager/email_contexts/index.haml
@@ -482,7 +463,11 @@ files:
482
463
  - app/views/ish_manager/iro_positions/_form.haml
483
464
  - app/views/ish_manager/iro_positions/edit.haml
484
465
  - app/views/ish_manager/iro_positions/new.haml
466
+ - app/views/ish_manager/iro_purses/_form.haml
467
+ - app/views/ish_manager/iro_purses/edit.haml
468
+ - app/views/ish_manager/iro_purses/new.haml
485
469
  - app/views/ish_manager/iro_purses/show.haml
470
+ - app/views/ish_manager/iro_purses/show_gameui.haml
486
471
  - app/views/ish_manager/iro_strategies/_form.haml
487
472
  - app/views/ish_manager/iro_strategies/edit.haml
488
473
  - app/views/ish_manager/iro_strategies/new.haml
@@ -1,8 +0,0 @@
1
-
2
- $(document).ready(function() {
3
-
4
- if ($('body').length > 0) {
5
- $('select').material_select()
6
- }
7
-
8
- })