forked from OpenNeo/impress
Move item description into header
This commit is contained in:
parent
e4fb067e45
commit
e8832f2c36
4 changed files with 71 additions and 80 deletions
|
|
@ -6,56 +6,46 @@ body.items-show
|
|||
.item-header
|
||||
+item-header
|
||||
|
||||
#item-info-section
|
||||
display: grid
|
||||
#your-items-form
|
||||
border: 1px solid $module-border-color
|
||||
font-size: 85%
|
||||
margin-bottom: 2em
|
||||
margin-left: auto
|
||||
margin-right: auto
|
||||
padding: 1em
|
||||
width: 30em
|
||||
|
||||
grid-template-areas: "info form"
|
||||
grid-template-columns: 1fr auto
|
||||
h3
|
||||
font-size: 150%
|
||||
font-weight: bold
|
||||
margin-bottom: .25em
|
||||
|
||||
#item-info
|
||||
grid-area: info
|
||||
#closet-hangers-ownership-groups
|
||||
+clearfix
|
||||
margin-bottom: .5em
|
||||
|
||||
#your-items-form
|
||||
grid-area: form
|
||||
div
|
||||
float: left
|
||||
margin: 0 5%
|
||||
text-align: left
|
||||
width: 40%
|
||||
|
||||
border: 1px solid $module-border-color
|
||||
font-size: 85%
|
||||
margin-bottom: 3em
|
||||
margin-left: 1em
|
||||
padding: 1em
|
||||
width: 30em
|
||||
li
|
||||
list-style: none
|
||||
word-wrap: break-word
|
||||
|
||||
h3
|
||||
font-size: 150%
|
||||
font-weight: bold
|
||||
margin-bottom: .25em
|
||||
label.unlisted
|
||||
font-style: italic
|
||||
|
||||
#closet-hangers-ownership-groups
|
||||
+clearfix
|
||||
margin-bottom: .5em
|
||||
form
|
||||
padding: .5em 0
|
||||
|
||||
div
|
||||
float: left
|
||||
margin: 0 5%
|
||||
text-align: left
|
||||
width: 40%
|
||||
select
|
||||
width: 9em
|
||||
|
||||
li
|
||||
list-style: none
|
||||
word-wrap: break-word
|
||||
|
||||
label.unlisted
|
||||
font-style: italic
|
||||
|
||||
form
|
||||
padding: .5em 0
|
||||
|
||||
select
|
||||
width: 9em
|
||||
|
||||
input[type=number]
|
||||
margin-right: .5em
|
||||
width: 3em
|
||||
input[type=number]
|
||||
margin-right: .5em
|
||||
width: 3em
|
||||
|
||||
#item-contributors
|
||||
+subtle-banner
|
||||
|
|
|
|||
|
|
@ -2,11 +2,10 @@
|
|||
|
||||
=item-header
|
||||
border-bottom: 1px solid $module-border-color
|
||||
margin-top: 1em
|
||||
margin-bottom: 1em
|
||||
|
||||
.item-header-main
|
||||
padding: 1em 0
|
||||
|
||||
display: grid
|
||||
grid-template-areas: "img gap1" "img name" "img links" "img gap2" "nav nav"
|
||||
align-items: center
|
||||
|
|
@ -36,6 +35,10 @@
|
|||
font-size: 75%
|
||||
margin-left: 1em
|
||||
|
||||
.item-description
|
||||
margin-top: .5em
|
||||
margin-bottom: 1em
|
||||
|
||||
.item-subpages-nav
|
||||
display: flex
|
||||
align-items: flex-end
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@
|
|||
= link_to t('items.show.resources.trading_post'), trading_post_url_for(item)
|
||||
= link_to t('items.show.resources.auction_genie'), auction_genie_url_for(item)
|
||||
|
||||
%p.item-description= @item.description
|
||||
|
||||
%nav.item-subpages-nav
|
||||
= link_to t('items.show.subpages_nav.preview'), item,
|
||||
class: ['preview-link'], 'data-is-current' => current_subpage == 'preview'
|
||||
|
|
|
|||
|
|
@ -4,40 +4,36 @@
|
|||
= render partial: "item_header",
|
||||
locals: {item: @item, trades: @trades, current_subpage: "preview"}
|
||||
|
||||
%section#item-info-section
|
||||
#item-info
|
||||
%p= @item.description
|
||||
|
||||
- if user_signed_in?
|
||||
#your-items-form
|
||||
%h3
|
||||
= t '.closet_hangers.header_html',
|
||||
:user_items_link => link_to(t('your_items'),
|
||||
user_closet_hangers_path(current_user))
|
||||
= form_tag update_quantities_user_item_closet_hangers_path(:user_id => current_user, :item_id => @item), :method => :put do
|
||||
#closet-hangers-ownership-groups
|
||||
- @current_user_lists.each do |owned, lists|
|
||||
%div
|
||||
%h4= closet_lists_group_name(:you, owned)
|
||||
%ul
|
||||
- lists.each do |list|
|
||||
%li
|
||||
= number_field_tag "quantity[#{list.id}]",
|
||||
@current_user_quantities[list.id], :min => 0
|
||||
= label_tag "quantity[#{list.id}]", list.name
|
||||
|
||||
- if user_signed_in?
|
||||
#your-items-form
|
||||
%h3
|
||||
= t '.closet_hangers.header_html',
|
||||
:user_items_link => link_to(t('your_items'),
|
||||
user_closet_hangers_path(current_user))
|
||||
= form_tag update_quantities_user_item_closet_hangers_path(:user_id => current_user, :item_id => @item), :method => :put do
|
||||
#closet-hangers-ownership-groups
|
||||
- @current_user_lists.each do |owned, lists|
|
||||
%div
|
||||
%h4= closet_lists_group_name(:you, owned)
|
||||
%ul
|
||||
- lists.each do |list|
|
||||
%li
|
||||
= number_field_tag "quantity[#{owned}]",
|
||||
@current_user_quantities[owned], :min => 0
|
||||
= number_field_tag "quantity[#{list.id}]",
|
||||
@current_user_quantities[list.id], :min => 0
|
||||
= label_tag "quantity[#{list.id}]", list.name
|
||||
|
||||
- unless lists.empty?
|
||||
= label_tag "quantity[#{owned}]",
|
||||
t('closet_lists.unlisted_name'),
|
||||
:class => 'unlisted'
|
||||
- else
|
||||
= label_tag "quantity[#{owned}]",
|
||||
t('.closet_hangers.quantity_label')
|
||||
= submit_tag t('.closet_hangers.submit')
|
||||
%li
|
||||
= number_field_tag "quantity[#{owned}]",
|
||||
@current_user_quantities[owned], :min => 0
|
||||
|
||||
- unless lists.empty?
|
||||
= label_tag "quantity[#{owned}]",
|
||||
t('closet_lists.unlisted_name'),
|
||||
:class => 'unlisted'
|
||||
- else
|
||||
= label_tag "quantity[#{owned}]",
|
||||
t('.closet_hangers.quantity_label')
|
||||
= submit_tag t('.closet_hangers.submit')
|
||||
|
||||
#outfit-preview-root{'data-item-id': @item.id}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue