summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2005-07-24 22:11:11 +0200
committerAndreas Gohr <andi@splitbrain.org>2005-07-24 22:11:11 +0200
commit6d861d1222d72bacbb7723f9df05548c76cca967 (patch)
tree7f344333faa7b41d2fe17481d126c8a92aa7173d /lib
parent2684e50a0796d39e424969890c16eb97a8838151 (diff)
downloadrpg-6d861d1222d72bacbb7723f9df05548c76cca967.tar.gz
rpg-6d861d1222d72bacbb7723f9df05548c76cca967.tar.bz2
EXIF/IPTC metadata in media popup
darcs-hash:20050724201111-7ad00-81e8de6162b0e0923c08dcc7b8c750cd604c4dfd.gz
Diffstat (limited to 'lib')
-rw-r--r--lib/exe/media.php1
-rw-r--r--lib/tpl/default/design.css18
2 files changed, 19 insertions, 0 deletions
diff --git a/lib/exe/media.php b/lib/exe/media.php
index e824150f3..14474cb0c 100644
--- a/lib/exe/media.php
+++ b/lib/exe/media.php
@@ -5,6 +5,7 @@
require_once(DOKU_INC.'inc/lang/en/lang.php');
require_once(DOKU_INC.'inc/lang/'.$conf['lang'].'/lang.php');
require_once(DOKU_INC.'inc/html.php');
+ require_once(DOKU_INC.'inc/JpegMeta.php');
require_once(DOKU_INC.'inc/search.php');
require_once(DOKU_INC.'inc/template.php');
require_once(DOKU_INC.'inc/auth.php');
diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
index 81558b4d2..41a34dd5f 100644
--- a/lib/tpl/default/design.css
+++ b/lib/tpl/default/design.css
@@ -700,3 +700,21 @@ dl.img_tags dt {
dl.img_tags dd {
background-color: #f5f5f5;
}
+
+div.meta {
+ color: #666;
+ font-size: 70%;
+ line-height: 95%;
+}
+
+div.meta img.thumb{
+ float:left;
+ margin-right: 0.1em;
+}
+
+/* -------------- Media Popup ---------------------- */
+
+div.mediaselect-right li, div.uploadform {
+ clear: both;
+}
+