prepare new release 1.0.40.1

Signed-off-by: Raphaël Tournoy <[email protected]>
CCSDForge · May 23, 2023 · 266bd71 · 266bd71
1 parent 5c41543
commit 266bd71
Show file tree

Hide file tree

Showing 5 changed files with 136 additions and 124 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Security
 -->
 
+## 1.0.40.1 - 2023-05-24
+### Changed
+- Merged Share + Metadata export panels to save space
+
 ## 1.0.40 - 2023-05-23
 ### Changed
 - New WYSIWYG editor version (editing toolbar for text areas) ; bumped from TinyMCE v4 to TinyMCE v6

diff --git a/application/languages/en/views.php b/application/languages/en/views.php
@@ -1805,7 +1805,9 @@
     'Rédacteur sans rubrique' => 'Editor without section',
 
     "Exporter" => "Export",
+    "Export métadonnées" => "Export metadata",
     "Partager" => "Share",
+    "Partager et exporter" => 'Share and export',
     "Voulez-vous partager la publication ? Rendez-vous" => "Do you want to share the publication? Go",
     "ici" => 'here',
     "Statistiques de consultation" => "Consultation statistics",

diff --git a/application/modules/journal/views/scripts/paper/view.phtml b/application/modules/journal/views/scripts/paper/view.phtml
@@ -130,17 +130,17 @@ if ($paper->isPublished()) {
                 foreach ($ogMeta as $key => $meta) {
                     if ($key === 'tag') {
                         foreach ($meta as $tag) {
-                            $this->headMeta()->appendProperty('og:'.$ogKey. ':' .$key, $tag);
+                            $this->headMeta()->appendProperty('og:' . $ogKey . ':' . $key, $tag);
                         }
                         continue;
                     }
                     if ($key === 'author') {
                         foreach ($meta as $profile) {
-                            $this->headMeta()->appendProperty('og:'.$ogKey. ':' . 'author', $profile['citation_author']);
+                            $this->headMeta()->appendProperty('og:' . $ogKey . ':' . 'author', $profile['citation_author']);
                         }
                         continue;
                     }
-                    $this->headMeta()->appendProperty('og:' . $ogKey. ':' .$key, $meta);
+                    $this->headMeta()->appendProperty('og:' . $ogKey . ':' . $key, $meta);
 
                 }
                 break;
@@ -173,7 +173,7 @@ if ($paper->isPublished()) {
             }
             continue;
         }
-        $this->headMeta()->appendName("twitter:".$twitterKey, $twitterMeta);
+        $this->headMeta()->appendName("twitter:" . $twitterKey, $twitterMeta);
     }
     foreach ($headMeta['header'] as $hKey => $headerMeta) {
         switch ($hKey) {
@@ -232,8 +232,8 @@ $this->jQuery()->addJavascriptFile('/js/paper/view.js');
         <div class="panel-body in">
             <?php $statusMsg = $this->translate('Statut actuel') . $this->translate(' :') . ' '; ?>
             <p>
-                <strong><?= $statusMsg ?></strong>
-                <span class="label label-status-<?= $status ?>"><?= ucfirst($this->translate(Episciences_PapersManager::getStatusLabel($status))) ?></span>
+                <strong><?= $statusMsg ?></strong> <span
+                        class="label label-status-<?= $status ?>"><?= ucfirst($this->translate(Episciences_PapersManager::getStatusLabel($status))) ?></span>
                 <?= $this->partial('partials/paper-revision-deadline.phtml', ['revisionDeadline' => $this->revisionDeadline]) ?>
             </p>
         </div>
@@ -346,22 +346,15 @@ if ($this->citations !== '') {
 <?php // export options ***************************************************** ?>
 
 <?php if ($paper->isPublished()) : ?>
-    <div class="row">
-        <div class="col-md-8">
-            <?php echo $this->partial('partials/paper_export.phtml', ['docid' => $paper->getDocid()]); ?>
-        </div>
-        <div class="col-md-4">
-            <?php // share options ***************************************************** ?>
-
-            <div class="panel panel-default collapsable">
-                <div class="panel-heading">
-                    <h2 class="panel-title"><?= $this->translate('Partager') ?></h2>
-                </div>
-                <?php echo $this->partial('partials/paper_share.phtml', ['paper' => $paper]); ?>
-            </div>
 
+
+    <div class="panel panel-default collapsable">
+        <div class="panel-heading">
+            <h2 class="panel-title"><?= $this->translate('Partager et exporter') ?></h2>
         </div>
+        <?php echo $this->partial('partials/paper_share.phtml', ['paper' => $paper]); ?>
     </div>
+
 <?php endif; ?>
 
 <?php if ($this->page_count || $this->file_count) : ?>

diff --git a/application/modules/journal/views/scripts/partials/paper_export.phtml b/application/modules/journal/views/scripts/partials/paper_export.phtml
@@ -2,27 +2,27 @@
 $docid = $this->docid;
 ?>
 
-<div class="panel panel-default collapsable">
-    <div class="panel-heading">
-        <h2 class="panel-title"><?= $this->translate('Exporter') ?></h2>
-    </div>
-    <div class="panel-body in" style="overflow: visible">
-
+<?php
+$exportUrl = $this->url(['id' => $docid]);
+$exportFormat['bibtex'] = 'BibTeX';
+$exportFormat['tei'] = 'TEI';
+$exportFormat['dc'] = 'Dublin Core';
+$exportFormat['datacite'] = 'OpenAIRE';
+$exportFormat['crossref'] = 'Crossref';
+$exportFormat['doaj'] = 'DOAJ';
+$exportFormat['zbjats'] = 'ZbMATH Open';
+$exportFormat['json'] = 'JSON';
+?>
+<div class="dropdown">
+    <button id="dLabel" class="btn btn-default btn" style="margin-top: 0.5em" type="button" data-toggle="dropdown" aria-haspopup="true"
+            aria-expanded="false">
+        <?= $this->translate('Export métadonnées') ?> <span class="caret"></span>
+    </button>
+    <ul class="dropdown-menu" aria-labelledby="dLabel">
         <?php
-        $exportUrl = $this->url(['id' => $docid]);
-        $exportFormat['bibtex'] = 'BibTeX';
-        $exportFormat['tei'] = '<abbr title="Text Encoding Initiative">TEI</abbr>';
-        $exportFormat['dc'] = ' <abbr title="Dublin Core">DC</abbr>';
-        $exportFormat['datacite'] = 'OpenAIRE';
-        $exportFormat['crossref'] = 'Crossref';
-        $exportFormat['doaj'] = 'DOAJ';
-        $exportFormat['zbjats'] = 'zbJATS';
-        $exportFormat['json'] = 'JSON';
-
         foreach ($exportFormat as $format => $title) {
-            printf('<a class="btn btn-default btn-sm" target="_blank" href="%s/%s">%s</a>&nbsp;', $exportUrl, $format, $title);
+            printf('<li><a class="" target="_blank" href="%s/%s">%s</a></li>', $exportUrl, $format, $title);
         }
         ?>
-
-    </div>
-</div>
+    </ul>
+</div>