From: garvinhicking <garvinhicking>
Date: Fri, 21 Apr 2006 10:56:07 +0000 (+0000)
Subject: Add detail pane for viewing media
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=fe935f243ab791d188067f1d0c202a83c3eb3732;p=s9y.git

Add detail pane for viewing media
---

diff --git a/deployment/serendipity_editor.js b/deployment/serendipity_editor.js
index d8c6c72..a853e0b 100644
--- a/deployment/serendipity_editor.js
+++ b/deployment/serendipity_editor.js
@@ -229,6 +229,10 @@ function serendipity_imageSelector_done(textarea)
     if (f['imgID']) {
         imgID = f['imgID'].value;
     }
+    baseURL = '';
+    if (f['baseURL']) {
+        baseURL = f['baseURL'].value;
+    }
 
     floating = 'center';
     if (f['serendipity[align]'][0].checked == true) {
@@ -242,7 +246,32 @@ function serendipity_imageSelector_done(textarea)
     }
 
     if (f['serendipity[isLink]'][1].checked == true) {
-        insert = "<a class='serendipity_image_link' href='" + f['serendipity[url]'].value + "'>" + img + "</a>";
+        if (f['serendipity[target]'].selectedIndex) {
+            targetval = f['serendipity[target]'].options[f['serendipity[target]'].selectedIndex].value;
+        } else {
+            targetval = '';
+        }
+
+        prepend   = '';
+        ilink     = f['serendipity[url]'].value;
+        if (!targetval || targetval == 'none') {
+            itarget = '';
+        } else if (targetval == 'js') {
+            itarget = ' onclick="F1 = window.open(\'' + f['serendipity[url]'].value + '\',\'Zoom\',\''
+                    + 'height=' + (parseInt(f['imgHeight'].value) + 15) + ','
+                    + 'width='  + (parseInt(f['imgWidth'].value)  + 15) + ','
+                    + 'top='    + (screen.height - f['imgHeight'].value) /2 + ','
+                    + 'left='   + (screen.width  - f['imgWidth'].value)  /2 + ','
+                    + 'toolbar=no,menubar=no,location=no,resize=1,resizable=1,scrollbars=yes\'); return false;"';
+        } else if (targetval == '_blank') {
+            itarget = ' target="_blank"';
+        } else if (targetval == 'plugin') {
+            itarget = ' id="s9yisphref' + imgID + '"';
+            prepend = '<a title="' + ilink + '" id="s9yisp' + imgID + '"></a>';
+            ilink   = baseURL + 'serendipity_admin_image_selector.php?serendipity[step]=showItem&amp;serendipity[image]=' + imgID;
+        }
+
+        insert = prepend + "<a class='serendipity_image_link' href='" + ilink + "'" + itarget + ">" + img + "</a>";
     } else {
         insert = img;
     }
diff --git a/docs/NEWS b/docs/NEWS
index d53857c..c145e95 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -38,10 +38,12 @@ Version 1.1-alpha4()
          - Search/Filter for specific properties/keywords.
          - Enhanced media filter for keywords
          - Use entered comments in the "You choose..." picking page
+         - Integrate new page for viewing images with media properties
+           through serendipity_admin_image_selector.php?serendipity[image]=X
+         - Integrate imageselectorplus plugin options for giving a target
+           to links
 
      TODO:
-         - Store uploader authorid (new DB column required)
-
          - New option for image_Selector to save a specific sized version
            (?fid=XXX&targetSize=XX)
          - Track referrers by image selector and store as property
diff --git a/include/admin/images.inc.php b/include/admin/images.inc.php
index ca59240..a32f9ac 100644
--- a/include/admin/images.inc.php
+++ b/include/admin/images.inc.php
@@ -321,6 +321,15 @@ switch ($serendipity['GET']['adminAction']) {
 
     if (isset($_REQUEST['go_properties'])) {
         serendipity_showPropertyForm($new_media);
+    } else {
+        $hidden = array(
+            'author'   => $serendipity['serendipityUser'],
+            'authorid' => $serendipity['authorid']
+        );
+
+        foreach($new_media AS $nm) {
+            serendipity_insertMediaProperty('base_hidden', '', $nm['image_id'], $hidden);
+        }
     }
     break;
 
diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php
index ef88587..57a2e02 100644
--- a/include/functions_images.inc.php
+++ b/include/functions_images.inc.php
@@ -84,7 +84,7 @@ function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total, $order
         $keywords[$i] = serendipity_db_escape_string($keyword);
     }
 
-    $join_properties = $join_keywords = $join_filterproperties = false;
+    $join_properties = $join_keywords = $join_filterproperties = $join_hiddenproperties = false;
     if (count($keywords) > 0) {
         $where_sql .= " AND (mk.property IN ('" . implode("', '", $keywords) . "'))\n";
         $join_keywords = true;
@@ -111,6 +111,13 @@ function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total, $order
             } else {
                 $where_sql .= " AND ($f >= " . (int)$fval['from'] . " AND $f <= " . (int)$fval['to'] . ")\n";
             }
+        } elseif ($f == 'i.authorid') {
+            $where_sql .= " AND (
+                                    (hp.property = 'authorid' AND hp.value = " . (int)$fval . ")
+                                    OR
+                                    (i.authorid = " . (int)$fval . ")
+                                )\n";
+            $join_hiddenproperties = true;
         } elseif ($orderfields[$f]['type'] == 'int') {
             if (substr($f, 0, 3) === 'bp.') {
                 $realf = substr($f, 3);
@@ -162,6 +169,11 @@ function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total, $order
                                         ON (bp2.mediaid = i.id AND bp2.property_group = 'base_property')\n";
     }
 
+    if ($join_hiddenproperties) {
+        $cond['joins'] .= "\n LEFT OUTER JOIN {$serendipity['dbPrefix']}mediaproperties AS hp
+                                        ON (hp.mediaid = i.id AND hp.property_group = 'base_hidden')\n";
+    }
+
     if ($serendipity['dbType'] == 'postgres') {
         $cond['group']    = '';
         $cond['distinct'] = 'DISTINCT';
@@ -190,7 +202,7 @@ function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total, $order
         return array();
     }
 
-    $total_query = "SELECT count(i.id)
+    $total_query = "SELECT count(DISTINCT i.id)
                            $basequery";
     $total_rs = serendipity_db_query($total_query, true, 'num');
     if (is_array($total_rs)) {
@@ -2019,9 +2031,6 @@ function serendipity_showPropertyForm(&$new_media, $keywordsPerBlock = 3, $is_ed
     $mirror = array();
     serendipity_checkPropertyAccess($new_media, $mirror, 'read');
 
-    $dprops   = explode(';', $serendipity['mediaProperties']);
-    $keywords = explode(';', $serendipity['mediaKeywords']);
-
     $editform_hidden = '';
     if (isset($GLOBALS['image_selector_addvars']) && is_array($GLOBALS['image_selector_addvars'])) {
         // These variables may come from serendipity_admin_image_selector.php to show embedded upload form
@@ -2030,6 +2039,9 @@ function serendipity_showPropertyForm(&$new_media, $keywordsPerBlock = 3, $is_ed
         }
     }
 
+    $dprops   = explode(';', $serendipity['mediaProperties']);
+    $keywords = explode(';', $serendipity['mediaKeywords']);
+
     $now  = serendipity_serverOffsetHour();
     $show = array();
     foreach($new_media AS $idx => $media) {
@@ -2046,128 +2058,154 @@ function serendipity_showPropertyForm(&$new_media, $keywordsPerBlock = 3, $is_ed
             serendipity_plugin_api::hook_event('media_getproperties_cached', $show[$idx]['metadata'], $show[$idx]['realfile']);
         }
 
-        foreach($dprops AS $prop) {
-            $type = 'input';
-            $parts = explode(':', trim($prop));
+        serendipity_parseMediaProperties($dprops, $keywords, $show[$idx], $props, $keywordsPerBlock, $is_edit);
+    }
 
-            if (in_array('MULTI', $parts)) {
-                $type = 'textarea';
-            }
+    $smarty_vars = array(
+        'is_edit'           => $is_edit,
+        'editform_hidden'   => $editform_hidden,
+        'keywordsPerBlock'  => $keywordsPerBlock,
+        'keywords'          => $keywords,
+        'dprops'            => $dprops
+    );
+    return serendipity_showMedia(
+        $show,
+        $mirror,
+        $url,
+        false,
+        1,
+        false,
+        $smarty_vars);
+}
 
-            if (preg_match('@(AUDIO|VIDEO|DOCUMENT|IMAGE|ARCHIVE|BINARY)@i', $prop)) {
-                $show_item = false;
-                if ($show[$idx]['mediatype'] == 'video' && in_array('VIDEO', $parts)) {
-                    $show_item = true;
-                }
+/**
+ * Parse/Convert properties
+ *
+ * @param  array    Holds the property key array
+ * @param  array    Holds the keyword key array
+ * @param  int      Holds the media metadata
+ * @param  int      Holds the media properties
+ * @param  int      How many keyword checkboxes to display next to each other?
+ * @param  boolean  Can existing data be modified?
+ * @return boolean
+ *
+ */
+function serendipity_parseMediaProperties(&$dprops, &$keywords, &$media, &$props, $keywordsPerBlock, $is_edit) {
+    global $serendipity;
 
-                if ($show[$idx]['mediatype'] == 'audio'  && in_array('AUDIO', $parts)) {
-                    $show_item = true;
-                }
+    if (!is_array($dprops)) {
+        $dprops   = explode(';', $serendipity['mediaProperties']);
+    }
+    if (!is_array($keywords)) {
+        $keywords = explode(';', $serendipity['mediaKeywords']);
+    }
 
-                if ($show[$idx]['mediatype'] == 'image'  && in_array('IMAGE', $parts)) {
-                    $show_item = true;
-                }
+    foreach($dprops AS $prop) {
+        $type = 'input';
+        $parts = explode(':', trim($prop));
 
-                if ($show[$idx]['mediatype'] == 'document' && in_array('DOCUMENT', $parts)) {
-                    $show_item = true;
-                }
+        if (in_array('MULTI', $parts)) {
+            $type = 'textarea';
+        }
 
-                if ($show[$idx]['mediatype'] == 'archive' && in_array('ARCHIVE', $parts)) {
-                    $show_item = true;
-                }
+        if (preg_match('@(AUDIO|VIDEO|DOCUMENT|IMAGE|ARCHIVE|BINARY)@i', $prop)) {
+            $show_item = false;
+            if ($media['mediatype'] == 'video' && in_array('VIDEO', $parts)) {
+                $show_item = true;
+            }
 
-                if ($show[$idx]['mediatype'] == 'binary' && in_array('BINARY', $parts)) {
-                    $show_item = true;
-                }
+            if ($media['mediatype'] == 'audio'  && in_array('AUDIO', $parts)) {
+                $show_item = true;
+            }
 
-                if (!$show_item) {
-                    continue;
-                }
+            if ($media['mediatype'] == 'image'  && in_array('IMAGE', $parts)) {
+                $show_item = true;
             }
 
-            if (!$is_edit) {
-                $type = 'readonly';
+            if ($media['mediatype'] == 'document' && in_array('DOCUMENT', $parts)) {
+                $show_item = true;
             }
-            $val =& serendipity_mediaTypeCast($parts[0], $props['base_property'][$parts[0]], true);
-
-            $propkey = htmlspecialchars($parts[0]) . $idx;
-
-            $show[$idx]['base_property'][$propkey] = array(
-                'label' => htmlspecialchars(defined('MEDIA_PROPERTY_' . strtoupper($parts[0])) ? constant('MEDIA_PROPERTY_' . strtoupper($parts[0])) : $parts[0]),
-                'type'  => $type,
-                'val'   => $val,
-                'title' => htmlspecialchars($parts[0])
-            );
-
-            if (empty($val)) {
-                switch($parts[0]) {
-                    case 'DATE':
-                        $show[$idx]['base_property'][$propkey]['val'] = serendipity_strftime(DATE_FORMAT_SHORT, serendipity_pickKey($show[$idx]['metadata'], 'DateCreated', $now));
-                        break;
-
-                    case 'RUN_LENGTH':
-                        $show[$idx]['base_property'][$propkey]['val'] = serendipity_pickKey($show[$idx]['metadata'], 'RunLength', '00:00:00.00');
-                        break;
-
-                    case 'DPI':
-                        $show[$idx]['base_property'][$propkey]['val'] = serendipity_pickKey($show[$idx]['metadata'], 'XResolution', 72);
-                        break;
-
-                    case 'COPYRIGHT':
-                        $show[$idx]['base_property'][$propkey]['val'] = serendipity_pickKey($show[$idx]['metadata'], 'Creator', $serendipity['serendipityUser']);
-                        break;
-
-                    case 'TITLE':
-                        $show[$idx]['base_property'][$propkey]['val'] = serendipity_pickKey($show[$idx]['metadata'], 'Title', $media['internal']['realname']);
-                        break;
-
-                    case 'COMMENT1':
-                        $show[$idx]['base_property'][$propkey]['val'] = serendipity_pickKey($show[$idx]['metadata'], 'Keywords', '');
-                        break;
-
-                    case 'COMMENT2':
-                        $show[$idx]['base_property'][$propkey]['val'] = serendipity_pickKey($show[$idx]['metadata'], 'PhotoLocation', '');
-                        break;
-
-                    default:
-                        serendipity_plugin_api('media_showproperties', $show[$idx], $propkey);
-                        break;
-                }
+
+            if ($media['mediatype'] == 'archive' && in_array('ARCHIVE', $parts)) {
+                $show_item = true;
+            }
+
+            if ($media['mediatype'] == 'binary' && in_array('BINARY', $parts)) {
+                $show_item = true;
+            }
+
+            if (!$show_item) {
+                continue;
             }
         }
 
+        if (!$is_edit) {
+            $type = 'readonly';
+        }
+        $val =& serendipity_mediaTypeCast($parts[0], $props['base_property'][$parts[0]], true);
+
+        $propkey = htmlspecialchars($parts[0]) . $idx;
+
+        $media['base_property'][$propkey] = array(
+            'label' => htmlspecialchars(defined('MEDIA_PROPERTY_' . strtoupper($parts[0])) ? constant('MEDIA_PROPERTY_' . strtoupper($parts[0])) : $parts[0]),
+            'type'  => $type,
+            'val'   => $val,
+            'title' => htmlspecialchars($parts[0])
+        );
+
+        if (empty($val)) {
+            switch($parts[0]) {
+                case 'DATE':
+                    $media['base_property'][$propkey]['val'] = serendipity_strftime(DATE_FORMAT_SHORT, serendipity_pickKey($media['metadata'], 'DateCreated', $now));
+                    break;
+
+                case 'RUN_LENGTH':
+                    $media['base_property'][$propkey]['val'] = serendipity_pickKey($media['metadata'], 'RunLength', '00:00:00.00');
+                    break;
+
+                case 'DPI':
+                    $media['base_property'][$propkey]['val'] = serendipity_pickKey($media['metadata'], 'XResolution', 72);
+                    break;
+
+                case 'COPYRIGHT':
+                    $media['base_property'][$propkey]['val'] = serendipity_pickKey($media['metadata'], 'Creator', $serendipity['serendipityUser']);
+                    break;
+
+                case 'TITLE':
+                    $media['base_property'][$propkey]['val'] = serendipity_pickKey($media['metadata'], 'Title', $media['internal']['realname']);
+                    break;
+
+                case 'COMMENT1':
+                    $media['base_property'][$propkey]['val'] = serendipity_pickKey($media['metadata'], 'Keywords', '');
+                    break;
+
+                case 'COMMENT2':
+                    $media['base_property'][$propkey]['val'] = serendipity_pickKey($media['metadata'], 'PhotoLocation', '');
+                    break;
+
+                default:
+                    serendipity_plugin_api::hook_event('media_showproperties', $media, $propkey);
+                    break;
+            }
+        }
+    }
+
+    if ($keywordsPerBlock > 0) {
         $rows = ceil(count($keywords) / $keywordsPerBlock);
         for($i = 0; $i < $rows; $i++) {
             for ($j = 0; $j < $keywordsPerBlock; $j++) {
                 $kidx = ($i*$keywordsPerBlock) + $j;
                 if (isset($keywords[$kidx])) {
-                    $show[$idx]['base_keywords'][$i][$j] = array(
+                    $media['base_keywords'][$i][$j] = array(
                         'name'      => htmlspecialchars($keywords[$kidx]),
                         'selected'  => isset($props['base_keyword'][$keywords[$kidx]]) ? true : false
                     );
                 } else {
-                    $show[$idx]['base_keywords'][$i][$j] = array();
+                    $media['base_keywords'][$i][$j] = array();
                 }
             }
         }
     }
-
-    // TODO: EXIF!
-    $smarty_vars = array(
-        'is_edit'           => $is_edit,
-        'editform_hidden'   => $editform_hidden,
-        'keywordsPerBlock'  => $keywordsPerBlock,
-        'keywords'          => $keywords,
-        'dprops'            => $dprops
-    );
-    return serendipity_showMedia(
-        $show,
-        $mirror,
-        $url,
-        false,
-        1,
-        false,
-        $smarty_vars);
 }
 
 /**
@@ -2181,7 +2219,7 @@ function serendipity_showPropertyForm(&$new_media, $keywordsPerBlock = 3, $is_ed
  */
 function serendipity_mediaTypeCast($key, $val, $invert = false) {
     if (stristr($key, 'date') !== FALSE) {
-        if ($invert && is_int($val)) {
+        if ($invert && is_numeric($val)) {
             return serendipity_strftime(DATE_FORMAT_SHORT, $val, false);
         } elseif ($invert === false) {
             $tmp = strtotime($val);
@@ -2214,6 +2252,51 @@ function serendipity_mediaTypeCast($key, $val, $invert = false) {
     return $val;
 }
 
+/**
+ * Inserts media properties
+ *
+ * @param   string  Property_group
+ * @return array    array('image_id') holding the last created thumbnail for immediate processing
+ *
+ */
+function serendipity_insertMediaProperty($property_group, $property_subgroup = '', $image_id, &$media, $use_cast = true) {
+    global $serendipity;
+
+    serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}mediaproperties
+                                WHERE mediaid = " . (int)$image_id . "
+                                  " . ($property_subgroup != 'ALL' ? "AND property_subgroup = '" . serendipity_db_escape_string($property_subgroup) . "'" : '') . "
+                                  AND property_group = '" . serendipity_db_escape_string($property_group) . "'");
+
+    if (is_array($media)) {
+        foreach($media AS $key => $val) {
+            if ($key == 'image_id') continue;
+
+            if (is_array($val)) {
+                $use_property_subgroup = $key;
+                $use_val = $val;
+            } else {
+                $use_property_subgroup = $property_subgroup;
+                $use_val = array($key => $val);
+            }
+
+            foreach($use_val AS $insert_key => $insert_val) {
+                if ($use_cast) {
+                    $insert_val = serendipity_mediaTypeCast($insert_key, $insert_val);
+                }
+                $q = sprintf("INSERT INTO {$serendipity['dbPrefix']}mediaproperties
+                                          (mediaid, property_group, property_subgroup, property, value)
+                                   VALUES (%d, '%s', '%s', '%s', '%s')",
+                             $image_id,
+                             serendipity_db_escape_string($property_group),
+                             serendipity_db_escape_string($useproperty_subgroup),
+                             serendipity_db_escape_string($insert_key),
+                             serendipity_db_escape_string($insert_val));
+                serendipity_db_query($q);
+            }
+        }
+    }
+}
+
 /**
  * Inserts the submitted properties of uploaded media items
  *
@@ -2230,58 +2313,22 @@ function serendipity_parsePropertyForm() {
     serendipity_checkPropertyAccess($serendipity['POST']['mediaProperties'], $serendipity['POST']['mediaKeywords'], 'write');
 
     foreach($serendipity['POST']['mediaProperties'] AS $id => $media) {
-        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}mediaproperties
-                                    WHERE mediaid = " . (int)$media['image_id'] . "
-                                      AND property_subgroup = ''
-                                      AND property_group = 'base_property'");
-        foreach($media AS $key => $val) {
-            if ($key == 'image_id') continue;
-            $val = serendipity_mediaTypeCast($key, $val);
-            $q = sprintf("INSERT INTO {$serendipity['dbPrefix']}mediaproperties
-                                      (mediaid, property_group, property_subgroup, property, value)
-                               VALUES (%d, 'base_property', '', '%s', '%s')",
-                         $media['image_id'],
-                         serendipity_db_escape_string($key),
-                         serendipity_db_escape_string($val));
-            serendipity_db_query($q);
-        }
+        serendipity_insertMediaProperty('base_property', '', $media['image_id'], $media);
 
         $s9y_img = $media['internal'];
         $s9y_img['image_id'] = $media['image_id'];
         serendipity_prepareMedia($s9y_img);
         $s9y_img['metadata'] =& serendipity_getMetaData($s9y_img['realfile'], $s9y_img['header']);
-        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}mediaproperties
-                                    WHERE mediaid = " . (int)$media['image_id'] . "
-                                          property_group = 'base_metadata'");
-        foreach($s9y_img['metadata'] AS $maingroup => $items) {
-            foreach($items AS $key => $val) {
-                $val = serendipity_mediaTypeCast($key, $val);
-                $q = sprintf("INSERT INTO {$serendipity['dbPrefix']}mediaproperties
-                                          (mediaid, property_group, property_subgroup, property, value)
-                                   VALUES (%d, 'base_metadata', '%s', '%s', '%s')",
-                             $media['image_id'],
-                             $maingroup,
-                             serendipity_db_escape_string($key),
-                             serendipity_db_escape_string($val));
-                serendipity_db_query($q);
-            }
-        }
+        serendipity_insertMediaProperty('base_metadata', 'ALL', $media['image_id'], $s9y_img['metadata']);
+        $s9y_img['hidden'] = array(
+            'author'   => $serendipity['serendipityUser'],
+            'authorid' => $serendipity['authorid']
+        );
+        serendipity_insertMediaProperty('base_hidden', '', $media['image_id'], $s9y_img['hidden']);
     }
 
     foreach($serendipity['POST']['mediaKeywords'] AS $id => $keywords) {
-        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}mediaproperties
-                                    WHERE mediaid = " . (int)$serendipity['POST']['mediaProperties'][$id]['image_id'] . "
-                                      AND property_subgroup = ''
-                                      AND property_group = 'base_keyword'");
-
-        foreach($keywords AS $keyword => $checked) {
-            $q = sprintf("INSERT INTO {$serendipity['dbPrefix']}mediaproperties
-                                      (mediaid, property_group, property_subgroup, property, value)
-                               VALUES (%d, 'base_keyword', '', '%s', '1')",
-                         $serendipity['POST']['mediaProperties'][$id]['image_id'],
-                         serendipity_db_escape_string($keyword));
-            serendipity_db_query($q);
-        }
+        serendipity_insertMediaProperty('base_keyword', '', $serendipity['POST']['mediaProperties'][$id]['image_id'], $keywords);
     }
 
     $array = array(
diff --git a/lang/UTF-8/serendipity_lang_bg.inc.php b/lang/UTF-8/serendipity_lang_bg.inc.php
index 736de7a..4b329a9 100644
--- a/lang/UTF-8/serendipity_lang_bg.inc.php
+++ b/lang/UTF-8/serendipity_lang_bg.inc.php
@@ -845,3 +845,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Въведете максималната височина в пиксели на изображенията, които ще се качват.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Грешка: Не можете да качвате изображения, по-големи от %s x %s пиксела.');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_cn.inc.php b/lang/UTF-8/serendipity_lang_cn.inc.php
index 4abd7ac..d72e553 100644
--- a/lang/UTF-8/serendipity_lang_cn.inc.php
+++ b/lang/UTF-8/serendipity_lang_cn.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_cn.inc.php 1119 2006-04-19 08:32:48Z garvinhicking $
+<?php # $Id: serendipity_lang_cn.inc.php 1122 2006-04-19 11:07:47Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 /* vim: set sts=4 ts=4 expandtab : */
@@ -858,3 +858,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_cs.inc.php b/lang/UTF-8/serendipity_lang_cs.inc.php
index f41dffb..742f560 100644
--- a/lang/UTF-8/serendipity_lang_cs.inc.php
+++ b/lang/UTF-8/serendipity_lang_cs.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_cs.inc.php 1119 2006-04-19 08:32:48Z garvinhicking $
+<?php # $Id: serendipity_lang_cs.inc.php 1122 2006-04-19 11:07:47Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) 2005 Josef Klimosz <ok2wo@centrum.cz>
@@ -860,3 +860,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_cz.inc.php b/lang/UTF-8/serendipity_lang_cz.inc.php
index 6ad33f4..ff38470 100644
--- a/lang/UTF-8/serendipity_lang_cz.inc.php
+++ b/lang/UTF-8/serendipity_lang_cz.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_cz.inc.php 1119 2006-04-19 08:32:48Z garvinhicking $
+<?php # $Id: serendipity_lang_cz.inc.php 1122 2006-04-19 11:07:47Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) 2004 Josef Klimosz <ok2wo@centrum.cz>
@@ -860,3 +860,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_da.inc.php b/lang/UTF-8/serendipity_lang_da.inc.php
index df92611..6626c65 100644
--- a/lang/UTF-8/serendipity_lang_da.inc.php
+++ b/lang/UTF-8/serendipity_lang_da.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_da.inc.php 1119 2006-04-19 08:32:48Z garvinhicking $
+<?php # $Id: serendipity_lang_da.inc.php 1122 2006-04-19 11:07:47Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) by Tom Sommer, <ts@dreamcoder.dk>
@@ -859,3 +859,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_de.inc.php b/lang/UTF-8/serendipity_lang_de.inc.php
index b81fad5..88d1375 100644
--- a/lang/UTF-8/serendipity_lang_de.inc.php
+++ b/lang/UTF-8/serendipity_lang_de.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_de.inc.php 1119 2006-04-19 08:32:48Z garvinhicking $
+<?php # $Id: serendipity_lang_de.inc.php 1122 2006-04-19 11:07:47Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) Jannis Hermanns, Garvin Hicking and others
@@ -858,3 +858,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_en.inc.php b/lang/UTF-8/serendipity_lang_en.inc.php
index 803b8a6..09e9f31 100644
--- a/lang/UTF-8/serendipity_lang_en.inc.php
+++ b/lang/UTF-8/serendipity_lang_en.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_en.inc.php 1119 2006-04-19 08:32:48Z garvinhicking $
+<?php # $Id: serendipity_lang_en.inc.php 1122 2006-04-19 11:07:47Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 /* vim: set sts=4 ts=4 expandtab : */
@@ -857,3 +857,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_es.inc.php b/lang/UTF-8/serendipity_lang_es.inc.php
index d87719c..9983b3a 100644
--- a/lang/UTF-8/serendipity_lang_es.inc.php
+++ b/lang/UTF-8/serendipity_lang_es.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_es.inc.php 1119 2006-04-19 08:32:48Z garvinhicking $
+<?php # $Id: serendipity_lang_es.inc.php 1122 2006-04-19 11:07:47Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) by Luis Cervantes <LuisCervantes@ono.com>,
@@ -875,3 +875,8 @@ Melvin TODO [20060128]: What spanish word do we use for "referrers" ??
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_fa.inc.php b/lang/UTF-8/serendipity_lang_fa.inc.php
index 864c7a1..93039e0 100644
--- a/lang/UTF-8/serendipity_lang_fa.inc.php
+++ b/lang/UTF-8/serendipity_lang_fa.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_fa.inc.php 1119 2006-04-19 08:32:48Z garvinhicking $
+<?php # $Id: serendipity_lang_fa.inc.php 1122 2006-04-19 11:07:47Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved. See LICENSE file for licensing details
 # this translation, translated by Omid Mottaghi <http://oxygenws.com>
@@ -859,3 +859,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_fi.inc.php b/lang/UTF-8/serendipity_lang_fi.inc.php
index 88bdc9c..1e3c1f4 100644
--- a/lang/UTF-8/serendipity_lang_fi.inc.php
+++ b/lang/UTF-8/serendipity_lang_fi.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_fi.inc.php 1119 2006-04-19 08:32:48Z garvinhicking $
+<?php # $Id: serendipity_lang_fi.inc.php 1122 2006-04-19 11:07:47Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation by Mauri Sahlberg <mos@iki.fi>
@@ -857,3 +857,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_fr.inc.php b/lang/UTF-8/serendipity_lang_fr.inc.php
index e332199..6bc7e2a 100644
--- a/lang/UTF-8/serendipity_lang_fr.inc.php
+++ b/lang/UTF-8/serendipity_lang_fr.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_fr.inc.php 1119 2006-04-19 08:32:48Z garvinhicking $
+<?php # $Id: serendipity_lang_fr.inc.php 1122 2006-04-19 11:07:47Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation by Sebastian Mordziol <argh@php-tools.net>
@@ -864,3 +864,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_hu.inc.php b/lang/UTF-8/serendipity_lang_hu.inc.php
index 8aa66fb..568506f 100644
--- a/lang/UTF-8/serendipity_lang_hu.inc.php
+++ b/lang/UTF-8/serendipity_lang_hu.inc.php
@@ -858,3 +858,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_is.inc.php b/lang/UTF-8/serendipity_lang_is.inc.php
index eaefa1f..ae391aa 100644
--- a/lang/UTF-8/serendipity_lang_is.inc.php
+++ b/lang/UTF-8/serendipity_lang_is.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_is.inc.php 1119 2006-04-19 08:32:48Z garvinhicking $
+<?php # $Id: serendipity_lang_is.inc.php 1122 2006-04-19 11:07:47Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation by Örn Arnarson <orn@arnarson.net>
@@ -858,3 +858,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_it.inc.php b/lang/UTF-8/serendipity_lang_it.inc.php
index e18bd4f..b9ec78d 100644
--- a/lang/UTF-8/serendipity_lang_it.inc.php
+++ b/lang/UTF-8/serendipity_lang_it.inc.php
@@ -861,3 +861,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_ja.inc.php b/lang/UTF-8/serendipity_lang_ja.inc.php
index 6e1e886..fce1ca5 100644
--- a/lang/UTF-8/serendipity_lang_ja.inc.php
+++ b/lang/UTF-8/serendipity_lang_ja.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_ja.inc.php 1119 2006-04-19 08:32:48Z garvinhicking $
+<?php # $Id: serendipity_lang_ja.inc.php 1122 2006-04-19 11:07:47Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) Tadashi Jokagi <elf2000@users.sourceforge.net>, 2004-2005.
@@ -861,3 +861,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_ko.inc.php b/lang/UTF-8/serendipity_lang_ko.inc.php
index 0c0c9db..2c9769a 100644
--- a/lang/UTF-8/serendipity_lang_ko.inc.php
+++ b/lang/UTF-8/serendipity_lang_ko.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_ko.inc.php 1119 2006-04-19 08:32:48Z garvinhicking $
+<?php # $Id: serendipity_lang_ko.inc.php 1122 2006-04-19 11:07:47Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translated by: Wesley Hwang-Chung <wesley96@gmail.com>
@@ -860,3 +860,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_nl.inc.php b/lang/UTF-8/serendipity_lang_nl.inc.php
index cede355..4dd82d2 100644
--- a/lang/UTF-8/serendipity_lang_nl.inc.php
+++ b/lang/UTF-8/serendipity_lang_nl.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_nl.inc.php 1119 2006-04-19 08:32:48Z garvinhicking $
+<?php # $Id: serendipity_lang_nl.inc.php 1122 2006-04-19 11:07:47Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) by Christiaan Heerze <webmaster@heimp.nl>
@@ -860,3 +860,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_no.inc.php b/lang/UTF-8/serendipity_lang_no.inc.php
index 5b43849..b6727a5 100644
--- a/lang/UTF-8/serendipity_lang_no.inc.php
+++ b/lang/UTF-8/serendipity_lang_no.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_no.inc.php 1119 2006-04-19 08:32:48Z garvinhicking $
+<?php # $Id: serendipity_lang_no.inc.php 1122 2006-04-19 11:07:47Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) by Jo Christian Oterhals <oterhals@gmail.com>
@@ -860,3 +860,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_pt.inc.php b/lang/UTF-8/serendipity_lang_pt.inc.php
index 6eae8ee..7476d00 100644
--- a/lang/UTF-8/serendipity_lang_pt.inc.php
+++ b/lang/UTF-8/serendipity_lang_pt.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_pt.inc.php 1119 2006-04-19 08:32:48Z garvinhicking $
+<?php # $Id: serendipity_lang_pt.inc.php 1122 2006-04-19 11:07:47Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) by Agner Olson <agner@agner.net>
@@ -862,3 +862,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_pt_PT.inc.php b/lang/UTF-8/serendipity_lang_pt_PT.inc.php
index 4387e50..c850e97 100644
--- a/lang/UTF-8/serendipity_lang_pt_PT.inc.php
+++ b/lang/UTF-8/serendipity_lang_pt_PT.inc.php
@@ -865,3 +865,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_ro.inc.php b/lang/UTF-8/serendipity_lang_ro.inc.php
index 2ba5c1f..ef03ca5 100644
--- a/lang/UTF-8/serendipity_lang_ro.inc.php
+++ b/lang/UTF-8/serendipity_lang_ro.inc.php
@@ -858,3 +858,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_ru.inc.php b/lang/UTF-8/serendipity_lang_ru.inc.php
index 3f575d7..463ba30 100644
--- a/lang/UTF-8/serendipity_lang_ru.inc.php
+++ b/lang/UTF-8/serendipity_lang_ru.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_ru.inc.php 1119 2006-04-19 08:32:48Z garvinhicking $
+<?php # $Id: serendipity_lang_ru.inc.php 1122 2006-04-19 11:07:47Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation by Nightly <nightly@reys.net>
@@ -861,3 +861,8 @@ $i18n_filename_to   = array('_', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_se.inc.php b/lang/UTF-8/serendipity_lang_se.inc.php
index fd0baff..cf4d040 100644
--- a/lang/UTF-8/serendipity_lang_se.inc.php
+++ b/lang/UTF-8/serendipity_lang_se.inc.php
@@ -857,3 +857,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_ta.inc.php b/lang/UTF-8/serendipity_lang_ta.inc.php
index b3bc7fc..21fb260 100644
--- a/lang/UTF-8/serendipity_lang_ta.inc.php
+++ b/lang/UTF-8/serendipity_lang_ta.inc.php
@@ -857,3 +857,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_tn.inc.php b/lang/UTF-8/serendipity_lang_tn.inc.php
index 5e54409..17b4011 100644
--- a/lang/UTF-8/serendipity_lang_tn.inc.php
+++ b/lang/UTF-8/serendipity_lang_tn.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_tn.inc.php 1119 2006-04-19 08:32:48Z garvinhicking $
+<?php # $Id: serendipity_lang_tn.inc.php 1122 2006-04-19 11:07:47Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translated by CapriSkye <admin@capriskye.com>
@@ -860,3 +860,8 @@ $i18n_unknown = 'tw';
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_tr.inc.php b/lang/UTF-8/serendipity_lang_tr.inc.php
index 1a71b1a..34d6298 100644
--- a/lang/UTF-8/serendipity_lang_tr.inc.php
+++ b/lang/UTF-8/serendipity_lang_tr.inc.php
@@ -861,3 +861,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_tw.inc.php b/lang/UTF-8/serendipity_lang_tw.inc.php
index d8b75dc..b84ea92 100644
--- a/lang/UTF-8/serendipity_lang_tw.inc.php
+++ b/lang/UTF-8/serendipity_lang_tw.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_tw.inc.php 1119 2006-04-19 08:32:48Z garvinhicking $
+<?php # $Id: serendipity_lang_tw.inc.php 1122 2006-04-19 11:07:47Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translated by CapriSkye <admin@capriskye.com>
@@ -860,3 +860,8 @@ $i18n_unknown = 'tw';
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/UTF-8/serendipity_lang_zh.inc.php b/lang/UTF-8/serendipity_lang_zh.inc.php
index 9db85d3..e21809b 100644
--- a/lang/UTF-8/serendipity_lang_zh.inc.php
+++ b/lang/UTF-8/serendipity_lang_zh.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_zh.inc.php 1119 2006-04-19 08:32:48Z garvinhicking $
+<?php # $Id: serendipity_lang_zh.inc.php 1122 2006-04-19 11:07:47Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 /* vim: set sts=4 ts=4 expandtab : */
@@ -858,3 +858,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/addlang.txt b/lang/addlang.txt
index 33dacb4..adc20ba 100644
--- a/lang/addlang.txt
+++ b/lang/addlang.txt
@@ -1,9 +1,5 @@
-@define('MEDIA_UPLOAD_SIZE', 'Max. file upload size');
-@define('MEDIA_UPLOAD_SIZE_DESC', 'Enter the maximum filesize for uploaded files in bytes. This setting can be overruled by server-side settings in PHP.ini: upload_max_filesize, post_max_size, max_input_time all take precedence over this option. An empty string means to only use the server-side limits.');
-@define('MEDIA_UPLOAD_SIZEERROR', 'Error: You cannot upload files larger than %s bytes!');
-@define('MEDIA_UPLOAD_MAXWIDTH', 'Max. width of image files for upload');
-@define('MEDIA_UPLOAD_MAXWIDTH_DESC', 'Enter the maximum image width in pixels for uploaded images.');
-@define('MEDIA_UPLOAD_MAXHEIGHT', 'Max. height of image files for upload');
-@define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
-@define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
 
diff --git a/lang/plugin_lang.php b/lang/plugin_lang.php
index 352b5ec..4b87c06 100644
--- a/lang/plugin_lang.php
+++ b/lang/plugin_lang.php
@@ -133,3 +133,8 @@ foreach($const['missing'] AS $file => $constants) {
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_bg.inc.php b/lang/serendipity_lang_bg.inc.php
index f2e47f3..497867e 100644
--- a/lang/serendipity_lang_bg.inc.php
+++ b/lang/serendipity_lang_bg.inc.php
@@ -845,3 +845,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Âúâåäåòå ìàêñèìàëíàòà âèñî÷èíà â ïèêñåëè íà èçîáðàæåíèÿòà, êîèòî ùå ñå êà÷âàò.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Ãðåøêà: Íå ìîæåòå äà êà÷âàòå èçîáðàæåíèÿ, ïî-ãîëåìè îò %s x %s ïèêñåëà.');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_cn.inc.php b/lang/serendipity_lang_cn.inc.php
index 2ea0d7d..8814708 100644
--- a/lang/serendipity_lang_cn.inc.php
+++ b/lang/serendipity_lang_cn.inc.php
@@ -858,3 +858,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_cs.inc.php b/lang/serendipity_lang_cs.inc.php
index ecc2e41..a7fc7e3 100644
--- a/lang/serendipity_lang_cs.inc.php
+++ b/lang/serendipity_lang_cs.inc.php
@@ -860,3 +860,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_cz.inc.php b/lang/serendipity_lang_cz.inc.php
index 3f609f8..fb09c23 100644
--- a/lang/serendipity_lang_cz.inc.php
+++ b/lang/serendipity_lang_cz.inc.php
@@ -860,3 +860,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_da.inc.php b/lang/serendipity_lang_da.inc.php
index 8b0f8bb..1769849 100644
--- a/lang/serendipity_lang_da.inc.php
+++ b/lang/serendipity_lang_da.inc.php
@@ -859,3 +859,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_de.inc.php b/lang/serendipity_lang_de.inc.php
index 19321c8..9949345 100644
--- a/lang/serendipity_lang_de.inc.php
+++ b/lang/serendipity_lang_de.inc.php
@@ -858,3 +858,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_en.inc.php b/lang/serendipity_lang_en.inc.php
index a40ae10..35ba0bb 100644
--- a/lang/serendipity_lang_en.inc.php
+++ b/lang/serendipity_lang_en.inc.php
@@ -857,3 +857,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_es.inc.php b/lang/serendipity_lang_es.inc.php
index d072c02..cb49967 100644
--- a/lang/serendipity_lang_es.inc.php
+++ b/lang/serendipity_lang_es.inc.php
@@ -875,3 +875,8 @@ Melvin TODO [20060128]: What spanish word do we use for "referrers" ??
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_fa.inc.php b/lang/serendipity_lang_fa.inc.php
index f48d01a..b2e68be 100644
--- a/lang/serendipity_lang_fa.inc.php
+++ b/lang/serendipity_lang_fa.inc.php
@@ -859,3 +859,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_fi.inc.php b/lang/serendipity_lang_fi.inc.php
index dc8be43..1e57a0e 100644
--- a/lang/serendipity_lang_fi.inc.php
+++ b/lang/serendipity_lang_fi.inc.php
@@ -857,3 +857,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_fr.inc.php b/lang/serendipity_lang_fr.inc.php
index df4d440..c86f291 100644
--- a/lang/serendipity_lang_fr.inc.php
+++ b/lang/serendipity_lang_fr.inc.php
@@ -864,3 +864,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_hu.inc.php b/lang/serendipity_lang_hu.inc.php
index ddc499e..6b3ddf0 100644
--- a/lang/serendipity_lang_hu.inc.php
+++ b/lang/serendipity_lang_hu.inc.php
@@ -858,3 +858,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_is.inc.php b/lang/serendipity_lang_is.inc.php
index 47b2e62..e02a3a2 100644
--- a/lang/serendipity_lang_is.inc.php
+++ b/lang/serendipity_lang_is.inc.php
@@ -858,3 +858,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_it.inc.php b/lang/serendipity_lang_it.inc.php
index 27b8e1d..aa8e1ba 100644
--- a/lang/serendipity_lang_it.inc.php
+++ b/lang/serendipity_lang_it.inc.php
@@ -861,3 +861,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_ja.inc.php b/lang/serendipity_lang_ja.inc.php
index 3cab0b1..7d889a5 100644
--- a/lang/serendipity_lang_ja.inc.php
+++ b/lang/serendipity_lang_ja.inc.php
@@ -861,3 +861,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_ko.inc.php b/lang/serendipity_lang_ko.inc.php
index 6df4f34..300ad4a 100644
--- a/lang/serendipity_lang_ko.inc.php
+++ b/lang/serendipity_lang_ko.inc.php
@@ -860,3 +860,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_nl.inc.php b/lang/serendipity_lang_nl.inc.php
index 80e33ab..8e58982 100644
--- a/lang/serendipity_lang_nl.inc.php
+++ b/lang/serendipity_lang_nl.inc.php
@@ -860,3 +860,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_no.inc.php b/lang/serendipity_lang_no.inc.php
index f175b95..79fd0c5 100644
--- a/lang/serendipity_lang_no.inc.php
+++ b/lang/serendipity_lang_no.inc.php
@@ -860,3 +860,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_pt.inc.php b/lang/serendipity_lang_pt.inc.php
index 2f13403..ab4961b 100644
--- a/lang/serendipity_lang_pt.inc.php
+++ b/lang/serendipity_lang_pt.inc.php
@@ -862,3 +862,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_pt_PT.inc.php b/lang/serendipity_lang_pt_PT.inc.php
index 94a8784..b655840 100644
--- a/lang/serendipity_lang_pt_PT.inc.php
+++ b/lang/serendipity_lang_pt_PT.inc.php
@@ -865,3 +865,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_ro.inc.php b/lang/serendipity_lang_ro.inc.php
index 2ba5c1f..ef03ca5 100644
--- a/lang/serendipity_lang_ro.inc.php
+++ b/lang/serendipity_lang_ro.inc.php
@@ -858,3 +858,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_ru.inc.php b/lang/serendipity_lang_ru.inc.php
index 59574f1..0ded5b8 100644
--- a/lang/serendipity_lang_ru.inc.php
+++ b/lang/serendipity_lang_ru.inc.php
@@ -861,3 +861,8 @@ $i18n_filename_to   = array('_', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_se.inc.php b/lang/serendipity_lang_se.inc.php
index 056086c..ca67be7 100644
--- a/lang/serendipity_lang_se.inc.php
+++ b/lang/serendipity_lang_se.inc.php
@@ -857,3 +857,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_ta.inc.php b/lang/serendipity_lang_ta.inc.php
index b3bc7fc..21fb260 100644
--- a/lang/serendipity_lang_ta.inc.php
+++ b/lang/serendipity_lang_ta.inc.php
@@ -857,3 +857,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_tn.inc.php b/lang/serendipity_lang_tn.inc.php
index 702be33..224cb66 100644
--- a/lang/serendipity_lang_tn.inc.php
+++ b/lang/serendipity_lang_tn.inc.php
@@ -860,3 +860,8 @@ $i18n_unknown = 'tw';
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_tr.inc.php b/lang/serendipity_lang_tr.inc.php
index 1a71b1a..34d6298 100644
--- a/lang/serendipity_lang_tr.inc.php
+++ b/lang/serendipity_lang_tr.inc.php
@@ -861,3 +861,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_tw.inc.php b/lang/serendipity_lang_tw.inc.php
index 61f9a35..7ed95cb 100644
--- a/lang/serendipity_lang_tw.inc.php
+++ b/lang/serendipity_lang_tw.inc.php
@@ -860,3 +860,8 @@ $i18n_unknown = 'tw';
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/lang/serendipity_lang_zh.inc.php b/lang/serendipity_lang_zh.inc.php
index 115b751..46248de 100644
--- a/lang/serendipity_lang_zh.inc.php
+++ b/lang/serendipity_lang_zh.inc.php
@@ -858,3 +858,8 @@
 @define('MEDIA_UPLOAD_MAXHEIGHT_DESC', 'Enter the maximum image height in pixels for uploaded images.');
 @define('MEDIA_UPLOAD_DIMERROR', 'Error: You cannot upload image files larger than %s x %s pixels!');
 
+@define('MEDIA_TARGET', 'Target for this link');
+@define('MEDIA_TARGET_JS', 'Popup window (via JavaScript, adaptive size)');
+@define('MEDIA_ENTRY', 'Isolated Entry');
+@define('MEDIA_TARGET_BLANK', 'Popup window (via target=_blank)');
+
diff --git a/serendipity_admin_image_selector.php b/serendipity_admin_image_selector.php
index b74949b..1eb602f 100644
--- a/serendipity_admin_image_selector.php
+++ b/serendipity_admin_image_selector.php
@@ -10,7 +10,7 @@ if (IN_serendipity !== true) {
 
 header('Content-Type: text/html; charset=' . LANG_CHARSET);
 
-if ($_SESSION['serendipityAuthedUser'] !== true)  {
+if ($_SESSION['serendipityAuthedUser'] !== true && $serendipity['GET']['step'] != 'showItem')  {
     die(HAVE_TO_BE_LOGGED_ON);
 }
 
@@ -37,6 +37,7 @@ if (empty($serendipity['GET']['step']) && $serendipity['GET']['page'] < 1) {
     return;
 }
 
+$showFile = 'admin/media_choose.tpl';
 $body_id = 'serendipityAdminBodyImageSelector';
 if ($serendipity['GET']['step'] === 'tree') {
     $body_id = 'serendipityAdminBodyImageSelectorTree';
@@ -47,8 +48,10 @@ $media = array(
     'only_path' => $serendipity['GET']['only_path'],
     'css'       => serendipity_rewriteURL('serendipity_admin.css'),
     'css_tree'  => serendipity_getTemplateFile('treeview/tree.css'),
+    'css_front' => serendipity_rewriteURL('serendipity.css'),
     'token_url' => serendipity_setFormToken('url'),
-    'imgID'     => (int)$serendipity['GET']['image']
+    'imgID'     => (int)$serendipity['GET']['image'],
+    'from'      => $serendipity['GET']['from']
 );
 
 switch ($serendipity['GET']['step']) {
@@ -111,7 +114,7 @@ switch ($serendipity['GET']['step']) {
         serendipity_plugin_api::hook_event('media_getproperties_cached', $media['file']['props']['base_metadata'], $media['file']['realfile']);
 
         if ($file['is_image']) {
-            $file['finishJSFunction'] = 'serendipity_imageSelector_done(\'' . htmlspecialchars($serendipity['GET']['textarea']) . '\')';
+            $file['finishJSFunction'] = $file['origfinishJSFunction'] = 'serendipity_imageSelector_done(\'' . htmlspecialchars($serendipity['GET']['textarea']) . '\')';
 
             if (!empty($serendipity['GET']['filename_only']) && $serendipity['GET']['filename_only'] !== 'true') {
                 $file['fast_select'] = true;
@@ -161,6 +164,31 @@ switch ($serendipity['GET']['step']) {
         $media['paths'] =& $paths;
         break;
 
+    case 'showItem':
+        $media['case'] = 'showitem';
+        $file          = serendipity_fetchImageFromDatabase((int)$serendipity['GET']['image']);
+        $media['file'] = &$file;
+        $keywords = $dprops = '';
+
+        if (!is_array($file)) {
+            $media['perm_denied'] = true;
+            break;
+        }
+
+        serendipity_prepareMedia($file);
+
+        $media['file']['props'] =& serendipity_fetchMediaProperties((int)$serendipity['GET']['image']);
+        serendipity_plugin_api::hook_event('media_getproperties_cached', $media['file']['props']['base_metadata'], $media['file']['realfile']);
+
+        serendipity_parseMediaProperties($keywords, $dprops, $media['file'], $media['file']['props'], 0, false);
+        serendipity_plugin_api::hook_event('frontend_media_showitem', $media);
+        if ($media['perm_denied']) {
+            unset($media['file']);
+            unset($file);
+        }
+        $showFile = 'admin/media_showitem.tpl';
+        break;
+
     case 'default':
     default:
         if (!empty($serendipity['GET']['adminAction']) && $serendipity['GET']['adminModule'] == 'images' && $serendipity['GET']['adminAction'] != 'default') {
@@ -205,6 +233,6 @@ switch ($serendipity['GET']['step']) {
 
 $media = array_merge($serendipity['GET'], $media);
 $serendipity['smarty']->assign('media', $media);
-$serendipity['smarty']->display(serendipity_getTemplateFile('admin/media_choose.tpl', 'serendipityPath'));
+$serendipity['smarty']->display(serendipity_getTemplateFile($showFile, 'serendipityPath'));
 
 /* vim: set sts=4 ts=4 expandtab : */
\ No newline at end of file
diff --git a/serendipity_editor.js b/serendipity_editor.js
index d8c6c72..0ceaae0 100644
--- a/serendipity_editor.js
+++ b/serendipity_editor.js
@@ -229,6 +229,10 @@ function serendipity_imageSelector_done(textarea)
     if (f['imgID']) {
         imgID = f['imgID'].value;
     }
+    baseURL = '';
+    if (f['baseURL']) {
+        baseURL = f['baseURL'].value;
+    }
 
     floating = 'center';
     if (f['serendipity[align]'][0].checked == true) {
@@ -242,7 +246,32 @@ function serendipity_imageSelector_done(textarea)
     }
 
     if (f['serendipity[isLink]'][1].checked == true) {
-        insert = "<a class='serendipity_image_link' href='" + f['serendipity[url]'].value + "'>" + img + "</a>";
+        if (f['serendipity[target]'].selectedIndex) {
+            targetval = f['serendipity[target]'].options[f['serendipity[target]'].selectedIndex].value;
+        } else {
+            targetval = '';
+        }
+
+        prepend   = '';
+        ilink     = f['serendipity[url]'].value;
+        if (!targetval || targetval == 'none') {
+            itarget = '';
+        } else if (targetval == 'js') {
+            itarget = ' onclick="F1 = window.open(\'' + f['serendipity[url]'].value + '\',\'Zoom\',\''
+                    + 'height=' + (parseInt(f['imgHeight'].value) + 15) + ','
+                    + 'width='  + (parseInt(f['imgWidth'].value)  + 15) + ','
+                    + 'top='    + (screen.height - f['imgHeight'].value) /2 + ','
+                    + 'left='   + (screen.width  - f['imgWidth'].value)  /2 + ','
+                    + 'toolbar=no,menubar=no,location=no,resize=1,resizable=1,scrollbars=yes\'); return false;"';
+        } else if (targetval == '_blank') {
+            itarget = ' target="_blank"';
+        } else if (targetval == 'plugin') {
+            itarget = ' id="s9yisphref' + imgID + '" onclick="javascript:this.href = this.href + \'&amp;serendipity[from]=\' + self.location.href;"';
+            prepend = '<a title="' + ilink + '" id="s9yisp' + imgID + '"></a>';
+            ilink   = baseURL + 'serendipity_admin_image_selector.php?serendipity[step]=showItem&amp;serendipity[image]=' + imgID;
+        }
+
+        insert = prepend + "<a class='serendipity_image_link' href='" + ilink + "'" + itarget + ">" + img + "</a>";
     } else {
         insert = img;
     }
diff --git a/templates/default/admin/media_choose.tpl b/templates/default/admin/media_choose.tpl
index 0c74ecc..24e4fbd 100644
--- a/templates/default/admin/media_choose.tpl
+++ b/templates/default/admin/media_choose.tpl
@@ -135,6 +135,8 @@
                     <input type="hidden" name="imgWidth"  value="{$media.file.dimensions_width}" />
                     <input type="hidden" name="imgHeight" value="{$media.file.dimensions_height}" />
                     <input type="hidden" name="imgID" value="{$media.imgID}" />
+                    <input type="hidden" name="baseURL" value="{$serendipityBaseURL}" />
+                    <input type="hidden" name="indexFile" value="{$serendipityIndexFile}" />
                     <input type="hidden" name="imgName"   value="{$media.file.full_file}" />
                     <input type="hidden" name="thumbName" value="{$media.file.show_thumb}" />
                     <input type="hidden" name="hotlink" value="{$media.file.hotlink}" />
@@ -177,7 +179,17 @@
                         {serendipity_hookPlugin hookAll=true hook='frontend_image_selector_link_url' eventData=$media.file.links}
                         <input type="text"  name="serendipity[url]" size="30" value="{$media.file.links.imagelinkurl}" /><br />
                     {/if}
-                    {serendipity_hookPlugin hookAll=true hook='frontend_image_selector_imagelink' eventData=$media.file}
+
+                    <label id="select_image_target">{$CONST.MEDIA_TARGET}</label>
+                        <select name="serendipity[target]" id="select_image_target">
+                            <option value="none"   {'target'|@ifRemember:'none':false:'selected'}>{$CONST.NONE}</option>
+                            <option value="js"     {'target'|@ifRemember:'js':false:'selected'}>{$CONST.MEDIA_TARGET_JS}</option>
+                            <option value="plugin" {'target'|@ifRemember:'plugin':false:'selected'}>{$CONST.MEDIA_ENTRY}</option>
+                            <option value="_blank" {'target'|@ifRemember:'_blank':false:'selected'}>{$CONST.MEDIA_TARGET_BLANK}</option>
+                        </select>
+                    <br />
+
+                    {serendipity_hookPlugin hookAll=true hook='frontend_image_selector_imagelink2' eventData=$media.file}
                     <br />
 
                     <b>{$CONST.COMMENT}:</b>
@@ -190,7 +202,7 @@
                     {serendipity_hookPlugin hookAll=true hook='frontend_image_selector_more' eventData=$media.file}
 
                     <input type="button" value="{$CONST.BACK}" onclick="history.go(-1);" />
-                    <input type="button" value="{$CONST.DONE}" onclick="rememberOptions(); {$media.file.finishJSFunction}" />
+                    <input type="button" value="{$CONST.DONE}" onclick="rememberOptions(); {$media.file.origfinishJSFunction}" />
                     {serendipity_hookPlugin hookAll=true hook='frontend_image_selector_submit' eventData=$media.file}
                 {/if}
             </div>
diff --git a/templates/default/admin/media_showitem.tpl b/templates/default/admin/media_showitem.tpl
new file mode 100644
index 0000000..606d952
--- /dev/null
+++ b/templates/default/admin/media_showitem.tpl
@@ -0,0 +1,76 @@
+<html>
+    <head>
+        <title>{$media.file.props.base_property.TITLE|@default:$media.file.realname}</title>
+        <meta http-equiv="Content-Type" content="text/html; charset={$CONST.LANG_CHARSET}" />
+        <link rel="stylesheet" type="text/css" href="{$media.css}" />
+        <link rel="stylesheet" type="text/css" href="{$media.css_front}" />
+    </head>
+
+<body id="{$media.body_id}">
+    {if $perm_denied}
+        {$CONST.PERM_DENIED}
+    {else}
+    <div class="serendipity_Entry_Date">
+        <h3 class="serendipity_date">{$media.file.realname}</h3>
+        <h4 class="serendipity_title"><a href="#">{$media.file.props.base_property.TITLE|@default:''}</a></h4>
+
+        <div class="serendipity_entry">
+            <div class="serendipity_entry_body">
+                <div class="serendipity_center">
+                    {if $media.file.is_image}
+                        <img src="{$media.file.full_file}" />
+                    {else}
+                        <a href="{$media.file.full_file}">{$media.file.realname} ({$media.file.displaymime})</a>
+                    {/if}
+                    <br /><a href="{$media.from|@escape}" title="{$CONST.BACK_TO_BLOG}">{$CONST.BACK_TO_BLOG}</a>
+                </div>
+                <br />
+
+                {if $media.file.base_property}
+                <h3>{$CONST.MEDIA_PROP}</h3>
+                <div>
+                <dl>
+                {foreach from=$media.file.base_property key="prop_fieldname" item="prop_content"}
+                {if $prop_content.val}
+                    <dt>{$prop_content.label}</dt>
+                    <dd>{$prop_content.val|@escape}</dd>
+                {/if}
+                {/foreach}
+                </dl>
+                </div>
+                {/if}
+
+                {if $media.file.props.base_keyword}
+                <h3>{$CONST.MEDIA_KEYWORDS}</h3>
+                <div>
+                {foreach from=$media.file.props.base_keyword key="prop_fieldname" item="prop_content"}
+                    {$prop_fieldname|@escape}&nbsp;
+                {/foreach}
+                    <p></p>
+                </div>
+                {/if}
+
+                {if $media.file.props.base_metadata}
+                <h3>EXIF/IPTC/XMP</h3>
+                <div>
+                <dl>
+                {foreach from=$media.file.props.base_metadata key="meta_type" item="meta_data"}
+                    <dt><strong>{$meta_type}</strong></dt>
+                    <dd><table>
+                    {foreach from=$meta_data key="meta_name" item="meta_value"}
+                        <tr>
+                            <td valign="top"><em>{$meta_name}</em></th>
+                            <td>{if is_array($meta_value)}<pre>{$meta_value|@print_r}</pre>{else}{$meta_value|@formatTime:DATE_FORMAT_SHORT:false:$meta_name}{/if}</td>
+                        </tr>
+                    {/foreach}
+                    </table></dd>
+                {/foreach}
+                </dl>
+                </div>
+                {/if}
+            </div>
+        </div>
+    </div>
+    {/if}
+</body>
+</html>