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

PHRAS-2829 #comment fix lightbox mobile

Browse Source
This commit is contained in:
Harrys Ravalomanana
2019-11-26 16:33:09 +04:00
parent c9907449a3
commit 194d8e243a
5 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -65,7 +65,7 @@
"normalize-css": "^2.1.0", "normalize-css": "^2.1.0",
"npm": "^6.0.0", "npm": "^6.0.0",
"npm-modernizr": "^2.8.3", "npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.34.79-d", "phraseanet-production-client": "0.34.80-d",
"requirejs": "^2.3.5", "requirejs": "^2.3.5",
"tinymce": "^4.0.28", "tinymce": "^4.0.28",
"underscore": "^1.8.3", "underscore": "^1.8.3",

19
resources/www/lightbox/styles/jquery-mobile/_jquery-validator.scss
View File

@@ -26,15 +26,15 @@ li.image_box a{
width: 100%; width: 100%;
} }
li.image_box{ li.image_box{
width: 32%; width: 18%;
position: relative; position: relative;
margin: 0 2% 15px 0; margin: 0 2.5% 15px 0;
padding: 0; padding: 0;
display: flex; display: flex;
align-items: center; align-items: center;
text-align: center; text-align: center;
background: #ededed; background: #ededed;
&:nth-child(3n) { &:nth-child(5n) {
margin-right: 0; margin-right: 0;
} }
.thumb_wrapper { .thumb_wrapper {
@@ -43,6 +43,19 @@ li.image_box{
height: 100%!important; height: 100%!important;
} }
} }
@media screen and (max-width: 767px) {
li.image_box{
width: 32%;
margin: 0 2% 15px 0;
&:nth-child(5n) {
margin-right: 2% ;
}
&:nth-child(3n) {
margin-right: 0;
}
}
}
a.no.active_choice{ a.no.active_choice{
background-color:red; background-color:red;
color: #fff; color: #fff;

4
templates/mobile/lightbox/basket_element.html.twig
View File

@@ -67,10 +67,10 @@
{% if basket_element.getBasket().getValidation() %} {% if basket_element.getBasket().getValidation() %}
{% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanAgree() %} {% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanAgree() %}
<fieldset data-role="controlgroup" data-type="horizontal" style="text-align:center;"> <fieldset data-role="controlgroup" data-type="horizontal" style="text-align:center;">
<input {% if basket_element.getUserValidationDatas(app.getAuthenticatedUser()).getAgreement() == true%}checked="checked"{% endif %} type="radio" name="radio-view" id="radio-view-yes_{{basket_element.getId()}}" value="yes" /> <input onclick="window.location.reload();" {% if basket_element.getUserValidationDatas(app.getAuthenticatedUser()).getAgreement() == true%}checked="checked"{% endif %} type="radio" name="radio-view" id="radio-view-yes_{{basket_element.getId()}}" value="yes" />
<label class="agreement_radio" style="width:110px;text-align:center;" <label class="agreement_radio" style="width:110px;text-align:center;"
for="radio-view-yes_{{ basket_element.getId() }}">{{ 'validation:: OUI' | trans }}</label> for="radio-view-yes_{{ basket_element.getId() }}">{{ 'validation:: OUI' | trans }}</label>
<input {% if basket_element.getUserValidationDatas(app.getAuthenticatedUser()).getAgreement() == false and basket_element.getUserValidationDatas(app.getAuthenticatedUser()).getAgreement() is not null %}checked="checked"{% endif %} type="radio" name="radio-view" id="radio-view-no_{{basket_element.getId()}}" value="no" /> <input onclick="window.location.reload();" {% if basket_element.getUserValidationDatas(app.getAuthenticatedUser()).getAgreement() == false and basket_element.getUserValidationDatas(app.getAuthenticatedUser()).getAgreement() is not null %}checked="checked"{% endif %} type="radio" name="radio-view" id="radio-view-no_{{basket_element.getId()}}" value="no" />
<label class="agreement_radio" style="width:110px;text-align:center;" <label class="agreement_radio" style="width:110px;text-align:center;"
for="radio-view-no_{{ basket_element.getId() }}">{{ 'validation:: NON' | trans }}</label> for="radio-view-no_{{ basket_element.getId() }}">{{ 'validation:: NON' | trans }}</label>
</fieldset> </fieldset>

6
templates/mobile/lightbox/sc_note.html.twig
View File

@@ -2,7 +2,8 @@
<li> <li>
<div class="validate-icon"> <div class="validate-icon">
{% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %} {% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %}
{% if validationDatas.getAgreement() == true %}<span class="icomoon icon-agree">&#xe95f;</span>{% else %}<span class="icomoon icon-disagree">&#xe971;</span>{% endif %} {% if validationDatas.getAgreement() == true %}<span class="icomoon icon-agree">&#xe95f;</span>{% endif %}
{% if validationDatas.getAgreement() == false and validationDatas.getAgreement() is not null %}<span class="icomoon icon-disagree">&#xe971; {{ validationDatas.getAgreement() }}</span>{% endif %}
{% endif %} {% endif %}
</div> </div>
<div class="validate-info"> <div class="validate-info">
@@ -10,8 +11,7 @@
{{ validationDatas.getParticipant().getUser().getDisplayName() }} {{ validationDatas.getParticipant().getUser().getDisplayName() }}
</h3> </h3>
{% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %} {% if basket_element.getBasket().getValidation().getParticipant(app.getAuthenticatedUser()).getCanSeeOthers() or validationDatas.getParticipant().getUser() == app.getAuthenticatedUser() %}
{% if validationDatas.getNote() != '' %}
{% if validationDatas.getNote() != '' and validationDatas.getAgreement() == true %}
<p style="text-align:left;">{{ 'validation:: note' | trans }} : {{ validationDatas.getNote()|nl2br }} </p> <p style="text-align:left;">{{ 'validation:: note' | trans }} : {{ validationDatas.getNote()|nl2br }} </p>
{% endif %} {% endif %}
{% endif %} {% endif %}

8
yarn.lock
View File

@@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.1:
js-cookie "^2.1.0" js-cookie "^2.1.0"
pym.js "^1.3.1" pym.js "^1.3.1"
phraseanet-production-client@0.34.79-d: phraseanet-production-client@0.34.80-d:
version "0.34.79-d" version "0.34.80-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.79-d.tgz#753ebac9e7dcfe49d9f81d2e67847a2031d5e8c6" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.80-d.tgz#1e54bee4306ab11528377cb63c19d8c7491ef0f3"
integrity sha512-TGVGYJrRjIMXiuy7TUsAKU+dHep5M0eBBaUykWYUwXDCwtkBSkDAzMW7Rmg6BxQAj8QJArOp+DCQZtVRbF0rZQ== integrity sha512-ilGs7ndDNztwlyeW9MA2TMiMhZC+P1/lNNeIsIuh+KuJH8M3Y3SWBcmsN2lqu5iM1Xg5FbWJ6iXcCSrLWHTqsw==
dependencies: dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2" "@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6" "@turf/turf" "^5.1.6"