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

PHRAS-2915 #comment add Read more btn #time 5h

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-02-12 17:26:10 +04:00
parent 546d07a559
commit fa462b368b
11 changed files with 2011 additions and 1897 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",
"npm": "^6.0.0",
"npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.34.126-d",
"phraseanet-production-client": "0.34.129-d",
"requirejs": "^2.3.5",
"tinymce": "^4.0.28",
"underscore": "^1.8.3",

956
resources/locales/messages.de.xlf
View File

File diff suppressed because it is too large Load Diff

964
resources/locales/messages.en.xlf
View File

File diff suppressed because it is too large Load Diff

964
resources/locales/messages.fr.xlf
View File

File diff suppressed because it is too large Load Diff

956
resources/locales/messages.nl.xlf
View File

File diff suppressed because it is too large Load Diff

4
resources/locales/validators.de.xlf
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2020-02-04T09:01:22Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<file date="2020-02-12T14:18:06Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -9,8 +9,8 @@
<trans-unit id="96f0767cb7ea65a7f86c8c9432e80d16cf9d8680" resname="Please provide the same passwords." approved="yes">
<source>Please provide the same passwords.</source>
<target state="translated">Bitte geben Sie diesselbe Passwörter ein.</target>
<jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
<jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
<jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
<jms:reference-file line="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
</trans-unit>
<trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore" approved="yes">

4
resources/locales/validators.en.xlf
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2020-02-04T09:01:47Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
<file date="2020-02-12T14:18:19Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -9,8 +9,8 @@
<trans-unit id="96f0767cb7ea65a7f86c8c9432e80d16cf9d8680" resname="Please provide the same passwords." approved="yes">
<source>Please provide the same passwords.</source>
<target state="translated">Please provide the same passwords.</target>
<jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
<jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
<jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
<jms:reference-file line="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
</trans-unit>
<trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore" approved="yes">

4
resources/locales/validators.fr.xlf
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2020-02-04T09:02:08Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
<file date="2020-02-12T14:18:36Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -9,8 +9,8 @@
<trans-unit id="96f0767cb7ea65a7f86c8c9432e80d16cf9d8680" resname="Please provide the same passwords." approved="yes">
<source>Please provide the same passwords.</source>
<target state="translated">Veuillez indiquer des mots de passe identiques.</target>
<jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
<jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
<jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
<jms:reference-file line="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
</trans-unit>
<trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore" approved="yes">

4
resources/locales/validators.nl.xlf
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2020-02-04T09:02:30Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
<file date="2020-02-12T14:18:59Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
@@ -9,8 +9,8 @@
<trans-unit id="96f0767cb7ea65a7f86c8c9432e80d16cf9d8680" resname="Please provide the same passwords.">
<source>Please provide the same passwords.</source>
<target state="new">Please provide the same passwords.</target>
<jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
<jms:reference-file line="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
<jms:reference-file line="44">Form/Login/PhraseaRecoverPasswordForm.php</jms:reference-file>
<jms:reference-file line="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
</trans-unit>
<trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore">

42
templates/web/lightbox/index.html.twig
View File

@@ -20,7 +20,7 @@
<table id="main_wrapper" cellspacing="0" cellpadding="0">
<thead>
<tr>
<th class="title">
<th class="title" id="feed_list">
<h1>{{ 'Validations' | trans }}</h1>
</th>
<th>
@@ -32,7 +32,9 @@
{% for basket in baskets_collection | sort | reverse%}
{% if basket.getValidation() %}
{% set basket_length = basket.getElements().count() %}
<tr>
{% set counter = ( counter | default(0) ) + 1 %}
<tr class="{% if counter >=4 %}other_feed hidden{% endif %}">
<td colspan="2">
<div class="basket_wrapper ui-corner-all clickable">
<table cellspacing="0" cellpadding="0" border="0">
@@ -84,10 +86,13 @@
</div>
</td>
</tr>
{% if counter == 3 %}<tr><td colspan="2" style="text-align: center"><a href="#see_more_feed" id="see_more_feed" class="see_more_feed btn btn-info">{{ 'lightbox::See_more_feedback' | trans }}</a></td></tr>{% endif %}
{% endif %}
{% endfor %}
<tr><td colspan="2" style="text-align: center"><a href="#feed_list" id="see_less_feed" class="see_more_feed hidden btn btn-success">{{ 'lightbox::See_less_feedback' | trans }}</a></td></tr>
<tr>
<th class="title">
<th class="title" id="panier_list">
<h1>{{ 'Paniers' | trans }}</h1>
</th>
<th>
@@ -97,7 +102,10 @@
{% for basket in baskets_collection | sort | reverse%}
{% if basket.getValidation is null %}
{% set basket_length = basket.getElements().count() %}
<tr>
{% set counter = ( counter | default(0) ) + 1 %}
{% set counter_length = baskets_collection.length() %}
<tr class="{% if counter >=4 %}other_basket hidden{% endif %}">
<td colspan="2">
<div class="basket_wrapper ui-corner-all clickable">
<table cellspacing="0" cellpadding="0" border="0">
@@ -140,12 +148,38 @@
<input type="hidden" name="ssel_id" value="{{ basket.getId() }}"/>
</div>
</td>
</tr>
{% if counter == 3 %}<tr><td colspan="2" style="text-align: center"><a href="#see_more_basket" id="see_more_basket" class="see_more_basket btn btn-info">{{ 'lightbox::see_more_basket' | trans }}</a></td></tr>{% endif %}
{% endif %}
{% endfor %}
<tr><td colspan="2" style="text-align: center"><a href="#panier_list" id="see_less_basket" class="see_more_basket hidden btn btn-success">{{ 'lightbox::see_less_basket' | trans }}</a></td></tr>
</tbody>
</table>
</div>
<script>
/* $('.see_more_basket').on('click',function (e) {
see_more('basket');
});
$('.see_more_feed').on('click',function (e) {
see_more('feed');
});
function see_more(target) {
$('.other_'+target).toggleClass('hidden');
document.getElementById('see_more_'+target).scrollIntoView({
behavior: 'smooth'
});
document.getElementById('see_less_'+target).scrollIntoView({
behavior: 'smooth',
block: "start"
});
$('.see_more_'+target).toggleClass('hidden');
}*/
</script>
{% endblock %}

8
yarn.lock
View File

@@ -7577,10 +7577,10 @@ phraseanet-common@^0.4.5-d:
js-cookie "^2.1.0"
pym.js "^1.3.1"
phraseanet-production-client@0.34.126-d:
version "0.34.126-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.126-d.tgz#93ca77826eb637bcc089887bc0a2cc43ef3b8c3e"
integrity sha512-x2P5Ckty4iRN6ju/3b43Ljtu0cd8jRdgEQbSGRcaVjd+DuFGgpFqJn5NkoqwSKIXpvutT4sqWTHb0UfZ/sBjPQ==
phraseanet-production-client@0.34.129-d:
version "0.34.129-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.129-d.tgz#7071380fe5ccbf0f9e5edc3d5d35403a807f8157"
integrity sha512-n6y6ji2vZeLTciK9kc/+/8d9PsvaeYb7Yns+RdvOb7AT41tNUhf9pfDspzEZ2HOMqQPju6QepVOULxbT0zCszw==
dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6"