More accurate icons and labels in media wizard

Labels and icons suggested that only image links were possible. Now it should be clear that file links are possible as well.
This commit is contained in:
Anna Dabrowska
2020-07-21 21:04:36 +02:00
parent 0c9dcbcead
commit abb3a0e47c
7 changed files with 15 additions and 8 deletions

View File

@ -202,7 +202,7 @@ class action_plugin_prosemirror_editor extends DokuWiki_Action_Plugin
'style' => 'display: none;',
]);
$mediaForm->addFieldsetOpen($this->getLang('legend:media'))->addClass('js-media-fieldset');
$mediaForm->addButtonHTML('mediamanager', inlineSVG(DOKU_PLUGIN . 'prosemirror/images/image.svg'))->attrs([
$mediaForm->addButtonHTML('mediamanager', inlineSVG(DOKU_PLUGIN . 'prosemirror/images/file-image-outline.svg'))->attrs([
'type' => 'button',
'class' => 'js-open-mediamanager mediaform_mediamanager'
]);

View File

@ -0,0 +1,3 @@
<svg style="width:24px;height:24px" viewBox="0 0 24 24">
<path d="M14,2L20,8V20A2,2 0 0,1 18,22H6A2,2 0 0,1 4,20V4A2,2 0 0,1 6,2H14M18,20V9H13V4H6V20H18M17,13V19H7L12,14L14,16M10,10.5A1.5,1.5 0 0,1 8.5,12A1.5,1.5 0 0,1 7,10.5A1.5,1.5 0 0,1 8.5,9A1.5,1.5 0 0,1 10,10.5Z" />
</svg>

After

Width:  |  Height:  |  Size: 284 B

3
images/file-image.svg Normal file
View File

@ -0,0 +1,3 @@
<svg style="width:24px;height:24px" viewBox="0 0 24 24">
<path d="M13,9H18.5L13,3.5V9M6,2H14L20,8V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V4C4,2.89 4.89,2 6,2M6,20H15L18,20V12L14,16L12,14L6,20M8,9A2,2 0 0,0 6,11A2,2 0 0,0 8,13A2,2 0 0,0 10,11A2,2 0 0,0 8,9Z" />
</svg>

After

Width:  |  Height:  |  Size: 273 B

View File

@ -20,12 +20,12 @@ $lang['type:image'] = 'Bild als Titel nutzen';
$lang['placeholder:link name'] = '(automatisch)';
$lang['legend:media'] = 'Bild';
$lang['legend:media'] = 'Bild oder Datei';
$lang['legend:alignment'] = 'Ausrichtung';
$lang['legend:linking'] = 'Verlinkung';
$lang['legend:caching'] = 'Caching';
$lang['media target'] = 'Bilddatei';
$lang['label:caption'] = 'Titel';
$lang['media target'] = 'Bilddatei oder Dokument';
$lang['label:caption'] = 'Titel / Linktext';
$lang['label:width'] = 'Breite (px)';
$lang['label:height'] = 'Höhe (px)';
$lang['label:default alignment'] = 'Standard';

View File

@ -20,12 +20,12 @@ $lang['type:image'] = 'Use an image as title';
$lang['placeholder:link name'] = '(automatic)';
$lang['legend:media'] = 'Media';
$lang['legend:media'] = 'Media or file';
$lang['legend:alignment'] = 'Alignment';
$lang['legend:linking'] = 'Linking';
$lang['legend:caching'] = 'Caching';
$lang['media target'] = 'Image file';
$lang['label:caption'] = 'Caption';
$lang['media target'] = 'Image or document file';
$lang['label:caption'] = 'Caption / link text';
$lang['label:width'] = 'Width (px)';
$lang['label:height'] = 'Height (px)';
$lang['label:default alignment'] = 'Default';

View File

@ -3,6 +3,7 @@
const paths = {
'alert-circle-outline': 'M11,15H13V17H11V15M11,7H13V13H11V7M12,2C6.47,2 2,6.5 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,20A8,8 0 0,1 4,12A8,8 0 0,1 12,4A8,8 0 0,1 20,12A8,8 0 0,1 12,20Z',
'chevron-down': 'M7.41,8.58L12,13.17L16.59,8.58L18,10L12,16L6,10L7.41,8.58Z',
'file-image-outline': 'M14,2L20,8V20A2,2 0 0,1 18,22H6A2,2 0 0,1 4,20V4A2,2 0 0,1 6,2H14M18,20V9H13V4H6V20H18M17,13V19H7L12,14L14,16M10,10.5A1.5,1.5 0 0,1 8.5,12A1.5,1.5 0 0,1 7,10.5A1.5,1.5 0 0,1 8.5,9A1.5,1.5 0 0,1 10,10.5Z',
'format-bold': 'M13.5,15.5H10V12.5H13.5A1.5,1.5 0 0,1 15,14A1.5,1.5 0 0,1 13.5,15.5M10,6.5H13A1.5,1.5 0 0,1 14.5,8A1.5,1.5 0 0,1 13,9.5H10M15.6,10.79C16.57,10.11 17.25,9 17.25,8C17.25,5.74 15.5,4 13.25,4H7V18H14.04C16.14,18 17.75,16.3 17.75,14.21C17.75,12.69 16.89,11.39 15.6,10.79Z',
'format-header-pound': 'M3,4H5V10H9V4H11V18H9V12H5V18H3V4M13,8H15.31L15.63,5H17.63L17.31,8H19.31L19.63,5H21.63L21.31,8H23V10H21.1L20.9,12H23V14H20.69L20.37,17H18.37L18.69,14H16.69L16.37,17H14.37L14.69,14H13V12H14.9L15.1,10H13V8M17.1,10L16.9,12H18.9L19.1,10H17.1Z',
'format-header-1': 'M3,4H5V10H9V4H11V18H9V12H5V18H3V4M14,18V16H16V6.31L13.5,7.75V5.44L16,4H18V16H20V18H14Z',

View File

@ -48,7 +48,7 @@ export default class ImageMenuItemDispatcher extends AbstractMenuItemDispatcher
}
return true;
},
icon: svgIcon('image'),
icon: svgIcon('file-image-outline'),
label: LANG.plugins.prosemirror['label:image'],
});
}