ish_manager 0.1.8.292 → 0.1.8.295
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/stylesheets/ish_manager/application.scss +32 -6
- data/app/controllers/ish_manager/galleries_controller.rb +15 -13
- data/app/controllers/ish_manager/maps_controller.rb +21 -5
- data/app/views/ish_manager/application/_form_errors.haml +2 -5
- data/app/views/ish_manager/application/_main_header_admin.haml +2 -0
- data/app/views/ish_manager/maps/_form.haml +15 -3
- data/app/views/ish_manager/maps/index.haml +4 -0
- data/app/views/ish_manager/maps/show.haml +9 -22
- data/app/views/ish_manager/markers/_form.haml +4 -10
- data/app/views/ish_manager/markers/_header.haml +8 -0
- data/app/views/ish_manager/markers/_index.haml +18 -0
- data/app/views/ish_manager/newsitems/_header.haml +3 -0
- data/app/views/ish_manager/newsitems/_index.haml +2 -16
- data/app/views/ish_manager/newsitems/_item.haml +28 -24
- data/app/views/ish_manager/tags/_form.haml +4 -0
- data/app/views/layouts/ish_manager/application_no_material.haml +43 -0
- metadata +6 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 710c42d5d4473bd16149b60411ed55e98aaed91ced010d090acd6c01a1023fa9
|
4
|
+
data.tar.gz: 554ea35404e17e8b0a430c9cc6ed6ba360cdee0a3e9347a87ab142e576093e38
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b33c41adf0b41179150e6f0e22f91a2fed188c48e6140962a0b6a999c33124de002ff4e6465406f88374207529a7e0b5d91cdcba9c2429e53c9d1675c8b635e0
|
7
|
+
data.tar.gz: a90c79990151ac36beaeab25012473698e170eb763074b480af38cf798cad029e9486d3c68e856d6675431c49b5bf7a706d67f29f79c1bc0dcd1ea74348f2c86
|
@@ -62,8 +62,13 @@ ul:not(.browser-default).bullets, {
|
|
62
62
|
|
63
63
|
/* A */
|
64
64
|
|
65
|
-
.addToggle
|
66
|
-
|
65
|
+
.addToggle::after {
|
66
|
+
content: " [<>]";
|
67
|
+
}
|
68
|
+
.addToggle {
|
69
|
+
+ * {
|
70
|
+
display: none;
|
71
|
+
}
|
67
72
|
}
|
68
73
|
.alert {
|
69
74
|
border: 1px solid yellow;
|
@@ -92,11 +97,19 @@ ul:not(.browser-default).bullets, {
|
|
92
97
|
padding: .5em;
|
93
98
|
border-radius: 8px;
|
94
99
|
margin-bottom: .5em;
|
100
|
+
padding: 0.5em;
|
95
101
|
}
|
96
102
|
|
97
103
|
|
98
104
|
/* C */
|
99
105
|
|
106
|
+
.Card {
|
107
|
+
border: 1px solid gray;
|
108
|
+
border-radius: 8px;
|
109
|
+
display: inline-block;
|
110
|
+
margin-bottom: .5em;
|
111
|
+
}
|
112
|
+
|
100
113
|
.center {
|
101
114
|
text-align: center;
|
102
115
|
}
|
@@ -111,8 +124,17 @@ ul:not(.browser-default).bullets, {
|
|
111
124
|
|
112
125
|
/* D */
|
113
126
|
/* E */
|
127
|
+
.error_explanation {
|
128
|
+
border: 1px solid red;
|
129
|
+
padding: .8em;
|
130
|
+
}
|
131
|
+
|
114
132
|
/* F */
|
115
133
|
|
134
|
+
.--form {
|
135
|
+
margin-bottom: 2em;
|
136
|
+
}
|
137
|
+
|
116
138
|
.flat-row {
|
117
139
|
display: flex;
|
118
140
|
flex-direction: row;
|
@@ -226,6 +248,13 @@ textarea.large {
|
|
226
248
|
display: inline;
|
227
249
|
}
|
228
250
|
|
251
|
+
/* N */
|
252
|
+
|
253
|
+
.notice {
|
254
|
+
border: 1px solid green;
|
255
|
+
padding: .8em;
|
256
|
+
}
|
257
|
+
|
229
258
|
/* P */
|
230
259
|
.panel-content {
|
231
260
|
padding: .5em;
|
@@ -246,10 +275,7 @@ ul.inline li {
|
|
246
275
|
padding-right: 1em;
|
247
276
|
}
|
248
277
|
|
249
|
-
|
250
|
-
border: 1px solid green;
|
251
|
-
padding: .8em;
|
252
|
-
}
|
278
|
+
|
253
279
|
|
254
280
|
.youtube_img {
|
255
281
|
width: 100px;
|
@@ -1,6 +1,7 @@
|
|
1
1
|
class IshManager::GalleriesController < IshManager::ApplicationController
|
2
2
|
|
3
3
|
before_action :set_lists
|
4
|
+
before_action :set_gallery, only: %w|destroy edit j_show show update|
|
4
5
|
|
5
6
|
# alphabetized! : )
|
6
7
|
|
@@ -24,7 +25,6 @@ class IshManager::GalleriesController < IshManager::ApplicationController
|
|
24
25
|
end
|
25
26
|
|
26
27
|
def destroy
|
27
|
-
@gallery = Gallery.unscoped.find params[:id]
|
28
28
|
authorize! :destroy, @gallery
|
29
29
|
@gallery.is_trash = true
|
30
30
|
@gallery.save
|
@@ -33,27 +33,25 @@ class IshManager::GalleriesController < IshManager::ApplicationController
|
|
33
33
|
end
|
34
34
|
|
35
35
|
def edit
|
36
|
-
@gallery = Gallery.unscoped.find params[:id]
|
37
36
|
authorize! :edit, @gallery
|
38
37
|
end
|
39
38
|
|
40
39
|
def index
|
41
40
|
authorize! :index, Gallery
|
42
41
|
@galleries = Gallery.unscoped.where(
|
43
|
-
:is_done.in => [false, nil],
|
44
|
-
:is_trash.in => [false, nil],
|
45
|
-
:user_profile => current_user.profile
|
42
|
+
# :is_done.in => [false, nil],
|
43
|
+
# :is_trash.in => [false, nil],
|
44
|
+
# :user_profile => current_user.profile
|
46
45
|
).order_by( :created_at => :desc )
|
47
46
|
if params[:q]
|
48
47
|
@galleries = @galleries.where({ :name => /#{params[:q]}/i })
|
49
|
-
@galleries.selector.delete('is_done')
|
48
|
+
# @galleries.selector.delete('is_done')
|
50
49
|
end
|
51
50
|
@galleries = @galleries.page( params[:galleries_page] ).per( 10 )
|
52
51
|
render params[:render_type]
|
53
52
|
end
|
54
53
|
|
55
54
|
def j_show
|
56
|
-
@gallery = Gallery.unscoped.find( params[:id] )
|
57
55
|
authorize! :show, @gallery
|
58
56
|
respond_to do |format|
|
59
57
|
format.json do
|
@@ -82,18 +80,12 @@ class IshManager::GalleriesController < IshManager::ApplicationController
|
|
82
80
|
end
|
83
81
|
|
84
82
|
def show
|
85
|
-
begin
|
86
|
-
@gallery = Gallery.unscoped.find_by :slug => params[:id]
|
87
|
-
rescue
|
88
|
-
@gallery = Gallery.unscoped.find params[:id]
|
89
|
-
end
|
90
83
|
authorize! :show, @gallery
|
91
84
|
@photos = @gallery.photos.unscoped.where({ :is_trash => false })
|
92
85
|
@deleted_photos = @gallery.photos.unscoped.where({ :is_trash => true })
|
93
86
|
end
|
94
87
|
|
95
88
|
def update
|
96
|
-
@gallery = Gallery.unscoped.find params[:id]
|
97
89
|
old_shared_profile_ids = @gallery.shared_profiles.map(&:id)
|
98
90
|
authorize! :update, @gallery
|
99
91
|
|
@@ -116,5 +108,15 @@ class IshManager::GalleriesController < IshManager::ApplicationController
|
|
116
108
|
end
|
117
109
|
end
|
118
110
|
|
111
|
+
private
|
112
|
+
|
113
|
+
def set_gallery
|
114
|
+
begin
|
115
|
+
@gallery = Gallery.unscoped.find_by :slug => params[:id]
|
116
|
+
rescue
|
117
|
+
@gallery = Gallery.unscoped.find params[:id]
|
118
|
+
end
|
119
|
+
end
|
120
|
+
|
119
121
|
end
|
120
122
|
|
@@ -4,6 +4,8 @@ class IshManager::MapsController < IshManager::ApplicationController
|
|
4
4
|
before_action :set_map, only: [ :destroy, :edit, :export, :map_editor, :show, :update, ] # alphabetized
|
5
5
|
before_action :set_lists
|
6
6
|
|
7
|
+
layout 'ish_manager/application_no_material', only: %w| index |
|
8
|
+
|
7
9
|
# alphabetized
|
8
10
|
|
9
11
|
def create
|
@@ -49,6 +51,9 @@ class IshManager::MapsController < IshManager::ApplicationController
|
|
49
51
|
send_data result
|
50
52
|
end
|
51
53
|
|
54
|
+
##
|
55
|
+
## @TODO: move to models, yes?
|
56
|
+
##
|
52
57
|
def import
|
53
58
|
authorize! :create, Map
|
54
59
|
|
@@ -62,7 +67,21 @@ class IshManager::MapsController < IshManager::ApplicationController
|
|
62
67
|
end
|
63
68
|
contents = JSON.parse contents
|
64
69
|
contents.deep_symbolize_keys!
|
65
|
-
|
70
|
+
|
71
|
+
## Delete existing
|
72
|
+
if params[:delete_existing]
|
73
|
+
map_ids = contents[:maps].map { |m| m[:_id] }
|
74
|
+
marker_ids = contents[:markers].map { |m| m[:_id] }
|
75
|
+
|
76
|
+
maps = Map.where( :_id.in => map_ids )
|
77
|
+
maps.each do |m|
|
78
|
+
marker_ids += m.markers.map(&:_id)
|
79
|
+
end
|
80
|
+
maps.destroy_all
|
81
|
+
|
82
|
+
Marker.where( :_id.in => marker_ids ).destroy_all
|
83
|
+
end
|
84
|
+
|
66
85
|
|
67
86
|
##
|
68
87
|
## process content
|
@@ -73,7 +92,6 @@ class IshManager::MapsController < IshManager::ApplicationController
|
|
73
92
|
profiles = contents[:profiles]
|
74
93
|
contents.delete :profiles
|
75
94
|
profiles.each do |profile|
|
76
|
-
puts! profile, 'a profile'
|
77
95
|
if Ish::UserProfile.where( _id: profile[:_id] ).first
|
78
96
|
errors.push({ message: "profile #{profile[:email]} already exists." })
|
79
97
|
else
|
@@ -96,11 +114,10 @@ class IshManager::MapsController < IshManager::ApplicationController
|
|
96
114
|
|
97
115
|
# everything else
|
98
116
|
contents.each do |k, v|
|
99
|
-
puts! [k,v],
|
117
|
+
# puts! [k, v], "Importing"
|
100
118
|
item = Map.export_key_to_class[k].constantize
|
101
119
|
v.map do |inn|
|
102
120
|
n = item.new inn
|
103
|
-
puts! n, 'n'
|
104
121
|
begin
|
105
122
|
flag = n.save
|
106
123
|
rescue Mongo::Error::OperationFailure => e
|
@@ -109,7 +126,6 @@ class IshManager::MapsController < IshManager::ApplicationController
|
|
109
126
|
if flag
|
110
127
|
errors.push({ class: k, id: inn[:_id], messages: 'ok' })
|
111
128
|
else
|
112
|
-
puts! n.errors.full_messages.join(", ")
|
113
129
|
errors.push({ class: k, id: inn[:_id], messages: "Could not save: |#{n.errors.full_messages.join(", ")}|." })
|
114
130
|
end
|
115
131
|
end
|
@@ -1,7 +1,4 @@
|
|
1
1
|
|
2
2
|
- if item.errors.any?
|
3
|
-
.
|
4
|
-
|
5
|
-
%ul
|
6
|
-
- item.errors.full_messages.each do |msg|
|
7
|
-
%li= msg
|
3
|
+
.error_explanation
|
4
|
+
= "#{pluralize(item.errors.count, "error")} prohibited this map from being saved: #{item.errors.full_messages.join(", ")}."
|
@@ -30,6 +30,8 @@
|
|
30
30
|
= form_tag videos_path, method: :get do
|
31
31
|
= text_field_tag :q
|
32
32
|
= link_to '[+]', new_video_path
|
33
|
+
%li{ :class => params[:controller] == 'ish_manager/tags' ? 'active' : '' }
|
34
|
+
= link_to 'Tags', tags_path
|
33
35
|
%ul
|
34
36
|
%li{ class: params[:controller] == 'ish_manager/newsitems' ? 'active' : '' }= link_to '+Newsitem', new_newsitem_path
|
35
37
|
-# %li{ :class => params[:controller] == 'ish_manager/stock_watches' ? 'active' : '' }= link_to 'Stock Watches (old m3)', stock_watches_path
|
@@ -4,7 +4,11 @@
|
|
4
4
|
|
5
5
|
- url = params[:action] == 'new' ? maps_path : map_path(@map.id)
|
6
6
|
|
7
|
-
|
7
|
+
|
8
|
+
= form_for @map, :html => { :multipart => true, class: '--form maps--form' }, url: url do |f|
|
9
|
+
.actions
|
10
|
+
= f.submit 'Save'
|
11
|
+
|
8
12
|
- if @map.errors.any?
|
9
13
|
#error_explanation
|
10
14
|
%h2= "#{pluralize(@map.errors.count, "error")} prohibited this map from being saved:"
|
@@ -49,6 +53,11 @@
|
|
49
53
|
|
50
54
|
= render 'ish_manager/application/form_nonpublic', f: f, model: @map
|
51
55
|
|
56
|
+
|
57
|
+
.row
|
58
|
+
= f.label :tags
|
59
|
+
= f.select :tag_ids, @tags_list, {}, { multiple: true }
|
60
|
+
|
52
61
|
.field
|
53
62
|
= f.label :description
|
54
63
|
= f.text_area :description, class: 'tinymce'
|
@@ -66,7 +75,10 @@
|
|
66
75
|
= f.label "Config"
|
67
76
|
= f.text_area :config, class: 'large'
|
68
77
|
%pre.small
|
69
|
-
|
70
|
-
|
78
|
+
:plain
|
79
|
+
description.collapsible: bool
|
80
|
+
map_panel_type: "Equirectangular" |
|
81
|
+
"MapPanel" | "MapPanelNoZoom" |
|
82
|
+
"ThreePanelV1" | "ThreePanelV4"
|
71
83
|
.actions
|
72
84
|
= f.submit 'Save'
|
@@ -6,9 +6,13 @@
|
|
6
6
|
%h1
|
7
7
|
Maps (#{@maps.length})
|
8
8
|
= link_to '[+]', new_map_path
|
9
|
+
|
9
10
|
.red-border
|
10
11
|
= form_tag import_map_path, :multipart => true do
|
11
12
|
= file_field_tag :input
|
13
|
+
.a
|
14
|
+
= label_tag :delete_existing
|
15
|
+
= check_box_tag :delete_existing
|
12
16
|
= submit_tag 'Import Map'
|
13
17
|
|
14
18
|
- @maps.each do |map|
|
@@ -4,13 +4,12 @@
|
|
4
4
|
|
5
5
|
.maps-show
|
6
6
|
= render 'map_meta_row', map: @map
|
7
|
-
%p.addToggle Description
|
7
|
+
%p.addToggle Description
|
8
8
|
.descr= raw @map.description
|
9
9
|
|
10
10
|
%p.addToggle
|
11
11
|
The Map (#{@map.w}x#{@map.h})
|
12
12
|
= link_to 'Map Editor', location_map_editor_path(@map.id)
|
13
|
-
[<>]
|
14
13
|
.the-map
|
15
14
|
= image_tag @map.image.image.url(:original) rescue nil
|
16
15
|
- @markers.each do |marker|
|
@@ -21,28 +20,13 @@
|
|
21
20
|
- else
|
22
21
|
= image_missing_tag
|
23
22
|
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
- if marker.title_image
|
29
|
-
= image_tag marker.title_image.image.url(:original)
|
30
|
-
- else
|
31
|
-
= image_missing_tag
|
32
|
-
.flat-row
|
33
|
-
.a= marker.slug
|
34
|
-
.a= button_to '~', edit_marker_path(marker), method: :get
|
35
|
-
.a= button_to 'x', marker_path(marker), method: :delete, data: { confirm: 'Are you sure?' }
|
36
|
-
.a= link_to '[api]', api_marker_path(marker)
|
37
|
-
.a= link_to '[this map]', edit_map_path(marker.slug)
|
38
|
-
.hide
|
39
|
-
%ul.bullets
|
40
|
-
%li <b>item_type:</b> #{marker.item_type}
|
41
|
-
|
42
|
-
%p.addToggle Newsitems (#{@map.newsitems.count}) [<>]
|
23
|
+
= render 'ish_manager/markers/header', markers: @markers, map: @map
|
24
|
+
= render 'ish_manager/markers/index', markers: @markers, map: @map
|
25
|
+
|
26
|
+
%p.addToggle= render 'ish_manager/newsitems/header', newsitems: @map.newsitems
|
43
27
|
= render 'ish_manager/newsitems/index', newsitems: @map.newsitems
|
44
28
|
|
45
|
-
%p.addToggle Maps (#{@maps.count})
|
29
|
+
%p.addToggle Maps (#{@maps.count})
|
46
30
|
.maps-list
|
47
31
|
- @maps.each do |m|
|
48
32
|
.item
|
@@ -52,3 +36,6 @@
|
|
52
36
|
= render 'form'
|
53
37
|
|
54
38
|
= button_to 'Export Subtree', export_map_path(@map.id, format: :json)
|
39
|
+
|
40
|
+
= render 'index_item', map: @map
|
41
|
+
|
@@ -5,18 +5,12 @@
|
|
5
5
|
|
6
6
|
-# @TODO: can I not have this url at all?
|
7
7
|
- url = %w|new create|.include?(params[:action]) ? markers_path : marker_path(@marker.id)
|
8
|
+
|
8
9
|
.markers--form
|
9
10
|
= form_for @marker, :html => { :multipart => true }, url: url do |f|
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
- if @marker.errors.any?
|
14
|
-
#error_explanation
|
15
|
-
%p= "#{pluralize(@marker.errors.count, "error")} prohibited this map from being saved:"
|
16
|
-
%ul.errors
|
17
|
-
- @marker.errors.full_messages.each do |message|
|
18
|
-
%li= message
|
19
|
-
|
11
|
+
= render 'ish_manager/application/form_errors', item: @marker
|
12
|
+
.actions
|
13
|
+
= f.submit 'Save'
|
20
14
|
.row
|
21
15
|
.col.s1
|
22
16
|
= f.label :map
|
@@ -0,0 +1,18 @@
|
|
1
|
+
|
2
|
+
.markers--index
|
3
|
+
- markers.each do |marker|
|
4
|
+
.Card
|
5
|
+
- if marker.title_image
|
6
|
+
= image_tag marker.title_image.image.url(:original)
|
7
|
+
- else
|
8
|
+
= image_missing_tag
|
9
|
+
.flex-row
|
10
|
+
.a= marker.slug
|
11
|
+
.a= button_to '~', edit_marker_path(marker), method: :get
|
12
|
+
.a= button_to 'x', marker_path(marker), method: :delete, data: { confirm: 'Are you sure?' }
|
13
|
+
.flex-row
|
14
|
+
.a= link_to '[api]', api_marker_path(marker)
|
15
|
+
.a= link_to '[this map]', edit_map_path(marker.slug)
|
16
|
+
.hide
|
17
|
+
%ul.bullets
|
18
|
+
%li <b>item_type:</b> #{marker.item_type}
|
@@ -5,23 +5,9 @@
|
|
5
5
|
- newsitems = newsitems.page( params[:newsitems_page] ).per( 10 )
|
6
6
|
|
7
7
|
.manager-newsitems--index
|
8
|
-
%h5 Newsitems (#{newsitems.count}) #{link_to image_new, new_newsitem_path }
|
9
8
|
= paginate newsitems, :param_name => :newsitems_page, :views_prefix => 'ish_manager'
|
10
9
|
- newsitems.each do |n|
|
11
|
-
|
12
|
-
|
13
|
-
%ul
|
14
|
-
%li
|
15
|
-
.float-left= link_to '[~]', edit_newsitem_path(n)
|
16
|
-
.float-left= button_to '[x]', newsitem_path( n ), :method => :delete, :data => { :confirm => 'Are you sure?' }
|
17
|
-
Name: #{n.name}
|
18
|
-
%li Desc: #{n.descr}
|
19
|
-
%li Created at: #{n.created_at}
|
20
|
-
%li Report id: #{n.report_id}
|
21
|
-
%li Gallery id: #{n.gallery_id}
|
22
|
-
%li username: #{n.username}
|
23
|
-
- if n.photo
|
24
|
-
%li Photo id: #{n.photo.id}
|
25
|
-
= render 'ish_manager/newsitems/item', :newsitem => n
|
10
|
+
= render 'ish_manager/newsitems/item', :newsitem => n
|
11
|
+
|
26
12
|
= paginate newsitems, :param_name => :newsitems_page, :views_prefix => 'ish_manager'
|
27
13
|
|
@@ -1,9 +1,16 @@
|
|
1
|
+
|
2
|
+
-#
|
3
|
+
-# ish_manager / newsitems / _item.haml
|
4
|
+
-#
|
5
|
+
|
1
6
|
- n ||= newsitem
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
.
|
7
|
+
|
8
|
+
.card.newsitems--item{ class: n.item_type }
|
9
|
+
.card-content
|
10
|
+
.float-left= link_to '[~]', edit_newsitem_path(n)
|
11
|
+
.float-left= button_to '[x]', newsitem_path( n ), :method => :delete, :data => { :confirm => 'Are you sure?' }
|
12
|
+
|
13
|
+
- if !n.photo.blank?
|
7
14
|
.the-photo
|
8
15
|
- if n.photo.gallery.blank?
|
9
16
|
= link_to image_tag( n.photo.photo.url(:small) ), n.photo.photo.url(:large), :rel => 'lightbox[newsitem]'
|
@@ -11,8 +18,7 @@
|
|
11
18
|
= link_to image_tag( n.photo.photo.url(:small) ), gallery_path( n.photo.gallery.slug, n.photo.gallery.photos.index(n.photo) )
|
12
19
|
.meta= render 'ish_manager/photos/meta', :photo => n.photo
|
13
20
|
|
14
|
-
|
15
|
-
.Nreport.newsitem-report
|
21
|
+
- if n.report
|
16
22
|
%ul
|
17
23
|
%li <b>Report</b> #{n.report.id}
|
18
24
|
%li Premium Tier #{n.report.premium_tier}
|
@@ -26,9 +32,7 @@
|
|
26
32
|
.subhead= n.report.subhead
|
27
33
|
.c
|
28
34
|
|
29
|
-
|
30
|
-
.Ngallery
|
31
|
-
|
35
|
+
- if !n.gallery.blank?
|
32
36
|
%h3= link_to n.gallery.name, gallery_path(n.gallery.slug, 0)
|
33
37
|
.meta
|
34
38
|
#{t('newsitems.gallery', :username => n.gallery.username, :date => pretty_date(n.gallery.created_at))}
|
@@ -43,20 +47,20 @@
|
|
43
47
|
.thumbnails
|
44
48
|
- n.gallery.photos.where( :is_trash => false )[0...8].each do |photo|
|
45
49
|
= link_to image_tag( photo.photo.url(:thumb), :alt => photo.name ), photo.photo.url(:small), :rel => "lightbox[#{n.gallery.slug}]"
|
46
|
-
.c
|
47
50
|
|
48
|
-
- if n.video_id
|
49
|
-
- video = Video.unscoped.find n.video_id
|
50
|
-
.Nvideo
|
51
|
-
= link_to video.video.url, video.video.url
|
52
|
-
-# %h3= link_to (video.name.blank? ? t('videos.no_title') : video.name), video_path(video.youtube_id)
|
53
|
-
= render 'ish_manager/application/meta', :item => video
|
54
|
-
= render 'ish_manager/videos/embed_half', :video => video
|
55
|
-
.c
|
56
51
|
|
57
|
-
|
58
|
-
|
59
|
-
.
|
60
|
-
|
61
|
-
|
52
|
+
- if n.video_id
|
53
|
+
- video = Video.unscoped.find n.video_id
|
54
|
+
.a
|
55
|
+
= link_to video.video.url, video.video.url
|
56
|
+
-# %h3= link_to (video.name.blank? ? t('videos.no_title') : video.name), video_path(video.youtube_id)
|
57
|
+
= render 'ish_manager/application/meta', :item => video
|
58
|
+
= render 'ish_manager/videos/embed_half', :video => video
|
59
|
+
.c
|
60
|
+
|
61
|
+
- if !n.descr.blank? && n.gallery.blank? && n.report.blank?
|
62
|
+
.Ndescr.panel
|
63
|
+
.meta= pretty_date n.created_at
|
64
|
+
.subhead= simple_format n.descr
|
65
|
+
.c
|
62
66
|
|
@@ -0,0 +1,43 @@
|
|
1
|
+
!!!
|
2
|
+
%html
|
3
|
+
%head
|
4
|
+
%title Ish Manager
|
5
|
+
%link{ :rel => 'icon', :href => "/favicon_#{ENV['RAILS_ENV']}.gif" }
|
6
|
+
%meta{ :name => :viewport, :content => 'width=device-width, initial-scale=1.0' }
|
7
|
+
%meta{ :charset => 'UTF-8' }
|
8
|
+
%meta{ :description => 'some description' }
|
9
|
+
%script{ :src => "//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js" }
|
10
|
+
%script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/jquery.tinymce.min.js" }
|
11
|
+
%script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/tinymce.min.js" }
|
12
|
+
%script{ :src => "//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js" }
|
13
|
+
= stylesheet_link_tag "//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"
|
14
|
+
= stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", :media => 'all'
|
15
|
+
= stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
|
16
|
+
|
17
|
+
= stylesheet_link_tag "ish_manager/application", media: "all"
|
18
|
+
|
19
|
+
= javascript_include_tag "ish_manager/application"
|
20
|
+
|
21
|
+
= csrf_meta_tags
|
22
|
+
%body{ class: [ params[:controller].gsub("ish_manager/",""), "#{params[:controller].gsub("ish_manager/","")}-#{params[:action]}", params[:action]] }
|
23
|
+
.bg-white
|
24
|
+
= render :partial => "ish_manager/application/main_header_#{current_user.profile.role_name}"
|
25
|
+
.container
|
26
|
+
.row
|
27
|
+
.col.s12
|
28
|
+
- if notice
|
29
|
+
- if notice.class == Array
|
30
|
+
%ul
|
31
|
+
- notice.map do |n|
|
32
|
+
%li
|
33
|
+
- n.map do |k,v|
|
34
|
+
<b>#{k} :</b> #{v}
|
35
|
+
%p.notice= notice
|
36
|
+
- if alert
|
37
|
+
%p.alert= alert
|
38
|
+
.container
|
39
|
+
= yield
|
40
|
+
= render 'ish_manager/application/main_footer'
|
41
|
+
= render 'analytics' if Rails.env.production?
|
42
|
+
= render 'debug' if !Rails.env.production?
|
43
|
+
|
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.
|
4
|
+
version: 0.1.8.295
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- piousbox
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-04-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: aws-sdk
|
@@ -366,10 +366,13 @@ files:
|
|
366
366
|
- app/views/ish_manager/maps/new.haml
|
367
367
|
- app/views/ish_manager/maps/show.haml
|
368
368
|
- app/views/ish_manager/markers/_form.haml
|
369
|
+
- app/views/ish_manager/markers/_header.haml
|
370
|
+
- app/views/ish_manager/markers/_index.haml
|
369
371
|
- app/views/ish_manager/markers/_index_small.haml
|
370
372
|
- app/views/ish_manager/markers/edit.haml
|
371
373
|
- app/views/ish_manager/markers/new.haml
|
372
374
|
- app/views/ish_manager/newsitems/_form.haml
|
375
|
+
- app/views/ish_manager/newsitems/_header.haml
|
373
376
|
- app/views/ish_manager/newsitems/_index.haml
|
374
377
|
- app/views/ish_manager/newsitems/_item.haml
|
375
378
|
- app/views/ish_manager/newsitems/edit.haml
|
@@ -446,6 +449,7 @@ files:
|
|
446
449
|
- app/views/layouts/ish_manager/application.haml
|
447
450
|
- app/views/layouts/ish_manager/application.haml-trash
|
448
451
|
- app/views/layouts/ish_manager/application2.haml
|
452
|
+
- app/views/layouts/ish_manager/application_no_material.haml
|
449
453
|
- config/routes.rb
|
450
454
|
- config/systemd/system/README.txt
|
451
455
|
- config/systemd/system/stockwatcher.service
|