ish_manager 0.1.8.260 → 0.1.8.265

Sign up to get free protection for your applications and to get access to all the features.
Files changed (32) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/ish_manager/application.scss +51 -2
  3. data/app/assets/stylesheets/ish_manager/maps.scss +13 -6
  4. data/app/assets/stylesheets/ish_manager/videos.scss +0 -10
  5. data/app/controllers/ish_manager/maps_controller.rb +10 -1
  6. data/app/controllers/ish_manager/reports_controller.rb +39 -33
  7. data/app/controllers/ish_manager/stock_watches_controller.rb +28 -22
  8. data/app/controllers/ish_manager/{co_tailors_controller.rb → trash/co_tailors_controller.rb} +0 -0
  9. data/app/controllers/ish_manager/{covered_calls_controller.rb → trash/covered_calls_controller.rb} +0 -0
  10. data/app/controllers/ish_manager/{events_controller.rb → trash/events_controller.rb} +0 -0
  11. data/app/controllers/ish_manager/{friends_controller.rb → trash/friends_controller.rb} +0 -0
  12. data/app/controllers/ish_manager/{iron_condors_controller.rb → trash/iron_condors_controller.rb} +0 -0
  13. data/app/controllers/ish_manager/videos_controller.rb +52 -50
  14. data/app/views/ish_manager/application/_main_header_admin.haml +19 -30
  15. data/app/views/ish_manager/application/_main_header_admin.haml-trash +21 -0
  16. data/app/views/ish_manager/application/_main_header_guy.haml +3 -3
  17. data/app/views/ish_manager/application/_meta.haml +9 -11
  18. data/app/views/ish_manager/application/home.haml +6 -0
  19. data/app/views/ish_manager/galleries/_index.haml +24 -20
  20. data/app/views/ish_manager/galleries/_menu.haml +1 -1
  21. data/app/views/ish_manager/maps/_form.haml +1 -1
  22. data/app/views/ish_manager/maps/_map_meta_row.haml +1 -1
  23. data/app/views/ish_manager/maps/map_editor.haml +1 -0
  24. data/app/views/ish_manager/maps/show.haml +2 -0
  25. data/app/views/ish_manager/reports/_form.haml +2 -1
  26. data/app/views/ish_manager/reports/show.haml +5 -13
  27. data/app/views/ish_manager/stock_watches/_form.haml +20 -17
  28. data/app/views/ish_manager/videos/_index.haml +1 -1
  29. data/config/routes.rb +2 -1
  30. data/lib/tasks/ish_manager_tasks.rake +1 -1
  31. metadata +8 -8
  32. data/app/assets/stylesheets/ish_manager/utils.scss +0 -26
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f6ee451db63e9c25624675fce5f5e85c80a60c9705f2b5b3cd5e3d6aaa88bb7a
4
- data.tar.gz: 78df149f47519467e53b72c845b13897b035f799fe29f183aaf3291ca1a71577
3
+ metadata.gz: f4d3cabdb357877960884b6e131a7afce5814ef6577a387493cee3ca93d3eb9c
4
+ data.tar.gz: acf80e11c1387f3abec24be7e59671c75173f1f840fbfc86995c6f6a8c204a3f
5
5
  SHA512:
6
- metadata.gz: bf7e81a7587039a8bb5be6960eee9ed7a7c23ec25c45f97c53fec1535afd9691c34788ccd40174ac7b88fbfee883dec169ff9f1f31621d9cda5ea6d773050df1
7
- data.tar.gz: b768486aae09ef375d4a11f05198821eb4033577fb02770b429ac83238971941b26a6bdef720e77d647ebd54cb430af38d28051f756e8f722056921e4ee9873b
6
+ metadata.gz: c88bc894f5eef54c7375d1c11594dfbb67b1430f2b0093155113325cef6e33c00ec1d56e3136c4658355ee01af4fbab9ce9ed95f4f0613c255405c419961e607
7
+ data.tar.gz: 1d073d153aeb300ea6f5299c92343886f3614965e5c0f1f3d12f7c81cc41b0513739b2c5ce72b89a188d39fd387871bcff52bf349d247c2ef49b28b9108d2b43
@@ -13,7 +13,6 @@
13
13
  *= require_self
14
14
  *= require ish_manager/tags
15
15
  *= require ish_manager/maps
16
- *= require ish_manager/utils
17
16
  *= require ish_manager/jquery-ui
18
17
  *= require ish_manager/galleries
19
18
  *= require ish_manager/photos
@@ -21,19 +20,63 @@
21
20
  *= require ish_manager/videos
22
21
  */
23
22
 
24
- body {
23
+ body {
25
24
  background: #dedede;
26
25
  font-size: 20px;
27
26
  }
27
+
28
28
  pre {
29
29
  background: #e0e0e0;
30
30
  padding: 1em;
31
31
  }
32
32
 
33
+ ul:not(.browser-default).errors,
34
+ ul:not(.browser-default).bullets, {
35
+ > li {
36
+ list-style-type: circle;
37
+ margin-left: 1em;
38
+ }
39
+ }
40
+
33
41
  /**
34
42
  * utils
35
43
  */
36
44
 
45
+ .-index {
46
+ .item {
47
+ margin-bottom: 3em;
48
+ }
49
+
50
+ /* clear nth! */
51
+ .row div:nth-child(2n+1) {
52
+ clear:left
53
+ }
54
+
55
+ .row h3 {
56
+ margin-bottom: 0;
57
+ }
58
+ }
59
+
60
+
61
+ .flat-row {
62
+ display: flex;
63
+ flex-direction: row;
64
+ justify-content: flex-start;
65
+ align-content: flex-start;
66
+
67
+ height: 2.4em;
68
+ line-height: 3em;
69
+
70
+ width: 100%;
71
+ margin: 1em 0 0 0;
72
+ padding: 0;
73
+
74
+ > * {
75
+ padding-right: 1em;
76
+ }
77
+ }
78
+
79
+
37
80
  /* A */
38
81
 
39
82
  .addToggle + * {
@@ -89,6 +132,7 @@ pre {
89
132
 
90
133
  .flex-row {
91
134
  display: flex;
135
+ flex-wrap: wrap;
92
136
  }
93
137
 
94
138
  .float-left {
@@ -111,6 +155,11 @@ hr {
111
155
  ul.inline li {
112
156
  display: inline;
113
157
  }
158
+ .inline-search {
159
+ width: 20px;
160
+ bordeR: 1px solid white;
161
+ display: inline-block;
162
+ }
114
163
 
115
164
  /* L */
116
165
  textarea.large {
@@ -8,15 +8,22 @@
8
8
  /*
9
9
  * Main - Maps
10
10
  */
11
- .maps--map-meta-row .a {
12
- line-height: 1em;
11
+ .maps--map-meta-row {
12
+ border-left: 10px solid #e3e3e3;
13
+ padding-left: 10px;
14
+
15
+ .a {
16
+ line-height: 1em;
17
+ }
13
18
  }
14
19
 
15
20
  .maps-index {
16
- h1 {
17
- padding-bottom: 10px;
18
- border-bottom: 10px solid #cecece;
19
- }
21
+
22
+ // h1 {
23
+ // padding-bottom: 10px;
24
+ // border-bottom: 10px solid #cecece;
25
+ // }
26
+
20
27
  .item {
21
28
  display: flex;
22
29
  flex-direction: row;
@@ -1,11 +1 @@
1
1
 
2
- .videos--index {
3
- .item {
4
- margin-bottom: 3em;
5
- }
6
-
7
- /* clear nth! */
8
- .row div:nth-child(2n+1) {
9
- clear:left
10
- }
11
- }
@@ -41,7 +41,16 @@ class IshManager::MapsController < IshManager::ApplicationController
41
41
 
42
42
  def index
43
43
  authorize! :index, ::Gameui::Map
44
- @maps = ::Gameui::Map.unscoped.where( parent_slug: "" ).order( slug: :asc )
44
+
45
+ if params[:q]
46
+ @maps = ::Gameui::Map.where({ slug: /#{params[:q]}/i })
47
+ if @maps.length == 1
48
+ redirect_to map_path(@maps[0])
49
+ return
50
+ end
51
+ end
52
+
53
+ @maps ||= ::Gameui::Map.unscoped.where( parent_slug: "" ).order( slug: :asc )
45
54
  @all_maps = Gameui::Map.all.order( slug: :asc )
46
55
  end
47
56
 
@@ -3,6 +3,8 @@ class IshManager::ReportsController < IshManager::ApplicationController
3
3
 
4
4
  before_action :set_lists
5
5
 
6
+ # alphabetized : )
7
+
6
8
  def create
7
9
  @report = Report.new params[:report].permit!
8
10
  @report.user_profile = current_user.profile # @TODO: this should not be hard-coded
@@ -40,12 +42,24 @@ class IshManager::ReportsController < IshManager::ApplicationController
40
42
  end
41
43
  end
42
44
 
45
+ def destroy
46
+ @report = Report.unscoped.find params[:id]
47
+ authorize! :destroy, @report
48
+ @report.is_trash = true
49
+ @report.save
50
+ redirect_to request.referrer
51
+ end
52
+
53
+ def edit
54
+ @report = Report.unscoped.find params[:id]
55
+ authorize! :edit, @report
56
+ end
57
+
43
58
  def index
44
59
  authorize! :index, Report
45
60
  @reports = Report.unscoped.order_by( :created_at => :desc
46
- ).where( :is_trash => false, :user_profile => current_user.profile
47
- ).page( params[:reports_page]
48
- ).per( Report::PER_PAGE )
61
+ ).where( :is_trash => false, :user_profile => current_user.profile
62
+ ).page( params[:reports_page] ).per( Report::PER_PAGE )
49
63
  if false === params[:site]
50
64
  @reports = @reports.where( :site_id => nil )
51
65
  end
@@ -53,24 +67,34 @@ class IshManager::ReportsController < IshManager::ApplicationController
53
67
  @site = Site.find params[:site_id]
54
68
  @reports = @reports.where( :site_id => params[:site_id] )
55
69
  end
70
+ if params[:q]
71
+ @reports = @reports.or({ slug: /#{params[:q]}/i }, { name: /#{params[:q]}}/i }) # @TODO: why can't I have space in search term?
72
+ if @reports.length == 1
73
+ redirect_to report_path(@reports[0])
74
+ return
75
+ end
76
+ end
56
77
  end
57
78
 
58
- def show
59
- @report = Report.unscoped.find params[:id]
60
- authorize! :show, @report
61
- end
79
+ def new
80
+ @report = Report.new
81
+ authorize! :new, @report
82
+ @tags_list = Tag.all.where( :is_public => true ).list
83
+ @sites_list = Site.all.list
84
+ @cities_list = City.list
85
+ @venues_list = Venue.all.list
62
86
 
63
- def edit
64
- @report = Report.unscoped.find params[:id]
65
- authorize! :edit, @report
87
+ respond_to do |format|
88
+ format.html do
89
+ render
90
+ end
91
+ format.json { render :json => @report }
92
+ end
66
93
  end
67
94
 
68
- def destroy
95
+ def show
69
96
  @report = Report.unscoped.find params[:id]
70
- authorize! :destroy, @report
71
- @report.is_trash = true
72
- @report.save
73
- redirect_to request.referrer
97
+ authorize! :show, @report
74
98
  end
75
99
 
76
100
  def update
@@ -95,23 +119,5 @@ class IshManager::ReportsController < IshManager::ApplicationController
95
119
  end
96
120
  end
97
121
 
98
- def new
99
- @report = Report.new
100
- authorize! :new, @report
101
- @tags_list = Tag.all.where( :is_public => true ).list
102
- @sites_list = Site.all.list
103
- @cities_list = City.list
104
- @venues_list = Venue.all.list
105
-
106
- respond_to do |format|
107
- format.html do
108
- render
109
- end
110
- format.json { render :json => @report }
111
- end
112
- end
113
-
114
-
115
-
116
122
  end
117
123
 
@@ -1,17 +1,8 @@
1
1
 
2
2
  class IshManager::StockWatchesController < IshManager::ApplicationController
3
3
 
4
- def index
5
- authorize! :index, Ish::StockWatch
6
- @profiles = Ish::UserProfile.all
7
- @stock_watches = Ish::StockWatch.order_by( ticker: :asc, direction: :asc, price: :desc
8
- ).includes( :profile )
9
- @stock_watch = Ish::StockWatch.new
10
- render 'index', :layout => 'ish_manager/application_no_materialize'
11
- end
12
-
13
4
  def create
14
- @stock_watch = Ish::StockWatch.new params[:ish_stock_watch].permit!
5
+ @stock_watch = Warbler::StockWatch.new permitted_params
15
6
  authorize! :create, @stock_watch
16
7
  flag = @stock_watch.save
17
8
  if flag
@@ -22,10 +13,31 @@ class IshManager::StockWatchesController < IshManager::ApplicationController
22
13
  redirect_to :action => 'index'
23
14
  end
24
15
 
16
+ def destroy
17
+ @w = Warbler::StockWatch.find params[:id]
18
+ authorize! :destroy, @w
19
+ flag = @w.destroy
20
+ if flag
21
+ flash[:notice] = 'Success.'
22
+ else
23
+ flash[:alert] = @w.errors.messages
24
+ end
25
+ redirect_to action: 'index'
26
+ end
27
+
28
+ def index
29
+ authorize! :index, Warbler::StockWatch
30
+ @profiles = Ish::UserProfile.all
31
+ @stock_watches = Warbler::StockWatch.order_by( ticker: :asc, direction: :asc, price: :desc
32
+ ).includes( :profile )
33
+ @stock_watch = Warbler::StockWatch.new
34
+ # render 'index', :layout => 'ish_manager/application_no_materialize'
35
+ end
36
+
25
37
  def update
26
- @stock_watch = Ish::StockWatch.find params[:id]
38
+ @stock_watch = Warbler::StockWatch.find params[:id]
27
39
  authorize! :update, @stock_watch
28
- flag = @stock_watch.update_attributes params[:ish_stock_watch].permit!
40
+ flag = @stock_watch.update_attributes permitted_params
29
41
  if flag
30
42
  flash[:notice] = 'Updated stock watch.'
31
43
  else
@@ -34,16 +46,10 @@ class IshManager::StockWatchesController < IshManager::ApplicationController
34
46
  redirect_to :action => 'index'
35
47
  end
36
48
 
37
- def destroy
38
- @w = Ish::StockWatch.find params[:id]
39
- authorize! :destroy, @w
40
- flag = @w.destroy
41
- if flag
42
- flash[:notice] = 'Success.'
43
- else
44
- flash[:alert] = @w.errors.messages
45
- end
46
- redirect_to action: 'index'
49
+ private
50
+
51
+ def permitted_params
52
+ params[:warbler_stock_watch].permit!
47
53
  end
48
54
 
49
55
  end
@@ -3,6 +3,58 @@ class IshManager::VideosController < IshManager::ApplicationController
3
3
 
4
4
  before_action :set_lists
5
5
 
6
+ # alphabetized : )
7
+
8
+ def create
9
+ @video = Video.new params[:video].permit(%i| name descr is_public is_trash is_feature x y lang youtube_id
10
+ tags city site user_profile premium_tier premium_purchases thumb video |)
11
+ @video.user_profile = current_user.profile
12
+ if !params[:video][:site_id].blank?
13
+ @video.site = Site.find params[:video][:site_id]
14
+ @video.site.touch
15
+ else
16
+ if @site
17
+ @video.site = @site
18
+ @site.touch
19
+ end
20
+ end
21
+ authorize! :create, @video
22
+
23
+ if @video.save
24
+ flash[:notice] = 'Success'
25
+ redirect_to videos_path
26
+ else
27
+ flash[:alert] = 'No luck'
28
+ @tags_list = Tag.list
29
+ @cities_list = City.list
30
+ render :action => 'new'
31
+ end
32
+ end
33
+
34
+ def destroy
35
+ @video = Video.unscoped.find params[:id]
36
+ authorize! :destroy, @video
37
+ flag = @video.update_attributes( :is_trash => true )
38
+ @video.city.touch if @video.city
39
+ @video.site.touch if @video.site
40
+ @video.tags.map &:touch
41
+ if flag
42
+ flash[:notice] = "deleted video"
43
+ else
44
+ flash[:alert] = "Cannot delete video: #{@video.errors.messages}"
45
+ end
46
+ redirect_to :action => 'index'
47
+ end
48
+
49
+ def edit
50
+ @video = Video.unscoped.find params[:id]
51
+ @user_profiles_list = Ish::UserProfile.list
52
+ authorize! :edit, @video
53
+
54
+ @tags_list = Tag.unscoped.or( { :is_public => true }, { :user_id => current_user.id } ).list
55
+ @cities_list = City.list
56
+ end
57
+
6
58
  def index
7
59
  authorize! :index, Video.new
8
60
  @videos = Video.unscoped.where( is_trash: false, :user_profile => current_user.profile ).order_by( :created_at => :desc )
@@ -59,41 +111,6 @@ class IshManager::VideosController < IshManager::ApplicationController
59
111
  @cities_list = City.list
60
112
  end
61
113
 
62
- def create
63
- @video = Video.new params[:video].permit(%i| name descr is_public is_trash is_feature x y lang youtube_id
64
- tags city site user_profile premium_tier premium_purchases thumb video |)
65
- @video.user_profile = current_user.profile
66
- if !params[:video][:site_id].blank?
67
- @video.site = Site.find params[:video][:site_id]
68
- @video.site.touch
69
- else
70
- if @site
71
- @video.site = @site
72
- @site.touch
73
- end
74
- end
75
- authorize! :create, @video
76
-
77
- if @video.save
78
- flash[:notice] = 'Success'
79
- redirect_to videos_path
80
- else
81
- flash[:alert] = 'No luck'
82
- @tags_list = Tag.list
83
- @cities_list = City.list
84
- render :action => 'new'
85
- end
86
- end
87
-
88
- def edit
89
- @video = Video.unscoped.find params[:id]
90
- @user_profiles_list = Ish::UserProfile.list
91
- authorize! :edit, @video
92
-
93
- @tags_list = Tag.unscoped.or( { :is_public => true }, { :user_id => current_user.id } ).list
94
- @cities_list = City.list
95
- end
96
-
97
114
  def update
98
115
  @video = Video.unscoped.find params[:id]
99
116
  authorize! :update, @video
@@ -109,19 +126,4 @@ class IshManager::VideosController < IshManager::ApplicationController
109
126
  end
110
127
  end
111
128
 
112
- def destroy
113
- @video = Video.unscoped.find params[:id]
114
- authorize! :destroy, @video
115
- flag = @video.update_attributes( :is_trash => true )
116
- @video.city.touch if @video.city
117
- @video.site.touch if @video.site
118
- @video.tags.map &:touch
119
- if flag
120
- flash[:notice] = "deleted video"
121
- else
122
- flash[:alert] = "Cannot delete video: #{@video.errors.messages}"
123
- end
124
- redirect_to :action => 'index'
125
- end
126
-
127
129
  end
@@ -1,49 +1,38 @@
1
1
 
2
- .manager--main-header
2
+
3
+ .application--main-header-admin.manager--main-header
3
4
  .container
4
5
  %i.fa.fa-compress.collapse-expand#collapseHeader
5
6
  .content
6
7
  %ul
7
8
  %li{ :class => params[:controller] == 'ish_manager/maps' ? 'active' : '' }
8
- = link_to 'GameUi::Maps', maps_path
9
+ = link_to 'Maps', maps_path
10
+ .inline-search
11
+ = form_tag maps_path, method: :get do
12
+ = text_field_tag :q
9
13
  = link_to '[+]', new_map_path
10
- %li{ :class => params[:controller] == 'ish_manager/cities' ? 'active' : '' }= link_to 'Cities', cities_path
11
- %li{ :class => params[:controller] == 'ish_manager/events' ? 'active' : '' }= link_to 'Events', events_path
12
- %li{ :class => params[:controller] == 'ish_manager/venues' ? 'active' : '' }= link_to 'Venues', venues_path
13
- %li{ :class => params[:controller] == 'ish_manager/user_profiles' ? 'active' : '' }= link_to 'Profiles', user_profiles_path
14
- %li{ :class => params[:controller] == 'ish_manager/friends ' ? 'active' : '' }= link_to 'Friends', friends_path
15
14
 
16
- %ul
17
- %li{ class: params[:controller] == 'ish_manager/newsitems' ? 'active' : '' }= link_to '+Newsitem', new_newsitem_path
18
- %li{ :class => params[:controller] == 'ish_manager/sites' ? 'active' : '' }= link_to 'Sites', sites_path
19
15
  %li{ :class => params[:controller] == 'ish_manager/galleries' ? 'active' : '' }
20
16
  = link_to 'Galleries', galleries_path
17
+ .inline-search
18
+ = form_tag galleries_path, method: :get do
19
+ = text_field_tag :q
21
20
  = link_to '[+]', new_gallery_path
22
21
  %li{ :class => params[:controller] == 'ish_manager/reports' ? 'active' : '' }
23
22
  = link_to 'Reports', reports_path
23
+ .inline-search
24
+ = form_tag reports_path, method: :get do
25
+ = text_field_tag :q
24
26
  = link_to '[+]', new_report_path
25
27
  %li{ :class => params[:controller] == 'ish_manager/videos' ? 'active' : '' }
26
28
  = link_to 'Videos', videos_path
29
+ .inline-search
30
+ = form_tag videos_path, method: :get do
31
+ = text_field_tag :q
27
32
  = link_to '[+]', new_video_path
28
- %li{ :class => params[:controller] == 'ish_manager/tags' ? 'active' : '' }= link_to 'Tags', tags_path
29
-
30
- - proc do # nothing
31
- %ul.nav.nav-pills
32
- -# %li{ :class => params[:controller] == 'ish_manager/ally' ? 'active' : '' }= link_to 'Ally', ally_root_path
33
- -# %li{ :class => params[:controller] == 'ish_manager/stock_actions' ? 'active' : '' }= link_to 'Stock Actions', stock_actions_path
34
- -# %li{ :class => params[:controller] == 'ish_manager/stock_options' ? 'active' : '' }= link_to 'Stock Options', stock_options_path
35
- %li{ :class => params[:controller] == 'ish_manager/stock_watches' ? 'active' : '' }= link_to 'Stock Watches', stock_watches_path
36
- -# %li{ :class => params[:controller] == 'ish_manager/iron_condors' ? 'active' : '' }= link_to 'Iron Condors', iron_condors_path
37
- -# %li{ :class => params[:controller] == 'ish_manager/covered_calls' ? 'active' : '' }= link_to 'Covered Calls', covered_calls_path
38
- %ul.nav.nav-pills
39
- %li{ :class => params[:controller] == 'ish_manager/invoices' ? 'active' : '' }= link_to 'Invoices', invoices_path
40
- %li{ :class => params[:controller] == 'ish_manager/payments' ? 'active' : '' }= link_to 'Payments', payments_path
41
- %li{ :class => params[:controller] == 'ish_manager/orders' ? 'active' : '' }= link_to 'Orders', orders_path
42
- -# %li{ :class => params[:controller] == 'ish_manager/co_tailors' ? 'active' : '' }= link_to 'Co Tailors', co_tailors_path
43
- %ul.nav.nav-pills
44
- %li{ :class => params[:controller] == 'ish_manager/leads' ? 'active' : '' }= link_to 'Leads', leads_path
45
- %li{ :class => params[:controller] == 'ish_manager/campaigns' ? 'active' : '' }= link_to 'Campaigns', campaigns_path
46
-
47
-
33
+ %ul
34
+ %li{ class: params[:controller] == 'ish_manager/newsitems' ? 'active' : '' }= link_to '+Newsitem', new_newsitem_path
35
+ %li{ :class => params[:controller] == 'ish_manager/stock_watches' ? 'active' : '' }= link_to 'Stock Watches', stock_watches_path
36
+ %li{ :class => params[:controller] == 'ish_manager/user_profiles' ? 'active' : '' }= link_to 'Profiles', user_profiles_path
48
37
  %hr
49
38
 
@@ -0,0 +1,21 @@
1
+
2
+
3
+ -# %li{ :class => params[:controller] == 'ish_manager/sites' ? 'active' : '' }= link_to 'Sites', sites_path
4
+ -# %li{ :class => params[:controller] == 'ish_manager/tags' ? 'active' : '' }= link_to 'Tags', tags_path
5
+ -# %li{ :class => params[:controller] == 'ish_manager/cities' ? 'active' : '' }= link_to 'Cities', cities_path
6
+ -# %li{ :class => params[:controller] == 'ish_manager/events' ? 'active' : '' }= link_to 'Events', events_path
7
+ -# %li{ :class => params[:controller] == 'ish_manager/venues' ? 'active' : '' }= link_to 'Venues', venues_path
8
+ -# %li{ :class => params[:controller] == 'ish_manager/friends ' ? 'active' : '' }= link_to 'Friends', friends_path
9
+ - proc do # nothing
10
+ %ul.nav.nav-pills
11
+ -# %li{ :class => params[:controller] == 'ish_manager/stock_actions' ? 'active' : '' }= link_to 'Stock Actions', stock_actions_path
12
+ -# %li{ :class => params[:controller] == 'ish_manager/stock_options' ? 'active' : '' }= link_to 'Stock Options', stock_options_path
13
+ -# %li{ :class => params[:controller] == 'ish_manager/iron_condors' ? 'active' : '' }= link_to 'Iron Condors', iron_condors_path
14
+ -# %li{ :class => params[:controller] == 'ish_manager/covered_calls' ? 'active' : '' }= link_to 'Covered Calls', covered_calls_path
15
+ %ul.nav.nav-pills
16
+ %li{ :class => params[:controller] == 'ish_manager/invoices' ? 'active' : '' }= link_to 'Invoices', invoices_path
17
+ %li{ :class => params[:controller] == 'ish_manager/payments' ? 'active' : '' }= link_to 'Payments', payments_path
18
+ %li{ :class => params[:controller] == 'ish_manager/orders' ? 'active' : '' }= link_to 'Orders', orders_path
19
+ %ul.nav.nav-pills
20
+ %li{ :class => params[:controller] == 'ish_manager/leads' ? 'active' : '' }= link_to 'Leads', leads_path
21
+ %li{ :class => params[:controller] == 'ish_manager/campaigns' ? 'active' : '' }= link_to 'Campaigns', campaigns_path
@@ -7,9 +7,9 @@
7
7
  .content
8
8
  %ul.nav.nav-pills
9
9
  %li{ :class => params[:controller] == 'ish_manager/galleries' ? 'active' : '' }= link_to 'Galleries', galleries_path
10
- %li{ :class => params[:controller] == 'ish_manager/reports' ? 'active' : '' }= link_to 'Reports', reports_path
11
- %li{ :class => params[:controller] == 'ish_manager/videos' ? 'active' : '' }= link_to 'Videos', videos_path
12
- %li{ :class => params[:controller] == 'ish_manager/friends ' ? 'active' : '' }= link_to 'Friends', friends_path
10
+ -# %li{ :class => params[:controller] == 'ish_manager/reports' ? 'active' : '' }= link_to 'Reports', reports_path
11
+ -# %li{ :class => params[:controller] == 'ish_manager/videos' ? 'active' : '' }= link_to 'Videos', videos_path
12
+ -# %li{ :class => params[:controller] == 'ish_manager/friends ' ? 'active' : '' }= link_to 'Friends', friends_path
13
13
  %ul.nav.nav-pills
14
14
  %hr
15
15
 
@@ -1,20 +1,18 @@
1
1
 
2
2
  .meta
3
- - if defined?(item.premium_tier) && item.premium_tier > 0
4
- <b>$#{item.premium_tier}</b>
3
+
5
4
  <b>On</b> #{item.created_at.to_s[0...10]}
5
+ - if item.user_profile
6
+ <b>By:</b>
7
+ = link_to item.user_profile.name, edit_user_profile_path( item.user_profile )
6
8
 
9
+ - if item.tags.length > 0
10
+ <b>Tags:</b> #{ item.tags.map(&:name).join(', ') }
7
11
  - if item.city
8
12
  <b>In City:</b> #{link_to item.city.name, city_path( item.city )}
9
- - if item.tags
10
- <b>Tags:</b> #{ item.tags.map(&:name).join(', ') }
11
- - if item.site
12
- <b>Site:</b>
13
- = link_to "#{item.site.domain}/#{item.site.lang}", site_path( item.site )
14
13
  - if item.respond_to?( :venue ) && item.venue
15
14
  <b>Venue:</b>
16
15
  = link_to item.venue.name, venue_path( item.venue )
17
- - if item.user_profile
18
- <b>By UserProfile:</b>
19
- = link_to item.user_profile.name, edit_user_profile_path( item.user_profile )
20
-
16
+
17
+ - if defined?(item.premium_tier) && item.premium_tier > 0
18
+ <b>Tier:$#{item.premium_tier}</b>
@@ -1,3 +1,9 @@
1
1
 
2
2
  Welcome home! Your role is #{current_user.profile.role_name}.
3
3
 
4
+ .bordered{ style: 'width: 400px;' }
5
+ = form_tag "https://www.cgtrader.com/free-3d-models", method: :get do
6
+ %p Search CGTrader:
7
+ = hidden_field_tag "polygons", "lt_5k"
8
+ = text_field_tag "keywords"
9
+ = submit_tag 'search'
@@ -2,34 +2,38 @@
2
2
  -# ish_manager / galleries / _index.haml
3
3
  -#
4
4
 
5
- = render 'ish_manager/galleries/menu'
6
-
7
5
  - n_thumbs ||= 8
8
6
  - param_name ||= :galleries_page
9
7
 
10
- - if @galleries.length > 0
11
- .galleries--list
8
+ .galleries--index.-index
9
+
10
+ = render 'ish_manager/galleries/menu'
11
+
12
+ - if @galleries.length > 0
13
+
12
14
  - if @galleries.respond_to? :total_pages
13
15
  = paginate @galleries, :param_name => param_name, :views_prefix => 'ish_manager'
14
16
 
15
- - @galleries.each do |g|
16
- .panel
17
- .panel-body
18
- %h3
19
- = link_to '[~]', edit_gallery_path( g )
20
- = link_to g.name, gallery_path(g.slug)
21
- (#{g.photos.length})
22
- = render 'meta', :item => g
23
- - if g.photos.length == 0
24
- = image_missing
25
- - else
26
- .thumbnails
27
- - g.photos.limit( n_thumbs ).each do |photo|
28
- = link_to image_tag(photo.photo.url(:thumb), :alt => g.name), gallery_path(g.slug)
17
+ .row
18
+ - @galleries.each do |g|
19
+ .col.s6
20
+ .item.panel
21
+ .panel-body
22
+ %h3
23
+ = link_to '[~]', edit_gallery_path( g )
24
+ = link_to g.name, gallery_path(g.slug)
25
+ (#{g.photos.length})
26
+ = render 'meta', item: g
27
+ - if g.photos.length == 0
28
+ = image_missing
29
+ - else
30
+ .thumbnails.flex-row
31
+ - g.photos.limit( n_thumbs ).each do |photo|
32
+ = link_to image_tag(photo.photo.url(:thumb), :alt => g.name), gallery_path(g.slug)
29
33
 
30
34
  - if @galleries.respond_to? :total_pages
31
35
  = paginate @galleries, :param_name => param_name, :views_prefix => 'ish_manager'
32
36
 
33
- - else
34
- %h5 No Galleries
37
+ - else
38
+ %h5 No Galleries
35
39
 
@@ -2,7 +2,7 @@
2
2
  .title
3
3
  .row
4
4
  .col.s12.col.m12
5
- %h1.center #{params[:action]} (#{@galleries.count}) #{link_to '[+]', new_gallery_path}
5
+ %h1.center Galleries #{params[:action]} (#{@galleries.count}) #{link_to '[+]', new_gallery_path}
6
6
  = render 'search', path: galleries_path
7
7
  %ul.menu-secondary
8
8
  %li{ class: "#{params[:render_type] == 'index_titles' ? 'active' : ''}" }
@@ -63,6 +63,6 @@
63
63
  = f.text_area :config, class: 'large'
64
64
  %pre.small
65
65
  description.collapsible: bool
66
- map_panel_type: "MapPanel" | "MapPanelNoZoom" | "ThreePanelV1"
66
+ map_panel_type: "Equirectangular" | "MapPanel" | "MapPanelNoZoom" | "ThreePanelV1" | "ThreePanelV4"
67
67
  .actions
68
68
  = f.submit 'Save'
@@ -8,4 +8,4 @@
8
8
  .a= button_to '+newsitem', new_map_newsitem_path(map), method: :get
9
9
  .a= link_to '[api]', api_map_path(map)
10
10
  .a= button_to 'x', map_path(map), method: :delete, data: { confirm: 'Are you sure?' }
11
- .a= map.slug
11
+ .a slug:#{map.slug}
@@ -1,5 +1,6 @@
1
1
 
2
2
  .maps-map-editor
3
+ = render 'map_meta_row', map: @map
3
4
  %h1 Map Editor
4
5
 
5
6
  .map-editor
@@ -42,3 +42,5 @@
42
42
  .item
43
43
  = link_to m.slug, edit_map_path(m.id)
44
44
 
45
+ %hr
46
+ = render 'form'
@@ -16,7 +16,8 @@
16
16
  .field
17
17
  = f.label :"Name"
18
18
  = f.text_field :name, :class=> 'form-control', :placeholder => "name of report", :type => "text"
19
- -# = f.text_field :slug, :class=> 'form-control', :placeholder => "name seo", :type => "text"
19
+ = f.label "Slug"
20
+ = f.text_field :slug, :class=> 'form-control', :placeholder => "name seo", :type => "text"
20
21
 
21
22
  .col.s4
22
23
  .field
@@ -2,19 +2,12 @@
2
2
  .manager-reports-show
3
3
  .row
4
4
  .large-12.columns
5
- %h1
5
+ %h1.flex-row
6
6
  = @report.name
7
7
  = link_to '[~]', edit_report_path( @report )
8
+ = button_to '[x]', report_path( @report ), :method => :delete, :data => { :confirm => 'Are you sure?' }
8
9
 
9
- .meta
10
- -# By #{link_to @report.user_profile.username, user_path( @report.user )}
11
- On #{@report.created_at.to_s.slice(0, 10)}
12
- - if @report.site
13
- In #{link_to "http://#{@report.site.domain}/#{@report.site.lang}", site_path( @report.site )}
14
- -# - if @report.tag
15
- -# Tagged #{link_to @report.tag.name, manager_tag_path( @report.tag )}
16
- - if @report.city
17
- In #{link_to @report.city.name, city_path( @report.city )}
10
+ = render 'meta', item: @report
18
11
 
19
12
  - if @report.subhead.length > 3
20
13
  .subhead= @report.subhead
@@ -23,6 +16,5 @@
23
16
  - if @report.photo
24
17
  .float-left= image_tag @report.photo.photo.url( :small )
25
18
  = raw @report.descr
26
- .c
27
-
28
- .c
19
+ %hr
20
+ = render 'form', :url => report_path(@report.id), :report => @report
@@ -3,23 +3,26 @@
3
3
  .float-left= button_to '[X]', stock_watch_path(stock_watch.id), method: :delete, data: { confirm: 'Are you sure?' }
4
4
 
5
5
 
6
- - url = stock_watches_path if !stock_watch.persisted?
6
+ - url = stock_watches_path if !stock_watch.persisted?
7
7
  - url = stock_watch_path( stock_watch ) if stock_watch.persisted?
8
8
 
9
9
  = form_for stock_watch, :url => url, :html => { :class => 'form-inline well' } do |f|
10
- .form-group
11
- = f.select :action, options_for_select( Ish::StockWatch::ACTIONS.map{|a|[a,a]}, :selected => stock_watch.action )
12
- .form-group
13
- = f.select :profile, options_for_select( [[nil,nil]]+@profiles.map{|p|[p.email,p.id]}, :selected => stock_watch.profile ? stock_watch.profile.id : nil )
14
- .form-group
15
- %label.control-label When
16
- = f.text_field :ticker, :class => 'form-control', :placeholder => 'ticker'
17
- .form-group
18
- %label.control-label Price
19
- = f.select :direction, options_for_select( Ish::StockWatch::DIRECTIONS.map{|d|[d,d]}, :selected => stock_watch.direction )
20
- .form-group
21
- %label.control-label $
22
- = f.number_field :price, :step => 0.01, :placeholder => "0.01"
23
- .form-group
24
- = f.submit ">", :class => %w(btn blue)
25
- .c
10
+ .flex-row
11
+ .form-group
12
+ = f.label :action
13
+ = f.select :action, options_for_select( Warbler::StockWatch::ACTIONS.map{|a|[a,a]}, :selected => stock_watch.action )
14
+ .form-group
15
+ = f.label :profile
16
+ = f.select :profile, options_for_select( [[nil,nil]]+@profiles.map{|p|[p.email,p.id]}, :selected => stock_watch.profile ? stock_watch.profile.id : nil )
17
+ .form-group
18
+ %label.control-label When
19
+ = f.text_field :ticker, :class => 'form-control', :placeholder => 'ticker'
20
+ .form-group
21
+ %label.control-label Price
22
+ = f.select :direction, options_for_select( Warbler::StockWatch::DIRECTIONS.map{|d|[d,d]}, :selected => stock_watch.direction )
23
+ .form-group
24
+ %label.control-label $
25
+ = f.number_field :price, :step => 0.01, :placeholder => "0.01"
26
+ .form-group
27
+ = f.submit ">", :class => %w(btn blue)
28
+
@@ -1,7 +1,7 @@
1
1
 
2
2
  - videos ||= @videos
3
3
 
4
- .videos--index
4
+ .videos--index.-index
5
5
 
6
6
  %h5
7
7
  Videos (#{videos.count})
data/config/routes.rb CHANGED
@@ -48,7 +48,8 @@ IshManager::Engine.routes.draw do
48
48
  resources 'markers'
49
49
  resources 'newsitems'
50
50
  end
51
- resources 'markers' # redundant
51
+ get 'maps/:id', to: 'maps#edit'
52
+ resources 'markers'
52
53
  end
53
54
 
54
55
  resources :newsitems
@@ -21,7 +21,7 @@ namespace :ish_manager do
21
21
  desc 'watch the stocks, and trigger actions - not alphavantage, tda now. 2021-08-08'
22
22
  task watch_stocks: :environment do
23
23
  while true
24
- stocks = Ish::StockWatch.where( :notification_type => :EMAIL )
24
+ stocks = Warbler::StockWatch.where( :notification_type => :EMAIL )
25
25
  stocks.each do |stock|
26
26
  begin
27
27
  Timeout::timeout( 10 ) do
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.260
4
+ version: 0.1.8.265
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-11-12 00:00:00.000000000 Z
11
+ date: 2021-12-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -189,19 +189,13 @@ files:
189
189
  - app/assets/stylesheets/ish_manager/trash/bootstrap.min.css
190
190
  - app/assets/stylesheets/ish_manager/trash/bootstrap.min.css.map
191
191
  - app/assets/stylesheets/ish_manager/user_profiles.scss
192
- - app/assets/stylesheets/ish_manager/utils.scss
193
192
  - app/assets/stylesheets/ish_manager/videos.scss
194
193
  - app/controllers/ish_manager/application_controller.rb
195
194
  - app/controllers/ish_manager/campaigns_controller.rb
196
195
  - app/controllers/ish_manager/cities_controller.rb
197
- - app/controllers/ish_manager/co_tailors_controller.rb
198
- - app/controllers/ish_manager/covered_calls_controller.rb
199
- - app/controllers/ish_manager/events_controller.rb
200
196
  - app/controllers/ish_manager/features_controller.rb
201
- - app/controllers/ish_manager/friends_controller.rb
202
197
  - app/controllers/ish_manager/galleries_controller.rb
203
198
  - app/controllers/ish_manager/invoices_controller.rb
204
- - app/controllers/ish_manager/iron_condors_controller.rb
205
199
  - app/controllers/ish_manager/leads_controller.rb
206
200
  - app/controllers/ish_manager/maps_controller.rb
207
201
  - app/controllers/ish_manager/markers_controller.rb
@@ -213,6 +207,11 @@ files:
213
207
  - app/controllers/ish_manager/sites_controller.rb
214
208
  - app/controllers/ish_manager/stock_watches_controller.rb
215
209
  - app/controllers/ish_manager/tags_controller.rb
210
+ - app/controllers/ish_manager/trash/co_tailors_controller.rb
211
+ - app/controllers/ish_manager/trash/covered_calls_controller.rb
212
+ - app/controllers/ish_manager/trash/events_controller.rb
213
+ - app/controllers/ish_manager/trash/friends_controller.rb
214
+ - app/controllers/ish_manager/trash/iron_condors_controller.rb
216
215
  - app/controllers/ish_manager/user_profiles_controller.rb
217
216
  - app/controllers/ish_manager/users_controller.rb
218
217
  - app/controllers/ish_manager/venues_controller.rb
@@ -230,6 +229,7 @@ files:
230
229
  - app/views/ish_manager/application/_main_footer.haml
231
230
  - app/views/ish_manager/application/_main_header.haml
232
231
  - app/views/ish_manager/application/_main_header_admin.haml
232
+ - app/views/ish_manager/application/_main_header_admin.haml-trash
233
233
  - app/views/ish_manager/application/_main_header_guy.haml
234
234
  - app/views/ish_manager/application/_main_header_manager.haml
235
235
  - app/views/ish_manager/application/_meta.haml
@@ -1,26 +0,0 @@
1
-
2
- ul:not(.browser-default).errors,
3
- ul:not(.browser-default).bullets, {
4
- > li {
5
- list-style-type: circle;
6
- margin-left: 1em;
7
- }
8
- }
9
-
10
- .flat-row {
11
- display: flex;
12
- flex-direction: row;
13
- justify-content: flex-start;
14
- align-content: flex-start;
15
-
16
- height: 3em;
17
- line-height: 3em;
18
-
19
- width: 100%;
20
- margin: 1em 0 0 0;
21
- padding: 0;
22
-
23
- > * {
24
- padding-right: 1em;
25
- }
26
- }