#1027 - item availability instead of status #523
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
blankoworld
requested review from
Garfield-fr,
jma,
BadrAly,
AoNoOokami,
reropag and
rerowep
BadrAly
suggested changes
Sep 24, 2019
rero_ils/modules/items/templates/rero_ils/detailed_view_items.html
Outdated
Show resolved
Hide resolved
BadrAly
approved these changes
Sep 24, 2019
iGormilhit
suggested changes
Sep 24, 2019
blankoworld
force-pushed
the
doo-#1027-replace-item-status
branch
from
8119648 to
4a871ac
Compare
@iGormilhit : I don't use "detailed" word as we limit the length to 50 chars.
? |
|
@blankoworld Ok for me. Thanks. |
jma
requested changes
Sep 24, 2019
| @@ -51,7 +55,10 @@ <h1 class="col-sm-11 col-md-11">{{ _('Barcode') }} {{ record.barcode }}</h1> | |||
| library.name) | |||
| }} | |||
| {% if record.status %} | |||
There was a problem hiding this comment.
this if can be removed I think.
| @@ -51,7 +55,10 @@ <h1 class="col-sm-11 col-md-11">{{ _('Barcode') }} {{ record.barcode }}</h1> | |||
| library.name) | |||
| }} | |||
| {% if record.status %} | |||
| {{ dl(_('Status'), _(record.status)) }} | |||
| {{ dl( | |||
There was a problem hiding this comment.
this can be rewritten as
{{ dl(
_('Availability'),
'<i class="fa fa-circle {}"></i> {}'.format(
'text-success' if record.available else 'text-danger',
_(record|item_availability_text)
)
)}}
jma
requested changes
Sep 24, 2019
| @@ -34,6 +34,10 @@ <h1 class="col-sm-11 col-md-11">{{ _('Barcode') }} {{ record.barcode }}</h1> | |||
| <section> | |||
| <!-- Item data --> | |||
| <section class="py-4"> | |||
| {% set availability = 'danger' %} | |||
iGormilhit
approved these changes
Sep 26, 2019
Item detail view contains status, as last field. But no info appears about the item availability. The availability appears in other view as a colored circle. Green circle while available. Red if not available. This change adds the colored circle before the item status. It also changes the field description to *Availability*. Co-Authored-by: Olivier DOSSMANN <[email protected]>
blankoworld
force-pushed
the
doo-#1027-replace-item-status
branch
from
4a871ac to
280f9c7
Compare
BadrAly
approved these changes
Sep 30, 2019
Garfield-fr
approved these changes
Sep 30, 2019
jma
approved these changes
Oct 3, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Item detail view contains status, as last field. But no info appears
about the item availability.
The availability appears in other view as a colored circle. Green circle
while available. Red if not available.
This change adds the colored circle before the item status. It also
changes the field description to Availability.