Commit d6ff2d69 authored by Marco Nolletti's avatar Marco Nolletti

Added showdescription and showkeywords options to config

Upped version
parent f632cdd1
......@@ -21,5 +21,5 @@ $meta['panorama_width'] = array('numeric');
$meta['panorama_height'] = array('numeric');
$meta['sort'] = array('multichoice', '_choices' => array('file','mod','date','title','random'));
$meta['options'] = array('multicheckbox', '_choices' => array('fullsize','crop','reverse','recursive','showtitle','showinfo','showfname'));
$meta['options'] = array('multicheckbox', '_choices' => array('fullsize','crop','reverse','recursive','showtitle','showinfo','showdescription','showkeywords','showfname'));
......@@ -2,9 +2,10 @@
/**
* German language file for photogallery plugin
*
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Marco Nolletti / Felix Mühlbauer
*/
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Marco Nolletti
* @contributors Felix Mühlbauer, Michael Große
*/
$lang['imagescnt'] = '%s Bilder';
$lang['videoocnt'] = '%s Videos';
......
......@@ -2,8 +2,9 @@
/**
* German language file for photogallery plugin
*
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Marco Nolletti / Felix Mühlbauer
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Marco Nolletti
* @contributors Felix Mühlbauer
*/
$lang['use_phpThumb'] = 'phpThumb für Cache und Thumbnails generation Verwenden';
......@@ -33,6 +34,8 @@ $lang['options_o_crop'] = 'Zuschneiden';
$lang['options_o_reverse'] = 'Sortierung umdrehen';
$lang['options_o_recursive'] = 'Unterordner durchsuchen';
$lang['options_o_showtitle'] = 'Titel des Bildes anzeigen';
$lang['options_o_showdescription'] = 'Breschreibung des Bildes anzeigen';
$lang['options_o_showkeywords'] = 'Schlagwörter des Bildes anzeigen';
$lang['options_o_showinfo'] = 'EXIF Info anzeigen';
$lang['options_o_showfname'] = 'Dateiname anzeigen';
......@@ -4,6 +4,7 @@
*
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Marco Nolletti
* @contributors Felix Mühlbauer
*/
$lang['imagescnt'] = '%s images';
......
......@@ -33,6 +33,8 @@ $lang['options_o_crop'] = 'Crop';
$lang['options_o_reverse'] = 'Invert sort order';
$lang['options_o_recursive'] = 'Recurse subfolders';
$lang['options_o_showtitle'] = 'Show the title of the image';
$lang['options_o_showdescription'] = 'Show the description of the image';
$lang['options_o_showkeywords'] = 'Show the keywords of the image';
$lang['options_o_showinfo'] = 'Show EXIF info';
$lang['options_o_showfname'] = 'Show the filename';
......@@ -33,6 +33,8 @@ $lang['options_o_crop'] = 'Ritaglia';
$lang['options_o_reverse'] = 'Inverti';
$lang['options_o_recursive'] = 'Ricerca ricorsiva';
$lang['options_o_showtitle'] = 'Mostra titolo';
$lang['options_o_showdescription'] = 'Mostra la descrizione';
$lang['options_o_showkeywords'] = 'Mostra le parole chiave';
$lang['options_o_showinfo'] = 'Mostra info EXIF';
$lang['options_o_showfname'] = 'Mostra nome file';
......
base photogallery
author Marco Nolletti
email mnolletti@gmail.com
date 2017-04-24
date 2017-06-17
name PhotoGallery Plugin
desc Creates a gallery of images from a namespace (PHP Version >= 5.4.45 required)
url http://www.dokuwiki.org/plugin:photogallery
......@@ -3,8 +3,9 @@
* DokuWiki Plugin photogallery (Syntax Component)
* Embed an image gallery
*
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Marco Nolletti
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Marco Nolletti
* @contributors Michael Große
*/
// must be run within Dokuwiki
......@@ -929,18 +930,18 @@ class syntax_plugin_photogallery extends DokuWiki_Syntax_Plugin {
$ret .= '<h4>'.hsc($title).'</h4>';
}
}
if ($data['showdesc']) {
if ($data['showdescription']) {
$desc = $this->_meta($img,'desc');
if(!empty($desc)){
$ret .= '<p>'.nl2br(hsc($desc)).'</p>';
}
}
if ($data['showkeywords']) {
$keywords = $this->_meta($img,'keywords');
if(!empty($keywords)){
$ret .= '<p>'.hsc($keywords).'</p>';
}
}
if ($data['showkeywords']) {
$keywords = $this->_meta($img,'keywords');
if(!empty($keywords)){
$ret .= '<p>'.hsc($keywords).'</p>';
}
}
if ($data['showinfo']){
$ret .= $this->_exif($img);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment