Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9735] XoopsModules/TDMPicture/trunk/TDMPicture
|
From: <lor...@us...> - 2012-06-29 08:24:03
|
Revision: 9735
http://xoops.svn.sourceforge.net/xoops/?rev=9735&view=rev
Author: lord_venom
Date: 2012-06-29 08:23:52 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php
XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
XoopsModules/TDMPicture/trunk/TDMPicture/admin/menu.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php 2012-06-29 07:20:51 UTC (rev 9734)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php 2012-06-29 08:23:52 UTC (rev 9735)
@@ -104,6 +104,13 @@
break;
case "edit":
+ //admin menu
+ $category_admin = new ModuleAdmin();
+ echo $category_admin->addNavigation('cat.php');
+ $category_admin->addItemButton(_AM_TDMPICTURE_ADD_CAT, 'cat.php?op=new_cat', 'add');
+ $category_admin->addItemButton(_AM_TDMPICTURE_LIST_CAT, 'cat.php?op=list', 'list');
+ echo $category_admin->renderButton();
+
$obj = $cat_handler->get($_REQUEST['cat_id']);
$form = $obj->getForm();
$form->display();
@@ -135,6 +142,10 @@
echo $obj->getHtmlErrors();
}
} else {
+
+ $category_admin = new ModuleAdmin();
+ echo $category_admin->addNavigation('cat.php');
+
xoops_confirm(array('ok' => 1, 'cat_id' => $_REQUEST['cat_id'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMPICTURE_FORMSUREDELCAT, $obj->getVar('cat_title')));
}
break;
@@ -153,9 +164,12 @@
//menu admin
$category_admin = new ModuleAdmin();
echo $category_admin->addNavigation('cat.php');
- if ($cat_waiting != 0){
+ if ($cat_waiting != 0 && !isset($_REQUEST['cat_display'])){
$category_admin->addItemButton(sprintf(_AM_TDMPICTURE_THEREARE_CAT_WAITING,$cat_waiting), 'cat.php?op=list&cat_display=0', 'update');
- }
+ }
+ if (isset($_REQUEST['cat_display'])) {
+ $category_admin->addItemButton(_AM_TDMPICTURE_LIST_CAT, 'cat.php?op=list', 'list');
+ }
$category_admin->addItemButton(_AM_TDMPICTURE_ADD_CAT, 'cat.php?op=new_cat', 'add');
echo $category_admin->renderButton();
@@ -220,13 +234,13 @@
}
echo '<tr class="'.$class.'">';
- echo '<td align="center" width="10%"><img src="'.$cat_img.'" alt="" title="" height="60"></td>';
- echo '<td align="left" width="55%">'.$category_ArrayTree[$i].$cat_title.'</td>';
- echo '<td align="center" width="10%">'.$cat_uid.'</td>';
- echo '<td align="center" width="5%">'.$assoc_cat[$i]->getVar('cat_weight').'</td>';
- echo '<td align="center" width="5%">'.$display.'</td>';
- echo '<td align="center" width="5%">'.$principal.'</td>';
- echo '<td align="center" width="10%">';
+ echo '<td align="center" width="10%" style="vertical-align:middle;"><img src="'.$cat_img.'" alt="" title="" height="40"></td>';
+ echo '<td align="left" width="55%" style="vertical-align:middle;">'.$category_ArrayTree[$i].$cat_title.'</td>';
+ echo '<td align="center" width="10%" style="vertical-align:middle;">'.$cat_uid.'</td>';
+ echo '<td align="center" width="5%" style="vertical-align:middle;">'.$assoc_cat[$i]->getVar('cat_weight').'</td>';
+ echo '<td align="center" width="5%" style="vertical-align:middle;">'.$display.'</td>';
+ echo '<td align="center" width="5%" style="vertical-align:middle;">'.$principal.'</td>';
+ echo '<td align="center" width="10%" style="vertical-align:middle;">';
echo '<a href="cat.php?op=edit&cat_id='.$cat_id.'"><img src="./../images/edit_mini.gif" border="0" alt="'._AM_TDMPICTURE_MODIFY.'" title="'._AM_TDMPICTURE_MODIFY.'"></a>';
echo '<a href="cat.php?op=delete&cat_id='.$cat_id.'"><img src="./../images/delete_mini.gif" border="0" alt="'._AM_TDMPICTURE_DELETE.'" title="'._AM_TDMPICTURE_DELETE.'"></a>';
echo '</td>';
@@ -234,7 +248,9 @@
}
echo '</table><br /><br />';
echo '<div align=right>'.$pagenav.'</div><br />';
- }
+ } else{
+ echo '<div class="errorMsg" style="text-align: center;">' . sprintf(_AM_TDMPICTURE_THEREARE_CAT,0) . '</div>';
+ }
break;
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-06-29 07:20:51 UTC (rev 9734)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-06-29 08:23:52 UTC (rev 9735)
@@ -17,23 +17,13 @@
* ****************************************************************************
*/
-include '../../../include/cp_header.php';
-include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
+include 'admin_header.php';
+xoops_cp_header();
-
- xoops_cp_header();
+tdmpicture_adminheader();
-include_once(XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/include/common.php');
- tdmpicture_adminheader();
-if ( !is_readable(XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php")) {
-TDMPicture_adminmenu(4, _AM_TDMPICTURE_MANAGE_FILE);
-} else {
-include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php';
-loadModuleAdminMenu (4, _AM_TDMPICTURE_MANAGE_FILE);
-}
-
$file_handler =& xoops_getModuleHandler('tdmpicture_file', 'TDMPicture');
$cat_handler =& xoops_getModuleHandler('tdmpicture_cat', 'TDMPicture');
@@ -47,19 +37,18 @@
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('file_display', 0));
$file_waiting = $file_handler->getCount($criteria);
-
-//menu
-echo '<div class="CPbigTitle" style="background-image: url(../images/decos/file.png); background-repeat: no-repeat; background-position: left; padding-left: 60px; padding-top:20px; padding-bottom:15px;"><h3><strong>'._AM_TDMPICTURE_MANAGE_FILE.'</strong></h3>';
-echo '</div><br /><div class="head" align="center">';
-echo !isset($_REQUEST['file_display']) || $_REQUEST['file_display'] == 1 ? '<a href="files.php?op=list&file_display=0">'.sprintf(_AM_TDMPICTURE_THEREARE_FILE_WAITING,$file_waiting).'</a>' : '<a href="files.php?op=list&file_display=1">'.sprintf(_AM_TDMPICTURE_THEREARE_FILE,$numfile).'</a>';
-echo ' | ';
-echo '<a href="files.php?op=upload">'._AM_TDMPICTURE_FILE_UPLOAD.'</a>';
-echo '</div><br>';
switch($op) {
//upload
case "upload":
+
+ //menu admin
+ $category_admin = new ModuleAdmin();
+ echo $category_admin->addNavigation('cat.php');
+ $category_admin->addItemButton(_AM_TDMPICTURE_LIST_FILE, 'files.php?op=list', 'list');
+ echo $category_admin->renderButton();
+
// Affichage du formulaire de cr?ation de cat?gories
$obj =& $file_handler->create();
$form = $obj->getForm();
@@ -300,7 +289,8 @@
case "update":
$obj = $file_handler->get($_REQUEST['file_id']);
- $obj->setVar('file_display', 1);
+ $obj->getVar('file_display') == 1 ? $obj->setVar('file_display', 0) : $obj->setVar('file_display', 1);
+ //$obj->setVar('file_display', 1);
if ($file_handler->insert($obj)) {
redirect_header('files.php', 2, _AM_TDMPICTURE_BASE);
}
@@ -350,6 +340,18 @@
if (!$numcat) {
redirect_header('cat.php', 2, _AM_TDMPICTURE_CATERROR);
}
+
+ //menu admin
+ $category_admin = new ModuleAdmin();
+ echo $category_admin->addNavigation('files.php');
+ if ($file_waiting != 0 && !isset($_REQUEST['file_display'])){
+ $category_admin->addItemButton(sprintf(_AM_TDMPICTURE_THEREARE_FILE_WAITING,$file_waiting), 'files.php?op=list&file_display=0', 'update');
+ }
+ if (isset($_REQUEST['file_display'])) {
+ $category_admin->addItemButton(_AM_TDMPICTURE_LIST_FILE, 'files.php?op=list', 'list');
+ }
+ $category_admin->addItemButton(_AM_TDMPICTURE_FILE_UPLOAD, 'files.php?op=upload', 'add');
+ echo $category_admin->renderButton();
//Parameters
$criteria = new CriteriaCompo();
@@ -403,7 +405,7 @@
$file_id = $arr[$i]->getVar('file_id');
$file_title = $myts->displayTarea($arr[$i]->getVar('file_title'));
- $display = $arr[$i]->getVar('file_display') == 1 ? "<img src='./../images/on.gif' border='0'>" : "<a href='files.php?op=update&file_id=".$file_id."'><img alt='"._AM_TDMPICTURE_UPDATE."' title='"._AM_TDMPICTURE_UPDATE."' src='./../images/off.gif' border='0'></a>";
+ $display = $arr[$i]->getVar('file_display') == 1 ? "<a href='files.php?op=update&file_id=".$file_id."'><img src='./../images/on.gif' border='0'></a>" : "<a href='files.php?op=update&file_id=".$file_id."'><img alt='"._AM_TDMPICTURE_UPDATE."' title='"._AM_TDMPICTURE_UPDATE."' src='./../images/off.gif' border='0'></a>";
//on test l'existance de l'image
$img = $arr[$i]->getVar("file_file") ? $arr[$i]->getVar("file_file") : 'blank.gif';
@@ -424,15 +426,15 @@
$thumb_img .= "</a>";
echo '<tr class="'.$class.'">';
- echo '<td align="center"><input type="checkbox" name="id[]" id="id[]" value="'.$arr[$i]->getVar("file_id") .'" /></td>';
- echo '<td align="center"><img src="'.$file_img.'" alt="" title="" height="60"></td>';
- echo '<td align="center">'.$file_cattitle.'</td>';
- echo '<td align="center">'.$file_title.'</td>';
- echo '<td align="center">'.$arr[$i]->getVar('file_res_x').'</td>';
- echo '<td align="center">'.$arr[$i]->getVar('file_res_y').'</td>';
- echo '<td align="center">'.$thumb_img.'</td>';
- echo '<td align="center">'.$display.'</td>';
- echo '<td align="center">';
+ echo '<td align="center" style="vertical-align:middle;"><input type="checkbox" name="id[]" id="id[]" value="'.$arr[$i]->getVar("file_id") .'" /></td>';
+ echo '<td align="center" style="vertical-align:middle;"><img src="'.$file_img.'" alt="" title="" height="60"></td>';
+ echo '<td align="center" style="vertical-align:middle;">'.$file_cattitle.'</td>';
+ echo '<td align="center" style="vertical-align:middle;">'.$file_title.'</td>';
+ echo '<td align="center" style="vertical-align:middle;">'.$arr[$i]->getVar('file_res_x').'</td>';
+ echo '<td align="center" style="vertical-align:middle;">'.$arr[$i]->getVar('file_res_y').'</td>';
+ echo '<td align="center" style="vertical-align:middle;">'.$thumb_img.'</td>';
+ echo '<td align="center" style="vertical-align:middle;">'.$display.'</td>';
+ echo '<td align="center" style="vertical-align:middle;">';
echo '<a href="files.php?op=edit&file_id='.$file_id.'"><img src="./../images/edit_mini.gif" border="0" alt="'._AM_TDMPICTURE_MODIFY.'" title="'._AM_TDMPICTURE_MODIFY.'"></a>';
echo '<a href="files.php?op=delete&file_id='.$file_id.'"><img src="./../images/delete_mini.gif" border="0" alt="'._AM_TDMPICTURE_DELETE.'" title="'._AM_TDMPICTURE_DELETE.'"></a>';
echo '<a href="files.php?op=edit_img&file_id='.$file_id.'"><img src="./../images/renew_mini.gif" border="0" alt="'._AM_TDMPICTURE_EDITIMG.'" title="'._AM_TDMPICTURE_EDITIMG.'"></a>';
@@ -441,7 +443,9 @@
}
echo '</table><input type="submit" name="op" value="'._DELETE.'" /></form><br /><br />';
echo '<div align=right>'.$pagenav.'</div><br />';
- }
+ } else{
+ echo '<div class="errorMsg" style="text-align: center;">' . sprintf(_AM_TDMPICTURE_THEREARE_FILE,0) . '</div>';
+ }
break;
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/menu.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/menu.php 2012-06-29 07:20:51 UTC (rev 9734)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/menu.php 2012-06-29 08:23:52 UTC (rev 9735)
@@ -16,6 +16,7 @@
*
* ****************************************************************************
*/
+
$adminmenu[0]['title'] = _MI_TDMPICTURE_ADMENUINDEX;
$adminmenu[0]['link'] = "admin/index.php";
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php 2012-06-29 07:20:51 UTC (rev 9734)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php 2012-06-29 08:23:52 UTC (rev 9735)
@@ -42,6 +42,8 @@
define("_AM_TDMPICTURE_MANAGE_FILE","Gestion des Fichiers");
define("_AM_TDMPICTURE_THEREARE_FILE","Il y a %s Fichiers dans la Base de donnée");
define("_AM_TDMPICTURE_THEREARE_FILE_WAITING","Il y a %s Fichiers en attente de validation");
+//admin menu
+define("_AM_TDMPICTURE_LIST_FILE","Liste des Fichiers");
define("_AM_TDMPICTURE_MANAGE_GD","Librairie GD");
define("_AM_TDMPICTURE_MANAGE_GDERROR","Certaine option du module peuvent ne pas fonctionner sans la librairie GD");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php 2012-06-29 07:20:51 UTC (rev 9734)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php 2012-06-29 08:23:52 UTC (rev 9735)
@@ -19,9 +19,9 @@
//Admin menu
define("_MI_TDMPICTURE_ADMENUINDEX","Index");
-define("_MI_TDMPICTURE_ADMENUCAT","Catégories");
-define("_MI_TDMPICTURE_ADMENUFILE","Fichiers");
-define("_MI_TDMPICTURE_ADMENUPERMISSIONS","Permissions");
+define("_MI_TDMPICTURE_ADMENUCAT","Gestion des Catégories");
+define("_MI_TDMPICTURE_ADMENUFILE","Gestion des Fichiers");
+define("_MI_TDMPICTURE_ADMENUPERMISSIONS","Gestion des Permissions");
define("_MI_TDMPICTURE_ADMENUABOUT","About");
define("_MI_TDMPICTURE_ADMENUPREF","Prérences");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
