Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12350] XoopsCore/branches/2.5.x/2.5.7
|
From: <luc...@us...> - 2014-03-07 22:49:01
|
Revision: 12350
http://sourceforge.net/p/xoops/svn/12350
Author: luciorota
Date: 2014-03-07 22:48:57 +0000 (Fri, 07 Mar 2014)
Log Message:
-----------
bug fixes in image manager
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/images/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_images.html
Modified: XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2014-03-07 02:01:09 UTC (rev 12349)
+++ XoopsCore/branches/2.5.x/2.5.7/docs/changelog.250.txt 2014-03-07 22:48:57 UTC (rev 12350)
@@ -1,5 +1,8 @@
XOOPS 2.5.x Changelog (Language changes: see: /docs/lang_diff.txt)
+Bugfixes:
+- fixed System Module image manager html/js bugs (luciorota)
+
===============================
2013/05/08: Version 2.5.7 Beta 1
===============================
@@ -64,6 +67,7 @@
- added xBootstrap theme (UI/UX Team: Angelo Roja, Bleekk, Heyula)
- added extra escape for "e" in YESTERDAY definition in locale.php, which was added in PHP 5.4 (madDan)
- fixed PHP minimum version comparison in ModuleAdmin (mamba)
+- fixed System Module image manager and popup image manager save images in different directories(luciorota)
Security fixes
- XSS issues reported by Mehdi Dadkhah (rgriffith)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/images/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/images/main.php 2014-03-07 02:01:09 UTC (rev 12349)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/images/main.php 2014-03-07 22:48:57 UTC (rev 12350)
@@ -89,8 +89,11 @@
xoops_cp_header();
// Define Stylesheet
$xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css' );
+ $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+ $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/lightbox.css' );
// Define scripts
$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+ $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.lightbox.js');
$xoTheme->addScript('modules/system/js/admin.js');
// Define Breadcrumb and tips
@@ -294,7 +297,12 @@
xoops_cp_header();
// Define Stylesheet
$xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css' );
+ $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+ $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/lightbox.css' );
// Define scripts
+ $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+ $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
+ $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.lightbox.js');
$xoTheme->addScript('modules/system/js/admin.js');
// Get image handler
$image_handler = xoops_gethandler('image');
@@ -325,7 +333,8 @@
$form->addElement(new XoopsFormHidden( 'image_id', $image_id ));
$form->addElement(new XoopsFormHidden( 'op', 'save' ));
$form->addElement(new XoopsFormHidden( 'fct', 'images' ));
- $form->addElement(new XoopsFormButton( '', 'img_button', _SUBMIT, 'submit' ) );
+ //$form->addElement(new XoopsFormButton( '', 'img_button', _SUBMIT, 'submit' ) );
+ $form->addElement(new XoopsFormButtonTray( '', _SUBMIT, 'submit', '', false ));
$form->assign($xoopsTpl);
} else {
@@ -343,23 +352,26 @@
xoops_cp_header();
// Define Stylesheet
$xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css' );
- $xoTheme->addStylesheet( 'browse.php?Frameworks/jquery/css/thumbs/thumbs.css' );
+ $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+ $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/lightbox.css' );
// Define scripts
$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
- $xoTheme->addScript('modules/system/js/thumbs.js');
+ $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
+ $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.lightbox.js');
+ $xoTheme->addScript('modules/system/js/admin.js');
// Get image id
$image_id = system_CleanVars ( $_REQUEST, 'image_id', 0, 'int' );
if ( $image_id > 0 ) {
$image = $image_handler->get($image_id);
$image_cat =& $imgcat_handler->get($image->getVar('imgcat_id'));
if ($image_cat->getVar('imgcat_storetype') == 'db') {
- $msg = '<div style="width: 180px;margin:0 auto;"><img class="thumb" src="' . XOOPS_URL . '/image.php?id=' . $image->getVar('image_id') . '" alt="" title="" style="max-width:120px; max-height:120px;"/></div>';
+ $msg = '<div style="width: 180px;margin:0 auto;"><img class="thumb" src="' . XOOPS_URL . '/image.php?id=' . $image->getVar('image_id') . '&width=120&height=120" alt="" title="" style="max-width:120px; max-height:120px;"/></div>';
} else {
- $msg = '<div style="width: 180px;margin:0 auto;"><img class="thumb" src="' . XOOPS_UPLOAD_URL . '/' . $image->getVar('image_name') . '" alt="" /></div>';
+ $msg = '<div style="width: 180px;margin:0 auto;"><img class="thumb" src="' . XOOPS_URL . '/image.php?id=' . $image->getVar('image_id') . '&width=120&height=120" alt="" title="" style="max-width:120px; max-height:120px;"/></div>';
}
$msg .= '<div class="spacer">' . $image->getVar('image_nicename') . '</div>';
$msg .= '<div class="spacer">' . _AM_SYSTEM_IMAGES_RUDELIMG . '</div>';
- xoops_confirm( array('op' => 'delfileok', 'image_id' => $image_id, 'fct' => 'images'), 'admin.php', $msg );
+ xoops_confirm( array('op' => 'delfileok', 'image_id' => $image_id, 'fct' => 'images'), 'admin.php', $msg, _DELETE );
} else {
redirect_header('admin.php?fct=images', 1, _AM_SYSTEM_DBERROR);
@@ -553,19 +565,21 @@
$form->addElement(new XoopsFormHidden('imgcat_id', $imgcat_id));
$form->addElement(new XoopsFormHidden('op', 'updatecat'));
$form->addElement(new XoopsFormHidden('fct', 'images'));
- $form->addElement(new XoopsFormButton('', 'imgcat_button', _SUBMIT, 'submit'));
+ //$form->addElement(new XoopsFormButton('', 'imgcat_button', _SUBMIT, 'submit'));
+ $form->addElement(new XoopsFormButtonTray( 'imgcat_button', _SUBMIT, 'submit', '', false ));
// Define main template
$xoopsOption['template_main'] = 'system_header.html';
// Call Header
xoops_cp_header();
// Define Stylesheet
$xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css' );
- $xoTheme->addStylesheet( 'browse.php?Frameworks/jquery/css/thumbs/thumbs.css' );
- $xoTheme->addStylesheet( 'browse.php?Frameworks/jquery/css/lightbox/lightbox.css' );
+ $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+ $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/lightbox.css' );
// Define scripts
$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+ $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
+ $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.lightbox.js');
$xoTheme->addScript('modules/system/js/admin.js');
- $xoTheme->addScript('modules/system/js/thumbs.js');
// Define Breadcrumb and tips
$xoBreadCrumb->addLink( _AM_SYSTEM_IMAGES_MANAGER, system_adminVersion('images', 'adminpath') );
$xoBreadCrumb->addLink( $imagecategory->getVar('imgcat_name'), '' );
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_images.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_images.html 2014-03-07 02:01:09 UTC (rev 12349)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_images.html 2014-03-07 22:48:57 UTC (rev 12350)
@@ -114,6 +114,10 @@
<div class="clear"></div>
</div>
<{if $nav_menu}><div class="xo-avatar-pagenav floatright"><{$nav_menu}></div><div class="clear spacer"></div><{/if}>
+<{else}>
+<div id="xo-category-add" class="">
+ <div class="clear"></div>
+</div>
<{/if}>
<!-- Add Image form -->
|
