Commit fe43ec783bfb1b34a97841be91945e5c2acc4737
Committed by
Daniela Feitosa
1 parent
0fa19467
Exists in
master
and in
29 other branches
Re-write gallery page
(ActionItem1799)
Showing
5 changed files
with
22 additions
and
15 deletions
Show diff stats
app/views/content_viewer/_article.rhtml
app/views/content_viewer/_uploaded_file.rhtml
1 | <% if uploaded_file.image? %> | 1 | <% if uploaded_file.image? %> |
2 | - <div> <%= link_to image_tag(uploaded_file.public_filename(:thumb), :alt => uploaded_file.display_title), uploaded_file.view_url %> </div> | 2 | + <%= link_to content_tag(:span, uploaded_file.display_title), uploaded_file.view_url, :class => 'image', :style => 'background-image: url(%s)'% uploaded_file.public_filename(:thumb) %> |
3 | <span><%= image_label(uploaded_file) %></span> | 3 | <span><%= image_label(uploaded_file) %></span> |
4 | <% else %> | 4 | <% else %> |
5 | <%= render :partial => 'article', :object => uploaded_file %> | 5 | <%= render :partial => 'article', :object => uploaded_file %> |
3.56 KB
public/designs/icons/tango/style.css
1 | @import url(ie6.css); | 1 | @import url(ie6.css); |
2 | 2 | ||
3 | +/******************SMALL ICONS********************/ | ||
3 | .icon-edit { background-image: url(Tango/16x16/apps/text-editor.png) } | 4 | .icon-edit { background-image: url(Tango/16x16/apps/text-editor.png) } |
4 | .icon-home { background-image: url(Tango/16x16/actions/go-home.png) } | 5 | .icon-home { background-image: url(Tango/16x16/actions/go-home.png) } |
5 | .icon-new { background-image: url(Tango/16x16/actions/filenew.png) } | 6 | .icon-new { background-image: url(Tango/16x16/actions/filenew.png) } |
@@ -98,3 +99,6 @@ | @@ -98,3 +99,6 @@ | ||
98 | .icon-locale { background-image: url(Tango/16x16/apps/preferences-desktop-locale.png) } | 99 | .icon-locale { background-image: url(Tango/16x16/apps/preferences-desktop-locale.png) } |
99 | .icon-user-removed { background-image: url(Tango/16x16/actions/gtk-cancel.png) } | 100 | .icon-user-removed { background-image: url(Tango/16x16/actions/gtk-cancel.png) } |
100 | .icon-user-unknown { background-image: url(Tango/16x16/status/dialog-error.png) } | 101 | .icon-user-unknown { background-image: url(Tango/16x16/status/dialog-error.png) } |
102 | + | ||
103 | +/******************LARGE ICONS********************/ | ||
104 | +.image-gallery-item .folder { background-image: url(mod/96x96/places/folder.png) } |
public/stylesheets/application.css
@@ -3301,6 +3301,7 @@ div.with_media_panel .formfield input { | @@ -3301,6 +3301,7 @@ div.with_media_panel .formfield input { | ||
3301 | margin: 5px; | 3301 | margin: 5px; |
3302 | float: left; | 3302 | float: left; |
3303 | overflow: hidden; | 3303 | overflow: hidden; |
3304 | + background-repeat: no-repeat; | ||
3304 | } | 3305 | } |
3305 | 3306 | ||
3306 | .image-gallery-item span { | 3307 | .image-gallery-item span { |
@@ -3315,26 +3316,28 @@ div.with_media_panel .formfield input { | @@ -3315,26 +3316,28 @@ div.with_media_panel .formfield input { | ||
3315 | 3316 | ||
3316 | .image-gallery-item img { | 3317 | .image-gallery-item img { |
3317 | padding: 2px; | 3318 | padding: 2px; |
3318 | - border: 1px solid; | ||
3319 | } | 3319 | } |
3320 | 3320 | ||
3321 | -.image-gallery-item .folder, .image-gallery-item .uploaded-file { | ||
3322 | - width: 120px; | ||
3323 | - height: 120px; | ||
3324 | - border: 1px solid; | 3321 | + |
3322 | +.image-gallery-item a{ | ||
3323 | + width: 130px; | ||
3324 | + height: 130px; | ||
3325 | } | 3325 | } |
3326 | 3326 | ||
3327 | -.image-gallery-item .folder { | ||
3328 | - background: transparent url('../images/icons-app/gtk-folder.png') no-repeat 50% 43%; | 3327 | +.image-gallery-item a { |
3329 | display: block; | 3328 | display: block; |
3330 | color: #DB8; | 3329 | color: #DB8; |
3330 | + background-repeat: no-repeat; | ||
3331 | + background-position: 50% 50%; | ||
3332 | + margin: auto; | ||
3333 | +} | ||
3334 | + | ||
3335 | +.image-gallery-item a span { | ||
3336 | + display: none; | ||
3331 | } | 3337 | } |
3332 | 3338 | ||
3333 | -.image-gallery-item .folder:hover { | ||
3334 | - border: 4px solid; | ||
3335 | - width: 114px; | ||
3336 | - height: 114px; | ||
3337 | - background-color: #FF9 | 3339 | +.image-gallery-item a:hover { |
3340 | + background-color: #EEE; | ||
3338 | } | 3341 | } |
3339 | 3342 | ||
3340 | .image-gallery-item .uploaded-file { | 3343 | .image-gallery-item .uploaded-file { |