mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-24 18:33:13 +00:00
Merge branch 'master' into PHRDPL-86_xdebug
This commit is contained in:
Nicolas Maillat
18
composer.lock
generated
18
composer.lock
generated
@@ -131,16 +131,16 @@
|
||||
},
|
||||
{
|
||||
"name": "alchemy/embed-bundle",
|
||||
"version": "2.0.8",
|
||||
"version": "2.0.9",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/alchemy-fr/embed-bundle.git",
|
||||
"reference": "cbaa5e34b7b6ccbe128f8c804649c8a3ecd1e621"
|
||||
"reference": "8cdb9612a9e3edd998b68f0803eacca8e0f50775"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/cbaa5e34b7b6ccbe128f8c804649c8a3ecd1e621",
|
||||
"reference": "cbaa5e34b7b6ccbe128f8c804649c8a3ecd1e621",
|
||||
"url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/8cdb9612a9e3edd998b68f0803eacca8e0f50775",
|
||||
"reference": "8cdb9612a9e3edd998b68f0803eacca8e0f50775",
|
||||
"shasum": ""
|
||||
},
|
||||
"require-dev": {
|
||||
@@ -177,7 +177,11 @@
|
||||
}
|
||||
],
|
||||
"description": "Embed resources bundle",
|
||||
"time": "2019-10-09T14:34:23+00:00"
|
||||
"support": {
|
||||
"source": "https://github.com/alchemy-fr/embed-bundle/tree/2.0.9",
|
||||
"issues": "https://github.com/alchemy-fr/embed-bundle/issues"
|
||||
},
|
||||
"time": "2020-02-04T14:53:00+00:00"
|
||||
},
|
||||
{
|
||||
"name": "alchemy/geonames-api-consumer",
|
||||
@@ -2856,6 +2860,7 @@
|
||||
}
|
||||
],
|
||||
"description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.",
|
||||
"abandoned": true,
|
||||
"time": "2015-05-20T03:37:09+00:00"
|
||||
},
|
||||
{
|
||||
@@ -2906,6 +2911,7 @@
|
||||
"Guzzle",
|
||||
"stream"
|
||||
],
|
||||
"abandoned": true,
|
||||
"time": "2014-10-12T19:18:40+00:00"
|
||||
},
|
||||
{
|
||||
@@ -6412,6 +6418,7 @@
|
||||
"profiler",
|
||||
"silex"
|
||||
],
|
||||
"abandoned": true,
|
||||
"time": "2016-10-26T11:08:02+00:00"
|
||||
},
|
||||
{
|
||||
@@ -6454,6 +6461,7 @@
|
||||
"plugin",
|
||||
"silex"
|
||||
],
|
||||
"abandoned": true,
|
||||
"time": "2015-11-11T07:16:28+00:00"
|
||||
},
|
||||
{
|
||||
|
||||
@@ -16,7 +16,7 @@ class Version
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
private $number = '4.1.0-alpha.19a';
|
||||
private $number = '4.1.0-alpha.20a';
|
||||
|
||||
/**
|
||||
* @var string
|
||||
|
||||
@@ -396,25 +396,25 @@ class PDFRecords extends PDF
|
||||
$this->pdf->SetY($this->pdf->GetY()+10);
|
||||
|
||||
$this->pdf->SetFont(PhraseaPDF::FONT, 'B', 12);
|
||||
$this->pdf->Write(5, $this->app->trans("print_feedback:: Document generated on : " . " "));
|
||||
$this->pdf->Write(5, $this->app->trans("print_feedback:: Document generated on : ") . " ");
|
||||
$this->pdf->SetFont(PhraseaPDF::FONT, '', 12);
|
||||
$this->pdf->Write(5, $this->formatDate(new \DateTime('now')));
|
||||
$this->pdf->Write(12, "\n");
|
||||
|
||||
$this->pdf->SetFont(PhraseaPDF::FONT, 'B', 12);
|
||||
$this->pdf->Write(5, $this->app->trans("print_feedback:: Feedback initiated by : " . " "));
|
||||
$this->pdf->Write(5, $this->app->trans("print_feedback:: Feedback initiated by : ") . " ");
|
||||
$this->pdf->SetFont(PhraseaPDF::FONT, '', 12);
|
||||
$this->pdf->Write(5, $this->getDisplayName($validation->getInitiator()));
|
||||
$this->pdf->Write(6, "\n");
|
||||
|
||||
$this->pdf->SetFont(PhraseaPDF::FONT, 'B', 12);
|
||||
$this->pdf->Write(5, $this->app->trans("print_feedback:: Feedback initiated on : " . " "));
|
||||
$this->pdf->Write(5, $this->app->trans("print_feedback:: Feedback initiated on : ") . " ");
|
||||
$this->pdf->SetFont(PhraseaPDF::FONT, '', 12);
|
||||
$this->pdf->Write(5, $this->formatDate($validation->getCreated()));
|
||||
$this->pdf->Write(6, "\n");
|
||||
|
||||
$this->pdf->SetFont(PhraseaPDF::FONT, 'B', 12);
|
||||
$this->pdf->Write(5, $this->app->trans("print_feedback:: Feedback expiring on : " . " "));
|
||||
$this->pdf->Write(5, $this->app->trans("print_feedback:: Feedback expiring on : ") . " ");
|
||||
$this->pdf->SetFont(PhraseaPDF::FONT, '', 12);
|
||||
$this->pdf->Write(5, $this->formatDate($validation->getExpires()));
|
||||
$this->pdf->Write(12, "\n");
|
||||
|
||||
@@ -62,6 +62,16 @@ class patch_410alpha17a implements patchInterface
|
||||
// $sql = "ALTER TABLE `metadatas_structure` ADD `gui_editable` INT(1) UNSIGNED NOT NULL DEFAULT '0' AFTER `readonly`";
|
||||
// $databox->get_connection()->executeQuery($sql);
|
||||
|
||||
foreach ($databox->get_meta_structure() as $databox_field) {
|
||||
if ($databox_field->get_tbranch() != '') {
|
||||
$databox_field->set_generate_cterms(true);
|
||||
} else {
|
||||
$databox_field->set_generate_cterms(false);
|
||||
}
|
||||
|
||||
$databox_field->save();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
111
lib/classes/patch/410alpha20a.php
Normal file
111
lib/classes/patch/410alpha20a.php
Normal file
@@ -0,0 +1,111 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of Phraseanet
|
||||
*
|
||||
* (c) 2005-2019 Alchemy
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
use Alchemy\Phrasea\Application;
|
||||
|
||||
class patch_410alpha20a implements patchInterface
|
||||
{
|
||||
/** @var string */
|
||||
private $release = '4.1.0-alpha.20a';
|
||||
|
||||
/** @var array */
|
||||
private $concern = [base::DATA_BOX];
|
||||
|
||||
/**
|
||||
* Returns the release version.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function get_release()
|
||||
{
|
||||
return $this->release;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function concern()
|
||||
{
|
||||
return $this->concern;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function require_all_upgrades()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function getDoctrineMigrations()
|
||||
{
|
||||
return [];
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function apply(base $databox, Application $app)
|
||||
{
|
||||
// fix the Longitude value
|
||||
|
||||
$sql = 'SELECT id, record_id, name, value FROM technical_datas WHERE trim(name) = "LongitudeRef" ';
|
||||
$stmt = $databox->get_connection()->prepare($sql);
|
||||
$stmt->execute();
|
||||
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
|
||||
$stmt->closeCursor();
|
||||
|
||||
foreach ($rs as $row) {
|
||||
if (trim($row['value']) === 'W' ) {
|
||||
$sql = 'UPDATE technical_datas SET value = CONCAT("-", value) WHERE trim(name) = "Longitude" AND record_id =:record_id';
|
||||
$stmt = $databox->get_connection()->prepare($sql);
|
||||
$stmt->execute([':record_id' => $row['record_id']]);
|
||||
}
|
||||
|
||||
$sqlDelete = 'DELETE FROM technical_datas WHERE id =:id';
|
||||
|
||||
$stmt1 = $databox->get_connection()->prepare($sqlDelete);
|
||||
$stmt1->execute([':id' => $row['id']]);
|
||||
$stmt1->closeCursor();
|
||||
}
|
||||
|
||||
$stmt->closeCursor();
|
||||
|
||||
// fix the Latitude value
|
||||
|
||||
$sql = 'SELECT id, record_id, name, value FROM technical_datas WHERE trim(name) = "LatitudeRef" ';
|
||||
$stmt = $databox->get_connection()->prepare($sql);
|
||||
$stmt->execute();
|
||||
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
|
||||
$stmt->closeCursor();
|
||||
|
||||
foreach ($rs as $row) {
|
||||
if (trim($row['value']) === 'S' ) {
|
||||
$sql = 'UPDATE technical_datas SET value = CONCAT("-", value) WHERE trim(name) = "Latitude" AND record_id =:record_id';
|
||||
$stmt = $databox->get_connection()->prepare($sql);
|
||||
$stmt->execute([':record_id' => $row['record_id']]);
|
||||
}
|
||||
|
||||
$sqlDelete = 'DELETE FROM technical_datas WHERE id =:id';
|
||||
|
||||
$stmt1 = $databox->get_connection()->prepare($sqlDelete);
|
||||
$stmt1->execute([':id' => $row['id']]);
|
||||
$stmt1->closeCursor();
|
||||
}
|
||||
|
||||
$stmt->closeCursor();
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -65,7 +65,7 @@
|
||||
"normalize-css": "^2.1.0",
|
||||
"npm": "^6.0.0",
|
||||
"npm-modernizr": "^2.8.3",
|
||||
"phraseanet-production-client": "0.34.116-d",
|
||||
"phraseanet-production-client": "0.34.126-d",
|
||||
"requirejs": "^2.3.5",
|
||||
"tinymce": "^4.0.28",
|
||||
"underscore": "^1.8.3",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -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-01-29T14:29:07Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
|
||||
<file date="2020-02-04T09:01:22Z" 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="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
|
||||
<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="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
|
||||
</trans-unit>
|
||||
<trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore" approved="yes">
|
||||
|
||||
@@ -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-01-29T14:29:20Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
|
||||
<file date="2020-02-04T09:01:47Z" 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="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
|
||||
<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="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
|
||||
</trans-unit>
|
||||
<trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore" approved="yes">
|
||||
|
||||
@@ -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-01-29T14:29:36Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
|
||||
<file date="2020-02-04T09:02:08Z" 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="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
|
||||
<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="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
|
||||
</trans-unit>
|
||||
<trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore" approved="yes">
|
||||
|
||||
@@ -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-01-29T14:29:56Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
|
||||
<file date="2020-02-04T09:02:30Z" 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="36">Form/Login/PhraseaRenewPasswordForm.php</jms:reference-file>
|
||||
<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="49">Form/Login/PhraseaRegisterForm.php</jms:reference-file>
|
||||
</trans-unit>
|
||||
<trans-unit id="90b8c9717bb7ed061dbf20fe1986c8b8593d43d4" resname="The token provided is not valid anymore">
|
||||
|
||||
@@ -17,3 +17,157 @@ $mainMenuMarginBottom: 30px;
|
||||
#mainContent {
|
||||
padding-top: $mainMenuHeight;
|
||||
}
|
||||
|
||||
|
||||
/*Help menu*/
|
||||
.contextMenu.helpcontextmenu {
|
||||
display: none;
|
||||
&.shown {
|
||||
display: block;
|
||||
position: absolute;
|
||||
z-index: 101;
|
||||
}
|
||||
}
|
||||
.help-trigger {
|
||||
display:inline-block;
|
||||
cursor:pointer;
|
||||
padding: 0 4px;
|
||||
border:none;
|
||||
margin-left: -12px;
|
||||
}
|
||||
|
||||
.phraseanet_logo {
|
||||
background: url(../../common/images/logo_phraseanet.png) no-repeat center center /contain;
|
||||
height: 75px;
|
||||
width: 230px;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.phraseanet_version {
|
||||
font-size: 15px;
|
||||
font-family: Roboto;
|
||||
font-weight: 500;
|
||||
color: #b7b7b7;
|
||||
padding-left: 58px;
|
||||
a {
|
||||
color: #b7b7b7;
|
||||
&:hover {
|
||||
color: #FFFFFF;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.phraseanet_about_top {
|
||||
background: #4e4e4e;
|
||||
padding: 30px 20px;
|
||||
}
|
||||
.phraseanet_about_bottom {
|
||||
padding: 25px 20px;
|
||||
min-height: 150px;
|
||||
background: #c8c8c8;
|
||||
a {
|
||||
font-family: Roboto;
|
||||
line-height: 1.2;
|
||||
font-size: 15px!important;
|
||||
font-weight: 500;
|
||||
color: #000000!important;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
}
|
||||
.phraseanet_gpl {
|
||||
img {
|
||||
position: absolute;
|
||||
width: 84px;
|
||||
}
|
||||
span {
|
||||
padding-top: 26px;
|
||||
display: inline-block;
|
||||
padding-left: 100px;
|
||||
padding-bottom: 20px;
|
||||
text-decoration: underline;
|
||||
}
|
||||
a {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
.ui-dialog {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
padding: .2em;
|
||||
outline: 0;
|
||||
}
|
||||
.ui-dialog .ui-dialog-titlebar {
|
||||
padding: .4em 1em;
|
||||
position: relative;
|
||||
}
|
||||
.ui-dialog .ui-dialog-title {
|
||||
float: left;
|
||||
margin: .1em 0;
|
||||
white-space: nowrap;
|
||||
width: 90%;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
.ui-dialog .ui-dialog-titlebar-close {
|
||||
position: absolute;
|
||||
right: .3em;
|
||||
top: 50%;
|
||||
width: 21px;
|
||||
margin: -10px 0 0 0;
|
||||
padding: 1px;
|
||||
height: 20px;
|
||||
text-indent: -9999999px;
|
||||
}
|
||||
.ui-dialog .ui-dialog-content {
|
||||
position: relative;
|
||||
border: 0;
|
||||
padding: .5em 1em;
|
||||
background: none;
|
||||
overflow: auto;
|
||||
}
|
||||
.ui-dialog .ui-dialog-buttonpane {
|
||||
text-align: left;
|
||||
border-width: 1px 0 0 0;
|
||||
background-image: none;
|
||||
margin-top: .5em;
|
||||
padding: .3em 1em .5em .4em;
|
||||
}
|
||||
.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
|
||||
float: right;
|
||||
}
|
||||
.ui-dialog .ui-dialog-buttonpane button {
|
||||
margin: .5em .4em .5em 0;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.overlay,
|
||||
.ui-widget-overlay {
|
||||
background-color: #000;
|
||||
opacity: 0.7;
|
||||
filter: alpha(opacity=70);
|
||||
height: 100%;
|
||||
width: 100%
|
||||
}
|
||||
|
||||
|
||||
.ui-icon, .ui-widget-content .ui-icon {
|
||||
background-image: url(/assets/vendors/jquery-ui/images/ui-lightness/ui-icons_222222_256x240.png)!important;
|
||||
display: block;
|
||||
text-indent: -99999px;
|
||||
overflow: hidden;
|
||||
background-repeat: no-repeat;
|
||||
background-position: -96px -128px;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
margin-left: -8px;
|
||||
margin-top: -8px;
|
||||
}
|
||||
|
||||
@@ -325,6 +325,7 @@ div.switch_right.unchecked {
|
||||
.ui-dialog-titlebar-close {
|
||||
border: none;
|
||||
margin-right: 4px;
|
||||
text-indent: -9999999px;
|
||||
}
|
||||
.ui-icon.ui-icon-closethick {
|
||||
background-image: url("/assets/common/images/icons/cross-white.png");
|
||||
@@ -841,6 +842,76 @@ span.simplecolorpicker.picker {
|
||||
}
|
||||
}
|
||||
|
||||
.help-trigger {
|
||||
display:inline-block;
|
||||
cursor:pointer;
|
||||
padding: 0 4px;
|
||||
border:none;
|
||||
margin-left: -12px;
|
||||
}
|
||||
|
||||
.phraseanet_logo {
|
||||
background: url(../../common/images/logo_phraseanet.png) no-repeat center center /contain;
|
||||
height: 75px;
|
||||
width: 230px;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.phraseanet_version {
|
||||
font-size: 15px;
|
||||
font-family: Roboto;
|
||||
font-weight: 500;
|
||||
color: #b7b7b7;
|
||||
padding-left: 58px;
|
||||
a {
|
||||
color: #b7b7b7;
|
||||
&:hover {
|
||||
color: #FFFFFF;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.phraseanet_about_top {
|
||||
background: #4e4e4e;
|
||||
padding: 30px 20px;
|
||||
}
|
||||
.phraseanet_about_bottom {
|
||||
padding: 25px 20px;
|
||||
min-height: 150px;
|
||||
background: #c8c8c8;
|
||||
a {
|
||||
font-family: Roboto;
|
||||
line-height: 1.2;
|
||||
font-size: 15px!important;
|
||||
font-weight: 500;
|
||||
color: #000000!important;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
}
|
||||
.phraseanet_gpl {
|
||||
img {
|
||||
position: absolute;
|
||||
width: 84px;
|
||||
}
|
||||
span {
|
||||
padding-top: 26px;
|
||||
display: inline-block;
|
||||
padding-left: 100px;
|
||||
padding-bottom: 20px;
|
||||
text-decoration: underline;
|
||||
}
|
||||
a {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
}
|
||||
.ui-icon, .ui-widget-content .ui-icon {
|
||||
background-image: url(/assets/vendors/jquery-ui/images/ui-lightness/ui-icons_222222_256x240.png)!important;
|
||||
}
|
||||
.ui-dialog-titlebar-close {
|
||||
text-indent: -9999999px;
|
||||
}
|
||||
@import './databases';
|
||||
@import './fields';
|
||||
@import './tables';
|
||||
|
||||
BIN
resources/www/common/images/GPLv3_Logo.png
Normal file
BIN
resources/www/common/images/GPLv3_Logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 42 KiB |
BIN
resources/www/common/images/logo_phraseanet.png
Normal file
BIN
resources/www/common/images/logo_phraseanet.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 18 KiB |
@@ -94,7 +94,7 @@ var commonModule = (function ($, p4) {
|
||||
.empty()
|
||||
.append(el.attr('infos'))
|
||||
.dialog({
|
||||
|
||||
title: 'About',
|
||||
autoOpen: false,
|
||||
closeOnEscape: true,
|
||||
resizable: false,
|
||||
@@ -106,7 +106,7 @@ var commonModule = (function ($, p4) {
|
||||
backgroundColor: '#000',
|
||||
opacity: 0.7
|
||||
}
|
||||
}).dialog('open').css({'overflow-x': 'auto', 'overflow-y': 'auto'});
|
||||
}).dialog('open').css({'overflow-x': 'auto', 'overflow-y': 'hidden', 'padding': '0'});
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -107,3 +107,60 @@ $mainMenuLinkBackgroundHoverColor: transparent;
|
||||
margin-left: -12px;
|
||||
}
|
||||
|
||||
.phraseanet_logo {
|
||||
background: url(../images/logo_phraseanet.png) no-repeat center center /contain;
|
||||
height: 75px;
|
||||
width: 230px;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.phraseanet_version {
|
||||
font-size: 15px;
|
||||
font-family: Roboto;
|
||||
font-weight: 500;
|
||||
color: #b7b7b7;
|
||||
padding-left: 58px;
|
||||
a {
|
||||
color: #b7b7b7;
|
||||
&:hover {
|
||||
color: #FFFFFF;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.phraseanet_about_top {
|
||||
background: #4e4e4e;
|
||||
padding: 30px 20px;
|
||||
}
|
||||
.phraseanet_about_bottom {
|
||||
padding: 25px 20px;
|
||||
min-height: 150px;
|
||||
background: #c8c8c8;
|
||||
a {
|
||||
font-family: Roboto;
|
||||
line-height: 1.2;
|
||||
font-size: 15px!important;
|
||||
font-weight: 500;
|
||||
color: #000000!important;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
}
|
||||
.phraseanet_gpl {
|
||||
img {
|
||||
position: absolute;
|
||||
width: 84px;
|
||||
}
|
||||
span {
|
||||
padding-top: 26px;
|
||||
display: inline-block;
|
||||
padding-left: 100px;
|
||||
padding-bottom: 20px;
|
||||
text-decoration: underline;
|
||||
}
|
||||
a {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -360,3 +360,86 @@ $select-height: 26px;
|
||||
#mainMenu li .context-menu-item-inner a:hover {
|
||||
color: #000;
|
||||
}
|
||||
|
||||
.ui-dialog-titlebar-close {
|
||||
text-indent: -9999999px;
|
||||
}
|
||||
|
||||
|
||||
/*Help menu*/
|
||||
.contextMenu.helpcontextmenu {
|
||||
display: none;
|
||||
&.shown {
|
||||
display: block;
|
||||
position: absolute;
|
||||
z-index: 101;
|
||||
}
|
||||
}
|
||||
.help-trigger {
|
||||
display:inline-block;
|
||||
cursor:pointer;
|
||||
padding: 0 4px;
|
||||
border:none;
|
||||
margin-left: -12px;
|
||||
}
|
||||
|
||||
.phraseanet_logo {
|
||||
background: url(../../common/images/logo_phraseanet.png) no-repeat center center /contain;
|
||||
height: 75px;
|
||||
width: 230px;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.phraseanet_version {
|
||||
font-size: 15px;
|
||||
font-family: Roboto;
|
||||
font-weight: 500;
|
||||
color: #b7b7b7;
|
||||
padding-left: 58px;
|
||||
a {
|
||||
color: #b7b7b7;
|
||||
&:hover {
|
||||
color: #FFFFFF;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.phraseanet_about_top {
|
||||
background: #4e4e4e;
|
||||
padding: 30px 20px;
|
||||
}
|
||||
.phraseanet_about_bottom {
|
||||
padding: 25px 20px;
|
||||
min-height: 150px;
|
||||
background: #c8c8c8;
|
||||
a {
|
||||
font-family: Roboto;
|
||||
line-height: 1.2;
|
||||
font-size: 15px!important;
|
||||
font-weight: 500;
|
||||
color: #000000!important;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
}
|
||||
.phraseanet_gpl {
|
||||
img {
|
||||
position: absolute;
|
||||
width: 84px;
|
||||
}
|
||||
span {
|
||||
padding-top: 26px;
|
||||
display: inline-block;
|
||||
padding-left: 100px;
|
||||
padding-bottom: 20px;
|
||||
text-decoration: underline;
|
||||
}
|
||||
a {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.ui-icon, .ui-widget-content .ui-icon {
|
||||
background-image: url(/assets/vendors/jquery-ui/images/ui-lightness/ui-icons_222222_256x240.png)!important;
|
||||
}
|
||||
|
||||
@@ -252,7 +252,7 @@
|
||||
{% endif %}
|
||||
<div title="" class="context-menu-item menu3-custom-item">
|
||||
<div style="" class="context-menu-item-inner infoDialog"
|
||||
infos="<div><span style='font-size:18px;'>PHRASEANET</span> {{ app['phraseanet.version'].getName() }} (V{{ app['phraseanet.version'].getNumber() }})</div><div></div><br/><div><a href='http://www.gnu.org/licenses/gpl.html' target='_blank'><img src='http://www.gnu.org/graphics/gplv3-88x31.png' style='vertical-align:middle;'/><span>License GNU GPL v3</span></a></div><br/><div><a href='http://www.phraseanet.com/' target='_blank'> © Copyright Alchemy 2005-{{ "now"|date("Y") }}</a><p style='margin-top: 10px' ><a href='../../gitlog.txt' target='_blank'>gitlog</a></p></div>">{{ 'phraseanet:: a propos' | trans }}</div>
|
||||
infos="<div class='phraseanet_about'><div class='phraseanet_about_top'><span class='phraseanet_logo'></span><div class='phraseanet_version'> {{ app['phraseanet.version'].getName() }} (V{{ app['phraseanet.version'].getNumber() }}) <a href='../../gitlog.txt' target='_blank'>gitlog</a></div></div><div class='phraseanet_about_bottom'><div class='phraseanet_gpl'><a href='http://www.gnu.org/licenses/gpl.html' target='_blank'><img src='/assets/common/images/GPLv3_Logo.png' width='380' /><span>License GNU GPL v3</span></a></div><p class='phraseanet_copyright'><a href='http://www.phraseanet.com/' target='_blank'> © Copyright Alchemy 2005-{{ "now"|date("Y") }}</a></p></div></div>">{{ 'phraseanet:: a propos' | trans }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
@@ -356,15 +356,20 @@
|
||||
var elements = [];
|
||||
var nbElement = 0;
|
||||
|
||||
if (nbProposals >= 1) {
|
||||
|
||||
|
||||
if (nbProposals > 1) {
|
||||
elements = $(".selected", container);
|
||||
nbElement = elements.length;
|
||||
} else {
|
||||
return false;
|
||||
} else if (nbProposals == 1) {
|
||||
elements = $(".records-subititution > div", container);
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (nbElement === 0) {
|
||||
if (nbElement === 0 && nbProposals > 1) {
|
||||
alert(language.selectOneRecord);
|
||||
|
||||
return false;
|
||||
} else if (nbElement > 1) {
|
||||
alert(language.onlyOneRecord);
|
||||
|
||||
@@ -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.116-d:
|
||||
version "0.34.116-d"
|
||||
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.116-d.tgz#74d2d3e14e68a66f3a64aeb1f857bad04a4491f0"
|
||||
integrity sha512-x0IB2zQu0L+jQ/TXpHae8CPqCHsv9yanp254hAcnuwEQ88cig4oNU8JLKxPvwt0d3WUQ5J2S0BdshdbfpFxBbw==
|
||||
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==
|
||||
dependencies:
|
||||
"@mapbox/mapbox-gl-language" "^0.9.2"
|
||||
"@turf/turf" "^5.1.6"
|
||||
|
||||
Reference in New Issue
Block a user