hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 23:43:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-914 - fix lightbox captions display, fix videoTips width and height

Browse Source
This commit is contained in:
Florian BLOUET
2016-01-21 18:00:42 +01:00
parent 27012d4b28
commit d3b779eee1
6 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/www/lightbox/styles/main.scss
View File

@@ -589,3 +589,7 @@ hr {
background-image: none; background-image: none;
border: none; border: none;
} }
.videoTips {
width: 100%;
height: 100%;
}

4
resources/www/prod/skins/skin-shared.scss
View File

@@ -518,6 +518,10 @@ h4 {
} }
} }
} }
.videoTips {
width: 100%;
height: 100%;
}
@import 'ui-components/jquery-ui'; @import 'ui-components/jquery-ui';
@import 'ui-components/context-menu'; @import 'ui-components/context-menu';

2
templates/web/common/caption.html.twig
View File

@@ -9,7 +9,7 @@
{{ macro.caption(record, business, display_exif) }} {{ macro.caption(record, business, display_exif) }}
{% elseif view == 'preview' %} {% elseif view == 'preview' %}
{% set display_exif = false %} {% set display_exif = false %}
{{ macro.caption(record, business, display_exif) }} {{ macro.caption(record, business, display_exif, true) }}
{% elseif view == 'basket' %} {% elseif view == 'basket' %}
{% set display_exif = false %} {% set display_exif = false %}
{{ macro.caption(record, business, display_exif) }} {{ macro.caption(record, business, display_exif) }}

4
templates/web/common/macros.html.twig
View File

@@ -116,8 +116,8 @@
{% endif %} {% endif %}
{% endmacro %} {% endmacro %}
{% macro caption(record, can_see_business, display_exif) %} {% macro caption(record, can_see_business, display_exif, limitedWidth = false) %}
<dl class="dl-horizontal"> <dl class="{% if limitedWidth %}{% else %}dl-horizontal{% endif %}">
{% for name, value in record.getCaption(caption_field_order(record, can_see_business)) %} {% for name, value in record.getCaption(caption_field_order(record, can_see_business)) %}
<dt>{{ name }}</dt> <dt>{{ name }}</dt>
<dd>{{ caption_field(record, name, value)|e|highlight }}</dd> <dd>{{ caption_field(record, name, value)|e|highlight }}</dd>

2
templates/web/lightbox/feed.html.twig
View File

@@ -81,7 +81,7 @@
<div class="lightbox_container PNB"> <div class="lightbox_container PNB">
{% set business = app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(first_item.getRecord(app).get_base_id(), 'canmodifrecord') %} {% set business = app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(first_item.getRecord(app).get_base_id(), 'canmodifrecord') %}
{% if first_item %} {% if first_item %}
{{macro.caption(first_item.getRecord(app), business, false)}} {{macro.caption(first_item.getRecord(app), business, false, true)}}
{% endif %} {% endif %}
</div> </div>
</div> </div>

2
templates/web/lightbox/validate.html.twig
View File

@@ -95,7 +95,7 @@
<div class="lightbox_container PNB"> <div class="lightbox_container PNB">
{% if basket_element %} {% if basket_element %}
{% set business = app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(basket_element.getRecord(app).get_base_id(), 'canmodifrecord') %} {% set business = app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(basket_element.getRecord(app).get_base_id(), 'canmodifrecord') %}
{{macro.caption(basket_element.getRecord(app), business, false)}} {{macro.caption(basket_element.getRecord(app), business, false, true)}}
{% endif %} {% endif %}
</div> </div>
</div> </div>