From cd368d5963bb0690f1086036853e514724dc0cb7 Mon Sep 17 00:00:00 2001 From: garvinhicking Date: Tue, 11 Apr 2006 14:55:04 +0000 Subject: [PATCH] All work no play make garvin a dull boy --- docs/NEWS | 2 +- include/functions_images.inc.php | 191 +++++++++--------------- include/functions_smarty.inc.php | 2 +- templates/default/admin/media_items.tpl | 3 + templates/default/admin/media_pane.tpl | 85 +++++++++++ 5 files changed, 163 insertions(+), 120 deletions(-) create mode 100644 templates/default/admin/media_pane.tpl diff --git a/docs/NEWS b/docs/NEWS index ee686c4..a480649 100644 --- a/docs/NEWS +++ b/docs/NEWS @@ -10,7 +10,7 @@ Version 1.1-alpha4() * Make media manager able to store media properties (garvinhicking) TODO: - - Show more existing properties in edit interface [see TODO in file] + - Show more existing properties in edit interface/Smartify [see TODO in file] - Read/Parse EXIF metadata, ask which to import [config option?] - Search/Filter for specific properties/keywords - Move/rename images/directories (browse serendipity_entries to fix up image paths [using ]. Also move ALL images of a directory, like when moving s9y installations. Put this into "Sync Thumbs" or "Manage Directories" panel. diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php index 82995d2..697d1ff 100644 --- a/include/functions_images.inc.php +++ b/include/functions_images.inc.php @@ -1163,7 +1163,6 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa global $serendipity; static $debug = false; - $sort_row_interval = array(8, 16, 50, 100); $sortParams = array('perpage', 'order', 'ordermode'); $importParams = array('adminModule', 'htmltarget', 'filename_only', 'textarea', 'subpage'); $extraParems = ''; @@ -1192,7 +1191,7 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa $serendipity['GET']['only_path'] = serendipity_uploadSecure($limit_path . $serendipity['GET']['only_path'], true); $serendipity['GET']['only_filename'] = str_replace(array('*', '?'), array('%', '_'), $serendipity['GET']['only_filename']); - $perPage = (!empty($serendipity['GET']['sortorder']['perpage']) ? $serendipity['GET']['sortorder']['perpage'] : $sort_row_interval[0]); + $perPage = (!empty($serendipity['GET']['sortorder']['perpage']) ? $serendipity['GET']['sortorder']['perpage'] : 8); $start = ($page-1) * $perPage; ## SYNCH START ## @@ -1329,99 +1328,11 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa $pages = ceil($totalImages / $perPage); $linkPrevious = '?' . $extraParems . 'serendipity[page]=' . ($page-1); $linkNext = '?' . $extraParems . 'serendipity[page]=' . ($page+1); - $sort_order = serendipity_getImageFields(); if (is_null($lineBreak)) { $lineBreak = floor(750 / ($serendipity['thumbSize'] + 20)); } -?> -
- $g_val) { - if ( !is_array($g_val) && $g_key != 'page' ) { - echo ''; - } - } -?> - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - -
- - - - -
-
- -
- -
- - - - - - - 0) { foreach ($serendipity['imageList'] as $k => $file) { if (!($serendipity['authorid'] == $file['authorid'] || $file['authorid'] == '0' || serendipity_checkPermission('adminImagesViewOthers'))) { // This is a fail-safe continue. Basically a non-matching file should already be filtered in SQL. @@ -1430,13 +1341,22 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa serendipity_prepareMedia($serendipity['imageList'][$k], $url); } - - serendipity_showMedia($serendipity['imageList'], $url, $manage, $lineBreak, true); } -?> - -
- - - - - -
- - - - - -
-
- $media) { $props =& serendipity_fetchMediaProperties($media['image_id']); - serendipity_prepareMedia($media['internal']); - serendipity_showMedia($file, $url, false, 1, false); + $show[$idx] =& $media['internal']; + serendipity_prepareMedia($show[$idx]); echo '' . "\n"; @@ -2046,10 +1967,12 @@ function serendipity_showPropertyForm(&$new_media, $keywordsPerBlock = 3, $manag echo '' . "\n"; } echo '' . "\n"; - - // TODO: EXIF! - // TODO: Upload date, Dimensions, Filename, Autor, Mime, ... } + + // TODO: SMARTIFY! + // TODO: EXIF! + // TODO: Upload date, Dimensions, Filename, Autor, Mime, ... + serendipity_showMedia($show, $mirror, $url, false, 1, false); ?>
@@ -2248,29 +2171,61 @@ function serendipity_prepareMedia(&$file, $url = '') { * @return boolean * */ -function serendipity_showMedia(&$file, $url = '', $manage = false, $lineBreak = 3, $enclose = true) { +function serendipity_showMedia(&$file, &$paths, $url = '', $manage = false, $lineBreak = 3, $enclose = true, $limit_path = null, $perPage = 8, $show_upload = false, $page = 1, $pages = 1, $linkNext = '', $linkPrevious = '') { global $serendipity; + $form_hidden = ''; + foreach($serendipity['GET'] AS $g_key => $g_val) { + if (!is_array($g_val) && $g_key != 'page') { + $form_hidden .= ''; + } + } + serendipity_smarty_init(); $media = array( - 'manage' => $manage, - 'lineBreak' => $lineBreak, - 'lineBreakP' => round(1/$lineBreak*100), - 'url' => $url, - 'enclose' => $enclose, - 'zoomIMG' => serendipity_getTemplateFile('admin/img/big_zoom.png'), - 'renameIMG' => serendipity_getTemplateFile('admin/img/big_rename.png'), - 'resizeIMG' => serendipity_getTemplateFile('admin/img/big_resize.png'), - 'rotatecwIMG' => serendipity_getTemplateFile('admin/img/big_rotate_ccw.png'), - 'rotateccwIMG' => serendipity_getTemplateFile('admin/img/big_rotate_cw.png'), - 'configureIMG' => serendipity_getTemplateFile('admin/img/configure.png'), - 'deleteIMG' => serendipity_getTemplateFile('admin/img/big_delete.png') - + 'manage' => $manage, + 'lineBreak' => $lineBreak, + 'lineBreakP' => round(1/$lineBreak*100), + 'url' => $url, + 'enclose' => $enclose, + 'zoomIMG' => serendipity_getTemplateFile('admin/img/big_zoom.png'), + 'renameIMG' => serendipity_getTemplateFile('admin/img/big_rename.png'), + 'resizeIMG' => serendipity_getTemplateFile('admin/img/big_resize.png'), + 'rotatecwIMG' => serendipity_getTemplateFile('admin/img/big_rotate_ccw.png'), + 'rotateccwIMG' => serendipity_getTemplateFile('admin/img/big_rotate_cw.png'), + 'configureIMG' => serendipity_getTemplateFile('admin/img/configure.png'), + 'deleteIMG' => serendipity_getTemplateFile('admin/img/big_delete.png'), + 'prevIMG' => serendipity_getTemplateFile('admin/img/previous.png'), + 'nextIMG' => serendipity_getTemplateFile('admin/img/next.png'), + 'token' => serendipity_setFormToken(), + 'form_hidden' => $form_hidden, + 'limit_path' => $limit_path, + 'blimit_path' => basename($limit_path), + 'only_path' => $serendipity['GET']['only_path'], + 'only_filename' => $serendipity['GET']['only_filename'], + 'sortorder' => $serendipity['GET']['sortorder'], + 'sort_order' => serendipity_getImageFields(), + 'sort_row_interval' => array(8, 16, 50, 100), + 'perPage' => $perPage, + 'show_upload' => $show_upload, + 'nr_files' => count($file), + 'page' => $page, + 'pages' => $pages, + 'linkNext' => $linkNext, + 'linkPrevious' => $linkPrevious ); + $media['files'] =& $file; + $media['paths'] =& $paths; $serendipity['smarty']->assign('media', $media); - $serendipity['smarty']->display(serendipity_getTemplateFile('admin/media_items.tpl', 'serendipityPath')); + + if ($enclose) { + serendipity_smarty_fetch('MEDIA_ITEMS', 'admin/media_items.tpl'); + $serendipity['smarty']->display(serendipity_getTemplateFile('admin/media_pane.tpl', 'serendipityPath')); + } else { + $serendipity['smarty']->display(serendipity_getTemplateFile('admin/media_items.tpl', 'serendipityPath')); + } return true; } \ No newline at end of file diff --git a/include/functions_smarty.inc.php b/include/functions_smarty.inc.php index c7e096a..1976efd 100644 --- a/include/functions_smarty.inc.php +++ b/include/functions_smarty.inc.php @@ -580,7 +580,7 @@ function serendipity_smarty_init($vars = array()) { $serendipity['smarty']->config_dir = &$serendipity['smarty']->template_dir[0]; $serendipity['smarty']->secure_dir = array($serendipity['serendipityPath'] . $serendipity['templatePath']); - $serendipity['smarty']->security_settings['MODIFIER_FUNCS'] = array('sprintf', 'sizeof', 'count', 'rand', 'print_r'); + $serendipity['smarty']->security_settings['MODIFIER_FUNCS'] = array('sprintf', 'sizeof', 'count', 'rand', 'print_r', 'str_repeat'); $serendipity['smarty']->security_settings['ALLOW_CONSTANTS'] = true; $serendipity['smarty']->security = true; $serendipity['smarty']->use_sub_dirs = false; diff --git a/templates/default/admin/media_items.tpl b/templates/default/admin/media_items.tpl index 655ff10..34d2a41 100644 --- a/templates/default/admin/media_items.tpl +++ b/templates/default/admin/media_items.tpl @@ -42,7 +42,10 @@ {/if} + + {if $media.enclose} + {/if} {if $media.enclose AND (($smarty.foreach.mediafiles.iteration % $media.lineBreak) == 0)} diff --git a/templates/default/admin/media_pane.tpl b/templates/default/admin/media_pane.tpl new file mode 100644 index 0000000..da26390 --- /dev/null +++ b/templates/default/admin/media_pane.tpl @@ -0,0 +1,85 @@ +
+ {$media.token} + {$media.form_hidden} + + + + + + + + + + + + + + + + + + + + + + + + +
{$CONST.FILTERS} - {$CONST.FIND_MEDIA}
{$CONST.FILTER_DIRECTORY} + {$CONST.SORT_ORDER_NAME}
{$CONST.SORT_ORDER}
{$CONST.SORT_BY} + + {$CONST.SORT_ORDER} + {$CONST.FILES_PER_PAGE} + +
+ {if $media.show_upload} + + {/if} + +
+
+ +{if $media.nr_files < 1} +
- {$CONST.NO_IMAGES_FOUND} -
+{else} + + + + + + + {$MEDIA_ITEMS} + +
+ + + + + +
+ {if $media.page != 1 AND $media.page <= $media.pages} + {$CONST.PREVIOUS} + {/if} + + {if $media.page != $media.pages} + {$CONST.NEXT} + {/if} +
+
+{/if} \ No newline at end of file -- 2.39.5