OpenNeo/impress
OpenNeo/impress
1
0
Fork 1
Code Pull requests Activity

a few tweaks to items#show contributors appearance

Browse source
This commit is contained in:
Emi Matchu 2012-10-24 22:16:01 -05:00
parent f56b544963
commit 07f49307f1
4 changed files with 67 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/items_helper.rb
View file

@ -110,7 +110,7 @@ module ItemsHelper
end end
def format_contribution_count(count) def format_contribution_count(count)
"(×#{count})".html_safe if count > 1 " (×#{count})".html_safe if count > 1
end end
private private

5
app/stylesheets/items/_show.sass
View file

@ -25,6 +25,8 @@ body.items-show
margin-bottom: 0 margin-bottom: 0
#item-preview #item-preview
+clearfix
div div
float: left float: left
@ -112,6 +114,9 @@ body.items-show
#item-contributors #item-contributors
+subtle-banner +subtle-banner
clear: both clear: both
margin:
bottom: 0
top: 2em
header header
display: inline display: inline

18
app/views/items/show.html.haml
View file

@ -89,15 +89,6 @@
%span.more more %span.more more
%span.less less %span.less less
- cache "items/#{@item.id} contributors" do
- unless @contributors_with_counts.empty?
#item-contributors
%header Brought to you by:
%ul
- @contributors_with_counts.each do |contributor, count|
%li #{link_to contributor.name, user_contributions_path(contributor)} #{format_contribution_count(count)}
%footer Thanks, everybody!
- cache 'items#show preview_header' do - cache 'items#show preview_header' do
#item-preview-header #item-preview-header
%h3 Preview %h3 Preview
@ -109,6 +100,15 @@
#item-preview-swf #item-preview-swf
Javascript and Flash are required to preview wearables. Sorry! Javascript and Flash are required to preview wearables. Sorry!
- cache "items/#{@item.id} contributors" do
- unless @contributors_with_counts.empty?
#item-contributors
%header Brought to you by:
%ul
- @contributors_with_counts.each do |contributor, count|
%li= link_to(contributor.name, user_contributions_path(contributor)) + format_contribution_count(count)
%footer Thanks!
:javascript :javascript
var CURRENT_ITEM_ZONES_RESTRICT = #{@item.zones_restrict.inspect}, var CURRENT_ITEM_ZONES_RESTRICT = #{@item.zones_restrict.inspect},
IMPRESS_HOST = #{RemoteImpressHost.inspect}; IMPRESS_HOST = #{RemoteImpressHost.inspect};

93
public/stylesheets/compiled/screen.css
View file

@ -1821,20 +1821,29 @@ body.items-show #item-thumbnail {
body.items-show #item-name { body.items-show #item-name {
margin-bottom: 0; margin-bottom: 0;
} }
/* line 28, ../../../app/stylesheets/items/_show.sass */ /* line 27, ../../../app/stylesheets/items/_show.sass */
body.items-show #item-preview {
overflow: hidden;
display: inline-block;
}
/* line 8, ../../../app/stylesheets/partials/clean/_mixins.sass */
body.items-show #item-preview {
display: block;
}
/* line 30, ../../../app/stylesheets/items/_show.sass */
body.items-show #item-preview div { body.items-show #item-preview div {
float: left; float: left;
} }
/* line 31, ../../../app/stylesheets/items/_show.sass */ /* line 33, ../../../app/stylesheets/items/_show.sass */
body.items-show #item-preview-species { body.items-show #item-preview-species {
width: 400px; width: 400px;
} }
/* line 34, ../../../app/stylesheets/items/_show.sass */ /* line 36, ../../../app/stylesheets/items/_show.sass */
body.items-show #item-preview-species a, body.items-show #item-preview-species img { body.items-show #item-preview-species a, body.items-show #item-preview-species img {
height: 50px; height: 50px;
width: 50px; width: 50px;
} }
/* line 38, ../../../app/stylesheets/items/_show.sass */ /* line 40, ../../../app/stylesheets/items/_show.sass */
body.items-show #item-preview-species a { body.items-show #item-preview-species a {
display: -moz-inline-box; display: -moz-inline-box;
-moz-box-orient: vertical; -moz-box-orient: vertical;
@ -1846,12 +1855,12 @@ body.items-show #item-preview-species a {
body.items-show #item-preview-species a { body.items-show #item-preview-species a {
*display: inline; *display: inline;
} }
/* line 40, ../../../app/stylesheets/items/_show.sass */ /* line 42, ../../../app/stylesheets/items/_show.sass */
body.items-show #item-preview-species a.current { body.items-show #item-preview-species a.current {
background: #eeffee; background: #eeffee;
outline: 1px solid #006600; outline: 1px solid #006600;
} }
/* line 43, ../../../app/stylesheets/items/_show.sass */ /* line 45, ../../../app/stylesheets/items/_show.sass */
body.items-show #item-preview-species a.deactivated { body.items-show #item-preview-species a.deactivated {
-moz-opacity: 0.5; -moz-opacity: 0.5;
-webkit-opacity: 0.5; -webkit-opacity: 0.5;
@ -1859,63 +1868,63 @@ body.items-show #item-preview-species a.deactivated {
-khtml-opacity: 0.5; -khtml-opacity: 0.5;
background: #fbe3e4; background: #fbe3e4;
} }
/* line 48, ../../../app/stylesheets/items/_show.sass */ /* line 50, ../../../app/stylesheets/items/_show.sass */
body.items-show #item-preview-species a.deactivated.current { body.items-show #item-preview-species a.deactivated.current {
outline-color: #fbc2c4; outline-color: #fbc2c4;
} }
/* line 51, ../../../app/stylesheets/items/_show.sass */ /* line 53, ../../../app/stylesheets/items/_show.sass */
body.items-show #item-preview-error { body.items-show #item-preview-error {
display: none; display: none;
padding: 20px 10px 0; padding: 20px 10px 0;
width: 380px; width: 380px;
} }
/* line 56, ../../../app/stylesheets/items/_show.sass */ /* line 58, ../../../app/stylesheets/items/_show.sass */
body.items-show #item-preview-swf { body.items-show #item-preview-swf {
height: 300px; height: 300px;
overflow: hidden; overflow: hidden;
width: 300px; width: 300px;
} }
/* line 61, ../../../app/stylesheets/items/_show.sass */ /* line 63, ../../../app/stylesheets/items/_show.sass */
body.items-show #item-zones { body.items-show #item-zones {
font-family: "Droid Serif", Georgia, "Times New Roman", Times, serif; font-family: "Droid Serif", Georgia, "Times New Roman", Times, serif;
font-size: 85%; font-size: 85%;
margin-bottom: 1em; margin-bottom: 1em;
} }
/* line 67, ../../../app/stylesheets/items/_show.sass */ /* line 69, ../../../app/stylesheets/items/_show.sass */
body.items-show #item-zones p { body.items-show #item-zones p {
display: inline; display: inline;
} }
/* line 70, ../../../app/stylesheets/items/_show.sass */ /* line 72, ../../../app/stylesheets/items/_show.sass */
body.items-show #item-zones p:first-child { body.items-show #item-zones p:first-child {
margin-right: 1em; margin-right: 1em;
} }
/* line 73, ../../../app/stylesheets/items/_show.sass */ /* line 75, ../../../app/stylesheets/items/_show.sass */
body.items-show #trade-hangers { body.items-show #trade-hangers {
font-size: 85%; font-size: 85%;
margin-bottom: 3em; margin-bottom: 3em;
text-align: left; text-align: left;
} }
/* line 78, ../../../app/stylesheets/items/_show.sass */ /* line 80, ../../../app/stylesheets/items/_show.sass */
body.items-show #trade-hangers p { body.items-show #trade-hangers p {
position: relative; position: relative;
} }
/* line 81, ../../../app/stylesheets/items/_show.sass */ /* line 83, ../../../app/stylesheets/items/_show.sass */
body.items-show #trade-hangers p:first-child { body.items-show #trade-hangers p:first-child {
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }
/* line 85, ../../../app/stylesheets/items/_show.sass */ /* line 87, ../../../app/stylesheets/items/_show.sass */
body.items-show #trade-hangers p.overflows .toggle { body.items-show #trade-hangers p.overflows .toggle {
display: block; display: block;
} }
/* line 90, ../../../app/stylesheets/items/_show.sass */ /* line 92, ../../../app/stylesheets/items/_show.sass */
body.items-show #trade-hangers p.showing-more .toggle .less { body.items-show #trade-hangers p.showing-more .toggle .less {
display: block; display: block;
} }
/* line 93, ../../../app/stylesheets/items/_show.sass */ /* line 95, ../../../app/stylesheets/items/_show.sass */
body.items-show #trade-hangers p.showing-more .toggle .more { body.items-show #trade-hangers p.showing-more .toggle .more {
display: none; display: none;
} }
/* line 96, ../../../app/stylesheets/items/_show.sass */ /* line 98, ../../../app/stylesheets/items/_show.sass */
body.items-show #trade-hangers .toggle { body.items-show #trade-hangers .toggle {
background: white; background: white;
bottom: 0; bottom: 0;
@ -1926,15 +1935,15 @@ body.items-show #trade-hangers .toggle {
position: absolute; position: absolute;
right: 0; right: 0;
} }
/* line 106, ../../../app/stylesheets/items/_show.sass */ /* line 108, ../../../app/stylesheets/items/_show.sass */
body.items-show #trade-hangers .toggle:hover { body.items-show #trade-hangers .toggle:hover {
text-decoration: underline; text-decoration: underline;
} }
/* line 109, ../../../app/stylesheets/items/_show.sass */ /* line 111, ../../../app/stylesheets/items/_show.sass */
body.items-show #trade-hangers .toggle .less { body.items-show #trade-hangers .toggle .less {
display: none; display: none;
} }
/* line 112, ../../../app/stylesheets/items/_show.sass */ /* line 114, ../../../app/stylesheets/items/_show.sass */
body.items-show #item-contributors { body.items-show #item-contributors {
border-color: #aaddaa; border-color: #aaddaa;
border-style: solid; border-style: solid;
@ -1944,18 +1953,20 @@ body.items-show #item-contributors {
padding: 0.5em 0; padding: 0.5em 0;
text-align: center; text-align: center;
clear: both; clear: both;
margin-bottom: 0;
margin-top: 2em;
} }
/* line 116, ../../../app/stylesheets/items/_show.sass */ /* line 121, ../../../app/stylesheets/items/_show.sass */
body.items-show #item-contributors header { body.items-show #item-contributors header {
display: inline; display: inline;
font-weight: bold; font-weight: bold;
margin-right: 0.25em; margin-right: 0.25em;
} }
/* line 121, ../../../app/stylesheets/items/_show.sass */ /* line 126, ../../../app/stylesheets/items/_show.sass */
body.items-show #item-contributors footer { body.items-show #item-contributors footer {
display: inline; display: inline;
} }
/* line 124, ../../../app/stylesheets/items/_show.sass */ /* line 129, ../../../app/stylesheets/items/_show.sass */
body.items-show #item-contributors ul { body.items-show #item-contributors ul {
list-style-type: none; list-style-type: none;
} }
@ -1973,15 +1984,15 @@ body.items-show #item-contributors ul li:after {
body.items-show #item-contributors ul li:last-child:after, body.items-show #item-contributors ul li.last:after { body.items-show #item-contributors ul li:last-child:after, body.items-show #item-contributors ul li.last:after {
content: ""; content: "";
} }
/* line 127, ../../../app/stylesheets/items/_show.sass */ /* line 132, ../../../app/stylesheets/items/_show.sass */
body.items-show #item-contributors ul li:last-child::after { body.items-show #item-contributors ul li:last-child::after {
content: "."; content: ".";
} }
/* line 130, ../../../app/stylesheets/items/_show.sass */ /* line 135, ../../../app/stylesheets/items/_show.sass */
body.items-show #item-preview-header { body.items-show #item-preview-header {
clear: both; clear: both;
} }
/* line 133, ../../../app/stylesheets/items/_show.sass */ /* line 138, ../../../app/stylesheets/items/_show.sass */
body.items-show #item-preview-header h3, body.items-show #item-preview-header a { body.items-show #item-preview-header h3, body.items-show #item-preview-header a {
display: -moz-inline-box; display: -moz-inline-box;
-moz-box-orient: vertical; -moz-box-orient: vertical;
@ -1993,17 +2004,17 @@ body.items-show #item-preview-header h3, body.items-show #item-preview-header a
body.items-show #item-preview-header h3, body.items-show #item-preview-header a { body.items-show #item-preview-header h3, body.items-show #item-preview-header a {
*display: inline; *display: inline;
} }
/* line 135, ../../../app/stylesheets/items/_show.sass */ /* line 140, ../../../app/stylesheets/items/_show.sass */
body.items-show #item-preview-header a { body.items-show #item-preview-header a {
font-size: 85%; font-size: 85%;
margin: -1.5em 0 0 1em; margin: -1.5em 0 0 1em;
} }
/* line 139, ../../../app/stylesheets/items/_show.sass */ /* line 144, ../../../app/stylesheets/items/_show.sass */
body.items-show .nc-icon { body.items-show .nc-icon {
height: 16px; height: 16px;
width: 16px; width: 16px;
} }
/* line 143, ../../../app/stylesheets/items/_show.sass */ /* line 148, ../../../app/stylesheets/items/_show.sass */
body.items-show #closet-hangers { body.items-show #closet-hangers {
border: 1px solid #006600; border: 1px solid #006600;
float: right; float: right;
@ -2015,13 +2026,13 @@ body.items-show #closet-hangers {
position: relative; position: relative;
z-index: 2; z-index: 2;
} }
/* line 156, ../../../app/stylesheets/items/_show.sass */ /* line 161, ../../../app/stylesheets/items/_show.sass */
body.items-show #closet-hangers h3 { body.items-show #closet-hangers h3 {
font-size: 150%; font-size: 150%;
font-weight: bold; font-weight: bold;
margin-bottom: 0.25em; margin-bottom: 0.25em;
} }
/* line 161, ../../../app/stylesheets/items/_show.sass */ /* line 166, ../../../app/stylesheets/items/_show.sass */
body.items-show #closet-hangers #closet-hangers-ownership-groups { body.items-show #closet-hangers #closet-hangers-ownership-groups {
overflow: hidden; overflow: hidden;
display: inline-block; display: inline-block;
@ -2031,41 +2042,41 @@ body.items-show #closet-hangers #closet-hangers-ownership-groups {
body.items-show #closet-hangers #closet-hangers-ownership-groups { body.items-show #closet-hangers #closet-hangers-ownership-groups {
display: block; display: block;
} }
/* line 165, ../../../app/stylesheets/items/_show.sass */ /* line 170, ../../../app/stylesheets/items/_show.sass */
body.items-show #closet-hangers #closet-hangers-ownership-groups div { body.items-show #closet-hangers #closet-hangers-ownership-groups div {
float: left; float: left;
margin: 0 5%; margin: 0 5%;
text-align: left; text-align: left;
width: 40%; width: 40%;
} }
/* line 171, ../../../app/stylesheets/items/_show.sass */ /* line 176, ../../../app/stylesheets/items/_show.sass */
body.items-show #closet-hangers #closet-hangers-ownership-groups div li { body.items-show #closet-hangers #closet-hangers-ownership-groups div li {
list-style: none; list-style: none;
word-wrap: break-word; word-wrap: break-word;
} }
/* line 175, ../../../app/stylesheets/items/_show.sass */ /* line 180, ../../../app/stylesheets/items/_show.sass */
body.items-show #closet-hangers #closet-hangers-ownership-groups div li label.unlisted { body.items-show #closet-hangers #closet-hangers-ownership-groups div li label.unlisted {
font-style: italic; font-style: italic;
} }
/* line 178, ../../../app/stylesheets/items/_show.sass */ /* line 183, ../../../app/stylesheets/items/_show.sass */
body.items-show #closet-hangers form { body.items-show #closet-hangers form {
padding: 0.5em 0; padding: 0.5em 0;
} }
/* line 181, ../../../app/stylesheets/items/_show.sass */ /* line 186, ../../../app/stylesheets/items/_show.sass */
body.items-show #closet-hangers select { body.items-show #closet-hangers select {
width: 9em; width: 9em;
} }
/* line 184, ../../../app/stylesheets/items/_show.sass */ /* line 189, ../../../app/stylesheets/items/_show.sass */
body.items-show #closet-hangers input[type=number] { body.items-show #closet-hangers input[type=number] {
margin-right: 0.5em; margin-right: 0.5em;
width: 3em; width: 3em;
} }
/* line 190, ../../../app/stylesheets/items/_show.sass */ /* line 195, ../../../app/stylesheets/items/_show.sass */
body.items-show.js #trade-hangers p { body.items-show.js #trade-hangers p {
max-height: 3em; max-height: 3em;
overflow: hidden; overflow: hidden;
} }
/* line 194, ../../../app/stylesheets/items/_show.sass */ /* line 199, ../../../app/stylesheets/items/_show.sass */
body.items-show.js #trade-hangers p.showing-more { body.items-show.js #trade-hangers p.showing-more {
max-height: none; max-height: none;
} }