ish_manager 0.1.8.260 → 0.1.8.261

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/ish_manager/application.scss +6 -1
  3. data/app/assets/stylesheets/ish_manager/maps.scss +13 -6
  4. data/app/assets/stylesheets/ish_manager/utils.scss +1 -1
  5. data/app/controllers/ish_manager/maps_controller.rb +10 -1
  6. data/app/views/ish_manager/application/_main_header_admin.haml +7 -30
  7. data/app/views/ish_manager/application/_main_header_admin.haml-trash +22 -0
  8. data/app/views/ish_manager/maps/_form.haml +1 -1
  9. data/app/views/ish_manager/maps/_map_meta_row.haml +1 -1
  10. data/app/views/ish_manager/maps/map_editor.haml +1 -0
  11. data/app/views/ish_manager/maps/show.haml +2 -0
  12. metadata +3 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f6ee451db63e9c25624675fce5f5e85c80a60c9705f2b5b3cd5e3d6aaa88bb7a
4
- data.tar.gz: 78df149f47519467e53b72c845b13897b035f799fe29f183aaf3291ca1a71577
3
+ metadata.gz: 006cc153f6fc7808e3cefb1afd2ecb8c333157a8466ff1602dfe7aeeda3bb1f9
4
+ data.tar.gz: 61ad4d1e6fb8bf67a89aafd4efa9b404b7dc200751ff645451f809ec5ba7b83e
5
5
  SHA512:
6
- metadata.gz: bf7e81a7587039a8bb5be6960eee9ed7a7c23ec25c45f97c53fec1535afd9691c34788ccd40174ac7b88fbfee883dec169ff9f1f31621d9cda5ea6d773050df1
7
- data.tar.gz: b768486aae09ef375d4a11f05198821eb4033577fb02770b429ac83238971941b26a6bdef720e77d647ebd54cb430af38d28051f756e8f722056921e4ee9873b
6
+ metadata.gz: 561450268ea240743abbbddca49574be06245a5779153da9c88836925d3ff8c65140e4b2a8a10eaf4b3192b0aca834085f30fb36ea0a1387d9d91ddc2342534f
7
+ data.tar.gz: 4710b5f7bf35185586f158d884e82fd57cf37d5086bf54f67b4d1ed9ad87c77aa639115d0f517129c0a0069133ee6ae8e0d4857d4f1c727ed09ed9c78f39b327
data/app/assets/stylesheets/ish_manager/application.scss CHANGED
@@ -21,7 +21,7 @@
21
21
  *= require ish_manager/videos
22
22
  */
23
23
 
24
- body {
24
+ body {
25
25
  background: #dedede;
26
26
  font-size: 20px;
27
27
  }
@@ -111,6 +111,11 @@ hr {
111
111
  ul.inline li {
112
112
  display: inline;
113
113
  }
114
+ .inline-search {
115
+ width: 20px;
116
+ bordeR: 1px solid white;
117
+ display: inline-block;
118
+ }
114
119
 
115
120
  /* L */
116
121
  textarea.large {
data/app/assets/stylesheets/ish_manager/maps.scss CHANGED
@@ -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;
data/app/assets/stylesheets/ish_manager/utils.scss CHANGED
@@ -13,7 +13,7 @@ ul:not(.browser-default).bullets, {
13
13
  justify-content: flex-start;
14
14
  align-content: flex-start;
15
15
 
16
- height: 3em;
16
+ height: 2.4em;
17
17
  line-height: 3em;
18
18
 
19
19
  width: 100%;
data/app/controllers/ish_manager/maps_controller.rb CHANGED
@@ -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
 
data/app/views/ish_manager/application/_main_header_admin.haml CHANGED
@@ -1,21 +1,17 @@
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
-
16
- %ul
17
14
  %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
21
17
  = link_to '[+]', new_gallery_path
@@ -25,25 +21,6 @@
25
21
  %li{ :class => params[:controller] == 'ish_manager/videos' ? 'active' : '' }
26
22
  = link_to 'Videos', videos_path
27
23
  = 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
-
24
+ %li{ :class => params[:controller] == 'ish_manager/user_profiles' ? 'active' : '' }= link_to 'Profiles', user_profiles_path
48
25
  %hr
49
26
 
data/app/views/ish_manager/application/_main_header_admin.haml-trash ADDED
@@ -0,0 +1,22 @@
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_watches' ? 'active' : '' }= link_to 'Stock Watches', stock_watches_path
12
+ -# %li{ :class => params[:controller] == 'ish_manager/stock_actions' ? 'active' : '' }= link_to 'Stock Actions', stock_actions_path
13
+ -# %li{ :class => params[:controller] == 'ish_manager/stock_options' ? 'active' : '' }= link_to 'Stock Options', stock_options_path
14
+ -# %li{ :class => params[:controller] == 'ish_manager/iron_condors' ? 'active' : '' }= link_to 'Iron Condors', iron_condors_path
15
+ -# %li{ :class => params[:controller] == 'ish_manager/covered_calls' ? 'active' : '' }= link_to 'Covered Calls', covered_calls_path
16
+ %ul.nav.nav-pills
17
+ %li{ :class => params[:controller] == 'ish_manager/invoices' ? 'active' : '' }= link_to 'Invoices', invoices_path
18
+ %li{ :class => params[:controller] == 'ish_manager/payments' ? 'active' : '' }= link_to 'Payments', payments_path
19
+ %li{ :class => params[:controller] == 'ish_manager/orders' ? 'active' : '' }= link_to 'Orders', orders_path
20
+ %ul.nav.nav-pills
21
+ %li{ :class => params[:controller] == 'ish_manager/leads' ? 'active' : '' }= link_to 'Leads', leads_path
22
+ %li{ :class => params[:controller] == 'ish_manager/campaigns' ? 'active' : '' }= link_to 'Campaigns', campaigns_path
data/app/views/ish_manager/maps/_form.haml CHANGED
@@ -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'
data/app/views/ish_manager/maps/_map_meta_row.haml CHANGED
@@ -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}
data/app/views/ish_manager/maps/map_editor.haml CHANGED
@@ -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
data/app/views/ish_manager/maps/show.haml CHANGED
@@ -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'
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.261
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-11-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -230,6 +230,7 @@ files:
230
230
  - app/views/ish_manager/application/_main_footer.haml
231
231
  - app/views/ish_manager/application/_main_header.haml
232
232
  - app/views/ish_manager/application/_main_header_admin.haml
233
+ - app/views/ish_manager/application/_main_header_admin.haml-trash
233
234
  - app/views/ish_manager/application/_main_header_guy.haml
234
235
  - app/views/ish_manager/application/_main_header_manager.haml
235
236
  - app/views/ish_manager/application/_meta.haml