Commit 1af64dd4cf36b0514a87e04602f35c85e5f24517
Exists in
theme-brasil-digital-from-staging
and in
9 other branches
Merge branch 'I4-Video-Gallery-Plugin' into stable
Showing
2 changed files
with
23 additions
and
4 deletions
Show diff stats
plugins/video/public/style.css
... | ... | @@ -2,14 +2,15 @@ |
2 | 2 | position: relative; |
3 | 3 | display: inline-block; |
4 | 4 | width: 95px; |
5 | - height: 85px; | |
5 | + height: 115px; | |
6 | 6 | margin: 1em; |
7 | 7 | border: solid #F0F0F0 1px; |
8 | 8 | vertical-align: top; |
9 | - text-align: center; | |
9 | + text-align: left; | |
10 | 10 | overflow: hidden; |
11 | 11 | padding-top: 7px; |
12 | 12 | margin-botton: 10px; |
13 | + text-overflow: ellipsis; | |
13 | 14 | } |
14 | 15 | |
15 | 16 | .video-gallery-top-box{ |
... | ... | @@ -23,3 +24,19 @@ |
23 | 24 | font-size: 1em; |
24 | 25 | text-color: white; |
25 | 26 | } |
27 | + | |
28 | +.video-title{ | |
29 | + width: 100%; | |
30 | + overflow: hidden; | |
31 | + text-overflow: ellipsis; | |
32 | +} | |
33 | + | |
34 | +.video-author{ | |
35 | + display: none; | |
36 | + overflow: hidden; | |
37 | + text-overflow: ellipsis; | |
38 | +} | |
39 | + | |
40 | +.video-gallery-thumbnail:hover div{ | |
41 | + display: inline-block; | |
42 | +} | |
26 | 43 | \ No newline at end of file | ... | ... |
plugins/video/views/shared/video_list.html.erb
1 | 1 | <div> |
2 | 2 | <% contents.each do |content| %> |
3 | - <%#= py content %> | |
4 | 3 | <% if content.display_to?(user) %> |
5 | 4 | <div class="video-gallery-thumbnail"> |
6 | 5 | <div class="video-gallery-top-box"> |
... | ... | @@ -9,7 +8,10 @@ |
9 | 8 | <% end %> |
10 | 9 | </div> |
11 | 10 | <div class="video-gallery-botton-box"> |
12 | - <font size="1em"><%= content.title %></font> | |
11 | + <div class="video-author"> | |
12 | + <%= _("by") %> <%= content.author_name %> <%= _("updated at") %> <%= time_ago_as_sentence(content.updated_at) %> | |
13 | + </div> | |
14 | + <div class="video-title"><%= content.title %></div> | |
13 | 15 | </div> |
14 | 16 | </div> |
15 | 17 | <% end %> | ... | ... |