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

Merge branch 'master' into PHRAS-1686-test-commit-proxies

Browse Source
This commit is contained in:
Nicolas Maillat
2019-05-24 13:20:26 +02:00
committed by GitHub
parent 3c4046b432 6b887fcd97
commit 1bc1233bec
9 changed files with 82 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/config.yml
View File

@@ -61,7 +61,9 @@ jobs:
- run: node -v - run: node -v
- run: npm -v - run: npm -v
- run: npm install -g yarn - run: npm install -g yarn
- run: /opt/circleci/nodejs/v10.12.0/bin/yarn install - run: rm ~/.yarn/bin/yarn
- run: ln -s /opt/circleci/nodejs/v10.12.0/bin/yarn ~/.yarn/bin/yarn
- run: yarn install
- run: if [[ ! -e elasticsearch-2.3.3 ]]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-2.3.3.tar.gz && tar -xvf elasticsearch-2.3.3.tar.gz && elasticsearch-2.3.3/bin/plugin install analysis-icu; fi - run: if [[ ! -e elasticsearch-2.3.3 ]]; then wget --no-check-certificate https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-2.3.3.tar.gz && tar -xvf elasticsearch-2.3.3.tar.gz && elasticsearch-2.3.3/bin/plugin install analysis-icu; fi
- run: - run:
command: elasticsearch-2.3.3/bin/elasticsearch command: elasticsearch-2.3.3/bin/elasticsearch

11
Dockerfile
View File

@@ -1,6 +1,5 @@
FROM php:7.1-fpm-stretch as builder FROM php:7.1-fpm-stretch as builder
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y \ && apt-get install -y \
apt-transport-https \ apt-transport-https \
@@ -135,8 +134,13 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& mkdir -p /var/log/supervisor && mkdir -p /var/log/supervisor
RUN mkdir /entrypoint /var/alchemy \
&& useradd -u 1000 app \
&& mkdir -p /home/app/.composer \
&& chown -R app: /home/app /var/alchemy
COPY --from=builder /var/alchemy /var/alchemy/Phraseanet COPY --from=builder --chown=app /var/alchemy /var/alchemy/Phraseanet
ADD ./docker/phraseanet/ /
RUN mkdir -p /var/alchemy/Phraseanet/logs \ RUN mkdir -p /var/alchemy/Phraseanet/logs \
&& chmod -R 777 /var/alchemy/Phraseanet/logs \ && chmod -R 777 /var/alchemy/Phraseanet/logs \
&& mkdir -p /var/alchemy/Phraseanet/cache \ && mkdir -p /var/alchemy/Phraseanet/cache \
@@ -150,11 +154,10 @@ RUN mkdir -p /var/alchemy/Phraseanet/logs \
&& mkdir -p /var/alchemy/Phraseanet/config \ && mkdir -p /var/alchemy/Phraseanet/config \
&& chmod -R 777 /var/alchemy/Phraseanet/config && chmod -R 777 /var/alchemy/Phraseanet/config
WORKDIR /var/alchemy/Phraseanet WORKDIR /var/alchemy/Phraseanet
CMD ["php-fpm"] CMD ["/boot.sh"]
# phraseanet-nginx # phraseanet-nginx
FROM nginx:1.15 as phraseanet-nginx FROM nginx:1.15 as phraseanet-nginx
RUN useradd -u 1000 app RUN useradd -u 1000 app
ADD ./docker/nginx/ / ADD ./docker/nginx/ /
COPY --from=builder /var/alchemy/www /var/alchemy/Phraseanet/www COPY --from=builder /var/alchemy/www /var/alchemy/Phraseanet/www

2
composer.json
View File

@@ -47,7 +47,7 @@
"php": ">=5.5.9", "php": ">=5.5.9",
"ext-intl": "*", "ext-intl": "*",
"alchemy-fr/tcpdf-clone": "~6.0", "alchemy-fr/tcpdf-clone": "~6.0",
"alchemy/embed-bundle": "^2.0.2", "alchemy/embed-bundle": "^2.0.3",
"alchemy/geonames-api-consumer": "~0.1.0", "alchemy/geonames-api-consumer": "~0.1.0",
"alchemy/mediavorus": "^0.4.4", "alchemy/mediavorus": "^0.4.4",
"alchemy/oauth2php": "1.1.0", "alchemy/oauth2php": "1.1.0",

14
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "f7b0fedd863f0f1aa5841665b563305d", "content-hash": "de1d9335418b121d0ede26765b0a9e7d",
"packages": [ "packages": [
{ {
"name": "alchemy-fr/tcpdf-clone", "name": "alchemy-fr/tcpdf-clone",
@@ -131,16 +131,16 @@
}, },
{ {
"name": "alchemy/embed-bundle", "name": "alchemy/embed-bundle",
"version": "2.0.1", "version": "2.0.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/alchemy-fr/embed-bundle.git", "url": "https://github.com/alchemy-fr/embed-bundle.git",
"reference": "36c788a38bfed3ed19fdc4e1cc0290f0a674e4b9" "reference": "e02e25a04911210eaedff0adb9cf7589010c473b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/36c788a38bfed3ed19fdc4e1cc0290f0a674e4b9", "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/e02e25a04911210eaedff0adb9cf7589010c473b",
"reference": "36c788a38bfed3ed19fdc4e1cc0290f0a674e4b9", "reference": "e02e25a04911210eaedff0adb9cf7589010c473b",
"shasum": "" "shasum": ""
}, },
"require-dev": { "require-dev": {
@@ -178,10 +178,10 @@
], ],
"description": "Embed resources bundle", "description": "Embed resources bundle",
"support": { "support": {
"source": "https://github.com/alchemy-fr/embed-bundle/tree/2.0.1", "source": "https://github.com/alchemy-fr/embed-bundle/tree/2.0.3",
"issues": "https://github.com/alchemy-fr/embed-bundle/issues" "issues": "https://github.com/alchemy-fr/embed-bundle/issues"
}, },
"time": "2019-05-14T12:25:18+00:00" "time": "2019-05-23T15:23:14+00:00"
}, },
{ {
"name": "alchemy/geonames-api-consumer", "name": "alchemy/geonames-api-consumer",

3
docker/phraseanet/boot.sh Executable file
View File

@@ -0,0 +1,3 @@
#!/bin/bash
php-fpm

34
lib/conf.d/data_templates/DublinCore.xml
View File

@@ -182,26 +182,26 @@
</subdefs> </subdefs>
<description> <description>
<Title src="XMP-dc:Title" thumbtitle="1" report="1" /> <Title src="XMP-dc:Title" type="string" thumbtitle="1" report="1" />
<Creator src="XMP-dc:Creator" report="1" /> <Creator src="XMP-dc:Creator" type="string" report="1" />
<Subject src="XMP-dc:Subject" multi="1"/> <Subject src="XMP-dc:Subject" type="string" multi="1"/>
<Description src="XMP-dc:Description" report="0" /> <Description src="XMP-dc:Description" type="string" report="0" />
<Publisher src="XMP-dc:Publisher" type="date" report="0" /> <Publisher src="XMP-dc:Publisher" type="date" report="0" />
<Contributor src="XMP-dc:Contributor" report="0"/> <Contributor src="XMP-dc:Contributor" type="string" report="0"/>
<Date src="XMP-dc:Date" type="date" report="0" /> <Date src="XMP-dc:Date" type="date" report="0" />
<Type src="XMP-dc:Type" report="1" /> <Type src="XMP-dc:Type" type="string" report="1" />
<Format src="XMP-dc:Format" report="0" /> <Format src="XMP-dc:Format" type="string" report="0" />
<Identifier src="XMP-dc:Identifier" report="1" /> <Identifier src="XMP-dc:Identifier" type="string" report="1" />
<Source src="XMP-dc:Source" report="0" /> <Source src="XMP-dc:Source" type="string" report="0" />
<Language src="XMP-dc:Language" report="0" /> <Language src="XMP-dc:Language" type="string" report="0" />
<Relation src="XMP-dc:Relation" report="0" /> <Relation src="XMP-dc:Relation" type="string" report="0" />
<Coverage src="XMP-dc:Coverage" report="1" /> <Coverage src="XMP-dc:Coverage" type="string" report="1" />
<Rights src="XMP-dc:Rights" report="0" /> <Rights src="XMP-dc:Rights" type="string" report="0" />
<Comments src="" business="1" report="0" /> <Comments src="" business="1" type="string" report="0" />
<Filename src="Phraseanet:tf-basename" readonly="1" type="string" report="1"/> <Filename src="Phraseanet:tf-basename" readonly="1" type="string" report="1"/>
<CameraDevice src="IFD0:Model" readonly="1" report="0" /> <CameraDevice src="IFD0:Model" type="string" readonly="1" report="0" />
<Latitude src="GPS:GPSLatitude" readonly="1" report="0" /> <Latitude src="GPS:GPSLatitude" type="number" readonly="1" report="0" />
<Longitude src="GPS:GPSLongitude" readonly="1" report="0"/> <Longitude src="GPS:GPSLongitude" type="number" readonly="1" report="0"/>
<ArchiveDate src="Phraseanet:tf-archivedate" readonly="1" type="date" report="0" /> <ArchiveDate src="Phraseanet:tf-archivedate" readonly="1" type="date" report="0" />
<LastEditDate src="Phraseanet:tf-editdate" readonly="1" type="date" report="0" /> <LastEditDate src="Phraseanet:tf-editdate" readonly="1" type="date" report="0" />
</description> </description>

40
lib/conf.d/data_templates/en-simple.xml
View File

@@ -182,27 +182,27 @@
</subdefs> </subdefs>
<description> <description>
<Object src="IPTC:ObjectName" /> <Object src="IPTC:ObjectName" type="string"/>
<Category src="IPTC:Category"/> <Category src="IPTC:Category" type="string"/>
<SupplCategory src="IPTC:SupplementalCategories" multi="1"/> <SupplCategory src="IPTC:SupplementalCategories" type="string" multi="1"/>
<Keywords src="IPTC:Keywords" multi="1"/> <Keywords src="IPTC:Keywords" type="string" multi="1"/>
<SpecialInstruct src="IPTC:SpecialInstructions"/> <SpecialInstruct src="IPTC:SpecialInstructions" type="string"/>
<Date src="IPTC:DateCreated" type="date" /> <Date src="IPTC:DateCreated" type="date" />
<Byline src="IPTC:By-line"/> <Byline src="IPTC:By-line" type="string"/>
<BylineTitle src="IPTC:By-lineTitle"/> <BylineTitle src="IPTC:By-lineTitle" type="string"/>
<City src="IPTC:City" /> <City src="IPTC:City" type="string"/>
<Province src="IPTC:Province-State" /> <Province src="IPTC:Province-State" type="string"/>
<Country src="IPTC:Country-PrimaryLocationName" /> <Country src="IPTC:Country-PrimaryLocationName" type="string"/>
<OriginalRef src="IPTC:OriginalTransmissionReference" /> <OriginalRef src="IPTC:OriginalTransmissionReference" type="string"/>
<Headline src="IPTC:Headline" report="1" thumbtitle="1" /> <Headline src="IPTC:Headline" type="string" report="1" thumbtitle="1"/>
<Credit src="IPTC:Credit" report="1" /> <Credit src="IPTC:Credit" type="string" report="1"/>
<Source src="IPTC:Source" /> <Source src="IPTC:Source" type="string"/>
<Caption src="IPTC:Caption-Abstract" /> <Caption src="IPTC:Caption-Abstract" type="string"/>
<CaptionWriter src="IPTC:Writer-Editor" /> <CaptionWriter src="IPTC:Writer-Editor" type="string"/>
<Longitude src="GPS:GPSLongitude" readonly="1"/> <Longitude src="GPS:GPSLongitude" type="number" readonly="1"/>
<Latitude src="GPS:GPSLatitude" readonly="1"/> <Latitude src="GPS:GPSLatitude" type="number" readonly="1"/>
<CameraModel src="IFD0:Model" readonly="1"/> <CameraModel src="IFD0:Model" type="string" readonly="1"/>
<FileName src="Phraseanet:tf-basename" readonly="1" type="string" /> <FileName src="Phraseanet:tf-basename" type="string" readonly="1"/>
</description> </description>
<statbits> <statbits>

42
lib/conf.d/data_templates/fr-simple.xml
View File

@@ -182,27 +182,27 @@
</subdefs> </subdefs>
<description> <description>
<Objet src="IPTC:ObjectName" /> <Objet src="IPTC:ObjectName" type="string"/>
<Categorie src="IPTC:Category"/> <Categorie src="IPTC:Category" type="string"/>
<AutresCategories src="IPTC:SupplementalCategories" multi="1"/> <AutresCategories src="IPTC:SupplementalCategories" type="string" multi="1"/>
<MotsCles src="IPTC:Keywords" multi="1"/> <MotsCles src="IPTC:Keywords" type="string" multi="1"/>
<Observations src="IPTC:SpecialInstructions"/> <Observations src="IPTC:SpecialInstructions" type="string"/>
<Date src="IPTC:DateCreated" type="date" /> <Date src="IPTC:DateCreated" type="date"/>
<Signature src="IPTC:By-line"/> <Signature src="IPTC:By-line" type="string"/>
<TitreCredits src="IPTC:By-lineTitle"/> <TitreCredits src="IPTC:By-lineTitle" type="string"/>
<Ville src="IPTC:City" /> <Ville src="IPTC:City" type="string" />
<Province src="IPTC:Province-State" /> <Province src="IPTC:Province-State" type="string"/>
<Pays src="IPTC:Country-PrimaryLocationName" /> <Pays src="IPTC:Country-PrimaryLocationName" type="string"/>
<ReferencesOriginales src="IPTC:OriginalTransmissionReference" /> <ReferencesOriginales src="IPTC:OriginalTransmissionReference" type="string"/>
<Titre src="IPTC:Headline" report="1" thumbtitle="1" /> <Titre src="IPTC:Headline" type="string" report="1" thumbtitle="1" />
<Credit src="IPTC:Credit" report="1" /> <Credit src="IPTC:Credit" type="string" report="1" />
<Source src="IPTC:Source" /> <Source src="IPTC:Source" type="string"/>
<Legende src="IPTC:Caption-Abstract" /> <Legende src="IPTC:Caption-Abstract" type="string"/>
<Redacteur src="IPTC:Writer-Editor" /> <Redacteur src="IPTC:Writer-Editor" type="string"/>
<Longitude src="GPS:GPSLongitude" readonly="1"/> <Longitude src="GPS:GPSLongitude" type="number" readonly="1"/>
<Latitude src="GPS:GPSLatitude" readonly="1"/> <Latitude src="GPS:GPSLatitude" type="number" readonly="1"/>
<AppareilPhoto src="IFD0:Model" readonly="1"/> <AppareilPhoto src="IFD0:Model" type="string" readonly="1"/>
<NomDeFichier src="Phraseanet:tf-basename" readonly="1" type="string" /> <NomDeFichier src="Phraseanet:tf-basename" type="string" readonly="1"/>
</description> </description>
<statbits> <statbits>

6
templates/web/prod/results/record.html.twig
View File

@@ -53,10 +53,10 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div style="height: 25px; position:relative; text-align:left;"> <div class="bottom_actions_holder" style="height: 27px; position:relative; text-align:left;">
<table class="bottom actions" style="width:100%; table-layout:fixed;"> <table class="bottom actions" style="width:100%; table-layout:fixed;">
<tr> <tr>
<td style="text-align:left;text-overflow:ellipsis;overflow:hidden;"> <td class="text-stack-wrapper" style="text-align:left;text-overflow:ellipsis;overflow:hidden;">
{% set collectionLogo = collection_logo(record.baseId) %} {% set collectionLogo = collection_logo(record.baseId) %}
{% if collectionLogo is empty %} {% if collectionLogo is empty %}
{{ record.collectionName }} {{ record.collectionName }}
@@ -74,7 +74,7 @@
{% endif %} {% endif %}
{# drop down options #} {# drop down options #}
<td style="text-align:right;width:{{l_width}}px;" valign="bottom"> <td class="icon-stack-wrapper" style="text-align:right;width:{{l_width}}px;" valign="bottom">
{% if settings.rollover_thumbnail == 'caption' %} {% if settings.rollover_thumbnail == 'caption' %}
{% if record_subdef_url(record, 'preview') is not null and has_access_subdef(record, 'preview') %} {% if record_subdef_url(record, 'preview') is not null and has_access_subdef(record, 'preview') %}