c80_news_tz 0.1.1.25 → 0.1.1.26
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/c80_news_tz/frontend/pubs_medium.scss +24 -0
- data/app/helpers/c80_news_tz/companies_helper.rb +49 -0
- data/app/helpers/c80_news_tz/publications_helper.rb +2 -1
- data/app/uploaders/c80_news_tz/clogo_uploader.rb +36 -1
- data/app/views/c80_news_tz/companies/shared/_companies_list.html.erb +37 -0
- data/lib/c80_news_tz/version.rb +1 -1
- metadata +4 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8835fd86c88a3f31564212488091f03bbef544e1
|
4
|
+
data.tar.gz: 70c441547614fa96359bcc346b41b9e340ac2dda
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1e738d5069822a972839b35d17d62aaa1502c73ced2413ad8e19ccf37e1daf0f5dbc35bbc3df390b54219c921fbef51a44df85625c2342023ec5f581bc22cc0c
|
7
|
+
data.tar.gz: 5a578aa2f65851b46ba5aca710f7a10c6a8df42f572054900ca807cf9839e16ae96d8d2735c1e93053156288c016e70eb5b5a08834ae180397cd0762fd77c174
|
@@ -11,6 +11,26 @@ div.pub_medium {
|
|
11
11
|
margin: 0 71px;
|
12
12
|
}
|
13
13
|
|
14
|
+
a.preview_image {
|
15
|
+
width: 223px;
|
16
|
+
height: 149px;
|
17
|
+
background-image: none !important;
|
18
|
+
display: block;
|
19
|
+
text-align: center;
|
20
|
+
white-space: nowrap;
|
21
|
+
|
22
|
+
span.helper {
|
23
|
+
display: inline-block;
|
24
|
+
vertical-align: middle;
|
25
|
+
height: 100%;
|
26
|
+
}
|
27
|
+
|
28
|
+
img {
|
29
|
+
vertical-align: middle;
|
30
|
+
}
|
31
|
+
|
32
|
+
}
|
33
|
+
|
14
34
|
div.time {
|
15
35
|
height: 24px;
|
16
36
|
line-height: 24px;
|
@@ -64,4 +84,8 @@ div.pub_medium {
|
|
64
84
|
right:0;
|
65
85
|
}
|
66
86
|
|
87
|
+
div.desc_short {
|
88
|
+
|
89
|
+
}
|
90
|
+
|
67
91
|
}
|
@@ -0,0 +1,49 @@
|
|
1
|
+
module C80NewsTz
|
2
|
+
module CompaniesHelper
|
3
|
+
|
4
|
+
# рендер списка компаний
|
5
|
+
def render_companies_list(page = 1, per_page = 8)
|
6
|
+
|
7
|
+
# NB:: передаём в партиал два списка:
|
8
|
+
# NB:: - один: непосредственно для ренедра
|
9
|
+
# NB:: - другой: вспомогательный, для передачи в виде аргумента в will_paginate
|
10
|
+
|
11
|
+
companies = Company.paginate(page: page, per_page: per_page)
|
12
|
+
companies_list = arrange_companies_list(companies)
|
13
|
+
|
14
|
+
render :partial => 'c80_news_tz/companies/shared/companies_list',
|
15
|
+
:locals => {
|
16
|
+
companies_for_render: companies_list,
|
17
|
+
companies: companies
|
18
|
+
}
|
19
|
+
end
|
20
|
+
|
21
|
+
private
|
22
|
+
|
23
|
+
# подготовить данные для рендера списка компаний во view
|
24
|
+
def arrange_companies_list(companies)
|
25
|
+
result = []
|
26
|
+
companies.each do |company|
|
27
|
+
wh = company.logo.thumb_preview_list_wh
|
28
|
+
result << {
|
29
|
+
title: company.title,
|
30
|
+
activity_type: company.activity_type,
|
31
|
+
href: apph_url_for_company(company.slug),
|
32
|
+
pubs_count: company.facts.count,
|
33
|
+
desc_short: company.desc_short,
|
34
|
+
logo: {
|
35
|
+
:alt_image => company.title,
|
36
|
+
:image => company.logo.thumb_preview_list,
|
37
|
+
:ww => wh[0],
|
38
|
+
:hh => wh[1],
|
39
|
+
:a_href => apph_url_for_company(company.slug),
|
40
|
+
:a_class => 'preview_image'
|
41
|
+
}
|
42
|
+
}
|
43
|
+
|
44
|
+
end
|
45
|
+
result
|
46
|
+
end
|
47
|
+
|
48
|
+
end
|
49
|
+
end
|
@@ -8,7 +8,7 @@ module C80NewsTz
|
|
8
8
|
|
9
9
|
process :resize_to_limit => [500,500]
|
10
10
|
|
11
|
-
|
11
|
+
version :thumb_fit do
|
12
12
|
process :resize_to_fit => [124,124]
|
13
13
|
end
|
14
14
|
|
@@ -29,6 +29,18 @@ module C80NewsTz
|
|
29
29
|
process :resize_to_fit => [124, 124]
|
30
30
|
end
|
31
31
|
|
32
|
+
# идёт в блок в списке партнёров на странице "партнёры"
|
33
|
+
version :thumb_preview_list do
|
34
|
+
process :resize_to_w223
|
35
|
+
#process :resize_to_fit => [223, 310]
|
36
|
+
end
|
37
|
+
|
38
|
+
# выдать актуальную ширину\высоту thumb_preview_list
|
39
|
+
def thumb_preview_list_wh
|
40
|
+
image = ::MiniMagick::Image.open(model.logo.thumb_preview_list.current_path)
|
41
|
+
[image["width"], image["height"]]
|
42
|
+
end
|
43
|
+
|
32
44
|
def store_dir
|
33
45
|
"uploads/companies/_logos/#{format("%02d", model.id)}"
|
34
46
|
end
|
@@ -49,6 +61,29 @@ module C80NewsTz
|
|
49
61
|
model.instance_variable_get(var) or model.instance_variable_set(var, SecureRandom.hex(length/2))
|
50
62
|
end
|
51
63
|
|
64
|
+
private
|
65
|
+
|
66
|
+
# NB:: подгон под ширину preview image в pub_medium
|
67
|
+
def resize_to_w223
|
68
|
+
manipulate! do |img|
|
69
|
+
w = 223
|
70
|
+
h = calc_height_of_image(w)
|
71
|
+
img.resize "#{w}x#{h}>"
|
72
|
+
img = yield(img) if block_given?
|
73
|
+
img
|
74
|
+
end
|
75
|
+
end
|
76
|
+
|
77
|
+
def calc_height_of_image(w)
|
78
|
+
model_image = ::MiniMagick::Image.open(model.logo.current_path)
|
79
|
+
calc_height(w, model_image["width"], model_image["height"])
|
80
|
+
end
|
81
|
+
|
82
|
+
# подгоняем по ширине, рассчитываем высоту
|
83
|
+
def calc_height(width, original_w, original_h)
|
84
|
+
k = width.to_f/original_w
|
85
|
+
original_h * k
|
86
|
+
end
|
52
87
|
|
53
88
|
end
|
54
89
|
|
@@ -0,0 +1,37 @@
|
|
1
|
+
<div class="div_pubs clearfix">
|
2
|
+
<% companies_for_render.each_with_index do |c,index| %>
|
3
|
+
<% k = index%3 %>
|
4
|
+
<div class="pub_medium pub_medium_<%= k %>">
|
5
|
+
|
6
|
+
<!--<div class="time"><%# что бы тут вывести? %></div>-->
|
7
|
+
|
8
|
+
<%# лого компании %>
|
9
|
+
<%= render_image_link_lazy_holder(c[:logo]) %>
|
10
|
+
|
11
|
+
<%# тип деятельности %>
|
12
|
+
<div class="rubric_title"><%= c[:activity_type] %></div>
|
13
|
+
|
14
|
+
<%# название компании %>
|
15
|
+
<div class="title"><%= link_to c[:title], c[:href], title:c[:title] %></div>
|
16
|
+
|
17
|
+
<%= link_to("#{c[:href]}",
|
18
|
+
title: "Публикаций: #{c[:pubs_count]}",
|
19
|
+
class: 'comments') do %>
|
20
|
+
<i class="fa fa-file-text"></i>
|
21
|
+
<%= c[:pubs_count] %>
|
22
|
+
<% end %>
|
23
|
+
|
24
|
+
<div class="desc_short">
|
25
|
+
<%= c[:desc_short] %>
|
26
|
+
</div>
|
27
|
+
|
28
|
+
</div>
|
29
|
+
|
30
|
+
<% if k == 2 && index != companies_for_render.count-1 %>
|
31
|
+
<div class="hr"></div>
|
32
|
+
<% end %>
|
33
|
+
<% end %>
|
34
|
+
</div>
|
35
|
+
<div class="div_will_paginate">
|
36
|
+
<%= will_paginate companies %>
|
37
|
+
</div>
|
data/lib/c80_news_tz/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: c80_news_tz
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.1.
|
4
|
+
version: 0.1.1.26
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- C80609A
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-
|
11
|
+
date: 2016-04-01 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -143,6 +143,7 @@ files:
|
|
143
143
|
- app/helpers/c80_news_tz/banners_helper.rb
|
144
144
|
- app/helpers/c80_news_tz/blurbs_helper.rb
|
145
145
|
- app/helpers/c80_news_tz/comments_helper.rb
|
146
|
+
- app/helpers/c80_news_tz/companies_helper.rb
|
146
147
|
- app/helpers/c80_news_tz/publications_helper.rb
|
147
148
|
- app/helpers/c80_news_tz/subj_helper.rb
|
148
149
|
- app/models/c80_news_tz/adress.rb
|
@@ -194,6 +195,7 @@ files:
|
|
194
195
|
- app/views/c80_news_tz/comments/shared/_comments_block.html.erb
|
195
196
|
- app/views/c80_news_tz/comments/shared/_comments_list.html.erb
|
196
197
|
- app/views/c80_news_tz/comments/shared/_reply_comment_form.html.erb
|
198
|
+
- app/views/c80_news_tz/companies/shared/_companies_list.html.erb
|
197
199
|
- app/views/layouts/c80_news_tz/application.html.erb
|
198
200
|
- app/views/shared/_banner_01.html.erb
|
199
201
|
- app/views/shared/_banner_02.html.erb
|