From fe43ec783bfb1b34a97841be91945e5c2acc4737 Mon Sep 17 00:00:00 2001 From: Keilla Menezes Date: Fri, 28 Jan 2011 18:22:43 -0300 Subject: [PATCH] Re-write gallery page --- app/views/content_viewer/_article.rhtml | 4 ++-- app/views/content_viewer/_uploaded_file.rhtml | 2 +- public/designs/icons/tango/mod/96x96/places/folder.png | Bin 0 -> 3650 bytes public/designs/icons/tango/style.css | 4 ++++ public/stylesheets/application.css | 27 +++++++++++++++------------ 5 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 public/designs/icons/tango/mod/96x96/places/folder.png diff --git a/app/views/content_viewer/_article.rhtml b/app/views/content_viewer/_article.rhtml index fcecc1c..5f6b119 100644 --- a/app/views/content_viewer/_article.rhtml +++ b/app/views/content_viewer/_article.rhtml @@ -1,2 +1,2 @@ -<%= link_to '', article.url, :class => article.css_class_name %> -<%= link_to article.title, article.view_url %> +<%= link_to content_tag(:span, article.title), article.url, :class => article.css_class_name %> +<%= article.title %> diff --git a/app/views/content_viewer/_uploaded_file.rhtml b/app/views/content_viewer/_uploaded_file.rhtml index 7aeca61..25b43c4 100644 --- a/app/views/content_viewer/_uploaded_file.rhtml +++ b/app/views/content_viewer/_uploaded_file.rhtml @@ -1,5 +1,5 @@ <% if uploaded_file.image? %> -
<%= link_to image_tag(uploaded_file.public_filename(:thumb), :alt => uploaded_file.display_title), uploaded_file.view_url %>
+ <%= 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) %> <%= image_label(uploaded_file) %> <% else %> <%= render :partial => 'article', :object => uploaded_file %> diff --git a/public/designs/icons/tango/mod/96x96/places/folder.png b/public/designs/icons/tango/mod/96x96/places/folder.png new file mode 100644 index 0000000..31f527a Binary files /dev/null and b/public/designs/icons/tango/mod/96x96/places/folder.png differ diff --git a/public/designs/icons/tango/style.css b/public/designs/icons/tango/style.css index c711478..4fa008b 100644 --- a/public/designs/icons/tango/style.css +++ b/public/designs/icons/tango/style.css @@ -1,5 +1,6 @@ @import url(ie6.css); +/******************SMALL ICONS********************/ .icon-edit { background-image: url(Tango/16x16/apps/text-editor.png) } .icon-home { background-image: url(Tango/16x16/actions/go-home.png) } .icon-new { background-image: url(Tango/16x16/actions/filenew.png) } @@ -98,3 +99,6 @@ .icon-locale { background-image: url(Tango/16x16/apps/preferences-desktop-locale.png) } .icon-user-removed { background-image: url(Tango/16x16/actions/gtk-cancel.png) } .icon-user-unknown { background-image: url(Tango/16x16/status/dialog-error.png) } + +/******************LARGE ICONS********************/ +.image-gallery-item .folder { background-image: url(mod/96x96/places/folder.png) } diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index d8468aa..9b31e6c 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -3301,6 +3301,7 @@ div.with_media_panel .formfield input { margin: 5px; float: left; overflow: hidden; + background-repeat: no-repeat; } .image-gallery-item span { @@ -3315,26 +3316,28 @@ div.with_media_panel .formfield input { .image-gallery-item img { padding: 2px; - border: 1px solid; } -.image-gallery-item .folder, .image-gallery-item .uploaded-file { - width: 120px; - height: 120px; - border: 1px solid; + +.image-gallery-item a{ + width: 130px; + height: 130px; } -.image-gallery-item .folder { - background: transparent url('../images/icons-app/gtk-folder.png') no-repeat 50% 43%; +.image-gallery-item a { display: block; color: #DB8; + background-repeat: no-repeat; + background-position: 50% 50%; + margin: auto; +} + +.image-gallery-item a span { + display: none; } -.image-gallery-item .folder:hover { - border: 4px solid; - width: 114px; - height: 114px; - background-color: #FF9 +.image-gallery-item a:hover { + background-color: #EEE; } .image-gallery-item .uploaded-file { -- libgit2 0.21.2