Changeset 3957:51227219596b for admin

Timestamp:

02/12/19 14:06:29 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Fix title+legend media insertion

Location:

admin

Files:

• js/_media_item.js (modified) (1 diff)
• media_item.php (modified) (7 diffs)

admin/js/_media_item.js

@@ -77 +77 @@
   // Confirm for deleting current medoa
   $('#delete-form input[name="delete"]').click(function() {
-    return window.confirm(dotclear.msg.confirm_delete_media);
+    let m_name = $('#delete-form input[name="remove"]').val();
+    return window.confirm(dotclear.msg.confirm_delete_media.replace('%s', m_name));
   });
 

admin/media_item.php

@@ -222 +222 @@
 };
 
+$get_img_desc = function($file, $default = '') {
+    if (count($file->media_meta) > 0) {
+        foreach ($file->media_meta as $k => $v) {
+            if ((string) $v && ($k == 'Description')) {
+                return $v;
+            }
+        }
+    }
+    return $default;
+};
+
 /* DISPLAY Main page
 -------------------------------------------------------- */
 $starting_scripts =
-'<script type="text/javascript">' . "\n" .
-dcPage::jsVar('dotclear.msg.confirm_delete_media', __('Are you sure to delete this media?')) . "\n" .
-"</script>" .
 dcPage::jsModal() .
 dcPage::jsLoad('js/_media_item.js');
@@ -282 +290 @@
 if ($select) {
     // Let user choose thumbnail size if image
-    $media_desc = $file->media_title;
+    $media_title = $file->media_title;
+    $media_desc = $get_img_desc($file, $media_title);
 
     echo
@@ -305 +314 @@
     if ($file->media_type == 'image') {
         $media_type = 'image';
-        $media_desc = $get_img_title($file,
+        $media_title = $get_img_title($file,
             $core->blog->settings->system->media_img_title_pattern,
             $core->blog->settings->system->media_img_use_dto_first,
             $core->blog->settings->system->media_img_no_date_alone);
-        if ($media_desc == $file->basename) {
-            $media_desc = '';
+        if ($media_title == $file->basename) {
+            $media_title = '';
         }
 
@@ -342 +351 @@
     '<button type="button" id="media-select-cancel">' . __('Cancel') . '</button>' .
     form::hidden(['type'], html::escapeHTML($media_type)) .
-    form::hidden(['title'], html::escapeHTML($file->media_title)) .
+    form::hidden(['title'], html::escapeHTML($media_title)) .
     form::hidden(['description'], html::escapeHTML($media_desc)) .
     form::hidden(['url'], $file->file_url) .
@@ -353 +362 @@
 # Insertion popup
 if ($popup && !$select) {
-    $media_desc = $file->media_title;
+    $media_title = $file->media_title;
+    $media_desc = $get_img_desc($file, $media_title);
 
     echo
@@ -376 +386 @@
     if ($file->media_type == 'image') {
         $media_type = 'image';
-        $media_desc = $get_img_title($file,
+        $media_title = $get_img_title($file,
             $core->blog->settings->system->media_img_title_pattern,
             $core->blog->settings->system->media_img_use_dto_first,
             $core->blog->settings->system->media_img_no_date_alone);
-        if ($media_desc == $file->basename) {
-            $media_desc = '';
+        if ($media_title == $file->basename) {
+            $media_title = '';
         }
 
@@ -518 +528 @@
     '<button type="button" id="media-insert-cancel">' . __('Cancel') . '</button>' .
     form::hidden(['type'], html::escapeHTML($media_type)) .
-    form::hidden(['title'], html::escapeHTML($file->media_title)) .
+    form::hidden(['title'], html::escapeHTML($media_title)) .
     form::hidden(['description'], html::escapeHTML($media_desc)) .
     form::hidden(['url'], $file->file_url) .