diff options
| author | Michael Hamann <michael@content-space.de> | 2011-09-08 11:27:42 +0200 |
|---|---|---|
| committer | Michael Hamann <michael@content-space.de> | 2011-09-08 11:39:00 +0200 |
| commit | fb46ebd87eb43d5cd9f67f353f6656d0e3a0b196 (patch) | |
| tree | b89b580659168d8550dcca66fb0c303389b77aaf /conf | |
| parent | aea34b5fe445064477d8ad0c98926db33a0d0851 (diff) | |
| parent | cc2c0b9d6af82732ed79eeb85c22b7c3192a4e55 (diff) | |
| download | rpg-fb46ebd87eb43d5cd9f67f353f6656d0e3a0b196.tar.gz rpg-fb46ebd87eb43d5cd9f67f353f6656d0e3a0b196.tar.bz2 | |
Merge branch 'media-revisions'
This introduces a new media manager and media revisions to DokuWiki. The
changes have been implemented by Kate Arzamastseva and are the
result of a Google Summer of Code project, the official project page can
be found at
http://www.google-melange.com/gsoc/project/google/gsoc2011/kate/18001
Thanks to Kate for the work and Google for sponsoring it!
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/dokuwiki.php | 1 | ||||
| -rw-r--r-- | conf/mediameta.php | 44 |
2 files changed, 40 insertions, 5 deletions
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index 5e185e9c2..298c8e572 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -20,6 +20,7 @@ $conf['basedir'] = ''; //absolute dir from serveroot - blank $conf['baseurl'] = ''; //URL to server including protocol - blank for autodetect $conf['savedir'] = './data'; //where to store all the files $conf['allowdebug'] = 0; //allow debug output, enable if needed 0|1 +$conf['mediarevisions'] = 1; //enable/disable media revisions /* Display Options */ diff --git a/conf/mediameta.php b/conf/mediameta.php index ba7117643..0428a4b88 100644 --- a/conf/mediameta.php +++ b/conf/mediameta.php @@ -29,29 +29,63 @@ $fields = array( 'img_title', 'text'), - 20 => array('Iptc.Caption', + 20 => array('', + 'img_date', + 'date', + array('Date.EarliestTime')), + + 30 => array('', + 'img_fname', + 'text', + array('File.Name')), + + 40 => array('Iptc.Caption', 'img_caption', 'textarea', array('Exif.UserComment', 'Exif.TIFFImageDescription', 'Exif.TIFFUserComment')), - 30 => array('Iptc.Byline', + 50 => array('Iptc.Byline', 'img_artist', 'text', array('Exif.TIFFArtist', 'Exif.Artist', 'Iptc.Credit')), - 40 => array('Iptc.CopyrightNotice', + 60 => array('Iptc.CopyrightNotice', 'img_copyr', 'text', array('Exif.TIFFCopyright', 'Exif.Copyright')), - 50 => array('Iptc.Keywords', + 70 => array('', + 'img_format', + 'text', + array('File.Format')), + + 80 => array('', + 'img_fsize', + 'text', + array('File.NiceSize')), + + 90 => array('', + 'img_width', + 'text', + array('File.Width')), + + 100 => array('', + 'img_height', + 'text', + array('File.Height')), + + 110 => array('', + 'img_camera', + 'text', + array('Simple.Camera')), + + 120 => array('Iptc.Keywords', 'img_keywords', 'text', array('Exif.Category')), ); - |