Menu
▾
▴
xoops-svn
|
From: <ma...@us...> - 2012-02-13 17:35:21
|
Revision: 8960
http://xoops.svn.sourceforge.net/xoops/?rev=8960&view=rev
Author: mageg
Date: 2012-02-13 17:35:10 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
Fixed bug ID: 3443381
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin/images/main.php
XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_images.html
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin/images/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin/images/main.php 2012-02-13 17:29:00 UTC (rev 8959)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin/images/main.php 2012-02-13 17:35:10 UTC (rev 8960)
@@ -229,9 +229,8 @@
$criteria->setLimit(xoops_getModuleOption('images_pager', 'system'));
$images = $image_handler->getObjects($criteria, true, false);
- if ($imagecategory->getVar('imgcat_storetype') == 'db') {
- $xoopsTpl->assign('db_store', 1 );
-
+ if ($imagecategory->getVar('imgcat_storetype') == 'db') {
+ $xoopsTpl->assign('db_store', 1 );
}
foreach (array_keys($images) as $i) {
@@ -301,17 +300,19 @@
// Get image id
$image_id = system_CleanVars ( $_REQUEST, 'image_id', 0, 'int' );
if ( $image_id > 0 ) {
- $image = $image_handler->get($image_id);
-
+ $image = $image_handler->get($image_id);
$image_cat =& $imgcat_handler->get($image->getVar('imgcat_id'));
// Define Breadcrumb and tips
$xoBreadCrumb->addLink( _AM_SYSTEM_IMAGES_MANAGER, system_adminVersion('images', 'adminpath') );
$xoBreadCrumb->addLink( $image_cat->getVar('imgcat_name'), system_adminVersion('images', 'adminpath') . '&op=listimg&imgcat_id=' .$image->getVar('imgcat_id') );
$xoBreadCrumb->addLink( _AM_SYSTEM_IMAGES_EDITIMG );
$xoBreadCrumb->render();
+ if ($image_cat->getVar('imgcat_storetype') == 'db') {
+ $msg = '<div class="txtcenter"><img class="tooltip" src="' . XOOPS_URL . '/image.php?id=' . $image->getVar('image_id') . '" alt="' . $image->getVar('image_nicename') . '" title="' . $image->getVar('image_nicename') . '" style="max-width:120px; max-height:120px;"/></div>';
+ } else {
+ $msg = '<div class="txtcenter"><img src="./class/thumbs/phpThumb.php?src=' . XOOPS_UPLOAD_PATH . '/' . $image->getVar('image_name') . '&h=120" alt="" /></div>';
+ }
- $msg = '<div class="txtcenter"><img src="./class/thumbs/phpThumb.php?src=' . XOOPS_UPLOAD_PATH . '/' . $image->getVar('image_name') . '&h=120" alt="" /></div>';
-
$xoopsTpl->assign('edit_thumbs', $msg );
$form = new XoopsThemeForm( _AM_SYSTEM_IMAGES_EDITIMG, 'edit_form', 'admin.php', 'post', true );
@@ -339,6 +340,7 @@
case 'delfile':
// Get image handler
$image_handler = xoops_gethandler('image');
+ $imgcat_handler = xoops_gethandler('imagecategory');
// Call Header
xoops_cp_header();
// Define Stylesheet
@@ -351,7 +353,12 @@
$image_id = system_CleanVars ( $_REQUEST, 'image_id', 0, 'int' );
if ( $image_id > 0 ) {
$image = $image_handler->get($image_id);
- $msg = '<div style="width: 180px;margin:0 auto;"><img class="thumb" src="' . XOOPS_UPLOAD_URL . '/' . $image->getVar('image_name') . '" alt="" /></div>';
+ $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>';
+ } else {
+ $msg = '<div style="width: 180px;margin:0 auto;"><img class="thumb" src="' . XOOPS_UPLOAD_URL . '/' . $image->getVar('image_name') . '" alt="" /></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 );
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_images.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_images.html 2012-02-13 17:29:00 UTC (rev 8959)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_images.html 2012-02-13 17:35:10 UTC (rev 8960)
@@ -86,11 +86,11 @@
<div class="xo-actions txtcenter">
<div class="spacer bold"><{$img.image_nicename}></div>
<img id="loading_img<{$img.image_id}>" src="./images/spinner.gif" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" /><img class="cursorpointer tooltip" id="img<{$img.image_id}>" onclick="system_setStatus( { fct: 'images', op: 'display_img', image_id: <{$img.image_id}> }, 'img<{$img.image_id}>', 'admin.php' )" src="<{if $img.image_display}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{$smarty.const._IMGDISPLAY}>" title="<{$smarty.const._IMGDISPLAY}>" />
- <{if !$db_store}>
- <a class="lightbox tooltip" href="<{$xoops_upload_url}>/<{$img.image_name}>" title="<{$smarty.const._PREVIEW}>">
+ <{if !$db_store}>
+ <a class="lightbox tooltip" href="<{$xoops_upload_url}>/<{$img.image_name}>" title="<{$smarty.const._PREVIEW}>">
<{else}>
<a class="lightbox tooltip" href="<{$xoops_url}>/image.php?id=<{$img.image_id}>" title="<{$smarty.const._PREVIEW}>">
- <{/if}>
+ <{/if}>
<img src="<{xoAdminIcons display.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_VIEW}>" />
</a>
<a class="tooltip" href="admin.php?fct=images&op=editimg&image_id=<{$img.image_id}>" title="<{$smarty.const._EDIT}>">
@@ -99,20 +99,20 @@
<a class="tooltip" href="admin.php?fct=images&op=delfile&image_id=<{$img.image_id}>" title="<{$smarty.const._DELETE}>">
<img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>" />
</a>
- <img class="tooltip" onclick="display_dialog(<{$img.image_id}>, true, true, 'slide', 'slide', 120, 350);" src="<{xoAdminIcons url.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_URL}>" title="<{$smarty.const._AM_SYSTEM_IMAGES_URL}>" />
+ <img class="tooltip" onclick="display_dialog(<{$img.image_id}>, true, true, 'slide', 'slide', 120, 350);" src="<{xoAdminIcons url.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_URL}>" title="<{$smarty.const._AM_SYSTEM_IMAGES_URL}>" />
</div>
</div>
</div>
<div id="dialog<{$img.image_id}>" title="<{$img.image_nicename}>" style='display:none;'>
- <div class="center">
- <{if !$db_store}>
- <{$xoops_upload_url}>/<{$img.image_name}>
- <{else}>
- <{$xoops_url}>/image.php?id=<{$img.image_id}>
- <{/if}>
- </div>
- </div>
+ <div class="center">
+ <{if !$db_store}>
+ <{$xoops_upload_url}>/<{$img.image_name}>
+ <{else}>
+ <{$xoops_url}>/image.php?id=<{$img.image_id}>
+ <{/if}>
+ </div>
+ </div>
<{/foreach}>
<div class="clear"></div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-02-19 08:10:37
|
Revision: 9018
http://xoops.svn.sourceforge.net/xoops/?rev=9018&view=rev
Author: beckmi
Date: 2012-02-19 08:10:30 +0000 (Sun, 19 Feb 2012)
Log Message:
-----------
Adding Comments, Templates, and Uninstall links to Module's Admin
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/class/gui.php
XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/language/english/admin.php
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/class/gui.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/class/gui.php 2012-02-19 06:08:26 UTC (rev 9017)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/class/gui.php 2012-02-19 08:10:30 UTC (rev 9018)
@@ -111,6 +111,10 @@
$menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=preferences&op=showmod&mod=" . $xoopsModule->getVar('mid', 'e'), _AM_SYSTEM_PREF);
$menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin&op=update&module=" . $xoopsModule->getVar('dirname', 'e'), _AM_SYSTEM_UPDATE);
$menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=blocksadmin&op=list&filter=1&selgen=" . $xoopsModule->getVar('mid', 'e') . "&selmod=-2&selgrp=-1&selvis=-1", _AM_SYSTEM_BLOCKS);
+ $menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=tplsets&op=listtpl&tplset=default&moddir=" . $xoopsModule->getVar('dirname', 'e'),_AM_SYSTEM_TPLSETS);
+ $menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?module=" . $xoopsModule->getVar('mid', 'e'). '&status=0&limit=10&fct=comments', _AM_SYSTEM_COMMENTS);
+ $menu_handler->addMenuTop(XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin&op=uninstall&module=" . $xoopsModule->getVar('dirname', 'e'), _AM_SYSTEM_UNINSTALL);
+
$menu_handler->addMenuTop(XOOPS_URL . "/modules/" . $xoopsModule->getVar('dirname', 'e') . "/", _AM_SYSTEM_GOTOMODULE);
// Define main tab navigation
$i=0;
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/language/english/admin.php 2012-02-19 06:08:26 UTC (rev 9017)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/language/english/admin.php 2012-02-19 08:10:30 UTC (rev 9018)
@@ -76,4 +76,6 @@
define("_MD_AM_PERMRESETNG","Could not reset group permission for module %s");
define("_MD_AM_PERMADDNGP","All parent items must be selected.");
+define("_AM_SYSTEM_UNINSTALL","Uninstall");
+
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-03-24 18:29:36
|
Revision: 9185
http://xoops.svn.sourceforge.net/xoops/?rev=9185&view=rev
Author: mageg
Date: 2012-03-24 18:29:29 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
fixed a bug on the "System Configuration". Now it appears just the sections that are allowed for admin.
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin.php
XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_index.html
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin.php 2012-03-24 18:26:23 UTC (rev 9184)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin.php 2012-03-24 18:29:29 UTC (rev 9185)
@@ -57,7 +57,7 @@
if ( in_array( XOOPS_GROUP_ADMIN, $group) || false != $sysperm_handler->checkRight( 'system_admin', $category, $group, $xoopsModule->getVar('mid') ) ) {
if ( file_exists( XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar( 'dirname', 'n' ) . '/admin/' . $fct . '/main.php' ) ) {
include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar( 'dirname', 'n' ) . '/admin/' . $fct . '/main.php';
- } else {
+ } else {
$error = true;
}
} else {
@@ -152,47 +152,49 @@
if (!in_array($directory, $inactive_section)) {
$menu['used'] = true;
}
- switch ( $directory ) {
- case 'avatars':
- $avatar_handler = xoops_getHandler('avatar');
- $avatar = $avatar_handler->getCount();
- $menu['infos'] = sprintf(_AM_SYSTEM_AVATAR_INFO, $avatar);
- break;
- case 'banners':
- $banner_handler =& xoops_getModuleHandler( 'banner', 'system' );
- $banner = $banner_handler->getCount();
- $menu['infos'] = sprintf(_AM_SYSTEM_BANNER_INFO, $banner);
- break;
- case 'comments':
- $comment_handler =& xoops_gethandler('comment');
- $comment = $comment_handler->getCount();
- $menu['infos'] = sprintf(_AM_SYSTEM_COMMENT_INFO, $comment);
- break;
- case 'groups':
- $groups_Handler =& xoops_getModuleHandler( 'group', 'system' );
- $groups = $groups_Handler->getCount();
- $menu['infos'] = sprintf(_AM_SYSTEM_GROUP_INFO, $groups);
- break;
- case 'images':
- $imgcat_handler = xoops_gethandler('imagecategory');
- $img = $imgcat_handler->getCount();
- $menu['infos'] = sprintf(_AM_SYSTEM_IMG_INFO, $img);
- break;
- case 'smilies':
- $smilies_Handler =& xoops_getModuleHandler( 'smilies', 'system' );
- $smilies = $smilies_Handler->getCount();
- $menu['infos'] = sprintf(_AM_SYSTEM_SMILIES_INFO, $smilies);
- break;
- case 'userrank':
- $userrank_Handler =& xoops_getModuleHandler( 'userrank', 'system' );
- $userrank = $userrank_Handler->getCount();
- $menu['infos'] = sprintf(_AM_SYSTEM_RANKS_INFO, $userrank);
- break;
- case 'users':
- $member_handler =& xoops_getModuleHandler('users', 'system');
- $member = $member_handler->getCount();
- $menu['infos'] = sprintf(_AM_SYSTEM_USERS_INFO, $member);
- break;
+ if ( false != $all_ok || in_array($modversion['category'], $ok_syscats)) {
+ switch ( $directory ) {
+ case 'avatars':
+ $avatar_handler = xoops_getHandler('avatar');
+ $avatar = $avatar_handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_AVATAR_INFO, $avatar);
+ break;
+ case 'banners':
+ $banner_handler =& xoops_getModuleHandler( 'banner', 'system' );
+ $banner = $banner_handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_BANNER_INFO, $banner);
+ break;
+ case 'comments':
+ $comment_handler =& xoops_gethandler('comment');
+ $comment = $comment_handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_COMMENT_INFO, $comment);
+ break;
+ case 'groups':
+ $groups_Handler =& xoops_getModuleHandler( 'group', 'system' );
+ $groups = $groups_Handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_GROUP_INFO, $groups);
+ break;
+ case 'images':
+ $imgcat_handler = xoops_gethandler('image');
+ $img = $imgcat_handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_IMG_INFO, $img);
+ break;
+ case 'smilies':
+ $smilies_Handler =& xoops_getModuleHandler( 'smilies', 'system' );
+ $smilies = $smilies_Handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_SMILIES_INFO, $smilies);
+ break;
+ case 'userrank':
+ $userrank_Handler =& xoops_getModuleHandler( 'userrank', 'system' );
+ $userrank = $userrank_Handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_RANKS_INFO, $userrank);
+ break;
+ case 'users':
+ $member_handler =& xoops_getModuleHandler('users', 'system');
+ $member = $member_handler->getCount();
+ $menu['infos'] = sprintf(_AM_SYSTEM_USERS_INFO, $member);
+ break;
+ }
}
$xoopsTpl->append_by_ref( 'menu', $menu );
unset( $menu );
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_index.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_index.html 2012-03-24 18:26:23 UTC (rev 9184)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_index.html 2012-03-24 18:29:29 UTC (rev 9185)
@@ -15,6 +15,7 @@
<tbody>
<{foreach item=menu from=$menu}>
+ <{if $menu.title}>
<tr class="<{cycle values='even,odd'}>">
<td class="bold width15">
<a class="tooltip" href="admin.php?fct=<{$menu.file}>" title="<{$smarty.const._AM_SYSTEM_GO}>: <{$menu.title}>">
@@ -26,11 +27,12 @@
<td class="width15"><{$menu.infos}></td>
<td class="xo-actions width2">
<{if $menu.used}>
- <img id="loading_<{$menu.file}>" src="images/spinner.gif" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" />
- <img class="tooltip" id="<{$menu.file}>" onclick="system_setStatus( { op: 'system_avtivate', type: '<{$menu.file}>' }, '<{$menu.file}>', 'admin.php' )" src="<{if $menu.status}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{$smarty.const._AM_SYSTEM_STATUS}>" title="<{$smarty.const._AM_SYSTEM_STATUS}>" />
+ <img id="loading_<{$menu.file}>" src="images/spinner.gif" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" />
+ <img class="tooltip" id="<{$menu.file}>" onclick="system_setStatus( { op: 'system_avtivate', type: '<{$menu.file}>' }, '<{$menu.file}>', 'admin.php' )" src="<{if $menu.status}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{$smarty.const._AM_SYSTEM_STATUS}>" title="<{$smarty.const._AM_SYSTEM_STATUS}>" />
<{/if}>
</td>
</tr>
+ <{/if}>
<{/foreach}>
</tbody>
</table>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-05-23 21:24:25
|
Revision: 9586
http://xoops.svn.sourceforge.net/xoops/?rev=9586&view=rev
Author: beckmi
Date: 2012-05-23 21:24:19 +0000 (Wed, 23 May 2012)
Log Message:
-----------
Fixing typo
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin.php
XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_index.html
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin.php 2012-05-23 21:23:46 UTC (rev 9585)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/admin.php 2012-05-23 21:24:19 UTC (rev 9586)
@@ -83,7 +83,7 @@
if (false != $error) {
$op = system_CleanVars ( $_REQUEST, 'op', '', 'string' );
- if ( $op == 'system_avtivate') {
+ if ( $op == 'system_activate') {
$part = system_CleanVars ( $_REQUEST, 'type', '', 'string' );
$config_handler = xoops_gethandler('config');
Modified: XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_index.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_index.html 2012-05-23 21:23:46 UTC (rev 9585)
+++ XoopsCore/branches/2.5.x/2.5.5/htdocs/modules/system/templates/admin/system_index.html 2012-05-23 21:24:19 UTC (rev 9586)
@@ -28,7 +28,7 @@
<td class="xo-actions width2">
<{if $menu.used}>
<img id="loading_<{$menu.file}>" src="images/spinner.gif" style="display:none;" alt="<{$smarty.const._AM_SYSTEM_LOADING}>" />
- <img class="tooltip" id="<{$menu.file}>" onclick="system_setStatus( { op: 'system_avtivate', type: '<{$menu.file}>' }, '<{$menu.file}>', 'admin.php' )" src="<{if $menu.status}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{$smarty.const._AM_SYSTEM_STATUS}>" title="<{$smarty.const._AM_SYSTEM_STATUS}>" />
+ <img class="tooltip" id="<{$menu.file}>" onclick="system_setStatus( { op: 'system_activate', type: '<{$menu.file}>' }, '<{$menu.file}>', 'admin.php' )" src="<{if $menu.status}><{xoAdminIcons success.png}><{else}><{xoAdminIcons cancel.png}><{/if}>" alt="<{$smarty.const._AM_SYSTEM_STATUS}>" title="<{$smarty.const._AM_SYSTEM_STATUS}>" />
<{/if}>
</td>
</tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X