ish_manager 0.1.8.38 → 0.1.8.39

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/app/models/ish_manager/ability.rb +6 -2
  3. data/app/views/ish_manager/reports/_form.haml +104 -39
  4. data/app/views/ish_manager/reports/new.haml +2 -1
  5. data/app/views/ish_manager/sites/_form.haml +45 -52
  6. data/app/views/ish_manager/sites/edit.haml +1 -0
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c4b497572b3faf26b506db7aac4843d5800b753f
4
- data.tar.gz: 10e205166fb3dc2e2553c9f9825baf2680e06fab
3
+ metadata.gz: c4030d8345c8ea9bd5c98d7e753ab2170af94c8b
4
+ data.tar.gz: 4e63bc9f9e0eb0156b34d770f80d8138d3f01e1b
5
5
  SHA512:
6
- metadata.gz: ac3a37a93aa99c71c8254263495a9921b44b1ae54661fbc2f9ef5d4c8042ed06aa911fd8396b0fa73dac5411290f4c40cfe25f6edf6986d8dd2d4d4938c8f1b6
7
- data.tar.gz: 49a5316fd42ad9d8b99af9cc0e396ace300f54de845fa35d1a9a016e329f6e27291ec9b70cc95872e1b5c27dd89b6b8f6351fed548dad2fbe0f47cef2e2bb66b
6
+ metadata.gz: 7ae50a5edeb02e5da77271bf045751b2ce068c0fe49ea7d547dfdacec4447d33fd82ade89519a47a692767c4d4ba01f29f220f5709211f1be742cfd2f99886cc
7
+ data.tar.gz: bb617b3d39cc641166c4765427a1f30c1169bf6bf22334377c583b26599a6df3e9cd4f0a45ce00c36d7fc4cc66e74198d04a88d007fed268ee27cb4e820d7beb
data/app/models/ish_manager/ability.rb CHANGED
@@ -12,7 +12,9 @@ class IshManager::Ability
12
12
  # role manager
13
13
  if user.profile && user.profile.role_name == :manager
14
14
 
15
- can [ :create_newsitem, :show ], ::City
15
+ can [ :create_newsitem, :show, :new_feature, :create_feature ], ::City
16
+
17
+ can [ :new ], ::Feature
16
18
 
17
19
  can [ :cities_index, :home, :sites_index, :venues_index ], ::Manager
18
20
 
@@ -20,10 +22,12 @@ class IshManager::Ability
20
22
 
21
23
  can [ :new, :create ], Report
22
24
 
23
- can [ :show, :edit, :update, :create_newsitem ], ::Site do |site|
25
+ can [ :show, :edit, :update, :create_newsitem, :new_feature, :create_feature ], ::Site do |site|
24
26
  !site.is_private && !site.is_trash
25
27
  end
26
28
 
29
+ # can [ :new_feature, :create_feature ], ::Tag
30
+
27
31
  end
28
32
 
29
33
  if user.profile && user.profile.sudoer?
data/app/views/ish_manager/reports/_form.haml CHANGED
@@ -9,47 +9,112 @@
9
9
  %ul
10
10
  - report.errors.full_messages.each do |msg|
11
11
  %li= msg
12
+ .row
13
+ .col-md-6
14
+ .field
15
+ = f.label :"Name & Name SEO"
16
+ = f.text_field :name, :class=> 'form-control', :placeholder => "name of report", :type => "text"
17
+ = f.text_field :name_seo, :class=> 'form-control', :placeholder => "name seo", :type => "text"
18
+
19
+ .col-md-6
20
+ .field
21
+ = f.label :subhead
22
+ = f.text_area :subhead, :class => 'form-control', :rows => "5", :style=> "resize: vertical;"
12
23
 
13
24
  .field
14
- = f.label :name
15
- = f.text_field :name
16
- .field
17
- = f.label :subhead
18
- = f.text_area :subhead
19
- .field
20
- = f.label :descr
21
- .descr= f.text_area :descr, :class => 'tinymce'
25
+ = f.label :Description
26
+ = f.text_area :descr, :class => 'tinymce'
27
+
28
+ %br/
29
+
30
+ .row
31
+ .col-md-6
32
+ / Single button
33
+ %label{} City
34
+ = select :report, :city_id, @cities_list, :class=>"btn"
35
+
36
+
37
+
38
+
39
+ .col-md-6
40
+ .field
41
+ = f.label :Coordinates
42
+ .panel.panel-default
43
+ .panel-body
44
+ .col-md-6
45
+ .form-group
46
+ %label{} X-coordinate
47
+ = f.text_field :x, :placeholder => "x", :type => "text", :class=>"form-control"
48
+
49
+ .col-md-6
50
+ .form-group
51
+ %label{} Y-coordinate
52
+ = f.text_field :y, :placeholder => "y", :type => "text", :class=>"form-control"
53
+
54
+
22
55
 
23
56
  .row
24
- .large-6.columns
25
- = f.label :city_id
26
- = select :report, :city_id, @cities_list
27
-
28
- .card
29
- .card-content
30
- = f.label :coords
31
- .row
32
- .col-xs-6
33
- = f.text_field :x
34
- .col-xs-6
35
- = f.text_field :y
36
-
37
- .card
38
- .card-content
39
- = f.label :site
57
+ .col-md-6
58
+ / Single button
59
+ %label{} Sites
60
+ .btn-group{:style => "width:100%"}
40
61
  = select :report, :site_id, @sites_list
41
-
42
- .large-6.columns
43
- = f.label :tag_id
44
- = select :report, :tag_id, @tags_list
45
-
46
- %p
47
- = f.check_box :is_public
48
- = f.label :is_public
49
-
50
- = file_field_tag :photo
51
- - begin
52
- = image_tag report.photo.photo.url(:thumb)
53
- - rescue
54
-
55
- = f.submit 'Submit'
62
+
63
+
64
+ .col-md-6
65
+ %label{} Tags
66
+ = select :report, :tag_id, @tags_list, :value=>"select a tag"
67
+
68
+ .panel.panel-default
69
+ .panel-heading
70
+ %h3.panel-title Upload File
71
+ .panel-body
72
+ .row
73
+ .col-md-6.col-md-offset-3
74
+ %button.btn.btn-primary.btn-lg.btn-block{:type => "button", :onClick => "upload()"} Upload File
75
+ = file_field_tag :photo, :style => "display:none", :id=>"photo"
76
+ .div.center
77
+ %img#thumbnail_image_boy.img-thumbnail{:alt => "uploaded image", :width=>"200px"}/
78
+
79
+
80
+ :javascript
81
+
82
+ $( document ).ready(function() {
83
+ $(".caret").html("");
84
+ });
85
+
86
+ function upload(){
87
+ document.getElementById("photo").click();
88
+ }
89
+
90
+ function handleFileSelect(evt) {
91
+ var files = evt.target.files;
92
+
93
+ // Loop through the FileList and render image files as thumbnails.
94
+ for (var i = 0, f; f = files[i]; i++) {
95
+ // Only process image files.
96
+ if (f.type.match('image.*')) {
97
+ var reader = new FileReader();
98
+
99
+ reader.onload = function (e) {
100
+ // get loaded data and render thumbnail.
101
+ document.getElementById("thumbnail_image_boy").src = e.target.result;
102
+ };
103
+
104
+ // read the image file as a data URL.
105
+ reader.readAsDataURL(f);
106
+ }else{
107
+ $("#photo").val("");
108
+ alert("Only images accepted.");
109
+ }
110
+ }
111
+ }
112
+ document.getElementById('photo').addEventListener('change', handleFileSelect, false);
113
+
114
+
115
+
116
+ .wrapper{:style => "text-align: center;"}
117
+ %p.center
118
+ = f.check_box :is_public
119
+ = f.label :is_public
120
+ %button.btn.btn-success{:type => "submit"} submit
data/app/views/ish_manager/reports/new.haml CHANGED
@@ -1,5 +1,6 @@
1
1
 
2
2
  .row
3
3
  .col-sm-12
4
- %h2.center New Report
4
+ %h1
5
+ %strong New Report
5
6
  = render 'ish_manager/reports/form', :report => @report
data/app/views/ish_manager/sites/_form.haml CHANGED
@@ -1,57 +1,50 @@
1
1
 
2
- - url ||= site_path(site)
3
- .manager-sites--form
4
- = form_for site, :url => url do |f|
5
- .row
6
- .large-6.columns
7
- = f.label :domain
8
- = f.text_field :domain
9
- .large-6.columns
10
- = f.label :lang
11
- = f.text_field :lang
2
+ .panel
3
+ .panel-content
4
+ - url ||= site_path(site)
5
+ = form_for site, :url => url do |f|
6
+ .row
7
+ .col-lg-6
8
+ = f.label :domain
9
+ = f.text_field :domain, :disabled => true
10
+ .col-lg-6
11
+ = f.label :lang
12
+ = f.text_field :lang, :disabled => true
12
13
 
13
- .row
14
- .large-6.columns
15
- = f.label :title
16
- = f.text_field :title
17
- .large-6.columns
18
- = f.label :subhead
19
- = f.text_field :subhead
20
-
21
- .row
22
- .large-6.columns
23
- = f.label :homepage_layout
24
- = f.text_field :homepage_layout
25
- .large-6.columns
26
- = f.label :layout
27
- = f.text_field :layout
14
+ .row
15
+ .col-lg-6
16
+ = f.label :title
17
+ = f.text_field :title
18
+ .col-lg-6
19
+ = f.label :subhead
20
+ = f.text_area :subhead
28
21
 
29
- .row
30
- .large-6.columns
31
- = f.label :n_features
32
- = f.text_field :n_features
33
- .large-6.columns
34
- = f.label :n_newsitems
35
- = f.text_field :n_newsitems
22
+ .row
23
+ .col-lg-6
24
+ = f.label :homepage_layout
25
+ = f.select :homepage_layout, [ 'show' ]
26
+ .col-lg-6
27
+ = f.label :layout
28
+ = f.select :layout, [ 'application' ]
36
29
 
37
- .row
38
- .small-4.columns
39
- = f.check_box :is_trash
40
- = f.label :is_trash
41
- .small-4.columns
42
- = f.check_box :is_private
43
- = f.label :is_private
44
- .small-4.columns
45
- = f.check_box :is_ads_enabled
46
- = f.label :is_ads_enabled
47
-
48
- .row
49
- .large-12.columns
50
- n features, n newsitems, n reports, n galleries.
51
- %br
52
- Is ads enabled? Are users enabled?
30
+ .row
31
+ .col-lg-4
32
+ = f.label :n_features
33
+ = f.text_field :n_features
34
+ .col-lg-4
35
+ = f.label :n_newsitems
36
+ = f.text_field :n_newsitems
37
+ .col-lg-4
38
+ = f.check_box :is_trash
39
+ = f.label :is_trash
40
+ %br
41
+ = f.check_box :is_private
42
+ = f.label :is_private
43
+ %br
44
+ = f.check_box :is_ads_enabled
45
+ = f.label :is_ads_enabled
53
46
 
54
- .row
55
- .large-12.columns.actions
56
- = f.submit
57
-
47
+ .row
48
+ .col-lg-12
49
+ = f.submit 'Submit', :class => :btn
50
+
data/app/views/ish_manager/sites/edit.haml CHANGED
@@ -6,4 +6,5 @@
6
6
  %br
7
7
 
8
8
  = render 'form', :site => @site
9
+ = render 'ish_manager/features/index', :features => @site.features.limit(16), :site => @site
9
10
  = render 'ish_manager/newsitems/index', :newsitems => @site.newsitems.limit(10), :site => @site
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.38
4
+ version: 0.1.8.39
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-08-13 00:00:00.000000000 Z
11
+ date: 2017-08-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails