|
From: <lor...@us...> - 2012-06-29 07:21:03
|
Revision: 9734
http://xoops.svn.sourceforge.net/xoops/?rev=9734&view=rev
Author: lord_venom
Date: 2012-06-29 07:20:51 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
add menu admin 2.5
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php
XoopsModules/TDMPicture/trunk/TDMPicture/admin/index.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php
XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
Added Paths:
-----------
XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_header.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php
Added: XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_header.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_header.php (rev 0)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_header.php 2012-06-29 07:20:51 UTC (rev 9734)
@@ -0,0 +1,56 @@
+<?php
+/**
+ * ****************************************************************************
+ * - TDMCreate By TDM - TEAM DEV MODULE FOR XOOPS
+ * - Licence GPL Copyright (c) (http://www.xoops.org)
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @license TDM GPL license
+ * @author TDM TEAM DEV MODULE
+ *
+ * Version : 1.38 Thu 2012/04/12 14:04:25 : Timgno Exp $
+ * ****************************************************************************
+ */
+include '../../../include/cp_header.php';
+include_once("../include/functions.php");
+include_once("../include/common.php");
+include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
+include_once(XOOPS_ROOT_PATH."/class/tree.php");
+include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+
+
+if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
+ //return true;
+}else{
+ redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
+ //return false;
+}
+
+$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
+$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
+$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
+
+$myts =& MyTextSanitizer::getInstance();
+
+if ($xoopsUser) {
+ $moduleperm_handler =& xoops_gethandler('groupperm');
+ if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar( 'mid' ), $xoopsUser->getGroups())) {
+ redirect_header(XOOPS_URL, 1, _NOPERM);
+ exit();
+ }
+} else {
+ redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
+ exit();
+}
+
+//Load languages
+xoops_loadLanguage('admin', $xoopsModule->getVar("dirname"));
+xoops_loadLanguage('modinfo', $xoopsModule->getVar("dirname"));
+xoops_loadLanguage('main', $xoopsModule->getVar("dirname"));
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php 2012-06-27 22:46:13 UTC (rev 9733)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php 2012-06-29 07:20:51 UTC (rev 9734)
@@ -17,19 +17,11 @@
* ****************************************************************************
*/
-include '../../../include/cp_header.php';
-include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
-include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar("dirname").'/include/common.php';
-include_once XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/class/tree.php";
+include 'admin_header.php';
+xoops_cp_header();
- xoops_cp_header();
-if ( !is_readable(XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php")) {
-TDMPicture_adminmenu(1, _AM_TDMPICTURE_MANAGE_CAT);
-} else {
-include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php';
-loadModuleAdminMenu (1, _AM_TDMPICTURE_MANAGE_CAT);
-}
+//load class
$file_handler =& xoops_getModuleHandler('tdmpicture_file', 'TDMPicture');
$cat_handler =& xoops_getModuleHandler('tdmpicture_cat', 'TDMPicture');
@@ -43,11 +35,9 @@
$criteria->add(new Criteria('cat_display', 0));
$cat_waiting = $cat_handler->getCount($criteria);
-//menu
-echo '<div class="CPbigTitle" style="background-image: url(../images/decos/cat.png); background-repeat: no-repeat; background-position: left; padding-left: 60px; padding-top:20px; padding-bottom:15px;"><h3><strong>'._AM_TDMPICTURE_MANAGE_CAT.'</strong></h3>';
-echo '</div><br /><div class="head" align="center">';
-echo !isset($_REQUEST['cat_display']) || $_REQUEST['cat_display'] == 1 ? '<a href="cat.php?op=list&cat_display=0">'.sprintf(_AM_TDMPICTURE_THEREARE_CAT_WAITING,$cat_waiting).'</a>' : '<a href="cat.php?op=list&cat_display=1">'.sprintf(_AM_TDMPICTURE_THEREARE_CAT,$numcat).'</a>';
-echo '</div><br>';
+
+
+//code list
switch($op) {
//sauv
@@ -151,7 +141,7 @@
case "update":
$obj = $cat_handler->get($_REQUEST['cat_id']);
- $obj->setVar('cat_display', 1);
+ $obj->getVar('cat_display') == 1 ? $obj->setVar('cat_display', 0) : $obj->setVar('cat_display', 1);
if ($cat_handler->insert($obj)) {
redirect_header('cat.php', 2, _AM_TDMPICTURE_BASE);
}
@@ -160,6 +150,15 @@
case "list":
default:
+ //menu admin
+ $category_admin = new ModuleAdmin();
+ echo $category_admin->addNavigation('cat.php');
+ if ($cat_waiting != 0){
+ $category_admin->addItemButton(sprintf(_AM_TDMPICTURE_THEREARE_CAT_WAITING,$cat_waiting), 'cat.php?op=list&cat_display=0', 'update');
+ }
+ $category_admin->addItemButton(_AM_TDMPICTURE_ADD_CAT, 'cat.php?op=new_cat', 'add');
+ echo $category_admin->renderButton();
+
//Parameters
$criteria = new CriteriaCompo();
$limit = 10;
@@ -190,7 +189,7 @@
}
//Affichage du tableau des cat\xE9gories
if ($numrows>0) {
- echo '<table width="100%" cellspacing="1" class="outer">';
+ echo '<table width="100%" cellspacing="1" class="outer" >';
echo '<tr>';
echo '<th align="center">'._AM_TDMPICTURE_IMG.'</th>';
echo '<th align="center">'._AM_TDMPICTURE_TITLE.'</th>';
@@ -210,7 +209,7 @@
$cat_pid = $assoc_cat[$i]->getVar('cat_pid');
$cat_title = $myts->displayTarea($assoc_cat[$i]->getVar('cat_title'));
- $display = $assoc_cat[$i]->getVar('cat_display') == 1 ? "<img src='./../images/on.gif' border='0'>" : "<a href='cat.php?op=update&cat_id=".$cat_id."'><img alt='"._AM_TDMPICTURE_UPDATE."' title='"._AM_TDMPICTURE_UPDATE."' src='./../images/off.gif' border='0'></a>";
+ $display = $assoc_cat[$i]->getVar('cat_display') == 1 ? "<a href='cat.php?op=update&cat_id=".$cat_id."'><img src='./../images/on.gif' border='0'></a>" : "<a href='cat.php?op=update&cat_id=".$cat_id."'><img alt='"._AM_TDMPICTURE_UPDATE."' title='"._AM_TDMPICTURE_UPDATE."' src='./../images/off.gif' border='0'></a>";
$principal = $assoc_cat[$i]->getVar('cat_index') == 1 ? "<img src='./../images/on.gif' border='0'>" : "<img src='./../images/off.gif' border='0'>";
//on test l'existance de l'image
$imgpath = TDMPICTURE_CAT_PATH.$assoc_cat[$i]->getVar("cat_img");
@@ -236,7 +235,18 @@
echo '</table><br /><br />';
echo '<div align=right>'.$pagenav.'</div><br />';
}
- // Affichage du formulaire de cr?ation de cat?gories
+
+ break;
+
+ // vue cr\xE9ation
+ case "new_cat":
+ //menu admin
+ $category_admin = new ModuleAdmin();
+ echo $category_admin->addNavigation('cat.php');
+ $category_admin->addItemButton(_AM_TDMPICTURE_LIST_CAT, 'cat.php?op=list', 'list');
+ echo $category_admin->renderButton();
+
+ // Affichage du formulaire de cr?ation de cat?gories
$obj =& $cat_handler->create();
$form = $obj->getForm();
$form->display();
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/index.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/index.php 2012-06-27 22:46:13 UTC (rev 9733)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/index.php 2012-06-29 07:20:51 UTC (rev 9734)
@@ -17,19 +17,10 @@
* ****************************************************************************
*/
-include '../../../include/cp_header.php';
-include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
-include_once(XOOPS_ROOT_PATH."/class/tree.php");
-include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+
+include 'admin_header.php';
xoops_cp_header();
-//apelle du menu admin
-if ( !is_readable(XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php")) {
-TDMPicture_adminmenu(0, _AM_TDMPICTURE_INDEXDESC);
-} else {
-include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php';
-loadModuleAdminMenu (0, _AM_TDMPICTURE_INDEXDESC);
-}
//load class
$file_handler =& xoops_getModuleHandler('tdmpicture_file', 'TDMPicture');
@@ -47,6 +38,11 @@
$criteria->add(new Criteria('file_display', 0));
$file_waiting = $file_handler->getCount($criteria);
+///////////////////////////////////////////////////////////
+//apelle du menu admin
+//test dossier
+// dossier dans uploads
+$folder = array(TDMPICTURE_UPLOADS_PATH, TDMPICTURE_THUMB_PATH, TDMPICTURE_CAT_PATH);
//test GD
if (!extension_loaded('gd')) {
if (!dl('gd.so')) {
@@ -55,67 +51,38 @@
}else {
$veriffile = '<span style="color: green;"><img src="./../images/on.gif" >'._AM_TDMPICTURE_MANAGE_GDOK.'</span>';
}
-include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/class/menu.php';
- //showIndex();
- $menu = new TDMPictureMenu();
- $menu->addItem('cat', 'cat.php', '../images/decos/cat.png', _AM_TDMPICTURE_MANAGE_CAT);
- $menu->addItem('file', 'files.php', '../images/decos/file.png', _AM_TDMPICTURE_MANAGE_FILE);
- $menu->addItem('about', 'about.php', '../images/decos/about.png', _AM_TDMPICTURE_MANAGE_ABOUT);
- $menu->addItem('block', '../../system/admin.php?fct=blocksadmin&selvis=-1&selmod=-2&selgrp=-1&selgen=' . $xoopsModule->getVar('mid'), '../images/decos/block.png', _AM_TDMPICTURE_MANAGE_BLOCK);
- $menu->addItem('comment', '../../system/admin.php?fct=comments&module=' . $xoopsModule->getVar('mid'), '../images/decos/comment.png', _AM_TDMPICTURE_MANAGE_COMMENT);
- $menu->addItem('update', '../../system/admin.php?fct=modulesadmin&op=update&module='.$xoopsModule ->getVar('name')
- , '../images/decos/update.png', _AM_TDMPICTURE_MANAGE_UPDATE);
- $menu->addItem('permissions', 'permissions.php', '../images/decos/permissions.png', _AM_TDMPICTURE_NAVPERMISSIONS);
- $menu->addItem('Preference', '../../system/admin.php?fct=preferences&op=showmod&mod='.$xoopsModule ->getVar('mid').
- '&&confcat_id=1', '../images/decos/pref.png', _AM_TDMPICTURE_NAVPREFERENCES);
-
- echo $menu->getCSS();
-
-echo '<div class="CPbigTitle" style="background-image: url(../images/decos/index.png); background-repeat: no-repeat; background-position: left; padding-left: 60px; padding-top:20px; padding-bottom:15px;">
- <h3><strong>'._AM_TDMPICTURE_INDEXDESC.'</strong></h3>
- </div><br /><table width="100%" border="0" cellspacing="10" cellpadding="4">
- <tr>
- <td valign="top">
- '.$menu->render().'</td>
- <td valign="top" width="60%">
- <fieldset><legend class="CPmediumTitle">'._AM_TDMPICTURE_MANAGE_CAT.'</legend>
- <br/>';
- printf(_AM_TDMPICTURE_THEREARE_CAT,$numcat);
- echo '<br/><br/>';
- printf(_AM_TDMPICTURE_THEREARE_CAT_WAITING,$cat_waiting);
- echo '<br/>
- </fieldset><br /><br />
+ $index_admin = new ModuleAdmin();
+ $index_admin->addInfoBox(_AM_TDMPICTURE_MANAGE_CAT);
+ $index_admin->addInfoBox(_AM_TDMPICTURE_MANAGE_FILE);
+ $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_CAT, _AM_TDMPICTURE_THEREARE_CAT, $numcat);
+ $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_FILE, _AM_TDMPICTURE_THEREARE_FILE, $numfile);
+ if ($cat_waiting == 0){
+ $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_CAT, _AM_TDMPICTURE_THEREARE_CAT_WAITING, $cat_waiting, 'Green');
+ }else{
+ $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_CAT, _AM_TDMPICTURE_THEREARE_CAT_WAITING, $cat_waiting, 'Red');
+ }
+ if ($numfile == 0){
+ $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_FILE, _AM_TDMPICTURE_THEREARE_FILE_WAITING, $numfile, 'Green');
+ }else{
+ $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_FILE, _AM_TDMPICTURE_THEREARE_FILE_WAITING, $numfile, 'Red');
+ }
-
- <fieldset><legend class="CPmediumTitle">'._AM_TDMPICTURE_MANAGE_FILE.'</legend>
- <br/>';
- printf(_AM_TDMPICTURE_THEREARE_FILE,$numfile);
- echo '<br/><br/>';
- printf(_AM_TDMPICTURE_THEREARE_FILE_WAITING,$file_waiting);
- echo '<br/>
- </fieldset><br /> <br />
-
- <fieldset><legend class="CPmediumTitle">'._AM_TDMPICTURE_MANAGE_GD.'</legend>
- <br/>';
- echo $veriffile;
- echo '<br/>
- </fieldset><br /> <br />
-
- <fieldset><legend class="CPmediumTitle">CHMOD 777</legend>
- <br/>';
- $uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/upload/";
- $uploadcat = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/upload/cat/";
- $uploadthumb = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/upload/thumb/";
-
- echo @chmod ($uploaddir, 0777) ? '<span style="color: green;"><img src="./../images/on.gif" >'.$uploaddir.' : '.substr(decoct(fileperms($uploaddir)),2).'</span>' : '<span style="color: red;"><img src="./../images/off.gif"> '.$uploaddir.' : '.substr(decoct(fileperms($uploaddir)),2).'</a>';
- echo '<br/>';
- echo @chmod ($uploadcat, 0777) ? '<span style="color: green;"><img src="./../images/on.gif" >'.$uploadcat.' : '.substr(decoct(fileperms($uploadcat)),2).'</span>' : '<span style="color: red;"><img src="./../images/off.gif"> '.$uploadcat.' : '.substr(decoct(fileperms($uploadcat)),2).'</a>';
- echo '<br/>';
- echo @chmod ($uploadthumb, 0777) ? '<span style="color: green;"><img src="./../images/on.gif" >'.$uploadthumb.' : '.substr(decoct(fileperms($uploadthumb)),2).'</span>' : '<span style="color: red;"><img src="./../images/off.gif"> '.$uploadthumb.' : '.substr(decoct(fileperms($uploadthumb)),2).'</a>';
-
- echo '</fieldset><br /> <br />';
-
- echo '</td></tr></table>';
+ foreach (array_keys( $folder) as $i) {
+ $index_admin->addConfigBoxLine($folder[$i], 'folder');
+ $index_admin->addConfigBoxLine(array($folder[$i], '777'), 'chmod');
+ }
+ $index_admin->addConfigBoxLine($veriffile);
+ echo $index_admin->addNavigation('index.php');
+ echo $index_admin->renderIndex();
+
+
+//if ( !is_readable(XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php")) {
+//TDMPicture_adminmenu(0, _AM_TDMPICTURE_INDEXDESC);
+//} else {
+//include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php';
+//loadModuleAdminMenu (0, _AM_TDMPICTURE_INDEXDESC);
+//}
+
xoops_cp_footer();
?>
\ No newline at end of file
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php 2012-06-27 22:46:13 UTC (rev 9733)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php 2012-06-29 07:20:51 UTC (rev 9734)
@@ -33,12 +33,15 @@
//index.php
define("_AM_TDMPICTURE_MANAGE_CAT","Gestion des Catégories");
-define("_AM_TDMPICTURE_THEREARE_CAT","Il y a <span style='color: #ff0000; font-weight: bold'>%s</span> Catégories dans la Base de donnée");
-define("_AM_TDMPICTURE_THEREARE_CAT_WAITING","Il y a <span style='color: #ff0000; font-weight: bold'>%s</span> Catégories en attente de validation");
+define("_AM_TDMPICTURE_THEREARE_CAT","Il y a %s Catégories dans la Base de donnée");
+define("_AM_TDMPICTURE_THEREARE_CAT_WAITING","Il y a %s Catégories en attente de validation");
+//admin menu
+define("_AM_TDMPICTURE_ADD_CAT","Ajouter des Catégories");
+define("_AM_TDMPICTURE_LIST_CAT","Liste des Catégories");
define("_AM_TDMPICTURE_MANAGE_FILE","Gestion des Fichiers");
-define("_AM_TDMPICTURE_THEREARE_FILE","Il y a <span style='color: #ff0000; font-weight: bold'>%s</span> Fichiers dans la Base de donnée");
-define("_AM_TDMPICTURE_THEREARE_FILE_WAITING","Il y a <span style='color: #ff0000; font-weight: bold'>%s</span> Fichiers en attente de validation");
+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");
define("_AM_TDMPICTURE_MANAGE_GD","Librairie GD");
define("_AM_TDMPICTURE_MANAGE_GDERROR","Certaine option du module peuvent ne pas fonctionner sans la librairie GD");
Added: XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php (rev 0)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php 2012-06-29 07:20:51 UTC (rev 9734)
@@ -0,0 +1,98 @@
+<?php
+/**
+ * ****************************************************************************
+ * - TDMPicture By TDM - TEAM DEV MODULE FOR XOOPS
+ * - Licence PRO Copyright (c) (http://www.tdmxoops.net)
+ *
+ * Cette licence, contient des limitations!!!
+ *
+ * 1. Vous devez posséder une permission d'exécuter le logiciel, pour n'importe quel usage.
+ * 2. Vous ne devez pas l' étudier,
+ * 3. Vous ne devez pas le redistribuer ni en faire des copies,
+ * 4. Vous n'avez pas la liberté de l'améliorer et de rendre publiques les modifications
+ *
+ * @license TDMFR PRO license
+ * @author TDMFR ; TEAM DEV MODULE
+ *
+ * ****************************************************************************
+ */
+
+//Admin menu
+define("_MI_TDMPICTURE_ADMENUINDEX","Index");
+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");
+
+
+//Preferences
+define("_MI_TDMPICTURE_MIMEMAX","Taille maxi des fichiers pour l'upload");
+define("_MI_TDMPICTURE_MIMETYPE","Extension autoriser séparer par | ");
+define("_MI_TDMPICTURE_EDITOR","Editeur");
+define("_MI_TDMPICTURE_FAVOURITE","Nombre de point pour être Favoris");
+define("_MI_TDMPICTURE_UPMAX","Nombre maximum d'upload simultanés");
+define("_MI_TDMPICTURE_LAST","Nombre maximum de nouveaux fichier ? afficher sur l'index");
+define("_MI_TDMPICTURE_WIDTH","Largeur maximum de l'image dans le detail");
+define("_MI_TDMPICTURE_HEIGTH","Hauteur maximum de l'image dans le detail");
+define("_MI_TDMPICTURE_THUMB_WIDTH","Miniature : Largeur maximum de l'image");
+define("_MI_TDMPICTURE_THUMB_HEIGTH","Miniature : Hauteur maximum de l'image");
+define("_MI_TDMPICTURE_THUMB_QUALITY","Miniature : Qualité de l'image");
+define("_MI_TDMPICTURE_PAGE","Nombre maximum de fichier par page ?");
+define("_MI_TDMPICTURE_DESCRIPTION","META : Description des pages sans information, pour le reste des pages cela seras automatique");
+define("_MI_TDMPICTURE_KEYWORDS","META : Mots clef des pages sans information, séparer les mots par un espace, pour le reste des pages cela seras automatique");
+define("_MI_TDMPICTURE_SLIDE_WIDTH","Slideshow : Largeur du slide");
+define("_MI_TDMPICTURE_SLIDE_HEIGTH","Slideshow : Hauteur du slide");
+define("_MI_TDMPICTURE_CAT_WIDTH","Catégorie : Largeur de l'image");
+define("_MI_TDMPICTURE_CAT_HEIGTH","Catégorie : Hauteur de l'image");
+define("_MI_TDMPICTURE_DISPLAY","Visualisation par defaut");
+//block
+define("_AM_TDMPICTURE_BLOCK_DATE","Fichier récents");
+define("_AM_TDMPICTURE_BLOCK_HITS","Fichier les plus affichés");
+define("_AM_TDMPICTURE_BLOCK_COUNTS","Fichier populaire");
+define("_AM_TDMPICTURE_BLOCK_DL","Fichiers les plus téléchargés");
+define("_AM_TDMPICTURE_BLOCK_COMMENTS","Fichiers les plus commentés");
+define("_AM_TDMPICTURE_BLOCK_RANDS","Fichier aléatoire");
+//
+define("_AM_TDMPICTURE_SELECT_STYLE","Style du block");
+define("_AM_TDMPICTURE_SELECT_TEXT","Texte");
+define("_AM_TDMPICTURE_SELECT_IMAGE","Image");
+define("_AM_TDMPICTURE_SELECT_IMAGE_DESC","Image / Info");
+define("_AM_TDMPICTURE_SELECT_SLIDE","Animé");
+//version 1.3
+define("_MI_TDMPICTURE_FULL_WIDTH","Largeur maximum de l'image réel");
+define("_MI_TDMPICTURE_FULL_HEIGTH","Hauteur maximum de l'image réel");
+define("_MI_TDMPICTURE_JAVA_WIDTH","Largeur de l'applet java (upload)");
+define("_MI_TDMPICTURE_JAVA_HEIGTH","Hauteur de l'applet java (upload)");
+//define("_MI_TDMPICTURE_CAT_CEL","Catégorie : Nombre de colonne");
+//define("_MI_TDMPICTURE_CAT_DISPLAY","Catégorie : Style des catégories");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_TEXT","texte");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_IMG","Image");
+//define("_MI_TDMPICTURE_CAT_SOUSCEL","Catégorie : Nombre de sous-catégorie");
+define("_MI_TDMPICTURE_VIEWMYALBUM","Voir mon album");
+define("_MI_TDMPICTURE_VIEWALBUM","Liste des albums");
+define("_MI_TDMPICTURE_UPLOAD","Uploader");
+define("_MI_TDMPICTURE_SOCIAL","Afficher social bar?");
+define("_MI_TDMPICTURE_RSS","Afficher RSS?");
+define("_MI_TDMPICTURE_PDF","Afficher PDF?");
+define("_MI_TDMPICTURE_THUMB_DECO","Miniature : Décoration de l'image");
+
+//version 1.5
+define("_MI_TDMPICTURE_CAT_CEL","Affichage catégorie : Nombre de colonne");
+define("_MI_TDMPICTURE_CAT_DISPLAY","Affichage : Style des catégories");
+define("_MI_TDMPICTURE_CAT_DISPLAY_TEXT","Catégorie puis sous-catégorie (sans image)");
+define("_MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG","Catégorie puis sous-catégorie (avec image)");
+define("_MI_TDMPICTURE_CAT_DISPLAY_SUB","Catégorie et sous-catégorie (sans image)");
+define("_MI_TDMPICTURE_CAT_DISPLAY_SUBIMG","Catégorie et sous-catégorie (avec image)");
+define("_MI_TDMPICTURE_CAT_DISPLAY_IMG","Image");
+define("_MI_TDMPICTURE_CAT_DISPLAY_NONE","Non");
+define("_MI_TDMPICTURE_CAT_SOUSCEL","Affichage catégorie : Nombre de sous-catégorie");
+
+define("_MI_TDMPICTURE_THUMB_STYLE","Miniature : centrage thumb");
+define("_MI_TDMPICTURE_THUMB_STYLE_CENTER","Centrer (carrer sur centre largeur");
+define("_MI_TDMPICTURE_THUMB_STYLE_HW","Limite sur largeur*Hauteur");
+define("_MI_TDMPICTURE_THUMB_STYLE_H","Limite sur Hauteur");
+define("_MI_TDMPICTURE_THUMB_STYLE_W","Limite sur largeur");
+
+define("_MI_TDMPICTURE_CAT","Proposer album");
+?>
\ No newline at end of file
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-06-27 22:46:13 UTC (rev 9733)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-06-29 07:20:51 UTC (rev 9734)
@@ -59,6 +59,9 @@
+// Set to 1 if you want to display menu generated by system module
+$modversion['system_menu'] = 1;
+
// Admin things
$modversion['hasAdmin'] = 1;
$modversion['adminindex'] = "admin/index.php";
@@ -421,4 +424,28 @@
$modversion['blocks'][$i]['options'] = "RAND()|5|25|0|0";
$modversion['blocks'][$i]['template'] = "tdmpicture_minitable.html";
$i++;
+//moduleadmin
+$modversion['min_php']='5.3';
+$modversion['min_xoops']="2.5";
+$modversion['min_admin']= "1.1";
+$modversion['min_db']= array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
+$modversion['image'] = "images/logo.png";
+$modversion['dirname'] = "{$dirname}";
+
+$modversion['dirmoduleadmin'] = "Frameworks/moduleclasses";
+$modversion['icons16'] = "Frameworks/moduleclasses/icons/16";
+$modversion['icons32'] = "Frameworks/moduleclasses/icons/32";
+
+$modversion['targetdir'] = XOOPS_ROOT_PATH."/modules/{$dirname}/modules/";
+$modversion['help'] = 'page=help';
+$modversion['license'] = 'GNU General Public License 2.0';
+$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
+
+$modversion['release_info'] = "Final 12/04/2012";
+$modversion['release_file'] = XOOPS_URL."/modules/{$dirname}/docs/readme.txt";
+$modversion['release_date'] = "10/3/2012";
+
+$modversion['manual'] = "MANUAL";
+$modversion['manual_file'] = XOOPS_URL."/modules/{$dirname}/docs/manual.txt";
+$modversion['module_status'] = "Final";
?>
\ 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: <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.
|
|
From: <lor...@us...> - 2012-06-29 10:48:23
|
Revision: 9736
http://xoops.svn.sourceforge.net/xoops/?rev=9736&view=rev
Author: lord_venom
Date: 2012-06-29 10:48:16 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Menu admin 2.5
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/admin/about.php
XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
XoopsModules/TDMPicture/trunk/TDMPicture/admin/permissions.php
XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
Added Paths:
-----------
XoopsModules/TDMPicture/trunk/TDMPicture/language/english/changelog.txt
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/changelog.txt
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/about.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/about.php 2012-06-29 08:23:52 UTC (rev 9735)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/about.php 2012-06-29 10:48:16 UTC (rev 9736)
@@ -17,93 +17,17 @@
* ****************************************************************************
*/
-include '../../../include/cp_header.php';
-include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
-include_once(XOOPS_ROOT_PATH."/class/tree.php");
-include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
-include_once("../include/functions.php");
-
+include 'admin_header.php';
xoops_cp_header();
-if ( !is_readable(XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php")) {
-Adminmenu(6, _AM_TDMPICTURE_MANAGE_ABOUT);
-echo "<style>
-.CPbigTitle{
- font-size: 20px;
- color: #1E90FF;
- background: no-repeat left top;
- font-weight: bold;
- height: 40px;
- vertical-align: middle;
- padding: 10px 0 0 50px;
- border-bottom: 3px solid #1E90FF;
-}
-</style>";
-} else {
-include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php';
-loadModuleAdminMenu (6, _AM_TDMPICTURE_MANAGE_ABOUT);
-}
-//menu
-echo '<div class="CPbigTitle" style="background-image: url(../images/decos/about.png); background-repeat: no-repeat; background-position: left; padding-left: 60px; padding-top:20px; padding-bottom:15px;"><h3><strong>'._AM_TDMPICTURE_MANAGE_ABOUT.'</strong></h3>';
-echo '</div><br />';
$versioninfo =& $module_handler->get( $xoopsModule->getVar( 'mid' ) );
-echo "
- <style type=\"text/css\">
- label,text {
- display: block;
- float: left;
- margin-bottom: 2px;
- }
- label {
- text-align: right;
- width: 150px;
- padding-right: 20px;
- }
- br {
- clear: left;
- }
- </style>
-";
-echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . $xoopsModule->getVar("name"). "</legend>";
-echo "<div style='padding: 8px;'>";
-echo "<img src='" . XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/" . $versioninfo->getInfo( 'image' ) . "' alt='' hspace='10' vspace='0' /></a>\n";
-echo "<div style='padding: 5px;'><strong>" . $versioninfo->getInfo( 'name' ) . " version " . $versioninfo->getInfo( 'version' ) . "</strong></div>\n";
-echo "<label>" ._AM_ABOUT_RELEASEDATE. ":</label><text>" . $versioninfo->getInfo( 'release' ) . "</text><br />";
-echo "<label>" ._AM_ABOUT_AUTHOR. ":</label><text>" . $versioninfo->getInfo( 'author' ) . "</text><br />";
-echo "<label>" ._AM_ABOUT_CREDITS. ":</label><text>" . $versioninfo->getInfo( 'credits' ) . "</text><br />";
-echo "<label>" ._AM_ABOUT_LICENSE. ":</label><text><a href=\"".$versioninfo->getInfo( 'license_file' )."\" target=\"_blank\" >" . $versioninfo->getInfo( 'license' ) . "</a></text>\n";
-echo "</div>";
-echo "</fieldset>";
-echo "<br clear=\"all\" />";
+ $about_admin = new ModuleAdmin();
+ echo $about_admin->addNavigation('about.php');
+ echo $about_admin->renderabout('9MYQB7GUK5MCS', true);
+
-echo "<fieldset><legend style='font-weight: bold; color: #900;'>" ._AM_ABOUT_MODULE_INFO. "</legend>";
-echo "<div style='padding: 8px;'>";
-echo "<label>" ._AM_ABOUT_MODULE_STATUS. ":</label><text>" . $versioninfo->getInfo( 'module_status' ) . "</text><br />";
-echo "<label>" ._AM_ABOUT_WEBSITE. ":</label><text>" . "<a href='" . $versioninfo->getInfo( 'module_website_url' ) . "' target='_blank'>" . $versioninfo->getInfo( 'module_website_name' ) . "</a>" . "</text><br />";
-echo "</div>";
-echo "</fieldset>";
-echo "<br clear=\"all\" />";
-echo "<fieldset><legend style='font-weight: bold; color: #900;'>" ._AM_ABOUT_AUTHOR_INFO. "</legend>";
-echo "<div style='padding: 8px;'>";
-echo "<label>" ._AM_ABOUT_AUTHOR_NAME. ":</label><text>" . $versioninfo->getInfo( 'author' ) . "</text><br />";
-echo "<label>" ._AM_ABOUT_WEBSITE. ":</label><text>" . "<a href='" . $versioninfo->getInfo( 'author_website_url' ) . "' target='_blank'>" . $versioninfo->getInfo( 'author_website_name' ) . "</a>" . "</text><br />";
-echo "</div>";
-echo "</fieldset>";
-echo "<br clear=\"all\" />";
-
-
-$file = XOOPS_ROOT_PATH. "/modules/".$xoopsModule->getVar("dirname")."/changelog.txt";
-if ( is_readable( $file ) ){
- echo "<fieldset><legend style='font-weight: bold; color: #900;'>" ._AM_ABOUT_CHANGELOG. "</legend>";
- echo "<div style='padding: 8px;'>";
- echo "<div>". implode("<br />", file( $file )) . "</div>";
- echo "</div>";
- echo "</fieldset>";
- echo "<br clear=\"all\" />";
-}
-
xoops_cp_footer();
?>
\ No newline at end of file
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-06-29 08:23:52 UTC (rev 9735)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-06-29 10:48:16 UTC (rev 9736)
@@ -220,12 +220,26 @@
break;
case "edit":
+ //admin menu
+ $category_admin = new ModuleAdmin();
+ echo $category_admin->addNavigation('files.php');
+ $category_admin->addItemButton(_AM_TDMPICTURE_FILE_UPLOAD, 'files.php?op=upload', 'add');
+ $category_admin->addItemButton(_AM_TDMPICTURE_LIST_FILE, 'files.php?op=list', 'list');
+ echo $category_admin->renderButton();
+
$obj = $file_handler->get($_REQUEST['file_id']);
$form = $obj->getForm();
$form->display();
break;
case "edit_img":
+ //admin menu
+ $category_admin = new ModuleAdmin();
+ echo $category_admin->addNavigation('files.php');
+ $category_admin->addItemButton(_AM_TDMPICTURE_FILE_UPLOAD, 'files.php?op=upload', 'add');
+ $category_admin->addItemButton(_AM_TDMPICTURE_LIST_FILE, 'files.php?op=list', 'list');
+ echo $category_admin->renderButton();
+
$obj = $file_handler->get($_REQUEST['file_id']);
$form = $obj->getImg();
$form->display();
@@ -249,6 +263,10 @@
echo $obj->getHtmlErrors();
}
} else {
+
+ $category_admin = new ModuleAdmin();
+ echo $category_admin->addNavigation('files.php');
+
xoops_confirm(array('ok' => 1, 'file_id' => $_REQUEST['file_id'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMPICTURE_FORMSUREDEL, $obj->getVar('file_title')));
}
break;
@@ -281,7 +299,9 @@
}
} else {
- xoops_cp_header();
+ $category_admin = new ModuleAdmin();
+ echo $category_admin->addNavigation('files.php');
+
$title = print_r( $_REQUEST['id'], TRUE );
xoops_confirm(array('ok' => 1, 'deletes' => 1, 'op' => $_REQUEST['op'], 'id'=> serialize(array_map("intval", $_REQUEST['id']))), $_SERVER['REQUEST_URI'], sprintf(_AM_TDMPICTURE_FORMSUREDEL, $title));
}
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/permissions.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/permissions.php 2012-06-29 08:23:52 UTC (rev 9735)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/permissions.php 2012-06-29 10:48:16 UTC (rev 9736)
@@ -17,11 +17,8 @@
* ****************************************************************************
*/
-include '../../../include/cp_header.php';
-include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
-include_once(XOOPS_ROOT_PATH."/class/tree.php");
-include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
-include_once("../include/functions.php");
+include 'admin_header.php';
+xoops_cp_header();
include_once XOOPS_ROOT_PATH . "/class/xoopslists.php";
include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
@@ -34,18 +31,9 @@
redirect_header( XOOPS_URL."/modules/".$xoopsModule->dirname()."/admin/permissions.php" , 1 , _AM_XD_GPERMUPDATED);
}
- xoops_cp_header();
-if ( !is_readable(XOOPS_ROOT_PATH . "/Frameworks/art/functions.admin.php")) {
-TDMPicture_adminmenu(5, _AM_TDMPICTURE_MANAGE_PERM);
-} else {
-include_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.admin.php';
-loadModuleAdminMenu (5, _AM_TDMPICTURE_MANAGE_PERM);
-}
+ $category_admin = new ModuleAdmin();
+ echo $category_admin->addNavigation('permissions.php');
-//menu
-echo '<div class="CPbigTitle" style="background-image: url(../images/decos/permissions.png); background-repeat: no-repeat; background-position: left; padding-left: 60px; padding-top:20px; padding-bottom:15px;"><h3><strong>'._AM_TDMPICTURE_MANAGE_PERM.'</strong></h3>';
-echo '</div><br />';
-
$module_id = $xoopsModule->getVar('mid');
Added: XoopsModules/TDMPicture/trunk/TDMPicture/language/english/changelog.txt
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/english/changelog.txt (rev 0)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/english/changelog.txt 2012-06-29 10:48:16 UTC (rev 9736)
@@ -0,0 +1,47 @@
+************************************************************
+Version 1.00 | 03-OCT-2009
+Dev: Xoops 2.0.16 / 2.2.3
+************************************************************
+- 10/10/09 : Ajout de l'anglais
+- 10/10/09 : Suppression du .htaccess bug
+************************************************************
+************************************************************
+Version 1.01 | 17-NOV-2009
+Dev: Xoops 2.0.16 / 2.2.3
+************************************************************
+- 17/11/09 : modifier admin/index.php ajout permission dossier upload
+- 17/11/09 : modifier tdmpicture.css changement dans le theme
+- 17/11/09 : modifier tpfile.html, viewfile.html changement dans le template
+- 17/11/09 : modifier viewfile.php, functions.php bug de redimention
+- 17/11/09 : modifier include.php jquery bug alert
+- 18/11/09 : modifier xoops_version.php, tpcat.html, index.php, viewcat.php redimension image cat\xE9gories.
+- 18/11/09 : modifier meta automatique
+************************************************************
+Version 1.02 | 17-NOV-2009
+Dev: Xoops 2.4.2
+************************************************************
+- 21/12/09 : modifier xoops_version.php bug
+- 21/12/09 : modifier all.php bug xoops 2.4
+- 21/12/09 : modifier all.html ajout de variable smarty
+************************************************************
+Version 1.03 | 14-MAR-2010
+Dev: 2.4.2
+************************************************************
+- 14/03/10 : modifier all ajout multi upload
+- 14/03/10 : modifier tdmpicture.css changement dans le theme
+- 14/03/10 : modifier xoops_version ajout d'option.
+- 14/03/10 : modifier jquery mode noConflict
+- 14/03/10 : modifier search.inc.php bug info user
+- 14/03/10 : modifier rss.php, bug IE.
+- 14/03/10 : modifier viewcat style d'affichage cat\xE9gorie.
+************************************************************
+Version 1.04 | 31-MAR-2010
+Dev: 2.4.4
+************************************************************
+- 31/03/10 : modifier xoops_version.php bug affichage
+************************************************************
+Version 1.05 | 12-AVR-2010
+Dev: 2.4.4
+************************************************************
+- 12/04/10 : modifier permission bug
+- 11/12/10 : multiupload
\ No newline at end of file
Added: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/changelog.txt
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/changelog.txt (rev 0)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/changelog.txt 2012-06-29 10:48:16 UTC (rev 9736)
@@ -0,0 +1,47 @@
+************************************************************
+Version 1.00 | 03-OCT-2009
+Dev: Xoops 2.0.16 / 2.2.3
+************************************************************
+- 10/10/09 : Ajout de l'anglais
+- 10/10/09 : Suppression du .htaccess bug
+************************************************************
+************************************************************
+Version 1.01 | 17-NOV-2009
+Dev: Xoops 2.0.16 / 2.2.3
+************************************************************
+- 17/11/09 : modifier admin/index.php ajout permission dossier upload
+- 17/11/09 : modifier tdmpicture.css changement dans le theme
+- 17/11/09 : modifier tpfile.html, viewfile.html changement dans le template
+- 17/11/09 : modifier viewfile.php, functions.php bug de redimention
+- 17/11/09 : modifier include.php jquery bug alert
+- 18/11/09 : modifier xoops_version.php, tpcat.html, index.php, viewcat.php redimension image cat\xE9gories.
+- 18/11/09 : modifier meta automatique
+************************************************************
+Version 1.02 | 17-NOV-2009
+Dev: Xoops 2.4.2
+************************************************************
+- 21/12/09 : modifier xoops_version.php bug
+- 21/12/09 : modifier all.php bug xoops 2.4
+- 21/12/09 : modifier all.html ajout de variable smarty
+************************************************************
+Version 1.03 | 14-MAR-2010
+Dev: 2.4.2
+************************************************************
+- 14/03/10 : modifier all ajout multi upload
+- 14/03/10 : modifier tdmpicture.css changement dans le theme
+- 14/03/10 : modifier xoops_version ajout d'option.
+- 14/03/10 : modifier jquery mode noConflict
+- 14/03/10 : modifier search.inc.php bug info user
+- 14/03/10 : modifier rss.php, bug IE.
+- 14/03/10 : modifier viewcat style d'affichage cat\xE9gorie.
+************************************************************
+Version 1.04 | 31-MAR-2010
+Dev: 2.4.4
+************************************************************
+- 31/03/10 : modifier xoops_version.php bug affichage
+************************************************************
+Version 1.05 | 12-AVR-2010
+Dev: 2.4.4
+************************************************************
+- 12/04/10 : modifier permission bug
+- 11/12/10 : multiupload
\ No newline at end of file
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-06-29 08:23:52 UTC (rev 9735)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-06-29 10:48:16 UTC (rev 9736)
@@ -24,27 +24,24 @@
$modversion['name'] = "TDMPicture";
$modversion['version'] = 1.06;
$modversion['description'] = 'Image manager';
-$modversion['author'] = 'TDM';
-$modversion['author_website_url'] = "http://www.tdmxoops.net/";
-$modversion['author_website_name'] = "Team Dev Module";
$modversion['credits'] = "none";
+$modversion['author'] = 'TDM';
+$modversion['pseudo'] = 'Venom';
+$modversion['website'] = '';
+$modversion['name_website'] = '';
$modversion['license'] = "GPL see LICENSE";
-$modversion["release_info"] = "README";
-//$modversion["release_file"] = XOOPS_URL."/modules/pronoboulistenaute/readme.txt";
-$modversion["manual"] = "MANUAL";
-//$modversion["manual_file"] = XOOPS_URL."/modules/pronoboulistenaute/manual.txt";
$modversion['official'] = 1;
$modversion['image'] = "images/TDMPicture_logo.png";
$modversion['dirname'] = "TDMPicture";
+$modversion['status_version'] = 'Final';
+$modversion['release_date'] = '2012';
+$modversion['sqlfile']['mysql'] = 'sql/mysql.sql';
+$modversion['onInstall'] = 'include/install.php';
+$modversion['onUpdate'] = 'include/update.php';
+$modversion['help'] = 'page=help';
+$modversion['min_php'] = '5.2';
+$modversion['min_xoops'] = '2.5';
-$modversion['demo_site_url'] = "http://www.tdmxoops.net/";
-$modversion['demo_site_name'] = "TDM";
-$modversion["module_website_url"] = "http://www.tdmxoops.net/";
-$modversion["module_website_name"] = "TDM";
-
-$modversion["release"] = "09-06-2009";
-$modversion["module_status"] = "Release";
-
// Sql file
$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
@@ -424,28 +421,5 @@
$modversion['blocks'][$i]['options'] = "RAND()|5|25|0|0";
$modversion['blocks'][$i]['template'] = "tdmpicture_minitable.html";
$i++;
-//moduleadmin
-$modversion['min_php']='5.3';
-$modversion['min_xoops']="2.5";
-$modversion['min_admin']= "1.1";
-$modversion['min_db']= array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
-$modversion['image'] = "images/logo.png";
-$modversion['dirname'] = "{$dirname}";
-$modversion['dirmoduleadmin'] = "Frameworks/moduleclasses";
-$modversion['icons16'] = "Frameworks/moduleclasses/icons/16";
-$modversion['icons32'] = "Frameworks/moduleclasses/icons/32";
-
-$modversion['targetdir'] = XOOPS_ROOT_PATH."/modules/{$dirname}/modules/";
-$modversion['help'] = 'page=help';
-$modversion['license'] = 'GNU General Public License 2.0';
-$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html/";
-
-$modversion['release_info'] = "Final 12/04/2012";
-$modversion['release_file'] = XOOPS_URL."/modules/{$dirname}/docs/readme.txt";
-$modversion['release_date'] = "10/3/2012";
-
-$modversion['manual'] = "MANUAL";
-$modversion['manual_file'] = XOOPS_URL."/modules/{$dirname}/docs/manual.txt";
-$modversion['module_status'] = "Final";
?>
\ 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-06-30 18:41:43
|
Revision: 9748
http://xoops.svn.sourceforge.net/xoops/?rev=9748&view=rev
Author: beckmi
Date: 2012-06-30 18:41:37 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
Removing thumbs.db files
Removed Paths:
-------------
XoopsModules/TDMPicture/trunk/TDMPicture/images/Thumbs.db
XoopsModules/TDMPicture/trunk/TDMPicture/images/colorbox/Thumbs.db
XoopsModules/TDMPicture/trunk/TDMPicture/images/colorbox/internet_explorer/Thumbs.db
XoopsModules/TDMPicture/trunk/TDMPicture/images/decos/Thumbs.db
XoopsModules/TDMPicture/trunk/TDMPicture/language/english/changelog.txt
XoopsModules/TDMPicture/trunk/TDMPicture/upload/Thumbs.db
XoopsModules/TDMPicture/trunk/TDMPicture/upload/cat/Thumbs.db
XoopsModules/TDMPicture/trunk/TDMPicture/upload/thumb/Thumbs.db
Deleted: XoopsModules/TDMPicture/trunk/TDMPicture/images/Thumbs.db
===================================================================
(Binary files differ)
Deleted: XoopsModules/TDMPicture/trunk/TDMPicture/images/colorbox/Thumbs.db
===================================================================
(Binary files differ)
Deleted: XoopsModules/TDMPicture/trunk/TDMPicture/images/colorbox/internet_explorer/Thumbs.db
===================================================================
(Binary files differ)
Deleted: XoopsModules/TDMPicture/trunk/TDMPicture/images/decos/Thumbs.db
===================================================================
(Binary files differ)
Deleted: XoopsModules/TDMPicture/trunk/TDMPicture/language/english/changelog.txt
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/english/changelog.txt 2012-06-30 15:41:52 UTC (rev 9747)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/english/changelog.txt 2012-06-30 18:41:37 UTC (rev 9748)
@@ -1,47 +0,0 @@
-************************************************************
-Version 1.00 | 03-OCT-2009
-Dev: Xoops 2.0.16 / 2.2.3
-************************************************************
-- 10/10/09 : Ajout de l'anglais
-- 10/10/09 : Suppression du .htaccess bug
-************************************************************
-************************************************************
-Version 1.01 | 17-NOV-2009
-Dev: Xoops 2.0.16 / 2.2.3
-************************************************************
-- 17/11/09 : modifier admin/index.php ajout permission dossier upload
-- 17/11/09 : modifier tdmpicture.css changement dans le theme
-- 17/11/09 : modifier tpfile.html, viewfile.html changement dans le template
-- 17/11/09 : modifier viewfile.php, functions.php bug de redimention
-- 17/11/09 : modifier include.php jquery bug alert
-- 18/11/09 : modifier xoops_version.php, tpcat.html, index.php, viewcat.php redimension image cat\xE9gories.
-- 18/11/09 : modifier meta automatique
-************************************************************
-Version 1.02 | 17-NOV-2009
-Dev: Xoops 2.4.2
-************************************************************
-- 21/12/09 : modifier xoops_version.php bug
-- 21/12/09 : modifier all.php bug xoops 2.4
-- 21/12/09 : modifier all.html ajout de variable smarty
-************************************************************
-Version 1.03 | 14-MAR-2010
-Dev: 2.4.2
-************************************************************
-- 14/03/10 : modifier all ajout multi upload
-- 14/03/10 : modifier tdmpicture.css changement dans le theme
-- 14/03/10 : modifier xoops_version ajout d'option.
-- 14/03/10 : modifier jquery mode noConflict
-- 14/03/10 : modifier search.inc.php bug info user
-- 14/03/10 : modifier rss.php, bug IE.
-- 14/03/10 : modifier viewcat style d'affichage cat\xE9gorie.
-************************************************************
-Version 1.04 | 31-MAR-2010
-Dev: 2.4.4
-************************************************************
-- 31/03/10 : modifier xoops_version.php bug affichage
-************************************************************
-Version 1.05 | 12-AVR-2010
-Dev: 2.4.4
-************************************************************
-- 12/04/10 : modifier permission bug
-- 11/12/10 : multiupload
\ No newline at end of file
Deleted: XoopsModules/TDMPicture/trunk/TDMPicture/upload/Thumbs.db
===================================================================
(Binary files differ)
Deleted: XoopsModules/TDMPicture/trunk/TDMPicture/upload/cat/Thumbs.db
===================================================================
(Binary files differ)
Deleted: XoopsModules/TDMPicture/trunk/TDMPicture/upload/thumb/Thumbs.db
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-07 14:11:55
|
Revision: 9794
http://xoops.svn.sourceforge.net/xoops/?rev=9794&view=rev
Author: lord_venom
Date: 2012-07-07 14:11:46 +0000 (Sat, 07 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/admin/about.php
XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_header.php
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/admin/permissions.php
XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_cat.php
XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php
XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
XoopsModules/TDMPicture/trunk/TDMPicture/include/functions.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/english/admin.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/english/main.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php
XoopsModules/TDMPicture/trunk/TDMPicture/search.php
XoopsModules/TDMPicture/trunk/TDMPicture/submit.php
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
Added Paths:
-----------
XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_footer.php
XoopsModules/TDMPicture/trunk/TDMPicture/docs/
XoopsModules/TDMPicture/trunk/TDMPicture/docs/changelog.txt
XoopsModules/TDMPicture/trunk/TDMPicture/docs/credits.txt
XoopsModules/TDMPicture/trunk/TDMPicture/docs/index.html
XoopsModules/TDMPicture/trunk/TDMPicture/docs/lang_diff.txt
XoopsModules/TDMPicture/trunk/TDMPicture/docs/licence.txt
XoopsModules/TDMPicture/trunk/TDMPicture/docs/readme.txt
XoopsModules/TDMPicture/trunk/TDMPicture/docs/readme_fr.txt
XoopsModules/TDMPicture/trunk/TDMPicture/images/picture_edit.png
XoopsModules/TDMPicture/trunk/TDMPicture/language/english/help/
XoopsModules/TDMPicture/trunk/TDMPicture/language/english/help/help.html
XoopsModules/TDMPicture/trunk/TDMPicture/language/english/help/index.html
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/help/
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/help/help.html
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/help/index.html
XoopsModules/TDMPicture/trunk/TDMPicture/upload/cat/no_picture.png
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/about.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/about.php 2012-07-07 14:10:39 UTC (rev 9793)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/about.php 2012-07-07 14:11:46 UTC (rev 9794)
@@ -17,17 +17,13 @@
* ****************************************************************************
*/
-include 'admin_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
+
xoops_cp_header();
+$aboutAdmin = new ModuleAdmin();
-$versioninfo =& $module_handler->get( $xoopsModule->getVar( 'mid' ) );
+echo $aboutAdmin->addNavigation('about.php');
+echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', FALSE);
- $about_admin = new ModuleAdmin();
- echo $about_admin->addNavigation('about.php');
- echo $about_admin->renderabout('9MYQB7GUK5MCS', true);
-
-
-
-xoops_cp_footer();
-?>
\ No newline at end of file
+include 'admin_footer.php';
\ No newline at end of file
Added: XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_footer.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_footer.php (rev 0)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_footer.php 2012-07-07 14:11:46 UTC (rev 9794)
@@ -0,0 +1,6 @@
+<?php
+echo"<br /><br /><div class='adminfooter'>\n" . " <div style='text-align: center;'>\n"
+ . " <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ . " </div>\n" . " " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . "</div>";
+
+xoops_cp_footer();
\ No newline at end of file
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_header.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_header.php 2012-07-07 14:10:39 UTC (rev 9793)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/admin_header.php 2012-07-07 14:11:46 UTC (rev 9794)
@@ -33,9 +33,12 @@
//return false;
}
-$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
-$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
+//$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
+//$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
+//$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
+$pathIcon16 = '../' . $xoopsModule->getInfo('icons16');
+$pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
+$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
$myts =& MyTextSanitizer::getInstance();
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php 2012-07-07 14:10:39 UTC (rev 9793)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php 2012-07-07 14:11:46 UTC (rev 9794)
@@ -77,6 +77,7 @@
$obj->setVar('cat_weight', $_REQUEST['cat_weight']);
$obj->setVar('cat_display', $_REQUEST['cat_display']);
$obj->setVar('cat_index', $_REQUEST['cat_index']);
+ $obj->setVar('cat_uid', $xoopsUser->getVar('uid'));
if ($cat_handler->insert($obj)) {
@@ -164,8 +165,10 @@
//menu admin
$category_admin = new ModuleAdmin();
echo $category_admin->addNavigation('cat.php');
- 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 ($cat_waiting != 0 && !isset($_REQUEST['cat_display'])){
+ $waitString = _AM_TDMPICTURE_BUTTON_CAT_WAITING.$cat_waiting;
+ echo $waitString;
+ $category_admin->addItemButton($waitString, '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');
@@ -223,8 +226,8 @@
$cat_pid = $assoc_cat[$i]->getVar('cat_pid');
$cat_title = $myts->displayTarea($assoc_cat[$i]->getVar('cat_title'));
- $display = $assoc_cat[$i]->getVar('cat_display') == 1 ? "<a href='cat.php?op=update&cat_id=".$cat_id."'><img src='./../images/on.gif' border='0'></a>" : "<a href='cat.php?op=update&cat_id=".$cat_id."'><img alt='"._AM_TDMPICTURE_UPDATE."' title='"._AM_TDMPICTURE_UPDATE."' src='./../images/off.gif' border='0'></a>";
- $principal = $assoc_cat[$i]->getVar('cat_index') == 1 ? "<img src='./../images/on.gif' border='0'>" : "<img src='./../images/off.gif' border='0'>";
+ $display = $assoc_cat[$i]->getVar('cat_display') == 1 ? "<a href='cat.php?op=update&cat_id=".$cat_id."'><img src='" . $pathIcon16."/1.png' border='0'></a>" : "<a href='cat.php?op=update&cat_id=".$cat_id."'><img alt='"._AM_TDMPICTURE_UPDATE."' title='"._AM_TDMPICTURE_UPDATE."' src='" . $pathIcon16."/0.png' border='0'></a>";
+ $principal = $assoc_cat[$i]->getVar('cat_index') == 1 ? "<img src='" . $pathIcon16."/1.png' border='0'>" : "<img src='" . $pathIcon16."/0.png' border='0'>";
//on test l'existance de l'image
$imgpath = TDMPICTURE_CAT_PATH.$assoc_cat[$i]->getVar("cat_img");
if (file_exists($imgpath)) {
@@ -241,13 +244,13 @@
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 '<a href="cat.php?op=edit&cat_id='.$cat_id.'"><img src=' . $pathIcon16.'/edit.png border="0" alt="'._AM_TDMPICTURE_MODIFY.'" title="'._AM_TDMPICTURE_MODIFY.'"></a>';
+ echo '<a href="cat.php?op=delete&cat_id='.$cat_id.'"><img src=' . $pathIcon16.'/delete.png border="0" alt="'._AM_TDMPICTURE_DELETE.'" title="'._AM_TDMPICTURE_DELETE.'"></a>';
echo '</td>';
echo '</tr>';
}
echo '</table><br /><br />';
- echo '<div align=right>'.$pagenav.'</div><br />';
+ echo '<div align=right>'.$pagenav.'</div>';
} else{
echo '<div class="errorMsg" style="text-align: center;">' . sprintf(_AM_TDMPICTURE_THEREARE_CAT,0) . '</div>';
}
@@ -269,5 +272,4 @@
break;
}
-xoops_cp_footer();
-?>
\ No newline at end of file
+include 'admin_footer.php';
\ No newline at end of file
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-07-07 14:10:39 UTC (rev 9793)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-07-07 14:11:46 UTC (rev 9794)
@@ -365,7 +365,9 @@
$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');
+ $waitString = _AM_TDMPICTURE_BUTTON_FILES_WAITING.$file_waiting;
+ //$category_admin->addItemButton(sprintf(_AM_TDMPICTURE_THEREARE_FILE_WAITING,$file_waiting), 'files.php?op=list&file_display=0', 'update');
+ $category_admin->addItemButton($waitString, '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');
@@ -409,7 +411,7 @@
echo '<th align="center" width="10%">'._AM_TDMPICTURE_IMG.'</th>';
echo '<th align="center" width="20%">'._AM_TDMPICTURE_CAT.'</th>';
echo '<th align="center" width="25%">'._AM_TDMPICTURE_TITLE.'</th>';
- echo '<th align="center" width="10%">'._AM_TDMPICTURE_WITH.'</th>';
+ echo '<th align="center" width="10%">'._AM_TDMPICTURE_WIDTH.'</th>';
echo '<th align="center" width="10%">'._AM_TDMPICTURE_HEIGHT.'</th>';
echo '<th align="center" width="5%">'._AM_TDMPICTURE_THUMB.'</th>';
echo '<th align="center" width="5%">'._AM_TDMPICTURE_DISPLAY.'</th>';
@@ -425,7 +427,7 @@
$file_id = $arr[$i]->getVar('file_id');
$file_title = $myts->displayTarea($arr[$i]->getVar('file_title'));
- $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>";
+ $display = $arr[$i]->getVar('file_display') == 1 ? "<a href='files.php?op=update&file_id=".$file_id."'><img src='" . $pathIcon16."/1.png' border='0'></a>" : "<a href='files.php?op=update&file_id=".$file_id."'><img alt='"._AM_TDMPICTURE_UPDATE."' title='"._AM_TDMPICTURE_UPDATE."' src='" . $pathIcon16."/0.png' border='0'></a>";
//on test l'existance de l'image
$img = $arr[$i]->getVar("file_file") ? $arr[$i]->getVar("file_file") : 'blank.gif';
@@ -439,9 +441,9 @@
$imgpath = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/upload/thumb/".$img;
$thumb_img = "<a href='files.php?op=thumb&file_id=".$file_id."'>";
if (file_exists($imgpath)) {
- $thumb_img .= "<img alt='"._AM_TDMPICTURE_ADDTHUMB."' title='"._AM_TDMPICTURE_ADDTHUMB."' src='./../images/on.gif' border='0'>";
+ $thumb_img .= "<img alt='"._AM_TDMPICTURE_ADDTHUMB."' title='"._AM_TDMPICTURE_ADDTHUMB."' src='" . $pathIcon16."/1.png' border='0'>";
} else {
- $thumb_img .= "<img alt='"._AM_TDMPICTURE_ADDTHUMB."' title='"._AM_TDMPICTURE_ADDTHUMB."' src='./../images/off.gif' border='0'>";
+ $thumb_img .= "<img alt='"._AM_TDMPICTURE_ADDTHUMB."' title='"._AM_TDMPICTURE_ADDTHUMB."' src='" . $pathIcon16."/0.png' border='0'>";
}
$thumb_img .= "</a>";
@@ -455,13 +457,13 @@
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>';
+ echo '<a href="files.php?op=edit&file_id='.$file_id.'"><img src=' . $pathIcon16.'/edit.png border="0" alt="'._AM_TDMPICTURE_MODIFY.'" title="'._AM_TDMPICTURE_MODIFY.'"></a>';
+ echo '<a href="files.php?op=delete&file_id='.$file_id.'"><img src=' . $pathIcon16.'/delete.png 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/picture_edit.png" border="0" alt="'._AM_TDMPICTURE_EDITIMG.'" title="'._AM_TDMPICTURE_EDITIMG.'"></a>';
echo '</td>';
echo '</tr>';
}
- echo '</table><input type="submit" name="op" value="'._DELETE.'" /></form><br /><br />';
+ echo '</table><input type="submit" name="op" value="'._AM_TDMPICTURE_DELETE_SELECTED.'" /></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>';
@@ -471,5 +473,4 @@
}
-xoops_cp_footer();
-?>
\ No newline at end of file
+include 'admin_footer.php';
\ No newline at end of file
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/menu.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/menu.php 2012-07-07 14:10:39 UTC (rev 9793)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/menu.php 2012-07-07 14:11:46 UTC (rev 9794)
@@ -17,25 +17,79 @@
* ****************************************************************************
*/
+
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+$pathIcon32 = $module->getInfo('icons32');
+$pathModuleAdmin = $module->getInfo('dirmoduleadmin');
+$pathLanguage = $path . $pathModuleAdmin;
+
+
+if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
+ $fileinc = $pathLanguage . '/language/english/main.php';
+}
+
+include_once $fileinc;
+
+$adminmenu = array();
+
+$i = 1;
+$adminmenu[$i]["title"] = _AM_MODULEADMIN_HOME;
+$adminmenu[$i]["link"] = "admin/index.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/home.png';
+
+//$i++;
+//$adminmenu[$i]["title"] = _MI_ISTATS_INDEX;
+//$adminmenu[$i]["link"] = "admin/main.php";
+//$adminmenu[$i]["icon"] = $pathIcon32 . '/manage.png';
+
+$i++;
+$adminmenu[$i]["title"] = _MI_TDMPICTURE_ADMENUCAT;
+$adminmenu[$i]["link"] = "admin/cat.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/category.png';
+
+$i++;
+$adminmenu[$i]["title"] = _MI_TDMPICTURE_ADMENUFILE;
+$adminmenu[$i]["link"] = "admin/files.php";
+$adminmenu[$i]["icon"] = 'images/decos/min_file.png';
+
+$i++;
+$adminmenu[$i]["title"] = _MI_TDMPICTURE_ADMENUPERMISSIONS;
+$adminmenu[$i]["link"] = "admin/permissions.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/permissions.png';
+
+$i++;
+$adminmenu[$i]['title'] = _AM_MODULEADMIN_ABOUT;
+$adminmenu[$i]["link"] = "admin/about.php";
+$adminmenu[$i]["icon"] = $pathIcon32 . '/about.png';
+
+
+
-$adminmenu[0]['title'] = _MI_TDMPICTURE_ADMENUINDEX;
-$adminmenu[0]['link'] = "admin/index.php";
-$adminmenu[0]['icon'] = 'images/decos/min_index.png';
-
-$adminmenu[1]['title'] = _MI_TDMPICTURE_ADMENUCAT;
-$adminmenu[1]['link'] = "admin/cat.php";
-$adminmenu[1]['icon'] = 'images/decos/min_cat.png';
+//$adminmenu[0]['title'] = _MI_TDMPICTURE_ADMENUINDEX;
+//$adminmenu[0]['link'] = "admin/index.php";
+//$adminmenu[0]['icon'] = 'images/decos/min_index.png';
+//
+//$adminmenu[1]['title'] = _MI_TDMPICTURE_ADMENUCAT;
+//$adminmenu[1]['link'] = "admin/cat.php";
+//$adminmenu[1]['icon'] = 'images/decos/min_cat.png';
-$adminmenu[2]['title'] = _MI_TDMPICTURE_ADMENUFILE;
-$adminmenu[2]['link'] = "admin/files.php";
-$adminmenu[2]['icon'] = 'images/decos/min_file.png';
+//$adminmenu[2]['title'] = _MI_TDMPICTURE_ADMENUFILE;
+//$adminmenu[2]['link'] = "admin/files.php";
+//$adminmenu[2]['icon'] = 'images/decos/min_file.png';
-$adminmenu[3]['title'] = _MI_TDMPICTURE_ADMENUPERMISSIONS;
-$adminmenu[3]['link'] = "admin/permissions.php";
-$adminmenu[3]['icon'] = 'images/decos/min_permissions.png';
+//$adminmenu[3]['title'] = _MI_TDMPICTURE_ADMENUPERMISSIONS;
+//$adminmenu[3]['link'] = "admin/permissions.php";
+//$adminmenu[3]['icon'] = 'images/decos/min_permissions.png';
+//
+//$adminmenu[4]['title'] = _MI_TDMPICTURE_ADMENUABOUT;
+//$adminmenu[4]['link'] = "admin/about.php";
+//$adminmenu[4]['icon'] = 'images/decos/min_about.png';
-$adminmenu[4]['title'] = _MI_TDMPICTURE_ADMENUABOUT;
-$adminmenu[4]['link'] = "admin/about.php";
-$adminmenu[4]['icon'] = 'images/decos/min_about.png';
-
?>
\ No newline at end of file
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/permissions.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/permissions.php 2012-07-07 14:10:39 UTC (rev 9793)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/permissions.php 2012-07-07 14:11:46 UTC (rev 9794)
@@ -84,6 +84,4 @@
echo '<div class="tips">' . _AM_TDMPICTURE_MANAGE_PERM . '</div><br />';
echo $permform->render();
-xoops_cp_footer() ;
-
-?>
\ No newline at end of file
+include 'admin_footer.php';
\ No newline at end of file
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_cat.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_cat.php 2012-07-07 14:10:39 UTC (rev 9793)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_cat.php 2012-07-07 14:11:46 UTC (rev 9794)
@@ -62,14 +62,14 @@
if ($action === false) {
$action = $_SERVER['REQUEST_URI'];
}
- $title = $this->isNew() ? sprintf(_AM_TDMPICTURE_ADD) : sprintf(_AM_TDMPICTURE_EDIT);
+ $title = $this->isNew() ? sprintf(_MD_TDMPICTURE_ADD) : sprintf(_MD_TDMPICTURE_EDIT);
include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
$form = new XoopsThemeForm($title, 'form', $action, 'post', true);
$form->setExtra('enctype="multipart/form-data"');
- $form->addElement(new XoopsFormText(_AM_TDMPICTURE_TITLE, 'cat_title', 80, 255, $this->getVar('cat_title')));
+ $form->addElement(new XoopsFormText(_MD_TDMPICTURE_TITLE, 'cat_title', 80, 255, $this->getVar('cat_title')));
if (!$this->isNew()) {
//Load groups
@@ -90,7 +90,7 @@
$arr = $cat_handler->getall($criteriaUser);
$mytree = new XoopsObjectTree($arr, 'cat_id', 'cat_pid');
- $form->addElement(new XoopsFormLabel(_AM_TDMPICTURE_PARENT, $mytree->makeSelBox('cat_pid', 'cat_title','-', $this->getVar('cat_pid'), true)));
+ $form->addElement(new XoopsFormLabel(_MD_TDMPICTURE_PARENT, $mytree->makeSelBox('cat_pid', 'cat_title','-', $this->getVar('cat_pid'), true)));
//editor
$editor_configs=array();
@@ -101,13 +101,13 @@
$editor_configs["width"] = "100%";
$editor_configs["height"] = "400px";
$editor_configs["editor"] = $xoopsModuleConfig["tdmpicture_editor"];
- $form->addElement( new XoopsFormEditor(_AM_TDMPICTURE_TEXT, "cat_text", $editor_configs), false );
+ $form->addElement( new XoopsFormEditor(_MD_TDMPICTURE_TEXT, "cat_text", $editor_configs), false );
- //upload
+//upload
$img = $this->getVar('cat_img') ? $this->getVar('cat_img') : 'blank.gif';
$uploadirectory = "modules/".$xoopsModule->dirname()."/upload/cat/";
- $imgtray = new XoopsFormElementTray(_AM_TDMPICTURE_IMG,'<br />');
- $imgpath=sprintf(_AM_TDMPICTURE_PATH, $uploadirectory );
+ $imgtray = new XoopsFormElementTray(_MD_TDMPICTURE_IMG,'<br />');
+ $imgpath=sprintf(_MD_TDMPICTURE_PATH, $uploadirectory );
$imageselect= new XoopsFormSelect($imgpath, 'img',$img);
$topics_array = XoopsLists :: getImgListAsArray(XOOPS_ROOT_PATH."/".$uploadirectory);
foreach( $topics_array as $image ) {
@@ -118,14 +118,14 @@
$imgtray -> addElement( new XoopsFormLabel( '', "<br /><img src='" . XOOPS_URL . "/" . $uploadirectory . "/" . $img . "' name='image3' id='image3' alt='' />" ) );
$fileseltray= new XoopsFormElementTray('','<br />');
- $fileseltray->addElement(new XoopsFormFile(_AM_TDMPICTURE_UPLOAD , 'attachedfile', $xoopsModuleConfig['tdmpicture_mimemax']),false);
+ $fileseltray->addElement(new XoopsFormFile(_MD_TDMPICTURE_UPLOAD , 'attachedfile', $xoopsModuleConfig['tdmpicture_mimemax']),false);
$fileseltray->addElement(new XoopsFormLabel(''), false);
$imgtray->addElement($fileseltray);
$form->addElement($imgtray);
//
//poit
- $form->addElement(new XoopsFormText(_AM_TDMPICTURE_WEIGHT, 'cat_weight', 10, 11, $this->getVar('cat_weight')));
+ $form->addElement(new XoopsFormText(_MD_TDMPICTURE_WEIGHT, 'cat_weight', 10, 11, $this->getVar('cat_weight')));
// Permissions
$gperm_handler =& xoops_gethandler('groupperm');
@@ -144,9 +144,9 @@
if(!$this->isNew()) { // Edit mode
$groups_ids = $gperm_handler->getGroupIds('tdmpicture_catview', $this->getVar('cat_id'), $xoopsModule->getVar('mid'));
$groups_ids = array_values($groups_ids);
- $groups_news_can_view_checkbox = new XoopsFormCheckBox(_AM_TDMPICTURE_PERM_2, 'groups_view[]', $groups_ids);
+ $groups_news_can_view_checkbox = new XoopsFormCheckBox(_MD_TDMPICTURE_PERM_2, 'groups_view[]', $groups_ids);
} else { // Creation mode
- $groups_news_can_view_checkbox = new XoopsFormCheckBox(_AM_TDMPICTURE_PERM_2, 'groups_view[]', $full_list);
+ $groups_news_can_view_checkbox = new XoopsFormCheckBox(_MD_TDMPICTURE_PERM_2, 'groups_view[]', $full_list);
}
$groups_news_can_view_checkbox->addOptionArray($group_list);
$form->addElement($groups_news_can_view_checkbox);
@@ -155,13 +155,21 @@
//
if ( is_object($xoopsUser) && $xoopsUser->isAdmin()) {
- $form->addElement(new XoopsFormRadioYN(_AM_TDMPICTURE_DISPLAYUSER, 'cat_display', $this->getVar('cat_display'), _YES, _NO));
- $form->addElement(new XoopsFormRadioYN(_AM_TDMPICTURE_DISPLAYINDEX, 'cat_index', $this->getVar('cat_index'), _YES, _NO));
+ $form->addElement(new XoopsFormRadioYN(_MD_TDMPICTURE_DISPLAYUSER, 'cat_display', $this->getVar('cat_display'), _YES, _NO));
+
+ //$form->addElement(new XoopsFormRadioYN(_MD_TDMPICTURE_DISPLAYINDEX, 'cat_index', $this->getVar('cat_index'), _YES, _NO));
+
+ $aff_index = new XoopsFormElementTray(_MD_TDMPICTURE_DISPLAYINDEX,'');
+ $aff_index->setDescription(_MD_TDMPICTURE_DISPLAYINDEXDESC);
+ $aff_index->addElement(new XoopsFormRadioYN('', 'cat_index', $this->getVar('cat_index'), _YES, _NO));
+ $form->addElement($aff_index);
+
+
}else {
if ($gperm_handler->checkRight('tdmpicture_view', 1048, $groups, $xoopsModule->getVar('mid'))) {
- $form->addElement(new XoopsFormRadioYN(_AM_TDMPICTURE_DISPLAYUSER, 'cat_display', $this->getVar('cat_display'), _YES, _NO));
- $form->addElement(new XoopsFormRadioYN(_AM_TDMPICTURE_DISPLAYINDEX, 'cat_index', $this->getVar('cat_index'), _YES, _NO));
+ $form->addElement(new XoopsFormRadioYN(_MD_TDMPICTURE_DISPLAYUSER, 'cat_display', $this->getVar('cat_display'), _YES, _NO));
+ $form->addElement(new XoopsFormRadioYN(_MD_TDMPICTURE_DISPLAYINDEX, 'cat_index', $this->getVar('cat_index'), _YES, _NO));
}else {
$form->addElement(new XoopsFormHidden('cat_display', 0));
}
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php 2012-07-07 14:10:39 UTC (rev 9793)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php 2012-07-07 14:11:46 UTC (rev 9794)
@@ -56,12 +56,11 @@
function getForm($action = false)
{
- global $xoopsUser, $xoopsDB, $xoopsModule, $xoopsModuleConfig;
+ global $xoopsUser, $xoopsDB, $xoopsModule, $xoopsModuleConfig;
- if ($action === false) {
- $action = $_SERVER['REQUEST_URI'];
+ if ($action === false) { $action = $_SERVER['REQUEST_URI'];
}
- $title = $this->isNew() ? sprintf(_AM_TDMPICTURE_ADD) : sprintf(_AM_TDMPICTURE_EDIT);
+ $title = $this->isNew() ? sprintf(_MD_TDMPICTURE_ADD) : sprintf(_MD_TDMPICTURE_EDIT);
include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
@@ -79,17 +78,17 @@
$form = new XoopsThemeForm($title, 'form', $action, 'post', true);
$form->setExtra('enctype="multipart/form-data"');
- // $form->addElement(new XoopsFormText(_AM_TDMPICTURE_TITLE, 'filecat_title', 100, 255, $this->getVar('filecat_title')), true);
+ // $form->addElement(new XoopsFormText(_MD_TDMPICTURE_TITLE, 'filecat_title', 100, 255, $this->getVar('filecat_title')), true);
if (!$this->isNew()) {
//Load groups
$form->addElement(new XoopsFormHidden('id', $this->getVar('file_id')));
- $form->addElement(new XoopsFormText(_AM_TDMPICTURE_TITLE, 'file_title', 100, 255, $this->getVar('file_title')), true);
+ $form->addElement(new XoopsFormText(_MD_TDMPICTURE_TITLE, 'file_title', 100, 255, $this->getVar('file_title')), true);
}
//
if (!$this->isNew()) {
-$button_file = new XoopsFormText(_AM_TDMPICTURE_URL, 'file_file', 100, 255, $this->getVar('file_file'));
+$button_file = new XoopsFormText(_MD_TDMPICTURE_URL, 'file_file', 100, 255, $this->getVar('file_file'));
$button_file->setExtra("disabled");
$form->addElement($button_file);
//editor
@@ -101,18 +100,18 @@
$editor_configs["width"] = "100%";
$editor_configs["height"] = "400px";
$editor_configs["editor"] = $xoopsModuleConfig["tdmpicture_editor"];
- $form->addElement( new XoopsFormEditor(_AM_TDMPICTURE_TEXT, "file_text", $editor_configs), false );
+ $form->addElement( new XoopsFormEditor(_MD_TDMPICTURE_TEXT, "file_text", $editor_configs), false );
//
-$form->addElement(new XoopsFormText(_AM_TDMPICTURE_SIZE, 'file_size', 10, 11, $this->getVar('file_size')));
+$form->addElement(new XoopsFormText(_MD_TDMPICTURE_SIZE, 'file_size', 10, 11, $this->getVar('file_size')));
-$form->addElement(new XoopsFormText(_AM_TDMPICTURE_WITH, 'file_res_x', 10, 11, $this->getVar('file_res_x')));
+$form->addElement(new XoopsFormText(_MD_TDMPICTURE_WIDTH, 'file_res_x', 10, 11, $this->getVar('file_res_x')));
-$form->addElement(new XoopsFormText(_AM_TDMPICTURE_HEIGHT, 'file_res_y', 10, 11, $this->getVar('file_res_y')));
+$form->addElement(new XoopsFormText(_MD_TDMPICTURE_HEIGHT, 'file_res_y', 10, 11, $this->getVar('file_res_y')));
//display
if ( is_object($xoopsUser) && $xoopsUser->isAdmin()) {
- $form->addElement(new XoopsFormRadioYN(_AM_TDMPICTURE_DISPLAYUSER, 'file_display', $this->getVar('file_display'), _YES, _NO));
+ $form->addElement(new XoopsFormRadioYN(_MD_TDMPICTURE_DISPLAYUSER, 'file_display', $this->getVar('file_display'), _YES, _NO));
}else {
$gperm_handler =& xoops_gethandler('groupperm');
@@ -151,7 +150,7 @@
$arr = $cat_handler->getall($criteriaUser);
$mytree = new XoopsObjectTree($arr, 'cat_id', 'cat_pid');
- $form->addElement(new XoopsFormLabel(_AM_TDMPICTURE_CAT, $mytree->makeSelBox('file_cat', 'cat_title','-', $this->getVar('cat_pid'), true)), true);
+ $form->addElement(new XoopsFormLabel(_MD_TDMPICTURE_CAT, $mytree->makeSelBox('file_cat', 'cat_title','-', $this->getVar('cat_pid'), true)), true);
//
@@ -160,7 +159,7 @@
if ( is_object($xoopsUser) && $xoopsUser->isAdmin()) {
- $form->addElement(new XoopsFormRadioYN(_AM_TDMPICTURE_DISPLAYUSER, 'file_display', $this->getVar('file_display'), _YES, _NO));
+ $form->addElement(new XoopsFormRadioYN(_MD_TDMPICTURE_DISPLAYUSER, 'file_display', $this->getVar('file_display'), _YES, _NO));
}else {
$gperm_handler =& xoops_gethandler('groupperm');
@@ -174,7 +173,7 @@
if ($gperm_handler->checkRight('tdmpicture_view', 16, $groups, $xoopsModule->getVar('mid'))) {
$form->addElement(new XoopsFormHidden('file_display', 1));
}else {
- $form->insertBreak('<div align="center">'._AM_TDMPICTURE_UPLOAD_LIMIT.'</div>', 'odd');
+ $form->insertBreak('<div align="center">'._MD_TDMPICTURE_UPLOAD_LIMIT.'</div>', 'odd');
$form->addElement(new XoopsFormHidden('file_display', 0));
}
}
@@ -198,7 +197,7 @@
//</script>';
//note
-$form->insertBreak('<div align="center">'._AM_TDMPICTURE_UPLOAD_DESC.'</div>', 'odd');
+$form->insertBreak('<div align="center">'._MD_TDMPICTURE_UPLOAD_DESC.'</div>', 'odd');
//$form->insertBreak('
@@ -237,7 +236,7 @@
//pour multi upload
$form->addElement(new XoopsFormHidden('MAX_FILE_SIZE', $xoopsModuleConfig['tdmpicture_mimemax']));
-$fileseltray= new XoopsFormElementTray(_AM_TDMPICTURE_UPLOAD,'<br />');
+$fileseltray= new XoopsFormElementTray(_MD_TDMPICTURE_UPLOAD,'<br />');
$fileseltray->addElement(new XoopsFormLabel('<div id="tdmfiletext" maxlength="'.$xoopsModuleConfig["tdmpicture_upmax"].'">
<b>'.sprintf(_MD_TDMPICTURE_MULTIUPLOAD, $xoopsModuleConfig["tdmpicture_upmax"]).'</b><br />
@@ -274,14 +273,14 @@
if ($action === false) {
$action = $_SERVER['REQUEST_URI'];
}
- $title = $this->isNew() ? sprintf(_AM_TDMPICTURE_ADD) : sprintf(_AM_TDMPICTURE_EDIT);
+ $title = $this->isNew() ? sprintf(_MD_TDMPICTURE_ADD) : sprintf(_MD_TDMPICTURE_EDIT);
include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
$form = new XoopsThemeForm($title, 'form', $action, 'post', true);
$form->setExtra('enctype="multipart/form-data" onsubmit="return checkCoords();"');
- //$form->addElement(new XoopsFormText(_AM_TDMPICTURE_TITLE, 'cat_title', 80, 255, $this->getVar('cat_title')));
+ //$form->addElement(new XoopsFormText(_MD_TDMPICTURE_TITLE, 'cat_title', 80, 255, $this->getVar('cat_title')));
if (!$this->isNew()) {
//Load groups
$form->addElement(new XoopsFormHidden('id', $this->getVar('cat_id')));
@@ -331,8 +330,8 @@
<br />';
- $form->insertBreak('<div align="center">'._AM_TDMPICTURE_NEWTHUMB.'</div>', 'odd');
-$img = new XoopsFormElementTray(_AM_TDMPICTURE_RECAD,'');
+ $form->insertBreak('<div align="center">'._MD_TDMPICTURE_NEWTHUMB.'</div>', 'odd');
+$img = new XoopsFormElementTray(_MD_TDMPICTURE_RECAD,'');
$img->addElement(new XoopsFormText('X1', 'x', 4, 4, ''));
$img->addElement(new XoopsFormText('Y1', 'y', 4, 4, ''));
$img->addElement(new XoopsFormText('X2', 'x2', 4, 4, ''));
@@ -343,7 +342,7 @@
//visible
if ( is_object($xoopsUser) && $xoopsUser->isAdmin()) {
- $form->addElement(new XoopsFormRadioYN(_AM_TDMPICTURE_DISPLAYUSER, 'file_display', $this->getVar('file_display'), _YES, _NO));
+ $form->addElement(new XoopsFormRadioYN(_MD_TDMPICTURE_DISPLAYUSER, 'file_display', $this->getVar('file_display'), _YES, _NO));
}else {
$gperm_handler =& xoops_gethandler('groupperm');
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-07 14:10:39 UTC (rev 9793)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-07 14:11:46 UTC (rev 9794)
@@ -68,11 +68,11 @@
//$cat_link = tdmspot_seo_genUrl( $xoopsModuleConfig['tdmspot_seo_cat'], $this->_tree[$key]['obj']->getVar('id'), $this->_tree[$key]['obj']->getVar('title'), $start, $limit, $tris );
$cat_link = TDMPICTURE_URL."/viewcat.php?ct=".$this->_tree[$key]['obj']->getVar('cat_id')."&tris=".$tris."&limit=".$limit;
//recherche image
- $imgpath = TDM_CAT_PATH .'/'. $this->_tree[$key]['obj']->getVar('cat_img');
+ $imgpath = TDM_CAT_PATH . $this->_tree[$key]['obj']->getVar('cat_img');
if (file_exists($imgpath) && $this->_tree[$key]['obj']->getVar('cat_img') != "blank.gif") {
- $picture = '<a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'"><img src="' . TDM_CAT_URL . '/'. $this->_tree[$key]['obj']->getVar('cat_img').'" class="img" width="'.$xoopsModuleConfig['tdmpicture_cat_width'].'" height="'.$xoopsModuleConfig['tdmpicture_cat_height'].'"></a>';
+ $picture = '<a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'"><img src="' . TDM_CAT_URL . $this->_tree[$key]['obj']->getVar('cat_img').'" class="img" width="'.$xoopsModuleConfig['tdmpicture_cat_width'].'" height="'.$xoopsModuleConfig['tdmpicture_cat_height'].'"></a>';
} else {
- $picture = '<a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'"><img src="' . TDM_CAT_URL . '/no_picture.png" class="img" width="'.$xoopsModuleConfig['tdmpicture_cat_width'].'" height="'.$xoopsModuleConfig['tdmpicture_cat_height'].'"></a>';
+ $picture = '<a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'"><img src="' . TDM_CAT_URL . 'no_picture.png" class="img" width="'.$xoopsModuleConfig['tdmpicture_cat_width'].'" height="'.$xoopsModuleConfig['tdmpicture_cat_height'].'"></a>';
}
//echo $selected;
Added: XoopsModules/TDMPicture/trunk/TDMPicture/docs/changelog.txt
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/docs/changelog.txt (rev 0)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/docs/changelog.txt 2012-07-07 14:11:46 UTC (rev 9794)
@@ -0,0 +1,61 @@
+************************************************************
+Version 1.06 | 30-June-2012
+Dev: Xoops 2.0.16 / 2.2.3
+************************************************************
+- 2012-06-30 : more Admin GUI standardization (mamba)
+- 2012-06-30 : adding /docs folder (mamba)
+- 2012-06-30 : fixing English translations (mamba)
+- 2012-06-30 : updating icon URL links to ModuleAdmin (mamba)
+- 2012-06-30 : adding admin_footer.php (mamba)
+- 2012-06-30 : adding Help file (mamba)
+- 2012-06-29 : Conversion to XOOPS 2.5.x Admin GUI (Venom)
+************************************************************
+Version 1.05 | 12-AVR-2010
+Dev: 2.4.4
+************************************************************
+- 12/04/10 : modifier permission bug
+- 11/12/10 : multiupload
+************************************************************
+Version 1.04 | 31-MAR-2010
+Dev: 2.4.4
+************************************************************
+- 31/03/10 : modifier xoops_version.php bug affichage
+************************************************************
+Version 1.03 | 14-MAR-2010
+Dev: 2.4.2
+************************************************************
+- 14/03/10 : modifier all ajout multi upload
+- 14/03/10 : modifier tdmpicture.css changement dans le theme
+- 14/03/10 : modifier xoops_version ajout d'option.
+- 14/03/10 : modifier jquery mode noConflict
+- 14/03/10 : modifier search.inc.php bug info user
+- 14/03/10 : modifier rss.php, bug IE.
+- 14/03/10 : modifier viewcat style d'affichage cat\xE9gorie.
+************************************************************
+Version 1.02 | 17-NOV-2009
+Dev: Xoops 2.4.2
+************************************************************
+- 21/12/09 : modifier xoops_version.php bug
+- 21/12/09 : modifier all.php bug xoops 2.4
+- 21/12/09 : modifier all.html ajout de variable smarty
+************************************************************
+Version 1.01 | 17-NOV-2009
+Dev: Xoops 2.0.16 / 2.2.3
+************************************************************
+- 17/11/09 : modifier admin/index.php ajout permission dossier upload
+- 17/11/09 : modifier tdmpicture.css changement dans le theme
+- 17/11/09 : modifier tpfile.html, viewfile.html changement dans le template
+- 17/11/09 : modifier viewfile.php, functions.php bug de redimention
+- 17/11/09 : modifier include.php jquery bug alert
+- 18/11/09 : modifier xoops_version.php, tpcat.html, index.php, viewcat.php redimension image cat\xE9gories.
+- 18/11/09 : modifier meta automatique
+************************************************************
+Version 1.00 | 03-OCT-2009
+Dev: Xoops 2.0.16 / 2.2.3
+************************************************************
+- 10/10/09 : Ajout de l'anglais
+- 10/10/09 : Suppression du .htaccess bug
+************************************************************
+
+
+
Added: XoopsModules/TDMPicture/trunk/TDMPicture/docs/credits.txt
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/docs/credits.txt (rev 0)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/docs/credits.txt 2012-07-07 14:11:46 UTC (rev 9794)
@@ -0,0 +1,4 @@
+Credits
+===============
+Author: TDM
+
Added: XoopsModules/TDMPicture/trunk/TDMPicture/docs/index.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/docs/index.html (rev 0)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/docs/index.html 2012-07-07 14:11:46 UTC (rev 9794)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/TDMPicture/trunk/TDMPicture/docs/lang_diff.txt
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/docs/lang_diff.txt (rev 0)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/docs/lang_diff.txt 2012-07-07 14:11:46 UTC (rev 9794)
@@ -0,0 +1,19 @@
+LANGUAGE DIFFERENCES
+=====================
+
+Below are language differences from a version to next version.
+
+Version 1.06
+----------------
+
+main.php
+----------
+define("_MD_TDMPICTURE_NBFILE","# of Pictures");
+define("_MD_TDMPICTURE_MEGABYTES"," MB");
+define("_MD_TDMPICTURE_KILOBYTES"," KB");
+
+admin.php
+----------
+define("_AM_TDMPICTURE_DELETE_SELECTED", "Delete Selected");
+define("_AM_TDMPICTURE_BUTTON_CAT_WAITING", "Categories to Approve: ");
+define("_AM_TDMPICTURE_BUTTON_FILES_WAITING", "Files to Approve: ");
\ No newline at end of file
Added: XoopsModules/TDMPicture/trunk/TDMPicture/docs/licence.txt
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/docs/licence.txt (rev 0)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/docs/licence.txt 2012-07-07 14:11:46 UTC (rev 9794)
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
Added: XoopsModules/TDMPicture/trunk/TDMPicture/docs/readme.txt
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/docs/readme.txt (rev 0)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/docs/readme.txt 2012-07-07 14:11:46 UTC (rev 9794)
@@ -0,0 +1,21 @@
+************************************************** **********
+TDMPicture
+Version 1.06 | 2012-06-30
+************************************************** **********
+
+************************************************** **********
+UPDATE
+************************************************** **********
+
+- Overwrite the file TDMPicture, to update the module from the site administration.
+- When using a custom template set, remove the module's templates for regeneration.
+- Appointments in the administration module to create permissions.
+
+
+************************************************** **********
+INSTALLATION
+************************************************** **********
+
+- Upload the entire folder 'TDMPicture' folder to / modules /
+- Go to Admin of your site to install the module.
+- Set permissions.
\ No newline at end of file
Added: XoopsModules/TDMPicture/trunk/TDMPicture/docs/readme_fr.txt
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/docs/readme_fr.txt (rev 0)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/docs/readme_fr.txt 2012-07-07 14:11:46 UTC (rev 9794)
@@ -0,0 +1,21 @@
+************************************************************
+TDMPicture
+Version 1.06 | 2012-06-30
+************************************************************
+
+************************************************************
+MISE A JOUR
+************************************************************
+
+- Ecraser le dossier TDMPicture, mettre jour le module depuis l'administration du site.
+- En cas d'utilisation d'un jeu de templates personnalis�, supprimer les templates du module pour les reg�n�rer.
+- Rendez-vous dans l'administration du module pour cr�er les permissions.
+
+
+***********************************...
[truncated message content] |
|
From: <lor...@us...> - 2012-07-08 19:12:03
|
Revision: 9806
http://xoops.svn.sourceforge.net/xoops/?rev=9806&view=rev
Author: lord_venom
Date: 2012-07-08 19:11:57 +0000 (Sun, 08 Jul 2012)
Log Message:
-----------
test news categorie
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
XoopsModules/TDMPicture/trunk/TDMPicture/index.php
XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php
Added Paths:
-----------
XoopsModules/TDMPicture/trunk/TDMPicture/images/decos/downloads-bg.gif
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-08 16:16:56 UTC (rev 9805)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-08 19:11:57 UTC (rev 9806)
@@ -50,13 +50,14 @@
return $ret;
}
- function _makeCatBoxOptions( $item_handler, $fieldName, $selected, $key, &$ret, &$ret2, $prefix_orig, $prefix_curr = '', $chcount) {
+ function _makeCatBoxOptions( $item_handler, $fieldName, $selected, $key, &$ret, &$select, $prefix_orig, $prefix_curr = '', $chcount) {
Global $xoopsModule, $xoopsModuleConfig, $cat_display, $cat_cel, $groups, $start, $limit, $tris ;
$gperm_handler =& xoops_gethandler('groupperm');
$parent = "";
$GLOBALS['navbar'] .= "";
+
if ( $key > 0 && $gperm_handler->checkRight('tdmpicture_catview', $this->_tree[$key]['obj']->getVar('cat_id'), $groups, $xoopsModule->getVar('mid'))) {
$value = $this->_tree[$key]['obj']->getVar( $this->_myId );
@@ -89,73 +90,30 @@
<ul>'.$picture. '<a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">' . $this->_tree[$key]['obj']->getVar( $fieldName ). '</a> ('.$count.')
<br style="clear: both;" /></ul></th></tr></table>';
- }
+ }
- if ($cat_display == "sub" || $cat_display == "subimg") {
- $cat_sub = true;
- } else {
- $cat_sub = false;
- }
-
- if ((!$prefix_curr && $cat_sub) || (!$cat_sub && $this->_tree[$key]['obj']->getVar('cat_pid') == $selected)) {
-
- $GLOBALS['souscat'] = true;
-
- switch ($cat_display) {
+ if ((!$prefix_curr) || ($this->_tree[$key]['obj']->getVar('cat_pid') == $selected)) {
-
- case "text":
- $ret .= '<td><ul><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">' . $this->_tree[$key]['obj']->getVar( $fieldName ). '</a> ('.$count.')';
- break;
+ $select = $this->makeSelBox('cat_pid', 'cat_title','-', 0, '-- '._MD_TDMPICTURE_CAT, $this->_tree[$key]['obj']->getVar('cat_id'), "OnChange='window.document.location=this.options[this.selectedIndex].value;'", 'tdmpicture_catview');
+ $ret .= '<li class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="form">'.$select.'</div></li>';
- case "textimg":
- $ret .= '<td><ul>'.$picture. '<br /><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">' . $this->_tree[$key]['obj']->getVar( $fieldName ). '</a> ('.$count.')';
- break;
-
- case "sub":
- $ret .= '<td><ul>  <a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</a> ('.$count.')';
- break;
-
- case "subimg":
- $ret .= '<td><ul>'.$picture. '<a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">' .$this->_tree[$key]['obj']->getVar( $fieldName ). '</a> ('.$count.')';
- break;
-
- case "img":
- $ret .= '<td><ul style="text-align:center;">'.$picture;
- break;
-
- }
-
- } else {
- if ($cat_sub) {
- $ret .= '<li> ('.$count.') ' . $prefix_curr . ' <a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'"> '.$this->_tree[$key]['obj']->getVar( $fieldName ). '</a></li>';
}
- }
//}
$prefix_curr .= $prefix_orig;
-
+
//}
}
if ( isset( $this->_tree[$key]['child'] ) && !empty( $this->_tree[$key]['child'] ) ) {
foreach ( $this->_tree[$key]['child'] as $childkey ) {
- $this->_makeCatBoxOptions( $item_handler, $fieldName, $selected, $childkey, $ret, $ret2, $prefix_orig, $prefix_curr , $chcount);
- if (!$prefix_curr) {
- $ret .= '<br style="clear:both;" /></ul></td>';
-
- if($chcount == $cat_cel) {
- $ret .= '</tr><tr>';
- $chcount = 1;
- } else {
- $chcount++;
- }
-
- }
- }
+ $GLOBALS['class'] = ($GLOBALS['class'] == "even") ? "odd" : "even";
+ $this->_makeCatBoxOptions( $item_handler, $fieldName, $selected, $childkey, $ret, $select, $prefix_orig, $prefix_curr , $chcount);
+
+ }
}
}
@@ -192,26 +150,16 @@
//makeCatBox($item_handler,name cat, )
function makeCatBox( $item_handler, $fieldName, $prefix = '-', $selected = '', $key = 0 ) {
Global $cat_display;
- if ($cat_display != "none") {
-
- $GLOBALS['souscat']=false;
- $GLOBALS['navbar'] = false;
-
- $ret1 = '<div style="text-align:right"><a href="javascript:;" onclick="javascript:masque(\'1\')" >+-</a></div>';
- $ret = '<table cellpadding="0" id="masque_1" class="outer tdmcat_'.$cat_display.'" cellspacing="0"><tr>';
+
+ $ret = '<div style="text-align:right"><a href="javascript:;" onclick="javascript:masque(\'1\')" >+-</a></div>';
+ $ret .= '<table cellpadding="0" id="masque_1" cellspacing="0"><tr><td><ul id="menu">';
$chcount = 1;
- $this->_makeCatBoxOptions( $item_handler, $fieldName, $selected, $key, $ret, $ret2, $prefix, '', $chcount );
- $ret .= '</tr></table><br />';
+ $GLOBALS['class'] = "odd";
+ $this->_makeCatBoxOptions( $item_handler, $fieldName, $selected, $key, $ret, $select, $prefix, '', $chcount );
+ $ret .= '<br style="clear: both;" /></ul></td></tr></table><br />';
- if (empty($GLOBALS['souscat'])) {
- $ret1 = false;
- $ret = false;
- }
+ return $ret;
-
- return $ret1 . $ret . $ret2;
- }
-
}
function makeSelBox( $name, $fieldName, $prefix = '-', $selected = '', $addEmptyOption = false, $key = 0, $extra = '', $perm = false ) {
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-08 16:16:56 UTC (rev 9805)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-08 19:11:57 UTC (rev 9806)
@@ -15,8 +15,70 @@
*
* ****************************************************************************
*/
+
+ ul#menu {
+ margin: 0;
+ padding-left: 1%;
+ padding-right:1%;
+ text-align: center;
+
+ }
+ ul#menu li {
+ list-style: none;
+ float:left;
+ width:47%;
+ height: 130px;
+ margin: 10px; padding: 0px;
+ -webkit-border-radius: 4px;
+ border-radius: 4px;
+ border: 2px solid white;
+ /* background: whiteSmoke url(../images/decos/downloads-bg.gif) repeat-x left top; */
+ -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+ }
+ ul#menu img {
+ float:left;
+ padding-left:20px;
+ padding-right:20px;
+ padding-top:10px;
+ }
+
+ ul#menu h2{
+ left:0;
+ text-align:left;
+padding-top:10px;
+padding-bottom:5px;
+ }
+
+ ul#menu div{
+ float:left;
+ }
+ ul#menu #text {
+ font-size: 13px;
+color: #728DA9;
+text-shadow: 0 1px 0 white;
+line-height: 20px;
+}
+
+ ul#menu #num{
+ text-align: center;
+font-size: 11px;
+color: #25587C;
+text-shadow: 0 1px 0 white;
+ }
+
+ ul#menu #form{
+ float:right;
+ padding-top:100px;
+ padding-right:20px;
+ text-align: center;
+font-size: 11px;
+color: #25587C;
+text-shadow: 0 1px 0 white;
+
+ }
+
/* + -----------------------------------------------------
AFFICHAGE UNIQUE CATEGORIE
+ ----------------------------------------------------- */
Added: XoopsModules/TDMPicture/trunk/TDMPicture/images/decos/downloads-bg.gif
===================================================================
(Binary files differ)
Property changes on: XoopsModules/TDMPicture/trunk/TDMPicture/images/decos/downloads-bg.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/index.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/index.php 2012-07-08 16:16:56 UTC (rev 9805)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/index.php 2012-07-08 19:11:57 UTC (rev 9806)
@@ -49,12 +49,14 @@
$xoopsTpl->assign('baseurl', $_SERVER['PHP_SELF']);
$xoopsTpl->assign('display', $xoopsModuleConfig['tdmpicture_display'] );
- switch($op) {
+ switch($op) {
+
+
case "list":
default:
-
-$xoopsTpl->assign('cat_id', true);
+
+ $xoopsTpl->assign('cat_id', true);
$xoopsTpl->assign('cat_view', true);
$xoopsTpl->assign('nav', "<a href='".XOOPS_URL. "/modules/".$xoopsModule->dirname()."'/>".$xoopsModule->name()."</a>");
// ************************************************************
@@ -81,7 +83,6 @@
$numcat = $cat_handler->getCount($criteria);
$xoopsTpl->assign('numcat', $numcat);
-
unset($criteria);
$xoopsTpl->assign('selectcat', tdmpicture_catselect($mytree, false));
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php 2012-07-08 16:16:56 UTC (rev 9805)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php 2012-07-08 19:11:57 UTC (rev 9806)
@@ -41,6 +41,8 @@
$ct = isset($_REQUEST['ct']) ? $_REQUEST['ct'] : false;
$start = isset($_REQUEST['start']) ? $_REQUEST['start'] : 0;
$tris = isset($_REQUEST['tris']) ? $_REQUEST['tris'] : 'file_indate';
+
+
//
//mode de visualisation
//$xoopsTpl->assign('view_mode', $view_mode = isset($_REQUEST['view_mode']) ? $_REQUEST['view_mode'] : 'block' );
@@ -61,6 +63,12 @@
redirect_header('index.php', 2, _MD_TDMPICTURE_NOPERM);
exit();
}
+ //perm
+ if (!$gperm_handler->checkRight('tdmpicture_catview', $ct, $groups, $xoopsModule->getVar('mid'))) {
+ redirect_header('index.php', 2, _NOPERM);
+ exit();
+ }
+
//return la categorie
$cat = $cat_handler->get($ct);
@@ -101,12 +109,9 @@
$meta_title = $meta_keywords = $meta_description = $GLOBALS['cat_title'];
$xoopsTpl->assign('nav_bar', $GLOBALS['navbar']);
-
-
-
// ************************************************************
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-09 12:24:18
|
Revision: 9814
http://xoops.svn.sourceforge.net/xoops/?rev=9814&view=rev
Author: lord_venom
Date: 2012-07-09 12:24:07 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
new category
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
XoopsModules/TDMPicture/trunk/TDMPicture/include/functions.php
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_index.html
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewcat.html
XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-09 12:21:37 UTC (rev 9813)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-09 12:24:07 UTC (rev 9814)
@@ -56,7 +56,7 @@
$gperm_handler =& xoops_gethandler('groupperm');
$parent = "";
- $GLOBALS['navbar'] .= "";
+ //$GLOBALS['navbar'] .= "";
if ( $key > 0 && $gperm_handler->checkRight('tdmpicture_catview', $this->_tree[$key]['obj']->getVar('cat_id'), $groups, $xoopsModule->getVar('mid'))) {
@@ -76,30 +76,35 @@
$picture = '<a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'"><img src="' . TDM_CAT_URL . 'no_picture.png" class="img" width="'.$xoopsModuleConfig['tdmpicture_cat_width'].'" height="'.$xoopsModuleConfig['tdmpicture_cat_height'].'"></a>';
}
- //echo $selected;
+
if (isset($selected) && $value == $selected ) {
+
+ $url_link = TDMPICTURE_URL."/index.php";
+ $GLOBALS['navbar'] = '<a href ="'.$url_link.'" title="'. $xoopsModule->name().'">' . $xoopsModule->name(). '</a> > ';
+ //trie
+ $navtrie = $this->makeSelTris(intval($value), $tris);
+
if ( isset( $this->_tree[$this->_tree[$key]['parent']]['obj'] ) ) {
- echo "passe";
- $parent_link = TDMPICTURE_URL."/viewcat.php?ct=".$this->_tree[$key]['obj']->getVar('cat_id')."&tris=".$tris."&limit=".$limit;
- $GLOBALS['navbar'] = '<a href ="'.$parent_link.'" title="'. $this->_tree[$this->_tree[$key]['parent']]['obj']->getVar('cat_title').'">' . $this->_tree[$this->_tree[$key]['parent']]['obj']->getVar('cat_title'). '</a> >';
- //$parent = '<div align="right"><a href ="'.$parent_link.'" title="'. $this->_tree[$this->_tree[$key]['parent']]['obj']->getVar('cat_title').'">' . $this->_tree[$this->_tree[$key]['parent']]['obj']->getVar('cat_title'). '</a></div>';
+
+ $parent_link = TDMPICTURE_URL."/viewcat.php?ct=".$this->_tree[$this->_tree[$key]['parent']]['obj']->getVar('cat_id')."&tris=".$tris."&limit=".$limit;
+ $GLOBALS['navbar'] .= '<a href ="'.$parent_link.'" title="'. $this->_tree[$this->_tree[$key]['parent']]['obj']->getVar('cat_title').'">' . $this->_tree[$this->_tree[$key]['parent']]['obj']->getVar('cat_title'). '</a> > ';
+
}
+
$GLOBALS['cat_count'] = $count;
$GLOBALS['cat_title'] = $this->_tree[$key]['obj']->getVar('cat_title');
- echo "passe";
- //$ret2 = '<br />
- //<table cellpadding="0" class="outer tdmcat" cellspacing="0"><tr><th>
- echo '<ul>'.$picture. '<a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">' . $this->_tree[$key]['obj']->getVar( $fieldName ). '</a> ('.$count.')';
- //<br style="clear: both;" /></ul></th></tr></table>';
-
+ $select = $this->makeSelBox('cat_pid', 'cat_title','-', $selected, '', $this->_tree[$key]['obj']->getVar('cat_id'), "OnChange='window.document.location=this.options[this.selectedIndex].value;'", 'tdmpicture_catview');
+
+ $ret .= '<li class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="form">'.$GLOBALS['navbar'].$select.' | '._MD_TDMPICTURE_TRIBY.' > '.$navtrie.'</div></li>';
+
}
if ((!$prefix_curr) && ($this->_tree[$key]['obj']->getVar('cat_pid') == $selected)) {
- $select = $this->makeSelBox('cat_pid', 'cat_title','-', 0, '--', $this->_tree[$key]['obj']->getVar('cat_id'), "OnChange='window.document.location=this.options[this.selectedIndex].value;'", 'tdmpicture_catview');
+ $select = $this->makeSelBox('cat_pid', 'cat_title','-', 0, '', $this->_tree[$key]['obj']->getVar('cat_id'), "OnChange='window.document.location=this.options[this.selectedIndex].value;'", 'tdmpicture_catview');
- $ret .= '<li class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="form">'.$select.'</div></li>';
+ $ret .= '<li style="width:47%;" class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="form">'.$select.'</div></li>';
}
@@ -150,12 +155,33 @@
}
}
+ //fonction du trie
+ function makeSelTris($cat, $tris) {
+
+ global $start, $tris, $limit, $groups, $xoopsUser, $xoopsModule, $xoopsModuleConfig;
+
+ //option du tris / nom de champ sql => nom afficher //
+ $option = array('file_title' => _MD_TDMPICTURE_TRITITLE , 'file_indate' => _MD_TDMPICTURE_TRIDATE, 'file_counts' => _MD_TDMPICTURE_TRICOUNTS, 'file_hits' => _MD_TDMPICTURE_TRIHITS, 'file_comments' => _MD_TDMPICTURE_TRICOMMENT);
+
+ $ret = '<select name="tris" onchange="window.document.location=this.options[this.selectedIndex].value;">';
+
+ foreach ($option as $key => $value) {
+ $select = ($tris == $key) ? 'selected="selected"' : false;
+ $cat_link = TDMPICTURE_URL."/viewcat.php?ct=".$cat."&tris=".$key;
+ $ret .= '<option '.$select.' value="'.$cat_link.'">'.$value.'</option>';
+
+ }
+ $ret .= '</select>';
+
+ return $ret;
+ }
+
//makeCatBox($item_handler,name cat, )
function makeCatBox( $item_handler, $fieldName, $prefix = '-', $selected = '', $key = 0 ) {
Global $cat_display;
$ret = '<div style="text-align:right"><a href="javascript:;" onclick="javascript:masque(\'1\')" >+-</a></div>';
- $ret .= '<table cellpadding="0" id="masque_1" cellspacing="0"><tr><td><ul id="menu">';
+ $ret .= '<table cellpadding="0" id="masque_1" cellspacing="0" style="margin:5px;"><tr><td><ul id="menu">';
$chcount = 1;
$GLOBALS['class'] = "odd";
$this->_makeCatBoxOptions( $item_handler, $fieldName, $selected, $key, $ret, $select, $prefix, '', $chcount );
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-09 12:21:37 UTC (rev 9813)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-09 12:24:07 UTC (rev 9814)
@@ -17,16 +17,16 @@
*/
ul#menu {
- margin: 0;
- padding-left: 1%;
- padding-right:1%;
+ margin: 0 auto;
+ padding:0 auto;
text-align: center;
+ width:100%;
}
ul#menu li {
list-style: none;
float:left;
- width:47%;
+ width:97%;
height: 130px;
margin: 10px; padding: 0px;
-webkit-border-radius: 4px;
@@ -34,6 +34,7 @@
border: 2px solid white;
/* background: whiteSmoke url(../images/decos/downloads-bg.gif) repeat-x left top; */
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+ overflow: auto;
}
ul#menu img {
float:left;
@@ -75,6 +76,7 @@
text-align: center;
font-size: 11px;
color: #25587C;
+font-weight: bold;
text-shadow: 0 1px 0 white;
}
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/include/functions.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/include/functions.php 2012-07-09 12:21:37 UTC (rev 9813)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/include/functions.php 2012-07-09 12:24:07 UTC (rev 9814)
@@ -245,24 +245,25 @@
}
- function tdmpicture_trisselect($cat, $tris) {
+ //fonction deplacer
+ //function tdmpicture_trisselect($cat, $tris) {
- global $start, $tris, $limit, $groups, $xoopsUser, $xoopsModule, $xoopsModuleConfig;
+ //global $start, $tris, $limit, $groups, $xoopsUser, $xoopsModule, $xoopsModuleConfig;
//$cat_handler =& xoops_getModuleHandler('tdmpicture_cat', 'TDMPicture');
- $option = array('file_title' => _MD_TDMPICTURE_TRITITLE , 'file_indate' => _MD_TDMPICTURE_TRIDATE, 'file_counts' => _MD_TDMPICTURE_TRICOUNTS, 'file_hits' => _MD_TDMPICTURE_TRIHITS, 'file_comments' => _MD_TDMPICTURE_TRICOMMENT);
- $select_tris = '<select name="tris" onchange="window.document.location=this.options[this.selectedIndex].value;">';
+ //$option = array('file_title' => _MD_TDMPICTURE_TRITITLE , 'file_indate' => _MD_TDMPICTURE_TRIDATE, 'file_counts' => _MD_TDMPICTURE_TRICOUNTS, 'file_hits' => _MD_TDMPICTURE_TRIHITS, 'file_comments' => _MD_TDMPICTURE_TRICOMMENT);
+ //$select_tris = '<select name="tris" onchange="window.document.location=this.options[this.selectedIndex].value;">';
//trouve le nom de la cat
//$cat = $cat_handler->get($cat);
- foreach ($option as $key => $value) {
- $select = ($tris == $key) ? 'selected="selected"' : false;
- $cat_link = TDMPICTURE_URL."/viewcat.php?ct=".$cat."&tris=".$key."&limit=".$limit;
- $select_tris .= '<option '.$select.' value="'.$cat_link.'">'.$value.'</option>';
+ //foreach ($option as $key => $value) {
+ //$select = ($tris == $key) ? 'selected="selected"' : false;
+ //$cat_link = TDMPICTURE_URL."/viewcat.php?ct=".$cat."&tris=".$key."&limit=".$limit;
+ //$select_tris .= '<option '.$select.' value="'.$cat_link.'">'.$value.'</option>';
-}
-$select_tris .= '</select>';
+//}
+//$select_tris .= '</select>';
-return $select_tris;
-}
+//return $select_tris;
+//}
function tdmpicture_viewselect($cat, $limit) {
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_index.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_index.html 2012-07-09 12:21:37 UTC (rev 9813)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_index.html 2012-07-09 12:24:07 UTC (rev 9814)
@@ -1,9 +1,6 @@
<br />
<div style="margin-left:auto;margin-right:auto;">
-<div class="TDMNav">
-<span><{$nav}></span><span> > <{$nav_bar}></span><span> <{$selectcat}><{$catform.elements.pid.body}></span>
-</div>
<br style="clear: both;"/> <br />
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewcat.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewcat.html 2012-07-09 12:21:37 UTC (rev 9813)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewcat.html 2012-07-09 12:24:07 UTC (rev 9814)
@@ -2,19 +2,6 @@
<div style="margin-left:auto;margin-right:auto;">
-<div class="TDMNav">
-<form name="xd_select_header" style="text-align: right;" method="post" action="genre.php">
-<{$smarty.const._MD_TDMPICTURE_TRIPARC}> <{$numfile}> <{$smarty.const._MD_TDMPICTURE_TRIFILE}>
-
-| <{$smarty.const._MD_TDMPICTURE_TRIBY}> <{$selecttris}>
-| <{$smarty.const._MD_TDMPICTURE_TRIVIEW}> <{$selectview}>
-</form>
-
-<br />
-<span><{$nav}></span><span> > <{$nav_bar}></span><span> <{$selectcat}><{$catform.elements.pid.body}></span>
-
-</div>
-
<br style="clear: both;"/> <br />
<{$display_cat}>
<br /><br />
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php 2012-07-09 12:21:37 UTC (rev 9813)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php 2012-07-09 12:24:07 UTC (rev 9814)
@@ -37,7 +37,7 @@
//variable post
$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'list';
- $limit = !empty($_REQUEST['limit']) ? $_REQUEST['limit'] : $xoopsModuleConfig['tdmpicture_page'];
+ //$limit = !empty($_REQUEST['limit']) ? $_REQUEST['limit'] : $xoopsModuleConfig['tdmpicture_page'];
$ct = isset($_REQUEST['ct']) ? $_REQUEST['ct'] : false;
$start = isset($_REQUEST['start']) ? $_REQUEST['start'] : 0;
$tris = isset($_REQUEST['tris']) ? $_REQUEST['tris'] : 'file_indate';
@@ -47,7 +47,7 @@
//mode de visualisation
//$xoopsTpl->assign('view_mode', $view_mode = isset($_REQUEST['view_mode']) ? $_REQUEST['view_mode'] : 'block' );
$xoopsTpl->assign('tris', $tris);
-$xoopsTpl->assign('limit', $limit);
+$xoopsTpl->assign('limit', $xoopsModuleConfig['tdmpicture_page']);
$xoopsTpl->assign('slide_width', $xoopsModuleConfig['tdmpicture_slide_width']);
$xoopsTpl->assign('slide_height', $xoopsModuleConfig['tdmpicture_slide_height']);
$xoopsTpl->assign('baseurl', $_SERVER['PHP_SELF']);
@@ -103,9 +103,9 @@
//navigation
$navigation = '';
$xoopsTpl->assign('cat_view', true);
- $xoopsTpl->assign('selectcat', tdmpicture_catselect($mytree, intval($ct)));
- $xoopsTpl->assign('selecttris', tdmpicture_trisselect(intval($ct), $tris));
- $xoopsTpl->assign('selectview', tdmpicture_viewselect(intval($ct), $limit));
+ //$xoopsTpl->assign('selectcat', tdmpicture_catselect($mytree, intval($ct)));
+ //$xoopsTpl->assign('selecttris', tdmpicture_trisselect(intval($ct), $tris));
+ //$xoopsTpl->assign('selectview', tdmpicture_viewselect(intval($ct), $limit));
$meta_title = $meta_keywords = $meta_description = $GLOBALS['cat_title'];
$xoopsTpl->assign('nav_bar', $GLOBALS['navbar']);
@@ -122,7 +122,7 @@
$criteria3->add(new Criteria('file_display', 1));
$criteria3->add(new Criteria('file_cat', $ct));
$criteria3->setStart($start);
- $criteria3->setLimit($limit);
+ $criteria3->setLimit($xoopsModuleConfig['tdmpicture_page']);
$criteria3->setSort($tris);
$criteria3->setOrder('DESC');
@@ -218,7 +218,7 @@
//navigation
if ( $numfile > $limit ) {
- $pagenav = new XoopsPageNav($numfile, $limit, $start, 'start', 'ct='.$ct.'&tris='.$tris.'&limit='.$limit);
+ $pagenav = new XoopsPageNav($numfile, $xoopsModuleConfig['tdmpicture_page'], $start, 'start', 'ct='.$ct.'&tris='.$tris.'&limit='.$limit);
$xoopsTpl->assign('nav_page', $pagenav->renderNav(2));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-09 17:19:37
|
Revision: 9827
http://xoops.svn.sourceforge.net/xoops/?rev=9827&view=rev
Author: lord_venom
Date: 2012-07-09 17:19:31 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
news design and purge
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php
XoopsModules/TDMPicture/trunk/TDMPicture/templates/blocks/tdmpicture_minitable.html
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php
XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-09 16:41:13 UTC (rev 9826)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-09 17:19:31 UTC (rev 9827)
@@ -54,8 +54,9 @@
float:left;
}
- ul#menu #text {
+ ul#menu #text, #text {
font-size: 13px;
+ font-weight: normal;
color: #728DA9;
text-shadow: 0 1px 0 white;
line-height: 20px;
@@ -338,9 +339,7 @@
}
.switch_title, .switch_title a {
- margin-top:10px;
- font-size: 1.3em;
- padding: 2px;
+
}
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php 2012-07-09 16:41:13 UTC (rev 9826)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php 2012-07-09 17:19:31 UTC (rev 9827)
@@ -42,7 +42,7 @@
define("TDMPICTURE_SOCIAL", $xoopsModuleConfig['tdmpicture_social']);
define("TDMPICTURE_PDF", $xoopsModuleConfig['tdmpicture_pdf']);
define("TDMPICTURE_DISPLAY_CAT", $xoopsModuleConfig['tdmpicture_cat_display']);
-define("TDMPICTURE_THUMB_DECO", $xoopsModuleConfig['tdmpicture_thumb_deco']);
+//define("TDMPICTURE_THUMB_DECO", $xoopsModuleConfig['tdmpicture_thumb_deco']);
define("TDMPICTURE_SLIDE_WIDTH", $xoopsModuleConfig['tdmpicture_slide_width']);
define("TDMPICTURE_SLIDE_HEIGHT", $xoopsModuleConfig['tdmpicture_slide_height']);
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php 2012-07-09 16:41:13 UTC (rev 9826)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php 2012-07-09 17:19:31 UTC (rev 9827)
@@ -76,7 +76,7 @@
define("_MI_TDMPICTURE_SOCIAL", "Show social bar?");
define("_MI_TDMPICTURE_RSS", "View RSS?");
define("_MI_TDMPICTURE_PDF", "Display PDF?");
-define("_MI_TDMPICTURE_THUMB_DECO", "Thumbnail: Decoration Image");
+//define("_MI_TDMPICTURE_THUMB_DECO", "Thumbnail: Decoration Image");
// New
define("_AM_TDMPICTURE_BLOCK_RANDS", "Random File");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php 2012-07-09 16:41:13 UTC (rev 9826)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php 2012-07-09 17:19:31 UTC (rev 9827)
@@ -75,7 +75,7 @@
define("_MI_TDMPICTURE_SOCIAL","Afficher social bar?");
define("_MI_TDMPICTURE_RSS","Afficher RSS?");
define("_MI_TDMPICTURE_PDF","Afficher PDF?");
-define("_MI_TDMPICTURE_THUMB_DECO","Miniature : Décoration de l'image");
+//define("_MI_TDMPICTURE_THUMB_DECO","Miniature : Décoration de l'image");
//version 1.5
define("_MI_TDMPICTURE_CAT_CEL","Affichage catégorie : Nombre de colonne");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php 2012-07-09 16:41:13 UTC (rev 9826)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php 2012-07-09 17:19:31 UTC (rev 9827)
@@ -75,7 +75,7 @@
define("_MI_TDMPICTURE_SOCIAL","Afficher social bar?");
define("_MI_TDMPICTURE_RSS","Afficher RSS?");
define("_MI_TDMPICTURE_PDF","Afficher PDF?");
-define("_MI_TDMPICTURE_THUMB_DECO","Miniature : Décoration de l'image");
+//define("_MI_TDMPICTURE_THUMB_DECO","Miniature : Décoration de l'image");
//version 1.5
define("_MI_TDMPICTURE_CAT_CEL","Affichage catégorie : Nombre de colonne");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/blocks/tdmpicture_minitable.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/blocks/tdmpicture_minitable.html 2012-07-09 16:41:13 UTC (rev 9826)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/blocks/tdmpicture_minitable.html 2012-07-09 17:19:31 UTC (rev 9827)
@@ -21,7 +21,6 @@
<{foreach item=blocks from=$block.blocks}>
<li>
<div class="switch_img">
- <span class="<{$smarty.const.TDMPICTURE_THUMB_DECO}>"></span>
<a href="<{$xoops_url}>/modules/TDMPicture/viewfile.php?st=<{$blocks.id}>"><img src="<{$blocks.img}>" title="<{$blocks.title}>" alt="<{$blocks.title}>" /></a>
</div>
@@ -41,7 +40,6 @@
<li>
<div class="switch_img">
- <span class="<{$smarty.const.TDMPICTURE_THUMB_DECO}>"></span>
<a href="<{$xoops_url}>/modules/TDMPicture/viewfile.php?st=<{$blocks.id}>"><img src="<{$blocks.img}>" title="<{$blocks.title}>" alt="<{$blocks.title}>" /></a>
</div>
@@ -121,7 +119,6 @@
<{foreach item=blocks from=$block.blocks}>
<li style="display: none; list-style-type: none; float:left;">
<div class="switch_img">
- <span class="<{$smarty.const.TDMPICTURE_THUMB_DECO}>"></span>
<a href="<{$xoops_url}>/modules/TDMPicture/viewfile.php?st=<{$blocks.id}>"><img src="<{$blocks.img}>" alt="<{$blocks.title}>" title="<{$blocks.title}>" /></a></li>
</div>
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html 2012-07-09 16:41:13 UTC (rev 9826)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html 2012-07-09 17:19:31 UTC (rev 9827)
@@ -9,7 +9,6 @@
<li>
<div class="switch_img">
-<span class="<{$smarty.const.TDMPICTURE_THUMB_DECO}>"></span>
<a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&tris=<{$tris}>"><img src="<{$file.img}>" slide="<{$file.img_popup}>" rel="group1" title="<{$file.title}>" alt="<{$file.title}>" /></a>
</div>
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-09 16:41:13 UTC (rev 9826)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-09 17:19:31 UTC (rev 9827)
@@ -21,15 +21,6 @@
<div style="margin-left:auto;margin-right:auto;">
-<div class="TDMNav">
-<form name="xd_select_header" style="text-align: right;" method="post" action="genre.php">
-<{$smarty.const._MD_TDMPICTURE_TRIBY}> <{$selecttris}>
-</form>
-
-<br />
-<span><{$nav}></span><span> > <{$nav_bar}></span><span> <{$selectcat}><{$catform.elements.pid.body}></span>
-
-</div>
<br style="clear: both;"/> <br />
<{$display_cat}>
<br /><br />
@@ -72,7 +63,7 @@
<ul id="display">
<li style="list-style: none;">
<div style="float:left; text-align:left;">
-<div class="switch_title"><{$file.title}>
+<div class="switch_title"><h2><{$file.title}></h2>
<br />
<span class="switch_date"><{$file.indate}></span>
-
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php 2012-07-09 16:41:13 UTC (rev 9826)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php 2012-07-09 17:19:31 UTC (rev 9827)
@@ -102,7 +102,7 @@
$navigation = '';
$xoopsTpl->assign('cat_view', true);
$xoopsTpl->assign('selectcat', tdmpicture_catselect($mytree, intval($ct)));
- $xoopsTpl->assign('selecttris', tdmpicture_trisselect(intval($ct), $tris));
+ //$xoopsTpl->assign('selecttris', tdmpicture_trisselect(intval($ct), $tris));
$xoopsTpl->assign('selectview', tdmpicture_viewselect(intval($ct), $limit));
$meta_title = $meta_keywords = $meta_description = $GLOBALS['cat_title'];
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-07-09 16:41:13 UTC (rev 9826)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-07-09 17:19:31 UTC (rev 9827)
@@ -263,14 +263,14 @@
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 75;
$i++;
-$modversion['config'][$i]['name'] = 'tdmpicture_thumb_deco';
-$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_THUMB_DECO';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'select';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = 'paper-clip';
-$modversion['config'][$i]['options'] = array('paper-clip' => 'paper-clip', 'tape' => 'tape', 'pin' => 'pin', 'None' => 'None');
-$i++;
+//$modversion['config'][$i]['name'] = 'tdmpicture_thumb_deco';
+//$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_THUMB_DECO';
+//$modversion['config'][$i]['description'] = '';
+//$modversion['config'][$i]['formtype'] = 'select';
+//$modversion['config'][$i]['valuetype'] = 'text';
+//$modversion['config'][$i]['default'] = 'paper-clip';
+//$modversion['config'][$i]['options'] = array('paper-clip' => 'paper-clip', 'tape' => 'tape', 'pin' => 'pin', 'None' => 'None');
+//$i++;
$modversion['config'][$i]['name'] = 'tdmpicture_slide_width';
$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_SLIDE_WIDTH';
$modversion['config'][$i]['description'] = '';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-09 20:16:20
|
Revision: 9830
http://xoops.svn.sourceforge.net/xoops/?rev=9830&view=rev
Author: lord_venom
Date: 2012-07-09 20:16:12 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
bug pdf
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-09 19:34:57 UTC (rev 9829)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-09 20:16:12 UTC (rev 9830)
@@ -54,7 +54,7 @@
float:left;
}
- ul#menu #text, #text {
+ #text, ul#menu #text {
font-size: 13px;
font-weight: normal;
color: #728DA9;
@@ -62,7 +62,7 @@
line-height: 20px;
}
- ul#menu #num{
+ #num, ul#menu #num{
text-align: center;
font-size: 11px;
color: #25587C;
@@ -70,7 +70,7 @@
}
- ul#menu #form{
+ ul#menu #form, #form{
float:right;
padding-top:100px;
padding-right:20px;
@@ -288,45 +288,7 @@
border-left: 1px solid #333;
}
-/* style pour l agraphe. */
-.switch_img .paper-clip {
- width: 30px;
- height: 60px;
- display: block;
- position: absolute;
- top: -5px;
- left: -2px;
- background: url(../images/paper-clip.png) no-repeat;
- z-index:1;
-}
-/* style pour le scotch regler left pour centrer */
-.switch_img .tape {
- width: 77px;
- height: 27px;
- display: block;
- position: absolute;
- top: -12px;
- left: 50%;
- background: url(../images/tape.png) no-repeat;
- z-index:1;
-}
-
-
-/* style pour la punaise regler left pour centrer */
-.switch_img .pin{
- width: 28px;
- height: 21px;
- display: block;
- position: absolute;
- top: -12px;
- left: 50%;
- background: url(../images/pin.png) no-repeat;
- z-index:1;
-}
-
-
-
.switch_switch {
float: left;
text-align:center;
@@ -339,8 +301,7 @@
}
.switch_title, .switch_title a {
- margin-top:10px;
- font-size: 1.3em;
+ margin-top:10px;
padding: 2px;
}
@@ -356,8 +317,6 @@
.switch_in {
margin-top: 10px;
padding: 2px;
- color:#848485;
- font-size: 0.6em;
text-transform: uppercase;
}
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-09 19:34:57 UTC (rev 9829)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-09 20:16:12 UTC (rev 9830)
@@ -64,11 +64,7 @@
<li style="list-style: none;">
<div style="float:left; text-align:left;">
<div class="switch_title"><h2><{$file.title}></h2>
-<br />
- <span class="switch_date"><{$file.indate}></span>
- -
- <span class="switch_in"><{$smarty.const._MD_TDMPICTURE_BY}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.uid}>"/><{$file.postername}></a>, <{$smarty.const._MD_TDMPICTURE_IN}>:<a href="<{$smarty.const.TDMPICTURE_URL}>/viewcat.php?ct=<{$file.file_cat_id}>"/><{$file.cat}></a></span>
-
+ <span id="num" class="switch_in"><{$smarty.const._MD_TDMPICTURE_BY}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.uid}>"/><{$file.postername}></a>, <{$smarty.const._MD_TDMPICTURE_IN}>: <{$file.indate}></span>
</div>
</div>
@@ -114,9 +110,9 @@
<{if $smarty.const.TDMPICTURE_PDF}>
<tr><td>
<div style="float: left;">
-<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper?option=auto&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_mini.png" title="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" /></a> <a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper?option=A4&st=<{$file.id}>" title="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A4.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" /></a>
-<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper?option=A3&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A3.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" /></a> <a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper?option=A2&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A2.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" /></a>
-<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper?option=A1&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A1.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA1}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA1}>" /></a>
+<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=auto&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_mini.png" title="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" /></a> <a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper?option=A4&st=<{$file.id}>" title="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A4.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" /></a>
+<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A3&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A3.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" /></a> <a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper?option=A2&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A2.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" /></a>
+<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A1&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A1.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA1}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA1}>" /></a>
</div>
</li></ul>
</td></tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-09 20:21:35
|
Revision: 9831
http://xoops.svn.sourceforge.net/xoops/?rev=9831&view=rev
Author: lord_venom
Date: 2012-07-09 20:21:11 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
bug pdf_paper.php
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/pdf_paper.php
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/pdf_paper.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/pdf_paper.php 2012-07-09 20:16:12 UTC (rev 9830)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/pdf_paper.php 2012-07-09 20:21:11 UTC (rev 9831)
@@ -214,7 +214,7 @@
$file_handler =& xoops_getModuleHandler('tdmpicture_file', 'TDMPicture');
$cat_handler =& xoops_getModuleHandler('tdmpicture_cat', 'TDMPicture');
-$file =& $file_handler->get($_REQUEST['ST']);
+$file =& $file_handler->get($_REQUEST['st']);
$newsletter_text = utf8_decode(Chars($file->getVar('file_text')));
$newsletter_indate = formatTimeStamp($file->getVar("file_indate"),"m");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-09 20:16:12 UTC (rev 9830)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-09 20:21:11 UTC (rev 9831)
@@ -110,8 +110,10 @@
<{if $smarty.const.TDMPICTURE_PDF}>
<tr><td>
<div style="float: left;">
-<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=auto&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_mini.png" title="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" /></a> <a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper?option=A4&st=<{$file.id}>" title="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A4.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" /></a>
-<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A3&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A3.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" /></a> <a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper?option=A2&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A2.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" /></a>
+<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=auto&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_mini.png" title="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" /></a>
+<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A4&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A4.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" /></a>
+<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A3&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A3.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" /></a>
+<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A2&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A2.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" /></a>
<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A1&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A1.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA1}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA1}>" /></a>
</div>
</li></ul>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-09 22:13:18
|
Revision: 9833
http://xoops.svn.sourceforge.net/xoops/?rev=9833&view=rev
Author: lord_venom
Date: 2012-07-09 22:13:12 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
new design
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-09 21:37:55 UTC (rev 9832)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-09 22:13:12 UTC (rev 9833)
@@ -62,13 +62,17 @@
line-height: 20px;
}
- #num, ul#menu #num{
+ #num, #num a, ul#menu #num{
text-align: center;
+ font-weight: normal;
font-size: 11px;
color: #25587C;
text-shadow: 0 1px 0 white;
}
+ #num a{
+ font-weight: bold;
+ }
ul#menu #form, #form{
float:right;
@@ -337,9 +341,7 @@
text-align: center;
margin: 10px;
padding: 10px;
- font-size: 0.9em;
border: 1px solid #DDD;
- color:#848485;
text-transform: uppercase;
float:right;
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php 2012-07-09 21:37:55 UTC (rev 9832)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php 2012-07-09 22:13:12 UTC (rev 9833)
@@ -39,7 +39,7 @@
define("_MD_TDMPICTURE_CAT","Catégorie");
define("_MD_TDMPICTURE_TYPE","Type");
define("_MD_TDMPICTURE_SIZE","Poids");
-define("_MD_TDMPICTURE_WIDTH","Largeur*Hauteur");
+//define("_MD_TDMPICTURE_WIDTH","Largeur*Hauteur");
define("_MD_TDMPICTURE_MORE","En savoir plus");
define("_MD_TDMPICTURE_SCREEN","Taille réel");
@@ -134,8 +134,8 @@
define("_MD_TDMPICTURE_URL","URL du fichier");
//define("_MD_TDMPICTURE_TYPE","Type");
//define("_MD_TDMPICTURE_SIZE","Taille en (octet)");
-//define("_MD_TDMPICTURE_WIDTH","Largeur");
-define("_AM_TDMPICTURE_HEIGHT","Hauteur");
+define("_MD_TDMPICTURE_WIDTH","Largeur");
+define("_MD_TDMPICTURE_HEIGHT","Hauteur");
//define("_AM_TDMPICTURE_EDITOR","Editeur");
//define("_AM_TDMPICTURE_EDITORURL","URL Editeur");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-09 21:37:55 UTC (rev 9832)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-09 22:13:12 UTC (rev 9833)
@@ -42,24 +42,13 @@
<table class="tdmp_table"><tr>
<th align="center"><span class="switch_title"><{$file.title}></span> <span class="switch_fav"><{$file.favourite}></span></th></tr>
-<tr><td align="center">
+<tr><td class="even" align="center">
<div class="boxgrid">
<{$file.img}>
- <div class="cover boxcaption">
- <p style="color: #FFF;"><{$smarty.const._MD_TDMPICTURE_MORE}></p>
-
- <div class="detail_info">
-<{$smarty.const._MD_TDMPICTURE_TYPE}>: <{$file.type}><br />
-<{$smarty.const._MD_TDMPICTURE_SIZE}>: <{$file.size}><br />
-<{$smarty.const._MD_TDMPICTURE_WIDTH}>: <{$file.with}>*<{$file.height}></a>
-<br/>
- </div>
-
+ </div>
-</div></div>
-
-</td></tr><tr><td>
+</td></tr><tr><td class="odd">
<ul id="display">
<li style="list-style: none;">
<div style="float:left; text-align:left;">
@@ -68,16 +57,12 @@
</div>
</div>
-<br class="clear"/>
-<{if $file.text}>
-<div class="switch_desc"><b><{$smarty.const._MD_TDMPICTURE_DESC}></b><br /><{$file.text}><br class="clear"/><br /></div>
-<{/if}>
-<div class="switch_info">
+<div id="num" class="switch_info">
<{$file.comments}><hr /><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&<{$file.cat_nav}>&tris=<{$tris}>"><{$smarty.const._MD_TDMPICTURE_COMMENT}></a>
</div>
-<div class="switch_info">
+<div id="num" class="switch_info">
<{$file.counts}>/<{$file.votes}><hr /><{$smarty.const._MD_TDMPICTURE_VOTE}>
<{if $perm_vote}>
<br />
@@ -86,14 +71,35 @@
<{/if}>
</div>
-<div class="switch_info"><{$file.hits}><hr /><{$smarty.const._MD_TDMPICTURE_HITS}></div>
+<br class="clear"/>
+<{if $file.text}>
+<div class="switch_desc"><b><{$smarty.const._MD_TDMPICTURE_DESC}></b><br /><{$file.text}><br class="clear"/><br /></div>
+<{/if}>
+
+
+<!-- tableau masquer -->
+<div style="text-align:right"><a href="javascript:;" onclick="javascript:masque('2')" ><{$smarty.const._MD_TDMPICTURE_MORE}></a><{if $file.menu}> | <a href="javascript:;" onclick="javascript:masque('3')" ><{$smarty.const._MD_TDMPICTURE_ADMIN}></a><{/if}></div>
+<table cellpadding="0" id="masque_2" cellspacing="0" style="display: none; margin:5px;"><tr><td>
+
+<div id="num" class="switch_info"><{$file.hits}><hr /><{$smarty.const._MD_TDMPICTURE_HITS}></div>
-<div class="switch_info"><{$file.dl}><hr /><{$smarty.const._MD_TDMPICTURE_DL}></div>
+<div id="num" class="switch_info"><{$file.dl}><hr /><{$smarty.const._MD_TDMPICTURE_DL}></div>
+<div id="num" class="switch_info"><{$file.type}><hr /><{$smarty.const._MD_TDMPICTURE_TYPE}></div>
+<div id="num" class="switch_info"><{$file.size}><hr /><{$smarty.const._MD_TDMPICTURE_SIZE}></div>
+
+<div id="num" class="switch_info"><{$file.height}><hr /><{$smarty.const._MD_TDMPICTURE_HEIGHT}></div>
+
+<div id="num" class="switch_info"><{$file.with}><hr /><{$smarty.const._MD_TDMPICTURE_WIDTH}></div>
+
+</td></tr></table>
+
+<!--end-->
+
<{if $file.menu}>
<br class="clear"/>
-<div class="switch_info" style="float:right;">
+<div id="masque_3" class="switch_info" style="display: none; margin:5px; float:right;">
<div align="center">
<{if $file.edit}>
<a href="<{$smarty.const.TDMPICTURE_URL}>/modfile.php?op=edit&file_id=<{$file.id}>"><img src="<{xoModuleIcons16 edit.png}>"></a>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-10 10:04:43
|
Revision: 9840
http://xoops.svn.sourceforge.net/xoops/?rev=9840&view=rev
Author: lord_venom
Date: 2012-07-10 10:04:33 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
new style and bug screen
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
XoopsModules/TDMPicture/trunk/TDMPicture/images/colorbox/controls.png
XoopsModules/TDMPicture/trunk/TDMPicture/images/colorbox/loading.gif
XoopsModules/TDMPicture/trunk/TDMPicture/language/english/main.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
Removed Paths:
-------------
XoopsModules/TDMPicture/trunk/TDMPicture/images/colorbox/border.png
XoopsModules/TDMPicture/trunk/TDMPicture/images/colorbox/internet_explorer/
XoopsModules/TDMPicture/trunk/TDMPicture/js/themes/
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-10 08:21:40 UTC (rev 9839)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-10 10:04:33 UTC (rev 9840)
@@ -266,14 +266,15 @@
list-style: none;
margin: 10px;
left:0;
- border: 1px solid #ccc;
- background: #fff;
- -moz-border-radius: 4px; -webkit-border-radius: 4px;
}
ul.display li .content_block {
list-style-type: none;
+
}
+.display li {
+border-bottom: 1px solid #F4F4F4;
+}
.switch_img{
@@ -286,10 +287,9 @@
margin-right: 10px;
margin-bottom:10px;
text-align:center;
- border-top: 1px solid #111;
- border-right: 1px solid #111;
- border-bottom: 1px solid #333;
- border-left: 1px solid #333;
+ border: 1px solid #FFF;
+ -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
}
@@ -298,6 +298,7 @@
text-align:center;
margin-left: auto;
margin-right: auto;
+
}
a.switch_thumb {
@@ -306,7 +307,7 @@
.switch_title, .switch_title a {
margin-top:10px;
- padding: 2px;
+
}
@@ -368,7 +369,7 @@
}
.switch_fav {
- padding-left: 10px;
+ padding: 10px;
margin: 0;
}
@@ -418,7 +419,11 @@
margin: 10px;
}
+.thumb_view li {
+border:none;
+}
+
/* + -----------------------------------------------------
DETAIL
+ ----------------------------------------------------- */
@@ -428,10 +433,9 @@
background: #fff;
margin: 0 15px 0 0;
text-align:center;
- border-top: 1px solid #111;
- border-right: 1px solid #111;
- border-bottom: 1px solid #333;
- border-left: 1px solid #333;
+ border: 1px solid #FFF;
+ -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
}
.detail_info {
@@ -469,8 +473,7 @@
+ ----------------------------------------------------- */
.boxgrid {
- overflow: hidden;
- position: relative;
+
}
@@ -497,8 +500,6 @@
display: block;
float: right;
text-align:right;
-margin-top: 0pt;
-margin-right: 10px;
background-color: #e9e9e9;
border: 1px solid #cccccc;
text-decoration: none;
@@ -716,65 +717,45 @@
/*
- ColorBox Core Style
- The following rules are the styles that are consistant between themes.
- Avoid changing this area to maintain compatability with future versions of ColorBox.
+ ColorBox Core Style:
+ The following CSS is consistent between example themes and should not be altered.
*/
#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
#cboxOverlay{position:fixed; width:100%; height:100%;}
#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
-#cboxContent{position:relative; overflow:hidden;}
+#cboxContent{position:relative;}
#cboxLoadedContent{overflow:auto;}
-#cboxLoadedContent iframe{display:block; width:100%; height:100%; border:0;}
#cboxTitle{margin:0;}
-#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%;}
+#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
+.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none;}
+.cboxIframe{width:100%; height:100%; display:block; border:0;}
+#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box;}
/*
- Example user style
- The following rules are ordered and tabbed in a way that represents the
- order/nesting of the generated HTML, so that the structure easier to understand.
+ User Style:
+ Change the following styles to modify the appearance of ColorBox. They are
+ ordered & tabbed in a way that represents the nesting of the generated HTML.
*/
-#cboxOverlay{background:url(../images/colorbox/overlay.png) repeat 0 0;}
+#cboxOverlay{background:#fff;}
#colorbox{}
- #cboxTopLeft{width:21px; height:21px; background:url(../images/colorbox/controls.png) no-repeat -100px 0;}
- #cboxTopRight{width:21px; height:21px; background:url(../images/colorbox/controls.png) no-repeat -129px 0;}
- #cboxBottomLeft{width:21px; height:21px; background:url(../images/colorbox/controls.png) no-repeat -100px -29px;}
- #cboxBottomRight{width:21px; height:21px; background:url(../images/colorbox/controls.png) no-repeat -129px -29px;}
- #cboxMiddleLeft{width:21px; background:url(../images/colorbox/controls.png) left top repeat-y;}
- #cboxMiddleRight{width:21px; background:url(../images/colorbox/controls.png) right top repeat-y;}
- #cboxTopCenter{height:21px; background:url(../images/colorbox/border.png) 0 0 repeat-x;}
- #cboxBottomCenter{height:21px; background:url(../images/colorbox/border.png) 0 -29px repeat-x;}
- #cboxContent{background:#fff;}
- #cboxLoadedContent{margin-bottom:28px;}
- #cboxTitle{position:absolute; bottom:4px; left:0; text-align:center; width:100%; color:#949494;}
- #cboxCurrent{position:absolute; bottom:4px; left:58px; color:#949494;}
- #cboxSlideshow{position:absolute; bottom:4px; right:30px; color:#0092ef;}
- #cboxPrevious{position:absolute; bottom:0; left:0px; background:url(../images/colorbox/controls.png) no-repeat -75px 0px; width:25px; height:25px; text-indent:-9999px;}
- #cboxPrevious.hover{background-position:-75px -25px;}
- #cboxNext{position:absolute; bottom:0; left:27px; background:url(../images/colorbox/controls.png) no-repeat -50px 0px; width:25px; height:25px; text-indent:-9999px;}
- #cboxNext.hover{background-position:-50px -25px;}
- #cboxLoadingOverlay{background:url(../images/colorbox/loading_background.png) no-repeat center center;}
+ #cboxContent{margin-top:32px; overflow:visible;}
+ .cboxIframe{background:#fff;}
+ #cboxError{padding:50px; border:1px solid #ccc;}
+ #cboxLoadedContent{background:#000; padding:1px;}
#cboxLoadingGraphic{background:url(../images/colorbox/loading.gif) no-repeat center center;}
- #cboxClose{position:absolute; bottom:0; right:0; background:url(../images/colorbox/controls.png) no-repeat -25px 0px; width:25px; height:25px; text-indent:-9999px;}
- #cboxClose.hover{background-position:-25px -25px;}
-
-/*
- The following fixes png-transparency for IE6.
- It is also necessary for png-transparency in IE7 & IE8 to avoid 'black halos' with the fade transition
-
- Since this method does not support CSS background-positioning, it is incompatible with CSS sprites.
- Colorbox preloads navigation hover classes to account for this.
-
- !! Important Note: AlphaImageLoader src paths are relative to the HTML document,
- while regular CSS background images are relative to the CSS document.
-*/
-.cboxIE #cboxTopLeft{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderTopLeft.png, sizingMethod='scale');}
-.cboxIE #cboxTopCenter{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderTopCenter.png, sizingMethod='scale');}
-.cboxIE #cboxTopRight{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderTopRight.png, sizingMethod='scale');}
-.cboxIE #cboxBottomLeft{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderBottomLeft.png, sizingMethod='scale');}
-.cboxIE #cboxBottomCenter{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderBottomCenter.png, sizingMethod='scale');}
-.cboxIE #cboxBottomRight{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderBottomRight.png, sizingMethod='scale');}
-.cboxIE #cboxMiddleLeft{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderMiddleLeft.png, sizingMethod='scale');}
-.cboxIE #cboxMiddleRight{background:transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src=images/internet_explorer/borderMiddleRight.png, sizingMethod='scale');}
-
+ #cboxLoadingOverlay{background:#000;}
+ #cboxTitle{position:absolute; top:-22px; left:0; color:#000;}
+ #cboxCurrent{position:absolute; top:-22px; right:205px; text-indent:-9999px;}
+ #cboxSlideshow, #cboxPrevious, #cboxNext, #cboxClose{text-indent:-9999px; width:20px; height:20px; position:absolute; top:-20px; background:url(../images/colorbox/controls.png) no-repeat 0 0;}
+ #cboxPrevious{background-position:0px 0px; right:44px;}
+ #cboxPrevious:hover{background-position:0px -25px;}
+ #cboxNext{background-position:-25px 0px; right:22px;}
+ #cboxNext:hover{background-position:-25px -25px;}
+ #cboxClose{background-position:-50px 0px; right:0;}
+ #cboxClose:hover{background-position:-50px -25px;}
+ .cboxSlideshow_on #cboxPrevious, .cboxSlideshow_off #cboxPrevious{right:66px;}
+ .cboxSlideshow_on #cboxSlideshow{background-position:-75px -25px; right:44px;}
+ .cboxSlideshow_on #cboxSlideshow:hover{background-position:-100px -25px;}
+ .cboxSlideshow_off #cboxSlideshow{background-position:-100px 0px; right:44px;}
+ .cboxSlideshow_off #cboxSlideshow:hover{background-position:-75px -25px;}
\ No newline at end of file
Deleted: XoopsModules/TDMPicture/trunk/TDMPicture/images/colorbox/border.png
===================================================================
(Binary files differ)
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/images/colorbox/controls.png
===================================================================
(Binary files differ)
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/images/colorbox/loading.gif
===================================================================
(Binary files differ)
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/english/main.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/english/main.php 2012-07-10 08:21:40 UTC (rev 9839)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/english/main.php 2012-07-10 10:04:33 UTC (rev 9840)
@@ -36,7 +36,7 @@
define( "_MD_TDMPICTURE_CAT", "Category");
define( "_MD_TDMPICTURE_TYPE", "type");
define( "_MD_TDMPICTURE_SIZE", "File Size");
-define( "_MD_TDMPICTURE_WIDTH", "Dimensions");
+//define( "_MD_TDMPICTURE_WIDTH", "Dimensions");
define( "_MD_TDMPICTURE_MORE", "About");
define( "_MD_TDMPICTURE_SCREEN", "Full Screen");
@@ -48,7 +48,7 @@
define( "_MD_TDMPICTURE_DESC", "Presentation");
define( "_MD_TDMPICTURE_VOTEADD", "Add one vote");
define( "_MD_TDMPICTURE_VOTEREMOVE", "Remove a vote");
-define( "_MD_TDMPICTURE_IN", "the");
+define( "_MD_TDMPICTURE_LE", "the");
define( "_MD_TDMPICTURE_NONEALBUM", "No album seems to be registered");
define( "_MD_TDMPICTURE_NONEARTISTE", "No artist appears to be saved");
define( "_MD_TDMPICTURE_NONEGENRE", "No genre seems to be registered");
@@ -127,7 +127,7 @@
define( "_MD_TDMPICTURE_URL", "URL file");
//define( "_MD_TDMPICTURE_TYPE", "Type");
//define( "_MD_TDMPICTURE_SIZE", "Size (in byte)");
-//define( "_MD_TDMPICTURE_WIDTH", "Width");
+define( "_MD_TDMPICTURE_WIDTH", "Width");
define( "_MD_TDMPICTURE_HEIGHT", "Height");
//
//define( "_MD_TDMPICTURE_EDITOR", "Publisher");
@@ -158,7 +158,7 @@
// Version 1.5
define("_MD_TDMPICTURE_MULTIUPLOAD", "You can load %s file(s).");
define("_MD_TDMPICTURE_BY", "By");
-//define("_MD_TDMPICTURE_IN", "In");
+define("_MD_TDMPICTURE_IN", "In");
//define("_MD_TDMPICTURE_FOR", "To");
//define("_MD_TDMPICTURE_ANTI", "Counter");
define('_MD_TDMPICTURE_PERM_2', 'Permissions to display');
@@ -167,3 +167,4 @@
define("_MD_TDMPICTURE_NBFILE","# of Pictures");
define("_MD_TDMPICTURE_MEGABYTES"," MB");
define("_MD_TDMPICTURE_KILOBYTES"," KB");
+define("_MD_TDMPICTURE_ADMIN"," Admin");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php 2012-07-10 08:21:40 UTC (rev 9839)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php 2012-07-10 10:04:33 UTC (rev 9840)
@@ -61,8 +61,8 @@
define("_AM_TDMPICTURE_SELECT_SLIDE", "Slideshow");
// version 1.3
-define("_MI_TDMPICTURE_FULL_WIDTH", "Maximum width of the image true");
-define("_MI_TDMPICTURE_FULL_HEIGTH", "Maximum height of the real image");
+//define("_MI_TDMPICTURE_FULL_WIDTH", "Maximum width of the image true");
+//define("_MI_TDMPICTURE_FULL_HEIGTH", "Maximum height of the real image");
define("_MI_TDMPICTURE_JAVA_WIDTH", "Width of java applet (upload)");
define("_MI_TDMPICTURE_JAVA_HEIGTH", "Height of java applet (upload)");
define("_MI_TDMPICTURE_CAT_CEL", "Category: Number of Column");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php 2012-07-10 08:21:40 UTC (rev 9839)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php 2012-07-10 10:04:33 UTC (rev 9840)
@@ -51,7 +51,7 @@
define("_MD_TDMPICTURE_DESC","Présentation:");
define("_MD_TDMPICTURE_VOTEADD","Ajouter un vote");
define("_MD_TDMPICTURE_VOTEREMOVE","Enlever un vote");
-define("_MD_TDMPICTURE_IN","le");
+define("_MD_TDMPICTURE_LE","le");
define( "_MD_TDMPICTURE_NONEALBUM", "Aucun album ne semble être enregistré");
define( "_MD_TDMPICTURE_NONEARTISTE", "Aucun artiste ne semble être enregistré");
@@ -167,7 +167,7 @@
//version 1.5
define("_MD_TDMPICTURE_MULTIUPLOAD","Vous pouvez charger %s fichier(s).");
define("_MD_TDMPICTURE_BY","Par");
-//define("_MD_TDMPICTURE_IN","Dans");
+define("_MD_TDMPICTURE_IN","Dans");
//define("_MD_TDMPICTURE_FOR","Pour");
//define("_MD_TDMPICTURE_ANTI","Contre");
define('_MD_TDMPICTURE_PERM_2','Permissions d\'afficher');
@@ -178,3 +178,4 @@
define("_MD_TDMPICTURE_NBFILE","# of Pictures");
define("_MD_TDMPICTURE_MEGABYTES"," Mo");
define("_MD_TDMPICTURE_KILOBYTES"," Ko");
+define("_MD_TDMPICTURE_ADMIN"," Admin");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php 2012-07-10 08:21:40 UTC (rev 9839)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php 2012-07-10 10:04:33 UTC (rev 9840)
@@ -60,8 +60,8 @@
define("_AM_TDMPICTURE_SELECT_IMAGE_DESC","Image / Info");
define("_AM_TDMPICTURE_SELECT_SLIDE","Animé");
//version 1.3
-define("_MI_TDMPICTURE_FULL_WIDTH","Largeur maximum de l'image réel");
-define("_MI_TDMPICTURE_FULL_HEIGTH","Hauteur maximum de l'image réel");
+//define("_MI_TDMPICTURE_FULL_WIDTH","Largeur maximum de l'image réel");
+//define("_MI_TDMPICTURE_FULL_HEIGTH","Hauteur maximum de l'image réel");
define("_MI_TDMPICTURE_JAVA_WIDTH","Largeur de l'applet java (upload)");
define("_MI_TDMPICTURE_JAVA_HEIGTH","Hauteur de l'applet java (upload)");
//define("_MI_TDMPICTURE_CAT_CEL","Catégorie : Nombre de colonne");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html 2012-07-10 08:21:40 UTC (rev 9839)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html 2012-07-10 10:04:33 UTC (rev 9840)
@@ -1,6 +1,6 @@
-<table class="tdmp_table"><tr>
-<td>
+<table class="outer"><tr>
+<td class="even">
<{if $numfile != 0}>
<ul id="display" class="<{$display}>">
<{foreach item=file from=$file}>
@@ -15,11 +15,13 @@
<div style="float:left; text-align:left;">
<div class="switch_title">
- <a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&<{$file.cat_nav}>&tris=<{$tris}>"><{$file.title}></a><span class="switch_fav"><{$file.favourite}></span>
+ <h2><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&<{$file.cat_nav}>&tris=<{$tris}>"><{$file.title}></a></h2><span class="switch_fav"><{$file.favourite}></span>
<br />
- <span class="switch_date"><{$file.indate}></span>
- -
- <span class="switch_in"><{$smarty.const._MD_TDMPICTURE_BY}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.uid}>"/><{$file.postername}></a>, <{$smarty.const._MD_TDMPICTURE_IN}>:<a href="<{$smarty.const.TDMPICTURE_URL}>/viewcat.php?ct=<{$file.file_cat_id}>"/><{$file.file_cat}></a></span>
+ <span id="num" class="switch_in">
+ <{$smarty.const._MD_TDMPICTURE_BY}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.uid}>"/><{$file.postername}></a>,
+ <{$smarty.const._MD_TDMPICTURE_IN}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/viewcat.php?ct=<{$file.file_cat_id}>"/><{$file.file_cat}></a>,
+ <{$smarty.const._MD_TDMPICTURE_LE}>: <{$file.indate}>
+ </span>
</div>
@@ -28,11 +30,11 @@
<div class="switch_desc"><{$file.text}><br class="clear"/></div>
-<div class="switch_info">
+<div id="num" class="switch_info">
<{$file.comments}><hr /><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&<{$file.cat_nav}>&tris=<{$tris}>"><{$smarty.const._MD_TDMPICTURE_COMMENT}></a>
</div>
-<div class="switch_info">
+<div id="num" class="switch_info">
<{$file.counts}>/<{$file.votes}><hr /><{$smarty.const._MD_TDMPICTURE_VOTE}>
<{if $perm_vote}>
<br />
@@ -40,22 +42,10 @@
<a href="javascript:;" onclick="RemoveVote(<{$file.id}>);return false;" title="<{$smarty.const._MD_TDMPICTURE_VOTEREMOVE}>">-</a>
<{/if}>
</div>
-
-<{if $file.menu}>
<br class="clear"/>
-<div class="switch_info">
-<div align="center">
-<{if $file.edit}>
-<a href="<{$smarty.const.TDMPICTURE_URL}>/modfile.php?op=edit&file_id=<{$file.id}>"><img src="<{xoModuleIcons16 edit.png}>"></a>
-<a href="<{$smarty.const.TDMPICTURE_URL}>/modfile.php?op=edit_img&file_id=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/picture_edit.png"></a>
-<{/if}>
-<{if $file.del}>
-<a href="<{$smarty.const.TDMPICTURE_URL}>/modfile.php?op=delete&file_id=<{$file.id}>"><img src="<{xoModuleIcons16 delete.png}>"></a>
-<{/if}>
-</div>
-</div>
-<{/if}>
+<div class="switch_title" style="text-align:right"><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&tris=<{$tris}>"><{$smarty.const._MD_TDMPICTURE_MORE}></a><{if $file.menu}></div><{/if}>
+
</li>
<{/foreach}>
</ul>
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-10 08:21:40 UTC (rev 9839)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-10 10:04:33 UTC (rev 9840)
@@ -2,18 +2,14 @@
var $tdmpicture = jQuery.noConflict();
$tdmpicture(document).ready(function(){
+
+ $tdmpicture("a[rel='group1']").colorbox({
+ rel:"group1",
+ maxWidth:"<{$smarty.const.TDMPICTURE_SLIDE_WIDTH}>px",
+ maxHeight:"<{$smarty.const.TDMPICTURE_SLIDE_HEIGHT}>px"
+ });
- $tdmpicture("a[rel='group1']").colorbox({});
-
- $tdmpicture('.boxgrid').hover(function() {
- $tdmpicture(".cover", this).stop().animate({bottom:'0px'},{queue:false,duration:160});
- }, function() {
- $tdmpicture(".cover", this).stop().animate({bottom:'-120px'},{queue:false,duration:160});
- });
-
-
-
});
</script>
@@ -40,24 +36,30 @@
<br class="clear"/>
-<table class="tdmp_table"><tr>
-<th align="center"><span class="switch_title"><{$file.title}></span> <span class="switch_fav"><{$file.favourite}></span></th></tr>
+<table><tr>
+<th align="center"><span class="switch_title"><h2><{$file.title}></h2></span></th></tr>
<tr><td class="even" align="center">
<div class="boxgrid">
- <{$file.img}>
- </div>
+ <a href="javascript:;" slide="<{$file.img_popup}>" rel="group1" title="<{$file.title}>" alt="<{$file.title}>" ><{$file.img}>
+ </a></div>
</td></tr><tr><td class="odd">
<ul id="display">
<li style="list-style: none;">
<div style="float:left; text-align:left;">
<div class="switch_title"><h2><{$file.title}></h2>
- <span id="num" class="switch_in"><{$smarty.const._MD_TDMPICTURE_BY}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.uid}>"/><{$file.postername}></a>, <{$smarty.const._MD_TDMPICTURE_IN}>: <{$file.indate}></span>
- </div>
+ <span id="num" class="switch_in">
+ <{$smarty.const._MD_TDMPICTURE_BY}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.uid}>"/><{$file.postername}></a>,
+ <{$smarty.const._MD_TDMPICTURE_IN}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/viewcat.php?ct=<{$file.file_cat_id}>"/><{$file.cat}></a>,
+ <{$smarty.const._MD_TDMPICTURE_LE}>: <{$file.indate}></span>
+
+ <span id="num" class="switch_fav"><{$file.favourite}></span></div>
</div>
+
+
<div id="num" class="switch_info">
<{$file.comments}><hr /><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&<{$file.cat_nav}>&tris=<{$tris}>"><{$smarty.const._MD_TDMPICTURE_COMMENT}></a>
</div>
@@ -76,7 +78,7 @@
<div class="switch_desc"><b><{$smarty.const._MD_TDMPICTURE_DESC}></b><br /><{$file.text}><br class="clear"/><br /></div>
<{/if}>
-
+<br class="clear"/>
<!-- tableau masquer -->
<div style="text-align:right"><a href="javascript:;" onclick="javascript:masque('2')" ><{$smarty.const._MD_TDMPICTURE_MORE}></a><{if $file.menu}> | <a href="javascript:;" onclick="javascript:masque('3')" ><{$smarty.const._MD_TDMPICTURE_ADMIN}></a><{/if}></div>
<table cellpadding="0" id="masque_2" cellspacing="0" style="display: none; margin:5px;"><tr><td>
@@ -114,7 +116,7 @@
<{/foreach}>
</td></tr>
<{if $smarty.const.TDMPICTURE_PDF}>
-<tr><td>
+<tr><td class="odd">
<div style="float: left;">
<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=auto&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_mini.png" title="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" /></a>
<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A4&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A4.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" /></a>
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-07-10 08:21:40 UTC (rev 9839)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-07-10 10:04:33 UTC (rev 9840)
@@ -206,20 +206,6 @@
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = '10';
$i++;
-$modversion['config'][$i]['name'] = 'tdmpicture_full_width';
-$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_FULL_WIDTH';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 800;
-$i++;
-$modversion['config'][$i]['name'] = 'tdmpicture_full_heigth';
-$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_FULL_HEIGTH';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 800;
-$i++;
$modversion['config'][$i]['name'] = 'tdmpicture_width';
$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_WIDTH';
$modversion['config'][$i]['description'] = '';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-10 10:25:33
|
Revision: 9841
http://xoops.svn.sourceforge.net/xoops/?rev=9841&view=rev
Author: lord_venom
Date: 2012-07-10 10:25:24 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
rename css
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-10 10:04:33 UTC (rev 9840)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-10 10:25:24 UTC (rev 9841)
@@ -95,7 +95,7 @@
$GLOBALS['cat_title'] = $this->_tree[$key]['obj']->getVar('cat_title');
$select = $this->makeSelBox('cat_pid', 'cat_title','-', $selected, '', $this->_tree[$key]['obj']->getVar('cat_id'), "OnChange='window.document.location=this.options[this.selectedIndex].value;'", 'tdmpicture_catview');
- $ret .= '<li class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="form">'.$GLOBALS['navbar'].$select.' | '._MD_TDMPICTURE_TRIBY.' > '.$navtrie.'</div></li>';
+ $ret .= '<li class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="tree_form">'.$GLOBALS['navbar'].$select.' | '._MD_TDMPICTURE_TRIBY.' > '.$navtrie.'</div></li>';
}
@@ -104,7 +104,7 @@
$select = $this->makeSelBox('cat_pid', 'cat_title','-', 0, '', $this->_tree[$key]['obj']->getVar('cat_id'), "OnChange='window.document.location=this.options[this.selectedIndex].value;'", 'tdmpicture_catview');
- $ret .= '<li style="width:47%;" class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="form">'.$select.'</div></li>';
+ $ret .= '<li style="width:47%;" class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="tree_form">'.$select.'</div></li>';
}
@@ -181,7 +181,7 @@
Global $cat_display;
$ret = '<div style="text-align:right"><a href="javascript:;" onclick="javascript:masque(\'1\')" >+-</a></div>';
- $ret .= '<table cellpadding="0" id="masque_1" cellspacing="0" style="margin:5px;"><tr><td><ul id="menu">';
+ $ret .= '<table cellpadding="0" id="masque_1" cellspacing="0" style="margin:5px;"><tr><td><ul id="tree_menu">';
$chcount = 1;
$GLOBALS['class'] = "odd";
$this->_makeCatBoxOptions( $item_handler, $fieldName, $selected, $key, $ret, $select, $prefix, '', $chcount );
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-10 10:04:33 UTC (rev 9840)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-10 10:25:24 UTC (rev 9841)
@@ -16,14 +16,14 @@
* ****************************************************************************
*/
- ul#menu {
+ ul#tree_menu {
margin: 0 auto;
padding:0 auto;
text-align: center;
width:100%;
}
- ul#menu li {
+ ul#tree_menu li {
list-style: none;
float:left;
width:97%;
@@ -36,25 +36,25 @@
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
overflow: auto;
}
- ul#menu img {
+ ul#tree_menu img {
float:left;
padding-left:20px;
padding-right:20px;
padding-top:10px;
}
- ul#menu h2{
+ ul#tree_menu h2{
left:0;
text-align:left;
padding-top:10px;
padding-bottom:5px;
}
- ul#menu div{
+ ul#tree_menu div{
float:left;
}
- #text, ul#menu #text {
+ #tdmpicture_text, ul#tree_menu #tree_text {
font-size: 13px;
font-weight: normal;
color: #728DA9;
@@ -62,7 +62,7 @@
line-height: 20px;
}
- #num, #num a, ul#menu #num{
+ #tdmpicture_num, #tdmpicture_num a, ul#tree_menu #tree_num{
text-align: center;
font-weight: normal;
font-size: 11px;
@@ -70,13 +70,13 @@
text-shadow: 0 1px 0 white;
}
- #num a{
+ #tdmpicture_num a{
font-weight: bold;
}
- ul#menu #form, #form{
- float:right;
- padding-top:100px;
+ ul#tree_menu #tree_form{
+ float:right;
+ padding-top:100px;
padding-right:20px;
text-align: center;
font-size: 11px;
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php 2012-07-10 10:04:33 UTC (rev 9840)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php 2012-07-10 10:25:24 UTC (rev 9841)
@@ -22,7 +22,6 @@
include_once XOOPS_ROOT_PATH.'/header.php';
include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar("dirname").'/include/common.php';
- tdmpicture_adminheader();
$xoopsTpl->assign('dirname', $mydirname);
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html 2012-07-10 10:04:33 UTC (rev 9840)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html 2012-07-10 10:25:24 UTC (rev 9841)
@@ -17,7 +17,7 @@
<div class="switch_title">
<h2><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&<{$file.cat_nav}>&tris=<{$tris}>"><{$file.title}></a></h2><span class="switch_fav"><{$file.favourite}></span>
<br />
- <span id="num" class="switch_in">
+ <span id="tdmpicture_num" class="switch_in">
<{$smarty.const._MD_TDMPICTURE_BY}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.uid}>"/><{$file.postername}></a>,
<{$smarty.const._MD_TDMPICTURE_IN}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/viewcat.php?ct=<{$file.file_cat_id}>"/><{$file.file_cat}></a>,
<{$smarty.const._MD_TDMPICTURE_LE}>: <{$file.indate}>
@@ -30,11 +30,11 @@
<div class="switch_desc"><{$file.text}><br class="clear"/></div>
-<div id="num" class="switch_info">
+<div id="tdmpicture_num" class="switch_info">
<{$file.comments}><hr /><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&<{$file.cat_nav}>&tris=<{$tris}>"><{$smarty.const._MD_TDMPICTURE_COMMENT}></a>
</div>
-<div id="num" class="switch_info">
+<div id="tdmpicture_num" class="switch_info">
<{$file.counts}>/<{$file.votes}><hr /><{$smarty.const._MD_TDMPICTURE_VOTE}>
<{if $perm_vote}>
<br />
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-10 10:04:33 UTC (rev 9840)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-10 10:25:24 UTC (rev 9841)
@@ -49,22 +49,22 @@
<li style="list-style: none;">
<div style="float:left; text-align:left;">
<div class="switch_title"><h2><{$file.title}></h2>
- <span id="num" class="switch_in">
+ <span id="tdmpicture_num" class="switch_in">
<{$smarty.const._MD_TDMPICTURE_BY}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.uid}>"/><{$file.postername}></a>,
<{$smarty.const._MD_TDMPICTURE_IN}>: <a href="<{$smarty.const.TDMPICTURE_URL}>/viewcat.php?ct=<{$file.file_cat_id}>"/><{$file.cat}></a>,
<{$smarty.const._MD_TDMPICTURE_LE}>: <{$file.indate}></span>
- <span id="num" class="switch_fav"><{$file.favourite}></span></div>
+ <span id="tdmpicture_num" class="switch_fav"><{$file.favourite}></span></div>
</div>
-<div id="num" class="switch_info">
+<div id="tdmpicture_num" class="switch_info">
<{$file.comments}><hr /><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&<{$file.cat_nav}>&tris=<{$tris}>"><{$smarty.const._MD_TDMPICTURE_COMMENT}></a>
</div>
-<div id="num" class="switch_info">
+<div id="tdmpicture_num" class="switch_info">
<{$file.counts}>/<{$file.votes}><hr /><{$smarty.const._MD_TDMPICTURE_VOTE}>
<{if $perm_vote}>
<br />
@@ -83,17 +83,17 @@
<div style="text-align:right"><a href="javascript:;" onclick="javascript:masque('2')" ><{$smarty.const._MD_TDMPICTURE_MORE}></a><{if $file.menu}> | <a href="javascript:;" onclick="javascript:masque('3')" ><{$smarty.const._MD_TDMPICTURE_ADMIN}></a><{/if}></div>
<table cellpadding="0" id="masque_2" cellspacing="0" style="display: none; margin:5px;"><tr><td>
-<div id="num" class="switch_info"><{$file.hits}><hr /><{$smarty.const._MD_TDMPICTURE_HITS}></div>
+<div id="tdmpicture_num" class="switch_info"><{$file.hits}><hr /><{$smarty.const._MD_TDMPICTURE_HITS}></div>
-<div id="num" class="switch_info"><{$file.dl}><hr /><{$smarty.const._MD_TDMPICTURE_DL}></div>
+<div id="tdmpicture_num" class="switch_info"><{$file.dl}><hr /><{$smarty.const._MD_TDMPICTURE_DL}></div>
-<div id="num" class="switch_info"><{$file.type}><hr /><{$smarty.const._MD_TDMPICTURE_TYPE}></div>
+<div id="tdmpicture_num" class="switch_info"><{$file.type}><hr /><{$smarty.const._MD_TDMPICTURE_TYPE}></div>
-<div id="num" class="switch_info"><{$file.size}><hr /><{$smarty.const._MD_TDMPICTURE_SIZE}></div>
+<div id="tdmpicture_num" class="switch_info"><{$file.size}><hr /><{$smarty.const._MD_TDMPICTURE_SIZE}></div>
-<div id="num" class="switch_info"><{$file.height}><hr /><{$smarty.const._MD_TDMPICTURE_HEIGHT}></div>
+<div id="tdmpicture_num" class="switch_info"><{$file.height}><hr /><{$smarty.const._MD_TDMPICTURE_HEIGHT}></div>
-<div id="num" class="switch_info"><{$file.with}><hr /><{$smarty.const._MD_TDMPICTURE_WIDTH}></div>
+<div id="tdmpicture_num" class="switch_info"><{$file.with}><hr /><{$smarty.const._MD_TDMPICTURE_WIDTH}></div>
</td></tr></table>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-10 13:23:10
|
Revision: 9842
http://xoops.svn.sourceforge.net/xoops/?rev=9842&view=rev
Author: lord_venom
Date: 2012-07-10 13:22:59 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
more...
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php
XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/english/main.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php
XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-07-10 13:22:59 UTC (rev 9842)
@@ -152,6 +152,35 @@
$form->display();
break;
+ case "edit_file":
+
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header('index.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+ }
+ if (isset($_REQUEST['file_id'])) {
+ $obj =& $file_handler->get($_REQUEST['file_id']);
+ } else {
+ $obj =& $file_handler->create();
+ }
+
+ //fichier commun
+ $obj->setVar('file_title', $_REQUEST['file_title']);
+ $obj->setVar('file_display', $_REQUEST['file_display']);
+ $obj->setVar('file_cat', $_REQUEST['file_cat']);
+ $obj->setVar('file_indate', time());
+ $obj->setVar('file_text', $_REQUEST['file_text']);
+ $obj->setVar('file_size', $_REQUEST['file_size']);
+ $obj->setVar('file_res_x', $_REQUEST['file_res_x']);
+ $obj->setVar('file_res_y', $_REQUEST['file_res_y']);
+
+ $erreur = $file_handler->insert($obj);
+
+ if ($erreur) {
+ redirect_header('files.php', 2, _AM_TDMPICTURE_BASE);
+ } else {
+ redirect_header('files.php', 2, _AM_TDMPICTURE_BASEERROR);
+ }
+ break;
case "save_img":
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php 2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php 2012-07-10 13:22:59 UTC (rev 9842)
@@ -91,6 +91,26 @@
$button_file = new XoopsFormText(_MD_TDMPICTURE_URL, 'file_file', 100, 255, $this->getVar('file_file'));
$button_file->setExtra("disabled");
$form->addElement($button_file);
+
+ //categorie
+ $cat_handler =& xoops_getModuleHandler('tdmpicture_cat', 'TDMPicture');
+
+ $criteriaDisplay = new CriteriaCompo();
+ $criteriaDisplay->add(new Criteria('cat_display', 1));
+ $criteriaDisplay->add(new Criteria('cat_index', 1));
+
+ $criteriaUser = new CriteriaCompo();
+ $criteriaUser->add($criteriaDisplay);
+ $criteriaUser->add(new Criteria('cat_display', 1), 'OR');
+ $criteriaUser->add(new Criteria('cat_uid', $uid));
+
+ $arr = $cat_handler->getall($criteriaUser);
+ $mytree = new TDMObjectTree($arr, 'cat_id', 'cat_pid');
+ $form->addElement(new XoopsFormLabel(_MD_TDMPICTURE_CAT,
+ $mytree->makeSelBox('file_cat', 'cat_title','-', $this->getVar('file_cat'), '', 0, '', 'tdmpicture_catview')));
+
+ //
+
//editor
$editor_configs=array();
$editor_configs["name"] ="file_text";
@@ -129,7 +149,7 @@
}
}
-$form->addElement(new XoopsFormHidden('op', 'save_file'));
+$form->addElement(new XoopsFormHidden('op', 'edit_file'));
$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
}
@@ -149,9 +169,13 @@
$criteriaUser->add(new Criteria('cat_uid', $uid));
$arr = $cat_handler->getall($criteriaUser);
- $mytree = new XoopsObjectTree($arr, 'cat_id', 'cat_pid');
- $form->addElement(new XoopsFormLabel(_MD_TDMPICTURE_CAT, $mytree->makeSelBox('file_cat', 'cat_title','-', $this->getVar('cat_pid'), true)), true);
+ //$mytree = new XoopsObjectTree($arr, 'cat_id', 'cat_pid');
+ //$form->addElement(new XoopsFormLabel(_MD_TDMPICTURE_CAT, $mytree->makeSelBox('file_cat', 'cat_title','-', $this->getVar('cat_pid'), true)), true);
+ $mytree = new TDMObjectTree($arr, 'cat_id', 'cat_pid');
+ $form->addElement(new XoopsFormLabel(_MD_TDMPICTURE_CAT,
+ $mytree->makeSelBox('file_cat', 'cat_title','-', $this->getVar('cat_pid'), '', 0, '', 'tdmpicture_catview')));
+
//
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-10 13:22:59 UTC (rev 9842)
@@ -103,7 +103,8 @@
if ((!$prefix_curr) && ($this->_tree[$key]['obj']->getVar('cat_pid') == $selected)) {
$select = $this->makeSelBox('cat_pid', 'cat_title','-', 0, '', $this->_tree[$key]['obj']->getVar('cat_id'), "OnChange='window.document.location=this.options[this.selectedIndex].value;'", 'tdmpicture_catview');
-
+
+
$ret .= '<li style="width:47%;" class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="tree_form">'.$select.'</div></li>';
}
@@ -130,15 +131,60 @@
global $start, $tris, $limit, $groups, $xoopsUser, $xoopsModule, $xoopsModuleConfig;
+ //perm
$gperm_handler =& xoops_gethandler('groupperm');
+ if (is_object($xoopsUser)) {
+ $groups = $xoopsUser->getGroups();
+ $uid = $xoopsUser->getVar('uid');
+ } else {
+ $groups = XOOPS_GROUP_ANONYMOUS;
+ $uid = 0;
+ }
+ //
if ( $key > 0 ) {
$value = $this->_tree[$key]['obj']->getVar( $this->_myId );
+ //$url = "viewcat.php?ct=".$this->_tree[$key]['obj']->getVar($this->_myId)."&tris=".$tris."&limit=".$limit;
+ //$value = tdmspot_seo_genUrl( $xoopsModuleConfig['tdmspot_seo_cat'], $this->_tree[$key]['obj']->getVar('id'), $this->_tree[$key]['obj']->getVar('title'), $start, $limit, $tris );
+
+ if ( !empty( $perm ) && $gperm_handler->checkRight($perm, $value, $groups, $xoopsModule->getVar('mid'))) {
+
+ $ret .= '<option value="' . $value . '"';
+
+ if ( $value == $selected ) {
+ $ret .= ' selected="selected"';
+ }
+ $ret .= '>' . $prefix_curr . $this->_tree[$key]['obj']->getVar( $fieldName ) . '</option>';
+ }
+ $prefix_curr .= $prefix_orig;
+ }
+ if ( isset( $this->_tree[$key]['child'] ) && !empty( $this->_tree[$key]['child'] ) ) {
+ foreach ( $this->_tree[$key]['child'] as $childkey ) {
+ $this->_makeSelBoxOptions( $fieldName, $selected, $childkey, $ret, $perm, $prefix_orig, $prefix_curr );
+ }
+ }
+ }
+
+ function _makeSelBoxOptions2( $fieldName, $selected, $key, &$ret, $perm, $prefix_orig, $prefix_curr = '' ) {
+
+ global $start, $tris, $limit, $groups, $xoopsUser, $xoopsModule, $xoopsModuleConfig;
+
+ //perm
+ $gperm_handler =& xoops_gethandler('groupperm');
+ if (is_object($xoopsUser)) {
+ $groups = $xoopsUser->getGroups();
+ $uid = $xoopsUser->getVar('uid');
+ } else {
+ $groups = XOOPS_GROUP_ANONYMOUS;
+ $uid = 0;
+ }
+ //
+ if ( $key > 0 ) {
+ $value = $this->_tree[$key]['obj']->getVar( $this->_myId );
$url = "viewcat.php?ct=".$this->_tree[$key]['obj']->getVar($this->_myId)."&tris=".$tris."&limit=".$limit;
//$value = tdmspot_seo_genUrl( $xoopsModuleConfig['tdmspot_seo_cat'], $this->_tree[$key]['obj']->getVar('id'), $this->_tree[$key]['obj']->getVar('title'), $start, $limit, $tris );
- if ( !empty( $perm ) && $gperm_handler->checkRight($perm, $this->_tree[$key]['obj']->getVar('id'), $groups, $xoopsModule->getVar('mid'))) {
+ if ( !empty( $perm ) && $gperm_handler->checkRight($perm, $value, $groups, $xoopsModule->getVar('mid'))) {
-
$ret .= '<option value="' . $url . '"';
if ( $value == $selected ) {
@@ -150,7 +196,7 @@
}
if ( isset( $this->_tree[$key]['child'] ) && !empty( $this->_tree[$key]['child'] ) ) {
foreach ( $this->_tree[$key]['child'] as $childkey ) {
- $this->_makeSelBoxOptions( $fieldName, $selected, $childkey, $ret, $perm, $prefix_orig, $prefix_curr );
+ $this->_makeSelBoxOptions2( $fieldName, $selected, $childkey, $ret, $perm, $prefix_orig, $prefix_curr );
}
}
}
@@ -197,7 +243,11 @@
if ( false != $addEmptyOption ) {
$ret .= '<option value="0">'.$addEmptyOption.'</option>';
}
+ if(!$extra){
$this->_makeSelBoxOptions( $fieldName, $selected, $key, $ret, $perm, $prefix );
+ } else {
+ $this->_makeSelBoxOptions2( $fieldName, $selected, $key, $ret, $perm, $prefix );
+ }
return $ret . '</select>';
}
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/english/main.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/english/main.php 2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/english/main.php 2012-07-10 13:22:59 UTC (rev 9842)
@@ -141,7 +141,7 @@
//define( "_MD_TDMPICTURE_ALBUM", "Album");
//define( "_MD_TDMPICTURE_CAT", "Category");
define( "_MD_TDMPICTURE_DISPLAYUSER", "Show in the user");
-//define( "_MD_TDMPICTURE_BASE", "save your changes are successfully");
+define( "_MD_TDMPICTURE_BASE", "save your changes are successfully");
//define( "_MD_TDMPICTURE_BASEERROR", "Error: Your changes are not recorded");
define( "_MD_TDMPICTURE_GENREDELALL", "ATTENTION all folder and subfolder it will delete");
define( "_MD_TDMPICTURE_NOPERM", "You do not have permission for this action");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php 2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php 2012-07-10 13:22:59 UTC (rev 9842)
@@ -150,7 +150,7 @@
define("_MD_TDMPICTURE_DISPLAYUSER","Afficher dans la partie user");
//define("_AM_TDMPICTURE_DISPLAYINDEX","Catégorie principale");
-//define("_AM_TDMPICTURE_BASE","Vos Modifications sont enregistrer avec succé");
+define("_MD_TDMPICTURE_BASE","Vos Modifications sont enregistrer avec succé");
//define("_AM_TDMPICTURE_BASEERROR","Erreur: Vos Modifications ne sont pas enregistrer");
define("_MD_TDMPICTURE_GENREDELALL","ATTENTION tous le dossier et c'est sous dossier serons supprimer");
define("_MD_TDMPICTURE_NOPERM","Vous n'avez pas les permissions pour cette action");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php 2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php 2012-07-10 13:22:59 UTC (rev 9842)
@@ -53,7 +53,7 @@
}
break;
- case "save_file":
+ case "edit_file":
//perm
if (!$gperm_handler->checkRight('tdmpicture_view', 128, $groups, $xoopsModule->getVar('mid'))) {
@@ -75,6 +75,7 @@
//fichier commun
$obj->setVar('file_title', $_REQUEST['file_title']);
$obj->setVar('file_display', $_REQUEST['file_display']);
+ $obj->setVar('file_cat', $_REQUEST['file_cat']);
$obj->setVar('file_indate', time());
$obj->setVar('file_text', $_REQUEST['file_text']);
$obj->setVar('file_size', $_REQUEST['file_size']);
@@ -84,11 +85,11 @@
$erreur = $file_handler->insert($obj);
}
- if ($erreur) {
- redirect_header('javascript:history.go(-2)', 2, _AM_TDMPICTURE_BASE);
- } else {
- redirect_header(TDMPICTURE_URL, 2, _AM_TDMPICTURE_BASEERROR);
- }
+ if ($erreur) {
+ redirect_header('index.php', 2, _MD_TDMPICTURE_BASE);
+ } else {
+ redirect_header('index.php', 2, _MD_TDMPICTURE_BASEERROR);
+ }
break;
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html 2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html 2012-07-10 13:22:59 UTC (rev 9842)
@@ -25,10 +25,10 @@
</div>
- </div>
-<div class="switch_desc"><{$file.text}><br class="clear"/></div>
+<div id="tdmpicture_text" class="switch_desc"><{$file.text}><br class="clear"/></div>
+<br class="clear"/> </div>
<div id="tdmpicture_num" class="switch_info">
<{$file.comments}><hr /><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&<{$file.cat_nav}>&tris=<{$tris}>"><{$smarty.const._MD_TDMPICTURE_COMMENT}></a>
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-10 10:25:24 UTC (rev 9841)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-10 13:22:59 UTC (rev 9842)
@@ -56,10 +56,14 @@
<span id="tdmpicture_num" class="switch_fav"><{$file.favourite}></span></div>
-</div>
+<{if $file.text}>
+<div id="tdmpicture_text" class="switch_desc"><b><{$smarty.const._MD_TDMPICTURE_DESC}></b><br /><{$file.text}><br class="clear"/><br /></div>
+<{/if}>
+<br class="clear"/></div>
+
<div id="tdmpicture_num" class="switch_info">
<{$file.comments}><hr /><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$file.id}>&<{$file.cat_nav}>&tris=<{$tris}>"><{$smarty.const._MD_TDMPICTURE_COMMENT}></a>
</div>
@@ -73,11 +77,8 @@
<{/if}>
</div>
-<br class="clear"/>
-<{if $file.text}>
-<div class="switch_desc"><b><{$smarty.const._MD_TDMPICTURE_DESC}></b><br /><{$file.text}><br class="clear"/><br /></div>
-<{/if}>
+
<br class="clear"/>
<!-- tableau masquer -->
<div style="text-align:right"><a href="javascript:;" onclick="javascript:masque('2')" ><{$smarty.const._MD_TDMPICTURE_MORE}></a><{if $file.menu}> | <a href="javascript:;" onclick="javascript:masque('3')" ><{$smarty.const._MD_TDMPICTURE_ADMIN}></a><{/if}></div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-10 16:16:18
|
Revision: 9843
http://xoops.svn.sourceforge.net/xoops/?rev=9843&view=rev
Author: lord_venom
Date: 2012-07-10 16:16:12 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
remove edit_img
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php
XoopsModules/TDMPicture/trunk/TDMPicture/download.php
XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-07-10 13:22:59 UTC (rev 9842)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-07-10 16:16:12 UTC (rev 9843)
@@ -182,72 +182,7 @@
}
break;
- case "save_img":
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('index.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
- }
- if (isset($_REQUEST['file_id'])) {
- $obj =& $file_handler->get($_REQUEST['file_id']);
- } else {
- $obj =& $file_handler->create();
- }
-
- if (!empty($xoopsUser) && $xoopsUser->getVar('uid') == $obj->getVar('file_uid') OR $xoopsUser->isAdmin())
- {
- $targ_w = $targ_h = 150;
- $jpeg_quality = 90;
- $uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/upload/";
-
- $src = TDMPICTURE_UPLOADS_PATH.$obj->getVar('file_file');
- $img_r = imagecreatefromjpeg($src);
- $dst_r = ImageCreateTrueColor( $_REQUEST['w'], $_REQUEST['h'] );
-
- imagecopyresampled($dst_r,$img_r,0,0,$_POST['x'],$_REQUEST['y'],
- $_REQUEST['w'], $_REQUEST['h'],$_REQUEST['w'],$_REQUEST['h']);
-
- $erreur = ImageJpeg ($dst_r, TDMPICTURE_UPLOADS_PATH.$obj->getVar('file_file'), $xoopsModuleConfig['tdmpicture_thumb_quality']);
-
- //insert
- $obj->setVar('file_size', @filesize($src));
- $obj->setVar('file_indate', time());
- $obj->setVar('file_display', $_REQUEST['file_display']);
- $obj->setVar('file_type', 'image/jpeg');
- $obj->setVar('file_res_x', $_REQUEST['w']);
- $obj->setVar('file_res_y', $_REQUEST['h']);
- //thumb
- $thumb = new Thumbnail(TDMPICTURE_UPLOADS_PATH.$obj->getVar('file_file'));
- switch($xoopsModuleConfig['tdmpicture_thumb_style']) {
-
- case "center":
- default:
- $thumb->cropFromCenter($xoopsModuleConfig['tdmpicture_thumb_width']);
- break;
-
- case "limit-width-height":
- $thumb->resize($xoopsModuleConfig['tdmpicture_thumb_width'],$xoopsModuleConfig['tdmpicture_thumb_heigth']);
- break;
-
- case "limit-width":
- $thumb->resize($xoopsModuleConfig['tdmpicture_thumb_width'], "");
- break;
-
- case "limit-height":
- $thumb->resize("",$xoopsModuleConfig['tdmpicture_thumb_heigth']);
- break;
- }
- $thumb->save(TDMPICTURE_THUMB_PATH.$obj->getVar('file_file'),$xoopsModuleConfig['tdmpicture_thumb_quality']);
- $erreur .= $file_handler->insert($obj);
- }
-
- if ($erreur) {
- redirect_header('files.php', 2, _AM_TDMPICTURE_BASE);
- } else {
- redirect_header('files.php', 2, _AM_TDMPICTURE_BASEERROR);
- }
-
- break;
-
case "edit":
//admin menu
$category_admin = new ModuleAdmin();
@@ -261,19 +196,6 @@
$form->display();
break;
- case "edit_img":
- //admin menu
- $category_admin = new ModuleAdmin();
- echo $category_admin->addNavigation('files.php');
- $category_admin->addItemButton(_AM_TDMPICTURE_FILE_UPLOAD, 'files.php?op=upload', 'add');
- $category_admin->addItemButton(_AM_TDMPICTURE_LIST_FILE, 'files.php?op=list', 'list');
- echo $category_admin->renderButton();
-
- $obj = $file_handler->get($_REQUEST['file_id']);
- $form = $obj->getImg();
- $form->display();
- break;
-
case "delete":
$obj =& $file_handler->get($_REQUEST['file_id']);
if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
@@ -488,7 +410,7 @@
echo '<td align="center" style="vertical-align:middle;">';
echo '<a href="files.php?op=edit&file_id='.$file_id.'"><img src=' . $pathIcon16.'/edit.png border="0" alt="'._AM_TDMPICTURE_MODIFY.'" title="'._AM_TDMPICTURE_MODIFY.'"></a>';
echo '<a href="files.php?op=delete&file_id='.$file_id.'"><img src=' . $pathIcon16.'/delete.png 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/picture_edit.png" border="0" alt="'._AM_TDMPICTURE_EDITIMG.'" title="'._AM_TDMPICTURE_EDITIMG.'"></a>';
+ //echo '<a href="files.php?op=edit_img&file_id='.$file_id.'"><img src="./../images/picture_edit.png" border="0" alt="'._AM_TDMPICTURE_EDITIMG.'" title="'._AM_TDMPICTURE_EDITIMG.'"></a>';
echo '</td>';
echo '</tr>';
}
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php 2012-07-10 13:22:59 UTC (rev 9842)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php 2012-07-10 16:16:12 UTC (rev 9843)
@@ -289,107 +289,7 @@
}
- function getImg($action = false)
- {
-
- global $xoopsUser, $xoopsDB, $xoopsModule, $xoopsModuleConfig;
-
- if ($action === false) {
- $action = $_SERVER['REQUEST_URI'];
- }
- $title = $this->isNew() ? sprintf(_MD_TDMPICTURE_ADD) : sprintf(_MD_TDMPICTURE_EDIT);
- include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
-
- $form = new XoopsThemeForm($title, 'form', $action, 'post', true);
- $form->setExtra('enctype="multipart/form-data" onsubmit="return checkCoords();"');
-
- //$form->addElement(new XoopsFormText(_MD_TDMPICTURE_TITLE, 'cat_title', 80, 255, $this->getVar('cat_title')));
- if (!$this->isNew()) {
- //Load groups
- $form->addElement(new XoopsFormHidden('id', $this->getVar('cat_id')));
- }
-
- //on test l'existance de l'image
- $img = $this->getVar("file_file") ? $this->getVar("file_file") : 'blank.gif';
- $imgpath = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/upload/".$img;
- if (file_exists($imgpath)) {
- $file_img = XOOPS_URL. "/modules/".$xoopsModule->dirname()."/upload/".$this->getVar("file_file");
- } else {
- $file_img = XOOPS_URL. "/modules/".$xoopsModule->dirname()."/upload/blank.gif";
- }
-
- echo '<script language="Javascript">
- var $tdmpicture = jQuery.noConflict();
- $tdmpicture(document).ready(function(){
-
- $tdmpicture("#cropbox").Jcrop({
- onChange: showCoords,
- onSelect: showCoords,
- aspectRatio: 0
- });
-
- });
-
-function showCoords(c)
-{
- var $tdmpicture = jQuery.noConflict();
- $tdmpicture("#x").val(c.x);
- $tdmpicture("#y").val(c.y);
- $tdmpicture("#x2").val(c.x2);
- $tdmpicture("#y2").val(c.y2);
- $tdmpicture("#w").val(c.w);
- $tdmpicture("#h").val(c.h);
-};
-
-function checkCoords()
- {
- if (parseInt($("#x").val())) return true;
- alert("Please select a crop region then press submit.");
- return false;
- };
-</script>';
-
- echo '<div style="border:1px solid #ccc;" align="center"><img src="'.$file_img.'" alt="" title="" id="cropbox" >
- <br />';
-
-
- $form->insertBreak('<div align="center">'._MD_TDMPICTURE_NEWTHUMB.'</div>', 'odd');
-$img = new XoopsFormElementTray(_MD_TDMPICTURE_RECAD,'');
-$img->addElement(new XoopsFormText('X1', 'x', 4, 4, ''));
-$img->addElement(new XoopsFormText('Y1', 'y', 4, 4, ''));
-$img->addElement(new XoopsFormText('X2', 'x2', 4, 4, ''));
-$img->addElement(new XoopsFormText('Y2', 'y2', 4, 4, ''));
-$img->addElement(new XoopsFormText('W', 'w', 4, 4, ''));
-$img->addElement(new XoopsFormText('H', 'h', 4, 4, ''));
-$form->addElement($img);
-
-//visible
-if ( is_object($xoopsUser) && $xoopsUser->isAdmin()) {
- $form->addElement(new XoopsFormRadioYN(_MD_TDMPICTURE_DISPLAYUSER, 'file_display', $this->getVar('file_display'), _YES, _NO));
- }else {
-
- $gperm_handler =& xoops_gethandler('groupperm');
-
- if (is_object($xoopsUser)) {
- $groups = $xoopsUser->getGroups();
- } else {
- $groups = XOOPS_GROUP_ANONYMOUS;
- }
-
- if ($gperm_handler->checkRight('tdmpicture_view', 256, $groups, $xoopsModule->getVar('mid'))) {
- $form->addElement(new XoopsFormHidden('file_display', 1));
- }else {
- $form->addElement(new XoopsFormHidden('file_display', 0));
- }
- }
-
- $form->addElement(new XoopsFormHidden('op', 'save_img'));
- $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-
- return $form;
- }
-
}
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/download.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/download.php 2012-07-10 13:22:59 UTC (rev 9842)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/download.php 2012-07-10 16:16:12 UTC (rev 9843)
@@ -59,5 +59,10 @@
//header('Content-Type: application/force-download');
//header ('Content-Disposition: attachment; filename='.$document_file.'');
//header('Content-length: '.$document->getVar("file_size"));
-echo "<html><head><meta http-equiv=\"Refresh\" content=\"0; URL=".$document_file."\"></meta></head><body></body></html>";
+ header('Content-Type: application/force-download');
+ header('Content-Disposition: attachment; filename='.basename($document_file));
+ readfile($document_file);
+
+
+//echo "<html><head><meta http-equiv=\"Refresh\" content=\"0; URL=".$document_file."\"></meta></head><body></body></html>";
?>
\ No newline at end of file
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php 2012-07-10 13:22:59 UTC (rev 9842)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/modfile.php 2012-07-10 16:16:12 UTC (rev 9843)
@@ -92,79 +92,8 @@
}
break;
-
- //modifier image
- case "edit_img":
-
- //perm
-if (!$gperm_handler->checkRight('tdmpicture_view', 128, $groups, $xoopsModule->getVar('mid'))) {
-redirect_header(XOOPS_URL, 2,_MD_TDMPICTURE_NOPERM);
-exit();
-}
-
- $obj = $file_handler->get($_REQUEST['file_id']);
- if (!empty($xoopsUser) && $xoopsUser->getVar('uid') == $obj->getVar('file_uid') OR $xoopsUser->isAdmin())
- {
- $form = $obj->getImg();
- $form->display();
- } else {
- redirect_header(TDMPICTURE_URL, 2, _MD_TDMPICTURE_NOPERM);
- }
- break;
- case "save_img":
-
-//perm
-if (!$gperm_handler->checkRight('tdmpicture_view', 128, $groups, $xoopsModule->getVar('mid'))) {
-redirect_header(XOOPS_URL, 2,_MD_TDMPICTURE_NOPERM);
-exit();
-}
- if (!$GLOBALS['xoopsSecurity']->check()) {
- redirect_header('index.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
- }
- if (isset($_REQUEST['file_id'])) {
- $obj =& $file_handler->get($_REQUEST['file_id']);
- } else {
- $obj =& $file_handler->create();
- }
-
- if (!empty($xoopsUser) && $xoopsUser->getVar('uid') == $obj->getVar('file_uid') OR $xoopsUser->isAdmin())
- {
- $targ_w = $targ_h = 150;
- $jpeg_quality = 90;
- $uploaddir = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/upload/";
-
- $src = TDMPICTURE_UPLOADS_PATH.$obj->getVar('file_file');
- $img_r = imagecreatefromjpeg($src);
- $dst_r = ImageCreateTrueColor( $_REQUEST['w'], $_REQUEST['h'] );
-
- imagecopyresampled($dst_r,$img_r,0,0,$_POST['x'],$_REQUEST['y'],
- $_REQUEST['w'], $_REQUEST['h'],$_REQUEST['w'],$_REQUEST['h']);
-
- $erreur = ImageJpeg ($dst_r, TDMPICTURE_UPLOADS_PATH.$obj->getVar('file_file'), $xoopsModuleConfig['tdmpicture_thumb_quality']);
- //insert
- $obj->setVar('file_size', @filesize($src));
- $obj->setVar('file_indate', time());
- $obj->setVar('file_display', $_REQUEST['file_display']);
- $obj->setVar('file_type', 'image/jpeg');
- $obj->setVar('file_res_x', $_REQUEST['w']);
- $obj->setVar('file_res_y', $_REQUEST['h']);
- //thumb
- $thumb = new Thumbnail(TDMPICTURE_UPLOADS_PATH.$obj->getVar('file_file'));
- $thumb->resize($xoopsModuleConfig['tdmpicture_thumb_width'],$xoopsModuleConfig['tdmpicture_thumb_heigth']);
- $thumb->save(TDMPICTURE_THUMB_PATH.$obj->getVar('file_file'),$xoopsModuleConfig['tdmpicture_thumb_quality']);
- $erreur .= $file_handler->insert($obj);
- }
-
- if ($erreur) {
- redirect_header('javascript:history.go(-2)', 2, _AM_TDMPICTURE_BASE);
- } else {
- redirect_header(TDMPICTURE_URL, 2, _AM_TDMPICTURE_BASEERROR);
- }
-
- break;
-
case "delete":
//perm
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-10 13:22:59 UTC (rev 9842)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-10 16:16:12 UTC (rev 9843)
@@ -106,7 +106,6 @@
<div align="center">
<{if $file.edit}>
<a href="<{$smarty.const.TDMPICTURE_URL}>/modfile.php?op=edit&file_id=<{$file.id}>"><img src="<{xoModuleIcons16 edit.png}>"></a>
-<a href="<{$smarty.const.TDMPICTURE_URL}>/modfile.php?op=edit_img&file_id=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/picture_edit.png"></a>
<{/if}>
<{if $file.del}>
<a href="<{$smarty.const.TDMPICTURE_URL}>/modfile.php?op=delete&file_id=<{$file.id}>"><img src="<{xoModuleIcons16 delete.png}>"></a>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-11 09:45:42
|
Revision: 9845
http://xoops.svn.sourceforge.net/xoops/?rev=9845&view=rev
Author: lord_venom
Date: 2012-07-11 09:45:31 +0000 (Wed, 11 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
XoopsModules/TDMPicture/trunk/TDMPicture/admin/index.php
XoopsModules/TDMPicture/trunk/TDMPicture/include/functions.php
XoopsModules/TDMPicture/trunk/TDMPicture/index.php
XoopsModules/TDMPicture/trunk/TDMPicture/user.php
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-07-10 19:44:32 UTC (rev 9844)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-07-11 09:45:31 UTC (rev 9845)
@@ -222,7 +222,7 @@
}
break;
- case _DELETE :
+ case _AM_TDMPICTURE_DELETE_SELECTED :
if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) {
if (!$GLOBALS['xoopsSecurity']->check()) {
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/index.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/index.php 2012-07-10 19:44:32 UTC (rev 9844)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/index.php 2012-07-11 09:45:31 UTC (rev 9845)
@@ -58,14 +58,14 @@
$index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_CAT, _AM_TDMPICTURE_THEREARE_CAT, $numcat);
$index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_FILE, _AM_TDMPICTURE_THEREARE_FILE, $numfile);
if ($cat_waiting == 0){
- $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_CAT, _AM_TDMPICTURE_THEREARE_CAT_WAITING, $cat_waiting, 'Green');
+ $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_CAT, _AM_TDMPICTURE_THEREARE_CAT_WAITING, 0, 'Green');
}else{
$index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_CAT, _AM_TDMPICTURE_THEREARE_CAT_WAITING, $cat_waiting, 'Red');
}
- if ($numfile == 0){
- $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_FILE, _AM_TDMPICTURE_THEREARE_FILE_WAITING, $numfile, 'Green');
+ if ($file_waiting == 0){
+ $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_FILE, _AM_TDMPICTURE_THEREARE_FILE_WAITING, 0, 'Green');
}else{
- $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_FILE, _AM_TDMPICTURE_THEREARE_FILE_WAITING, $numfile, 'Red');
+ $index_admin->addInfoBoxLine(_AM_TDMPICTURE_MANAGE_FILE, _AM_TDMPICTURE_THEREARE_FILE_WAITING, $file_waiting, 'Red');
}
foreach (array_keys( $folder) as $i) {
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/include/functions.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/include/functions.php 2012-07-10 19:44:32 UTC (rev 9844)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/include/functions.php 2012-07-11 09:45:31 UTC (rev 9845)
@@ -49,26 +49,6 @@
}
-function TDMDownloads_NumbersOfEntries($mytree, $categories, $entries,$cid)
-{
- $count = 0;
- $child_arr = array();
- if(in_array($cid, $categories)) {
- $child = $mytree->getAllChild($cid);
- foreach (array_keys($entries) as $i) {
- if ($entries[$i]->getVar('cid') == $cid){
- $count++;
- }
- foreach (array_keys($child) as $j) {
- if ($entries[$i]->getVar('cid') == $j){
- $count++;
- }
- }
- }
- }
- return $count;
-}
-
function tdmpicture_adminheader()
{
global $xoopsConfig, $xoopsModule, $xoTheme, $xoopsTpl;
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/index.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/index.php 2012-07-10 19:44:32 UTC (rev 9844)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/index.php 2012-07-11 09:45:31 UTC (rev 9845)
@@ -65,10 +65,10 @@
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('cat_display', 1));
- $criteria->add(new Criteria('cat_index', 1));
+ //$criteria->add(new Criteria('cat_index', 1));
$criteria->setSort('cat_weight');
$criteria->setOrder('DESC');
- $criteria->add(new Criteria('cat_display', 1));
+ //$criteria->add(new Criteria('cat_display', 1));
$cat_arr = $cat_handler->getall($criteria);
$mytree = new TDMObjectTree($cat_arr, 'cat_id', 'cat_pid');
//asigne les URL
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/user.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/user.php 2012-07-10 19:44:32 UTC (rev 9844)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/user.php 2012-07-11 09:45:31 UTC (rev 9845)
@@ -69,30 +69,32 @@
// ************************************************************
// Liste des Categories
// ************************************************************
-
+
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('cat_display', 1));
- $criteria->add(new Criteria('cat_uid', $ut));
+ //$criteria->add(new Criteria('cat_index', 1));
$criteria->setSort('cat_weight');
$criteria->setOrder('DESC');
+ //$criteria->add(new Criteria('cat_display', 1));
$cat_arr = $cat_handler->getall($criteria);
$mytree = new TDMObjectTree($cat_arr, 'cat_id', 'cat_pid');
//asigne les URL
define("TDM_CAT_URL", TDMPICTURE_CAT_URL);
define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH);
+ define("TDM_CAT_LINK", "viewcat.php");
$cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
$display_cat = $mytree->makeCatBox($file_handler, 'cat_title','-', $cat = false);
$xoopsTpl->assign('display_cat', $display_cat);
$numcat = $cat_handler->getCount($criteria);
- $xoopsTpl->assign('numcat', $numcat);
+ $xoopsTpl->assign('numcat', $numcat);
unset($criteria);
-$xoopsTpl->assign('selectcat', tdmpicture_catselect($mytree, false));
+//$xoopsTpl->assign('selectcat', tdmpicture_catselect($mytree, false));
// ************************************************************
// Liste des derniers fichier
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-11 17:36:41
|
Revision: 9846
http://xoops.svn.sourceforge.net/xoops/?rev=9846&view=rev
Author: lord_venom
Date: 2012-07-11 17:36:32 +0000 (Wed, 11 Jul 2012)
Log Message:
-----------
file_ext
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php
XoopsModules/TDMPicture/trunk/TDMPicture/include/jquery.php
XoopsModules/TDMPicture/trunk/TDMPicture/index.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php
XoopsModules/TDMPicture/trunk/TDMPicture/submit.php
XoopsModules/TDMPicture/trunk/TDMPicture/user.php
XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php
XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php
XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-07-11 17:36:32 UTC (rev 9846)
@@ -82,7 +82,7 @@
$obj->setVar('file_display', $_REQUEST['file_display']);
$obj->setVar('file_indate', time());
$obj->setVar('file_uid', !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0);
- $obj->setVar('file_ext', $_REQUEST['file_ext']);
+ //$obj->setVar('file_ext', $_REQUEST['file_ext']);
//upload
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php 2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php 2012-07-11 17:36:32 UTC (rev 9846)
@@ -41,7 +41,7 @@
define("TDMPICTURE_RSS", $xoopsModuleConfig['tdmpicture_rss']);
define("TDMPICTURE_SOCIAL", $xoopsModuleConfig['tdmpicture_social']);
define("TDMPICTURE_PDF", $xoopsModuleConfig['tdmpicture_pdf']);
-define("TDMPICTURE_DISPLAY_CAT", $xoopsModuleConfig['tdmpicture_cat_display']);
+//define("TDMPICTURE_DISPLAY_CAT", $xoopsModuleConfig['tdmpicture_cat_display']);
//define("TDMPICTURE_THUMB_DECO", $xoopsModuleConfig['tdmpicture_thumb_deco']);
define("TDMPICTURE_SLIDE_WIDTH", $xoopsModuleConfig['tdmpicture_slide_width']);
define("TDMPICTURE_SLIDE_HEIGHT", $xoopsModuleConfig['tdmpicture_slide_height']);
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/include/jquery.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/include/jquery.php 2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/include/jquery.php 2012-07-11 17:36:32 UTC (rev 9846)
@@ -143,7 +143,7 @@
$obj->setVar('file_display', $_REQUEST['file_display']);
$obj->setVar('file_indate', time());
$obj->setVar('file_uid', !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0);
- $obj->setVar('file_ext', $_REQUEST['file_ext']);
+ //$obj->setVar('file_ext', $_REQUEST['file_ext']);
foreach ($_FILES as $file => $fileArray) {
@@ -310,11 +310,11 @@
$file['file_track'] = 'track_p_'.$f;
//$file['file_trackurl'] = $ret->getVar("file_img");
- if ($ret->getVar("file_ext") == 0) {
- $file['file_trackurl'] = XOOPS_URL."/modules/".$xoopsModule->dirname()."/sound/".$ret->getVar("file_img");
- } else {
- $file['file_trackurl'] = $ret->getVar("file_img");
- }
+ //if ($ret->getVar("file_ext") == 0) {
+ //$file['file_trackurl'] = XOOPS_URL."/modules/".$xoopsModule->dirname()."/sound/".$ret->getVar("file_img");
+ //} else {
+ //$file['file_trackurl'] = $ret->getVar("file_img");
+ //}
//creer le path fichier
$filename = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/sound/".$ret->getVar('file_img');
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/index.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/index.php 2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/index.php 2012-07-11 17:36:32 UTC (rev 9846)
@@ -75,8 +75,8 @@
define("TDM_CAT_URL", TDMPICTURE_CAT_URL);
define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH);
define("TDM_CAT_LINK", "viewcat.php");
- $cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
- $cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
+ //$cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
+ //$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
$display_cat = $mytree->makeCatBox($file_handler, 'cat_title','-', $cat = false);
$xoopsTpl->assign('display_cat', $display_cat);
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php 2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php 2012-07-11 17:36:32 UTC (rev 9846)
@@ -65,11 +65,11 @@
//define("_MI_TDMPICTURE_FULL_HEIGTH", "Maximum height of the real image");
define("_MI_TDMPICTURE_JAVA_WIDTH", "Width of java applet (upload)");
define("_MI_TDMPICTURE_JAVA_HEIGTH", "Height of java applet (upload)");
-define("_MI_TDMPICTURE_CAT_CEL", "Category: Number of Column");
-define("_MI_TDMPICTURE_CAT_DISPLAY", "Category: Style category");
-define("_MI_TDMPICTURE_CAT_DISPLAY_TEXT", "text");
-define("_MI_TDMPICTURE_CAT_DISPLAY_IMG", "Image");
-define("_MI_TDMPICTURE_CAT_SOUSCEL", "Category: Number of sub-category");
+//define("_MI_TDMPICTURE_CAT_CEL", "Category: Number of Column");
+//define("_MI_TDMPICTURE_CAT_DISPLAY", "Category: Style category");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_TEXT", "text");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_IMG", "Image");
+//define("_MI_TDMPICTURE_CAT_SOUSCEL", "Category: Number of sub-category");
define("_MI_TDMPICTURE_VIEWMYALBUM", "See my album");
define("_MI_TDMPICTURE_VIEWALBUM", "Album List");
define("_MI_TDMPICTURE_UPLOAD", "Upload");
@@ -84,11 +84,11 @@
// Version 1.5
-define("_MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG", "Category and subcategory (with image) ");
-define("_MI_TDMPICTURE_CAT_DISPLAY_SUB", "Category and subcategory (without image) ");
-define("_MI_TDMPICTURE_CAT_DISPLAY_SUBIMG", "Category and subcategory (with image) ");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG", "Category and subcategory (with image) ");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_SUB", "Category and subcategory (without image) ");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_SUBIMG", "Category and subcategory (with image) ");
-define("_MI_TDMPICTURE_CAT_DISPLAY_NONE", "No ");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_NONE", "No ");
define("_MI_TDMPICTURE_THUMB_STYLE", "Miniature: centering thumb");
define("_MI_TDMPICTURE_THUMB_STYLE_CENTER", "Center (on Carrer center width");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php 2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php 2012-07-11 17:36:32 UTC (rev 9846)
@@ -78,15 +78,15 @@
//define("_MI_TDMPICTURE_THUMB_DECO","Miniature : Décoration de l'image");
//version 1.5
-define("_MI_TDMPICTURE_CAT_CEL","Affichage catégorie : Nombre de colonne");
-define("_MI_TDMPICTURE_CAT_DISPLAY","Affichage : Style des catégories");
-define("_MI_TDMPICTURE_CAT_DISPLAY_TEXT","Catégorie puis sous-catégorie (sans image)");
-define("_MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG","Catégorie puis sous-catégorie (avec image)");
-define("_MI_TDMPICTURE_CAT_DISPLAY_SUB","Catégorie et sous-catégorie (sans image)");
-define("_MI_TDMPICTURE_CAT_DISPLAY_SUBIMG","Catégorie et sous-catégorie (avec image)");
-define("_MI_TDMPICTURE_CAT_DISPLAY_IMG","Image");
-define("_MI_TDMPICTURE_CAT_DISPLAY_NONE","Non");
-define("_MI_TDMPICTURE_CAT_SOUSCEL","Affichage catégorie : Nombre de sous-catégorie");
+//define("_MI_TDMPICTURE_CAT_CEL","Affichage catégorie : Nombre de colonne");
+//define("_MI_TDMPICTURE_CAT_DISPLAY","Affichage : Style des catégories");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_TEXT","Catégorie puis sous-catégorie (sans image)");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG","Catégorie puis sous-catégorie (avec image)");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_SUB","Catégorie et sous-catégorie (sans image)");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_SUBIMG","Catégorie et sous-catégorie (avec image)");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_IMG","Image");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_NONE","Non");
+//define("_MI_TDMPICTURE_CAT_SOUSCEL","Affichage catégorie : Nombre de sous-catégorie");
define("_MI_TDMPICTURE_THUMB_STYLE","Miniature : centrage thumb");
define("_MI_TDMPICTURE_THUMB_STYLE_CENTER","Centrer (carrer sur centre largeur");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php 2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php 2012-07-11 17:36:32 UTC (rev 9846)
@@ -78,15 +78,15 @@
//define("_MI_TDMPICTURE_THUMB_DECO","Miniature : Décoration de l'image");
//version 1.5
-define("_MI_TDMPICTURE_CAT_CEL","Affichage catégorie : Nombre de colonne");
-define("_MI_TDMPICTURE_CAT_DISPLAY","Affichage : Style des catégories");
-define("_MI_TDMPICTURE_CAT_DISPLAY_TEXT","Catégorie puis sous-catégorie (sans image)");
-define("_MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG","Catégorie puis sous-catégorie (avec image)");
-define("_MI_TDMPICTURE_CAT_DISPLAY_SUB","Catégorie et sous-catégorie (sans image)");
-define("_MI_TDMPICTURE_CAT_DISPLAY_SUBIMG","Catégorie et sous-catégorie (avec image)");
-define("_MI_TDMPICTURE_CAT_DISPLAY_IMG","Image");
-define("_MI_TDMPICTURE_CAT_DISPLAY_NONE","Non");
-define("_MI_TDMPICTURE_CAT_SOUSCEL","Affichage catégorie : Nombre de sous-catégorie");
+//define("_MI_TDMPICTURE_CAT_CEL","Affichage catégorie : Nombre de colonne");
+//define("_MI_TDMPICTURE_CAT_DISPLAY","Affichage : Style des catégories");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_TEXT","Catégorie puis sous-catégorie (sans image)");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG","Catégorie puis sous-catégorie (avec image)");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_SUB","Catégorie et sous-catégorie (sans image)");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_SUBIMG","Catégorie et sous-catégorie (avec image)");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_IMG","Image");
+//define("_MI_TDMPICTURE_CAT_DISPLAY_NONE","Non");
+//define("_MI_TDMPICTURE_CAT_SOUSCEL","Affichage catégorie : Nombre de sous-catégorie");
define("_MI_TDMPICTURE_THUMB_STYLE","Miniature : centrage thumb");
define("_MI_TDMPICTURE_THUMB_STYLE_CENTER","Centrer (carrer sur centre largeur");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/submit.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/submit.php 2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/submit.php 2012-07-11 17:36:32 UTC (rev 9846)
@@ -141,7 +141,7 @@
$obj->setVar('file_display', $_REQUEST['file_display']);
$obj->setVar('file_indate', time());
$obj->setVar('file_uid', !empty($xoopsUser) ? $xoopsUser->getVar('uid') : 0);
- $obj->setVar('file_ext', $_REQUEST['file_ext']);
+ //$obj->setVar('file_ext', $_REQUEST['file_ext']);
//upload
foreach ($_FILES['tdmfile']['error'] as $key => $value)
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/user.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/user.php 2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/user.php 2012-07-11 17:36:32 UTC (rev 9846)
@@ -82,8 +82,8 @@
define("TDM_CAT_URL", TDMPICTURE_CAT_URL);
define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH);
define("TDM_CAT_LINK", "viewcat.php");
- $cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
- $cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
+ //$cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
+ //$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
$display_cat = $mytree->makeCatBox($file_handler, 'cat_title','-', $cat = false);
$xoopsTpl->assign('display_cat', $display_cat);
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php 2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php 2012-07-11 17:36:32 UTC (rev 9846)
@@ -93,8 +93,8 @@
//asigne les URL
define("TDM_CAT_URL", TDMPICTURE_CAT_URL);
define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH);
- $cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
- $cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
+ //$cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
+ //$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
$display_cat = $mytree->makeCatBox($file_handler, 'cat_title','-', $ct);
$xoopsTpl->assign('display_cat', $display_cat);
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php 2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php 2012-07-11 17:36:32 UTC (rev 9846)
@@ -92,8 +92,8 @@
//asigne les URL
define("TDM_CAT_URL", TDMPICTURE_CAT_URL);
define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH);
- $cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
- $cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
+ //$cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
+ //$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
$display_cat = $mytree->makeCatBox($file_handler, 'cat_title','-', $ct);
$xoopsTpl->assign('display_cat', $display_cat);
$xoopsTpl->assign('numfile', $GLOBALS['cat_count']);
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-07-11 09:45:31 UTC (rev 9845)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-07-11 17:36:32 UTC (rev 9846)
@@ -272,14 +272,14 @@
$modversion['config'][$i]['default'] = 400;
$i++;
//version 1.5
-$modversion['config'][$i]['name'] = 'tdmpicture_cat_display';
-$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_CAT_DISPLAY';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'select';
-$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = 'text';
-$modversion['config'][$i]['options'] = array(_MI_TDMPICTURE_CAT_DISPLAY_NONE => 'none' , _MI_TDMPICTURE_CAT_DISPLAY_SUB => 'sub', _MI_TDMPICTURE_CAT_DISPLAY_SUBIMG => 'subimg', _MI_TDMPICTURE_CAT_DISPLAY_TEXT => 'text', _MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG => 'textimg', _MI_TDMPICTURE_CAT_DISPLAY_IMG => 'img');
-$i++;
+//$modversion['config'][$i]['name'] = 'tdmpicture_cat_display';
+//$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_CAT_DISPLAY';
+//$modversion['config'][$i]['description'] = '';
+//$modversion['config'][$i]['formtype'] = 'select';
+//$modversion['config'][$i]['valuetype'] = 'text';
+//$modversion['config'][$i]['default'] = 'text';
+//$modversion['config'][$i]['options'] = array(_MI_TDMPICTURE_CAT_DISPLAY_NONE => 'none' , _MI_TDMPICTURE_CAT_DISPLAY_SUB => 'sub', _MI_TDMPICTURE_CAT_DISPLAY_SUBIMG => 'subimg', _MI_TDMPICTURE_CAT_DISPLAY_TEXT => 'text', _MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG => 'textimg', _MI_TDMPICTURE_CAT_DISPLAY_IMG => 'img');
+//$i++;
$modversion['config'][$i]['name'] = 'tdmpicture_cat_cel';
$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_CAT_CEL';
$modversion['config'][$i]['description'] = '';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-13 20:03:38
|
Revision: 9864
http://xoops.svn.sourceforge.net/xoops/?rev=9864&view=rev
Author: lord_venom
Date: 2012-07-13 20:03:32 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Error upload
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php
XoopsModules/TDMPicture/trunk/TDMPicture/submit.php
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-07-13 19:38:54 UTC (rev 9863)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/files.php 2012-07-13 20:03:32 UTC (rev 9864)
@@ -95,6 +95,7 @@
$uploader->fetchMedia('tdmfile',$key);
if (!$uploader->upload()) {
$errors = $uploader->getErrors();
+ redirect_header("files.php",2, $errors);
} else {
$erreur=true;
if (strrpos($uploader->getMediaName(), '.') !== false) {
@@ -147,7 +148,7 @@
redirect_header('files.php', 2, _AM_TDMPICTURE_BASE);
}
//include_once('../include/forms.php');
- echo $obj->getHtmlErrors();
+ echo $obj->getHtmlErrors().$errors;
$form =& $obj->getForm();
$form->display();
break;
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php 2012-07-13 19:38:54 UTC (rev 9863)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tdmpicture_file.php 2012-07-13 20:03:32 UTC (rev 9864)
@@ -183,7 +183,7 @@
if ( is_object($xoopsUser) && $xoopsUser->isAdmin()) {
- $form->addElement(new XoopsFormRadioYN(_MD_TDMPICTURE_DISPLAYUSER, 'file_display', $this->getVar('file_display'), _YES, _NO));
+ $form->addElement(new XoopsFormRadioYN(_MD_TDMPICTURE_DISPLAYUSER, 'file_display', 0, _YES, _NO));
}else {
$gperm_handler =& xoops_gethandler('groupperm');
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/submit.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/submit.php 2012-07-13 19:38:54 UTC (rev 9863)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/submit.php 2012-07-13 20:03:32 UTC (rev 9864)
@@ -81,7 +81,7 @@
$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
if (!$uploader->upload()) {
$errors = $uploader->getErrors();
- redirect_header("javascript:history.go(-1)",3, $errors);
+ redirect_header("index.php",2, $errors);
} else {
$obj->setVar('cat_img', $uploader->getSavedFileName());
}
@@ -117,7 +117,7 @@
redirect_header('submit.php', 2, _MD_TDMPICTURE_BASE);
}
//include_once('../include/forms.php');
- echo $obj->getHtmlErrors();
+ echo $obj->getHtmlErrors().$errors;
$form =& $obj->getForm();
$form->display();
break;
@@ -152,6 +152,7 @@
$uploader->fetchMedia('tdmfile',$key);
if (!$uploader->upload()) {
$errors = $uploader->getErrors();
+ redirect_header("index.php",2, $errors);
} else {
$erreur=true;
if (strrpos($uploader->getMediaName(), '.') !== false) {
@@ -203,7 +204,7 @@
redirect_header('submit.php', 2, _MD_TDMPICTURE_BASE);
}
//include_once('../include/forms.php');
- echo $obj->getHtmlErrors();
+ echo $obj->getHtmlErrors().$errors;
$form =& $obj->getForm();
$form->display();
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-13 21:29:26
|
Revision: 9865
http://xoops.svn.sourceforge.net/xoops/?rev=9865&view=rev
Author: lord_venom
Date: 2012-07-13 21:29:20 +0000 (Fri, 13 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php
XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php 2012-07-13 20:03:32 UTC (rev 9864)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/english/modinfo.php 2012-07-13 21:29:20 UTC (rev 9865)
@@ -63,8 +63,8 @@
// version 1.3
//define("_MI_TDMPICTURE_FULL_WIDTH", "Maximum width of the image true");
//define("_MI_TDMPICTURE_FULL_HEIGTH", "Maximum height of the real image");
-define("_MI_TDMPICTURE_JAVA_WIDTH", "Width of java applet (upload)");
-define("_MI_TDMPICTURE_JAVA_HEIGTH", "Height of java applet (upload)");
+//define("_MI_TDMPICTURE_JAVA_WIDTH", "Width of java applet (upload)");
+//define("_MI_TDMPICTURE_JAVA_HEIGTH", "Height of java applet (upload)");
//define("_MI_TDMPICTURE_CAT_CEL", "Category: Number of Column");
//define("_MI_TDMPICTURE_CAT_DISPLAY", "Category: Style category");
//define("_MI_TDMPICTURE_CAT_DISPLAY_TEXT", "text");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php 2012-07-13 20:03:32 UTC (rev 9864)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/modinfo.php 2012-07-13 21:29:20 UTC (rev 9865)
@@ -62,8 +62,8 @@
//version 1.3
//define("_MI_TDMPICTURE_FULL_WIDTH","Largeur maximum de l'image réel");
//define("_MI_TDMPICTURE_FULL_HEIGTH","Hauteur maximum de l'image réel");
-define("_MI_TDMPICTURE_JAVA_WIDTH","Largeur de l'applet java (upload)");
-define("_MI_TDMPICTURE_JAVA_HEIGTH","Hauteur de l'applet java (upload)");
+//define("_MI_TDMPICTURE_JAVA_WIDTH","Largeur de l'applet java (upload)");
+//define("_MI_TDMPICTURE_JAVA_HEIGTH","Hauteur de l'applet java (upload)");
//define("_MI_TDMPICTURE_CAT_CEL","Catégorie : Nombre de colonne");
//define("_MI_TDMPICTURE_CAT_DISPLAY","Catégorie : Style des catégories");
//define("_MI_TDMPICTURE_CAT_DISPLAY_TEXT","texte");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php 2012-07-13 20:03:32 UTC (rev 9864)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/modinfo.php 2012-07-13 21:29:20 UTC (rev 9865)
@@ -62,8 +62,8 @@
//version 1.3
define("_MI_TDMPICTURE_FULL_WIDTH","Largeur maximum de l'image réel");
define("_MI_TDMPICTURE_FULL_HEIGTH","Hauteur maximum de l'image réel");
-define("_MI_TDMPICTURE_JAVA_WIDTH","Largeur de l'applet java (upload)");
-define("_MI_TDMPICTURE_JAVA_HEIGTH","Hauteur de l'applet java (upload)");
+//define("_MI_TDMPICTURE_JAVA_WIDTH","Largeur de l'applet java (upload)");
+//define("_MI_TDMPICTURE_JAVA_HEIGTH","Hauteur de l'applet java (upload)");
//define("_MI_TDMPICTURE_CAT_CEL","Catégorie : Nombre de colonne");
//define("_MI_TDMPICTURE_CAT_DISPLAY","Catégorie : Style des catégories");
//define("_MI_TDMPICTURE_CAT_DISPLAY_TEXT","texte");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-07-13 20:03:32 UTC (rev 9864)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-07-13 21:29:20 UTC (rev 9865)
@@ -158,22 +158,22 @@
$modversion['config'][$i]['description'] = '';
$modversion['config'][$i]['formtype'] = 'textarea';
$modversion['config'][$i]['valuetype'] = 'text';
-$modversion['config'][$i]['default'] = 'image/bmp|image/gif|image/ief|image/jpeg|image/pipeg|image/tiff|image/x-portable-anymap|image/x-portable-bitmap|image/x-portable-graymap|image/x-portable-pixmap|image/x-rgb|image/x-xbitmap|image/x-xwindowdump';
+$modversion['config'][$i]['default'] = 'image/png|image/bmp|image/gif|image/ief|image/jpeg|image/pipeg|image/tiff|image/x-portable-anymap|image/x-portable-bitmap|image/x-portable-graymap|image/x-portable-pixmap|image/x-rgb|image/x-xbitmap|image/x-xwindowdump';
$i++;
-$modversion['config'][$i]['name'] = 'tdmpicture_java_width';
-$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_JAVA_WIDTH';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 640;
-$i++;
-$modversion['config'][$i]['name'] = 'tdmpicture_java_heigth';
-$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_JAVA_HEIGTH';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 400;
-$i++;
+//$modversion['config'][$i]['name'] = 'tdmpicture_java_width';
+//$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_JAVA_WIDTH';
+//$modversion['config'][$i]['description'] = '';
+//$modversion['config'][$i]['formtype'] = 'textbox';
+//$modversion['config'][$i]['valuetype'] = 'int';
+//$modversion['config'][$i]['default'] = 640;
+//$i++;
+//$modversion['config'][$i]['name'] = 'tdmpicture_java_heigth';
+//$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_JAVA_HEIGTH';
+//$modversion['config'][$i]['description'] = '';
+//$modversion['config'][$i]['formtype'] = 'textbox';
+//$modversion['config'][$i]['valuetype'] = 'int';
+//$modversion['config'][$i]['default'] = 400;
+//$i++;
include_once XOOPS_ROOT_PATH . "/class/xoopslists.php";
$modversion["config"][$i]["name"] = "tdmpicture_editor";
$modversion["config"][$i]["title"] = "_MI_TDMPICTURE_EDITOR";
@@ -280,20 +280,20 @@
//$modversion['config'][$i]['default'] = 'text';
//$modversion['config'][$i]['options'] = array(_MI_TDMPICTURE_CAT_DISPLAY_NONE => 'none' , _MI_TDMPICTURE_CAT_DISPLAY_SUB => 'sub', _MI_TDMPICTURE_CAT_DISPLAY_SUBIMG => 'subimg', _MI_TDMPICTURE_CAT_DISPLAY_TEXT => 'text', _MI_TDMPICTURE_CAT_DISPLAY_TEXTIMG => 'textimg', _MI_TDMPICTURE_CAT_DISPLAY_IMG => 'img');
//$i++;
-$modversion['config'][$i]['name'] = 'tdmpicture_cat_cel';
-$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_CAT_CEL';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 2;
-$i++;
-$modversion['config'][$i]['name'] = 'tdmpicture_cat_souscel';
-$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_CAT_SOUSCEL';
-$modversion['config'][$i]['description'] = '';
-$modversion['config'][$i]['formtype'] = 'textbox';
-$modversion['config'][$i]['valuetype'] = 'int';
-$modversion['config'][$i]['default'] = 10;
-$i++;
+//$modversion['config'][$i]['name'] = 'tdmpicture_cat_cel';
+//$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_CAT_CEL';
+//$modversion['config'][$i]['description'] = '';
+//$modversion['config'][$i]['formtype'] = 'textbox';
+//$modversion['config'][$i]['valuetype'] = 'int';
+//$modversion['config'][$i]['default'] = 2;
+//$i++;
+//$modversion['config'][$i]['name'] = 'tdmpicture_cat_souscel';
+//$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_CAT_SOUSCEL';
+//$modversion['config'][$i]['description'] = '';
+//$modversion['config'][$i]['formtype'] = 'textbox';
+//$modversion['config'][$i]['valuetype'] = 'int';
+//$modversion['config'][$i]['default'] = 10;
+//$i++;
//
$modversion['config'][$i]['name'] = 'tdmpicture_cat_width';
$modversion['config'][$i]['title'] = '_MI_TDMPICTURE_CAT_WIDTH';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-14 18:25:19
|
Revision: 9878
http://xoops.svn.sourceforge.net/xoops/?rev=9878&view=rev
Author: lord_venom
Date: 2012-07-14 18:25:12 +0000 (Sat, 14 Jul 2012)
Log Message:
-----------
Path url
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php
XoopsModules/TDMPicture/trunk/TDMPicture/admin/user.php
XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
XoopsModules/TDMPicture/trunk/TDMPicture/download.php
XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php
XoopsModules/TDMPicture/trunk/TDMPicture/index.php
XoopsModules/TDMPicture/trunk/TDMPicture/pdf_paper.php
XoopsModules/TDMPicture/trunk/TDMPicture/submit.php
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_index.html
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_liste.html
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewcat.html
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
XoopsModules/TDMPicture/trunk/TDMPicture/user.php
XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php
XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php
XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php 2012-07-14 18:11:32 UTC (rev 9877)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/cat.php 2012-07-14 18:25:12 UTC (rev 9878)
@@ -218,7 +218,7 @@
echo '</tr>';
$class = 'odd';
$mytree = new TDMObjectTree($assoc_cat, 'cat_id', 'cat_pid');
- $category_ArrayTree = $mytree->makeArrayTree('','<img src="'.TDMPICTURE_IMAGES_URL.'/decos/arrow.gif">');
+ $category_ArrayTree = $mytree->makeArrayTree('','<img src="'.TDMPICTURE_IMAGES_URL.'decos/arrow.gif">');
foreach (array_keys($category_ArrayTree) as $i) {
$class = ($class == 'even') ? 'odd' : 'even';
$cat_id = $assoc_cat[$i]->getVar('cat_id');
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/admin/user.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/admin/user.php 2012-07-14 18:11:32 UTC (rev 9877)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/admin/user.php 2012-07-14 18:25:12 UTC (rev 9878)
@@ -200,7 +200,7 @@
echo '</tr>';
$class = 'odd';
$mytree = new TDMObjectTree($assoc_user, 'user_id', 'user_pid');
- $useregory_ArrayTree = $mytree->makeArrayTree('','<img src="'.TDMPICTURE_IMAGES_URL.'/decos/arrow.gif">');
+ $useregory_ArrayTree = $mytree->makeArrayTree('','<img src="'.TDMPICTURE_IMAGES_URL.'decos/arrow.gif">');
foreach (array_keys($useregory_ArrayTree) as $i) {
$class = ($class == 'even') ? 'odd' : 'even';
$user_id = $assoc_user[$i]->getVar('user_id');
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-14 18:11:32 UTC (rev 9877)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-14 18:25:12 UTC (rev 9878)
@@ -68,11 +68,11 @@
//$cat_link = tdmspot_seo_genUrl( $xoopsModuleConfig['tdmspot_seo_cat'], $this->_tree[$key]['obj']->getVar('id'), $this->_tree[$key]['obj']->getVar('title'), $start, $limit, $tris );
$cat_link = TDMPICTURE_URL."/viewcat.php?ct=".$this->_tree[$key]['obj']->getVar('cat_id')."&tris=".$tris."&limit=".$limit;
//recherche image
- $imgpath = TDM_CAT_PATH . $this->_tree[$key]['obj']->getVar('cat_img');
+ $imgpath = TDMPICTURE_CAT_PATH . $this->_tree[$key]['obj']->getVar('cat_img');
if (file_exists($imgpath) && $this->_tree[$key]['obj']->getVar('cat_img') != "blank.gif") {
- $picture = '<a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'"><img src="' . TDM_CAT_URL . $this->_tree[$key]['obj']->getVar('cat_img').'" class="img" width="'.$xoopsModuleConfig['tdmpicture_cat_width'].'" height="'.$xoopsModuleConfig['tdmpicture_cat_height'].'"></a>';
+ $picture = '<a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'"><img src="' . TDMPICTURE_CAT_URL . $this->_tree[$key]['obj']->getVar('cat_img').'" class="img" width="'.$xoopsModuleConfig['tdmpicture_cat_width'].'" height="'.$xoopsModuleConfig['tdmpicture_cat_height'].'"></a>';
} else {
- $picture = '<a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'"><img src="' . TDM_CAT_URL . 'no_picture.png" class="img" width="'.$xoopsModuleConfig['tdmpicture_cat_width'].'" height="'.$xoopsModuleConfig['tdmpicture_cat_height'].'"></a>';
+ $picture = '<a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'"><img src="' . TDMPICTURE_CAT_URL . 'no_picture.png" class="img" width="'.$xoopsModuleConfig['tdmpicture_cat_width'].'" height="'.$xoopsModuleConfig['tdmpicture_cat_height'].'"></a>';
}
@@ -104,7 +104,7 @@
$select = $this->makeSelBox('cat_pid', 'cat_title','-', 0, '', $this->_tree[$key]['obj']->getVar('cat_id'), "OnChange='window.document.location=this.options[this.selectedIndex].value;'", 'tdmpicture_catview');
- $ret .= '<li style="width:47%;" class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="tree_form">'.$select.'</div></li>';
+ $ret .= '<li style="width:47%;" class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="tree_form">'.$select.'</div></div></li>';
}
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-14 18:11:32 UTC (rev 9877)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-14 18:25:12 UTC (rev 9878)
@@ -54,7 +54,9 @@
float:left;
}
+
#tdmpicture_text, ul#tree_menu #tree_text {
+ float:left;
font-size: 13px;
font-weight: normal;
color: #728DA9;
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/download.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/download.php 2012-07-14 18:11:32 UTC (rev 9877)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/download.php 2012-07-14 18:25:12 UTC (rev 9878)
@@ -40,9 +40,9 @@
}
//on test l'existance de l'image
- $imgpath = XOOPS_ROOT_PATH . "/modules/".$xoopsModule->dirname()."/upload/".$document->getVar("file_file");
+ $imgpath = TDMPICTURE_UPLOADS_PATH.$document->getVar("file_file");
if (file_exists($imgpath)) {
- $document_file = XOOPS_URL. "/modules/".$xoopsModule->dirname()."/upload/".$document->getVar("file_file");
+ $document_file = TDMPICTURE_UPLOADS_URL.$document->getVar("file_file");
} else {
redirect_header('index.php', 2, _AM_TDMPICTURE_BASEERROR);
exit();
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php 2012-07-14 18:11:32 UTC (rev 9877)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/include/common.php 2012-07-14 18:25:12 UTC (rev 9878)
@@ -27,8 +27,8 @@
define("TDMPICTURE_DIRNAME", basename(dirname(dirname(__FILE__))));
define("TDMPICTURE_URL", XOOPS_URL . '/modules/' . TDMPICTURE_DIRNAME);
-define("TDMPICTURE_IMAGES_URL", TDMPICTURE_URL . '/images');
-define("TDMPICTURE_UPLOADS_URL", TDMPICTURE_URL . '/upload');
+define("TDMPICTURE_IMAGES_URL", TDMPICTURE_URL . '/images/');
+define("TDMPICTURE_UPLOADS_URL", TDMPICTURE_URL . '/upload/');
define("TDMPICTURE_THUMB_URL", TDMPICTURE_URL . '/upload/thumb/');
define("TDMPICTURE_CAT_URL", TDMPICTURE_URL . '/upload/cat/');
@@ -45,6 +45,8 @@
//define("TDMPICTURE_THUMB_DECO", $xoopsModuleConfig['tdmpicture_thumb_deco']);
define("TDMPICTURE_SLIDE_WIDTH", $xoopsModuleConfig['tdmpicture_slide_width']);
define("TDMPICTURE_SLIDE_HEIGHT", $xoopsModuleConfig['tdmpicture_slide_height']);
+define("TDMPICTURE_WIDTH", $xoopsModuleConfig['tdmpicture_width']);
+define("TDMPICTURE_HEIGHT", $xoopsModuleConfig['tdmpicture_heigth']);
include_once TDMPICTURE_ROOT_PATH . '/include/functions.php';
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/index.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/index.php 2012-07-14 18:11:32 UTC (rev 9877)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/index.php 2012-07-14 18:25:12 UTC (rev 9878)
@@ -72,9 +72,9 @@
$cat_arr = $cat_handler->getall($criteria);
$mytree = new TDMObjectTree($cat_arr, 'cat_id', 'cat_pid');
//asigne les URL
- define("TDM_CAT_URL", TDMPICTURE_CAT_URL);
- define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH);
- define("TDM_CAT_LINK", "viewcat.php");
+ //define("TDM_CAT_URL", TDMPICTURE_CAT_URL);
+ //define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH);
+ //define("TDM_CAT_LINK", "viewcat.php");
//$cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
//$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
$display_cat = $mytree->makeCatBox($file_handler, 'cat_title','-', $cat = false);
@@ -121,10 +121,10 @@
//
$file['cat_nav'] = 'ct='.$file_arr[$f]->getVar('file_cat');
//on test l'existance de l'image
- $imgpath = TDMPICTURE_UPLOADS_PATH . "/thumb/".$file_arr[$f]->getVar("file_file");
+ $imgpath = TDMPICTURE_THUMB_PATH.$file_arr[$f]->getVar("file_file");
if (file_exists($imgpath)) {
- $file['img'] = TDMPICTURE_UPLOADS_URL. "/thumb/".$file_arr[$f]->getVar("file_file");
- $file['img_popup'] = TDMPICTURE_UPLOADS_URL. "/".$file_arr[$f]->getVar("file_file");
+ $file['img'] = TDMPICTURE_THUMB_URL.$file_arr[$f]->getVar("file_file");
+ $file['img_popup'] = TDMPICTURE_UPLOADS_URL.$file_arr[$f]->getVar("file_file");
} else {
$file['img'] = false;
}
@@ -154,12 +154,12 @@
if (@$moyen == 0) {
$file['moyen'] = "";
} else {
- $file['moyen'] = "<img src='".TDMPICTURE_IMAGES_URL."/rate".$moyen.".png'/>";
+ $file['moyen'] = "<img src='".TDMPICTURE_IMAGES_URL."rate".$moyen.".png'/>";
}
//favorie
if ($file['counts'] >= $xoopsModuleConfig['tdmpicture_favourite']) {
- $file['favourite'] = "<img src='".TDMPICTURE_IMAGES_URL."/flag.png'/>";
+ $file['favourite'] = "<img src='".TDMPICTURE_IMAGES_URL."flag.png'/>";
} else {
$file['favourite'] = "";
}
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/pdf_paper.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/pdf_paper.php 2012-07-14 18:11:32 UTC (rev 9877)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/pdf_paper.php 2012-07-14 18:25:12 UTC (rev 9878)
@@ -44,10 +44,10 @@
exit();
}
- if( file_exists(XOOPS_ROOT_PATH."/modules/TDMPicture/language/".$xoopsConfig['language']."/admin.php") ) {
- include_once(XOOPS_ROOT_PATH."/modules/TDMPicture/language/".$xoopsConfig['language']."/admin.php");
+ if( file_exists(TDMPICTURE_ROOT_PATH."/language/".$xoopsConfig['language']."/admin.php") ) {
+ include_once(TDMPICTURE_ROOT_PATH."/language/".$xoopsConfig['language']."/admin.php");
} else {
- include_once(XOOPS_ROOT_PATH."/modules/TDMPicture/language/english/admin.php");
+ include_once(TDMPICTURE_ROOT_PATH."/language/english/admin.php");
}
$myts = & MyTextSanitizer :: getInstance(); // MyTextSanitizer object
@@ -174,7 +174,7 @@
$pdf->AddPage();
//titre
$absx=($wt-$w)/2;
-$pdf->Image(''.XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/upload/'.$file->getVar("file_file").'', $absx, 0,$w);
+$pdf->Image(''.TDMPICTURE_UPLOADS_PATH.$file->getVar("file_file").'', $absx, 0,$w);
$pdf->Output();
break;
@@ -204,7 +204,7 @@
//titre
$size = '210';
$absx=(210-$size)/2;
-$pdf->Image(''.XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/upload/'.$file->getVar("file_file").'', $absx, 0,$size);
+$pdf->Image(''.TDMPICTURE_UPLOADS_PATH.$file->getVar("file_file").'', $absx, 0,$size);
$pdf->Output();
break;
@@ -234,7 +234,7 @@
//titre
$size = '297';
$absx=(297-$size)/2;
-$pdf->Image(''.XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/upload/'.$file->getVar("file_file").'', $absx, 0,$size);
+$pdf->Image(''.TDMPICTURE_UPLOADS_PATH.$file->getVar("file_file").'', $absx, 0,$size);
$pdf->Output();
break;
@@ -265,7 +265,7 @@
//titre
$size = '420';
$absx=(420-$size)/2;
-$pdf->Image(''.XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/upload/'.$file->getVar("file_file").'', $absx, 0,$size);
+$pdf->Image(''.TDMPICTURE_UPLOADS_PATH.$file->getVar("file_file").'', $absx, 0,$size);
$pdf->Output();
break;
@@ -295,7 +295,7 @@
//titre
$size = '594';
$absx=(594-$size)/2;
-$pdf->Image(''.XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/upload/'.$file->getVar("file_file").'', $absx, 0,$size);
+$pdf->Image(''.TDMPICTURE_UPLOADS_PATH.$file->getVar("file_file").'', $absx, 0,$size);
$pdf->Output();
break;
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/submit.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/submit.php 2012-07-14 18:11:32 UTC (rev 9877)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/submit.php 2012-07-14 18:25:12 UTC (rev 9878)
@@ -212,7 +212,7 @@
case "list":
default:
- redirect_header(TDMPICTURE_URL, 2, _MD_TDMPICTURE_NOPERM);
+ redirect_header("index.php", 2, _MD_TDMPICTURE_NOPERM);
exit();
}
tdmpicture_header();
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_index.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_index.html 2012-07-14 18:11:32 UTC (rev 9877)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_index.html 2012-07-14 18:25:12 UTC (rev 9878)
@@ -65,10 +65,10 @@
<td>
<!--nav -->
<div class="TDMNav"">
- <a href="#" class="switch_thumb" title="<{$smarty.const._MD_TDMPICTURE_SWITCH}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/view_choose.png" title="<{$smarty.const._MD_TDMPICTURE_SWITCH}>"></span></a>
- <a href="javascript:;" class="openSlideshow" title="<{$smarty.const._MD_TDMPICTURE_SLIDE}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/diapo.png" title="<{$smarty.const._MD_TDMPICTURE_SLIDE}>"></span></a>
- <{if $xoops_userid}><a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$xoops_userid}>" title="<{$smarty.const._MD_TDMPICTURE_VIEWMYALBUM}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/photo.png" title="<{$smarty.const._MD_TDMPICTURE_VIEWMYALBUM}>"></span></a><{/if}>
- <{if $perm_submit}><a href="<{$smarty.const.TDMPICTURE_URL}>/submit.php" title="<{$smarty.const._MD_TDMPICTURE_UPLOAD}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/upload.png" title="<{$smarty.const._MD_TDMPICTURE_UPLOAD}>"></span></a><{/if}>
+ <a href="#" class="switch_thumb" title="<{$smarty.const._MD_TDMPICTURE_SWITCH}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>view_choose.png" title="<{$smarty.const._MD_TDMPICTURE_SWITCH}>"></span></a>
+ <a href="javascript:;" class="openSlideshow" title="<{$smarty.const._MD_TDMPICTURE_SLIDE}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>diapo.png" title="<{$smarty.const._MD_TDMPICTURE_SLIDE}>"></span></a>
+ <{if $xoops_userid}><a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$xoops_userid}>" title="<{$smarty.const._MD_TDMPICTURE_VIEWMYALBUM}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>photo.png" title="<{$smarty.const._MD_TDMPICTURE_VIEWMYALBUM}>"></span></a><{/if}>
+ <{if $perm_submit}><a href="<{$smarty.const.TDMPICTURE_URL}>/submit.php" title="<{$smarty.const._MD_TDMPICTURE_UPLOAD}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>upload.png" title="<{$smarty.const._MD_TDMPICTURE_UPLOAD}>"></span></a><{/if}>
</div>
<br class="clear"/>
<{include file="db:tdmpicture_tpfile.html"}>
@@ -85,7 +85,7 @@
<!-- AddThis Button END -->
<!-- Button RSS -->
<{if $smarty.const.TDMPICTURE_RSS}>
-<div style="float:right;"><a href="<{$smarty.const.TDMPICTURE_URL}>/rss.php" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/rss.png" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" /></a></div>
+<div style="float:right;"><a href="<{$smarty.const.TDMPICTURE_URL}>/rss.php" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>rss.png" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" /></a></div>
<{/if}>
<!-- Button RSS END-->
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_liste.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_liste.html 2012-07-14 18:11:32 UTC (rev 9877)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_liste.html 2012-07-14 18:25:12 UTC (rev 9878)
@@ -14,7 +14,7 @@
<{foreach item=file from=$file}>
<{cycle values=odd,even assign=class}>
<tr class="<{$class}>">
- <td style="vertical-align: middle;"><a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.file_uid}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/photo.png" /></a></td>
+ <td style="vertical-align: middle;"><a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.file_uid}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>photo.png" /></a></td>
<td align="center" style="vertical-align: middle;"><a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.file_uid}>"><{$file.user_uname}>, <{$file.user_name}></a></td>
<td align="center" style="vertical-align: middle;"><a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.file_uid}>"><{$file.file_usercount}></a></td>
</tr>
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewcat.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewcat.html 2012-07-14 18:11:32 UTC (rev 9877)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewcat.html 2012-07-14 18:25:12 UTC (rev 9878)
@@ -65,10 +65,10 @@
<td>
<!--nav -->
<div class="TDMNav">
- <a href="#" class="switch_thumb" title="<{$smarty.const._MD_TDMPICTURE_SWITCH}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/view_choose.png" title="<{$smarty.const._MD_TDMPICTURE_SWITCH}>"></span></a>
- <a href="javascript:;" class="openSlideshow" title="<{$smarty.const._MD_TDMPICTURE_SLIDE}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/diapo.png" title="<{$smarty.const._MD_TDMPICTURE_SLIDE}>"></span></a>
- <{if $xoops_userid}><a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$xoops_userid}>" title="<{$smarty.const._MD_TDMPICTURE_VIEWMYALBUM}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/photo.png" title="<{$smarty.const._MD_TDMPICTURE_VIEWMYALBUM}>"></span></a><{/if}>
- <{if $perm_submit}><a href="<{$smarty.const.TDMPICTURE_URL}>/submit.php" title="<{$smarty.const._MD_TDMPICTURE_UPLOAD}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/upload.png" title="<{$smarty.const._MD_TDMPICTURE_UPLOAD}>"></span></a><{/if}>
+ <a href="#" class="switch_thumb" title="<{$smarty.const._MD_TDMPICTURE_SWITCH}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>view_choose.png" title="<{$smarty.const._MD_TDMPICTURE_SWITCH}>"></span></a>
+ <a href="javascript:;" class="openSlideshow" title="<{$smarty.const._MD_TDMPICTURE_SLIDE}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>diapo.png" title="<{$smarty.const._MD_TDMPICTURE_SLIDE}>"></span></a>
+ <{if $xoops_userid}><a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$xoops_userid}>" title="<{$smarty.const._MD_TDMPICTURE_VIEWMYALBUM}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>photo.png" title="<{$smarty.const._MD_TDMPICTURE_VIEWMYALBUM}>"></span></a><{/if}>
+ <{if $perm_submit}><a href="<{$smarty.const.TDMPICTURE_URL}>/submit.php" title="<{$smarty.const._MD_TDMPICTURE_UPLOAD}>"><span><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>upload.png" title="<{$smarty.const._MD_TDMPICTURE_UPLOAD}>"></span></a><{/if}>
</div>
<br class="clear"/>
<{include file="db:tdmpicture_tpfile.html"}>
@@ -87,7 +87,7 @@
<!-- AddThis Button END -->
<!-- Button RSS -->
<{if $smarty.const.TDMPICTURE_RSS}>
-<div style="float:right;"><a href="<{$smarty.const.TDMPICTURE_URL}>/rss.php" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/rss.png" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" /></a></div>
+<div style="float:right;"><a href="<{$smarty.const.TDMPICTURE_URL}>/rss.php" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>rss.png" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" /></a></div>
<{/if}>
<!-- Button RSS END-->
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-14 18:11:32 UTC (rev 9877)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-14 18:25:12 UTC (rev 9878)
@@ -29,9 +29,9 @@
<{foreach item=file from=$file}>
<div class="TDMNav"">
- <{if $perm_dl}><a href="<{$smarty.const.TDMPICTURE_URL}>/download.php?st=<{$file.id}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/down.png" title="<{$smarty.const._MD_TDMPICTURE_DL}>"></a><{/if}>
- <a href="javascript:;" slide="<{$file.img_popup}>" rel="group1" title="<{$file.title}>" alt="<{$file.title}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/zoom.png" title="<{$smarty.const._MD_TDMPICTURE_SCREEN}>" alt="<{$smarty.const._MD_TDMPICTURE_SCREEN}>" /></a>
- <{if $file.useralb }><a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.uid}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/photo.png" title="<{$smarty.const._MD_TDMPICTURE_VIEWALBUM}> <{$file.postername}>"></a><{/if}>
+ <{if $perm_dl}><a href="<{$smarty.const.TDMPICTURE_URL}>/download.php?st=<{$file.id}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>down.png" title="<{$smarty.const._MD_TDMPICTURE_DL}>"></a><{/if}>
+ <a href="javascript:;" slide="<{$file.img_popup}>" rel="group1" title="<{$file.title}>" alt="<{$file.title}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>zoom.png" title="<{$smarty.const._MD_TDMPICTURE_SCREEN}>" alt="<{$smarty.const._MD_TDMPICTURE_SCREEN}>" /></a>
+ <{if $file.useralb }><a href="<{$smarty.const.TDMPICTURE_URL}>/user.php?ut=<{$file.uid}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>photo.png" title="<{$smarty.const._MD_TDMPICTURE_VIEWALBUM}> <{$file.postername}>"></a><{/if}>
</div>
<br class="clear"/>
@@ -41,7 +41,8 @@
<tr><td class="even" align="center">
<div class="boxgrid">
- <a href="javascript:;" slide="<{$file.img_popup}>" rel="group1" title="<{$file.title}>" alt="<{$file.title}>" ><{$file.img}>
+ <a href="javascript:;" slide="<{$file.img_popup}>" rel="group1" title="<{$file.title}>" alt="<{$file.title}>" >
+ <img style="max-width:<{$smarty.const.TDMPICTURE_WIDTH}>px; max-height:<{$smarty.const.TDMPICTURE_HEIGHT}>px;" src="<{$file.img}>" slide="<{$file.img_popup}>" rel="group1" title="<{$file.title}>" alt="<{$file.title}>" />
</a></div>
</td></tr><tr><td class="odd">
@@ -118,11 +119,11 @@
<{if $smarty.const.TDMPICTURE_PDF}>
<tr><td class="odd">
<div style="float: left;">
-<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=auto&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_mini.png" title="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" /></a>
-<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A4&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A4.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" /></a>
-<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A3&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A3.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" /></a>
-<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A2&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A2.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" /></a>
-<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A1&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/pdf_A1.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA1}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA1}>" /></a>
+<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=auto&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>pdf_mini.png" title="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFAUTO}>" /></a>
+<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A4&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>pdf_A4.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA4}>" /></a>
+<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A3&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>pdf_A3.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA3}>" /></a>
+<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A2&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>pdf_A2.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA2}>" /></a>
+<a href="<{$smarty.const.TDMPICTURE_URL}>/pdf_paper.php?option=A1&st=<{$file.id}>"><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>pdf_A1.png" title="<{$smarty.const._MD_TDMPICTURE_PDFA1}>" alt="<{$smarty.const._MD_TDMPICTURE_PDFA1}>" /></a>
</div>
</li></ul>
</td></tr>
@@ -142,7 +143,7 @@
<!-- AddThis Button END -->
<!-- Button RSS -->
<{if $smarty.const.TDMPICTURE_RSS}>
-<div style="float:right;"><a href="<{$smarty.const.TDMPICTURE_URL}>/rss.php" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>/rss.png" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" /></a></div>
+<div style="float:right;"><a href="<{$smarty.const.TDMPICTURE_URL}>/rss.php" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" ><img src="<{$smarty.const.TDMPICTURE_IMAGES_URL}>rss.png" title="<{$smarty.const._MD_TDMPICTURE_RSS}>" alt="<{$smarty.const._MD_TDMPICTURE_RSS}>" /></a></div>
<{/if}>
<!-- Button RSS END-->
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/user.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/user.php 2012-07-14 18:11:32 UTC (rev 9877)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/user.php 2012-07-14 18:25:12 UTC (rev 9878)
@@ -79,8 +79,8 @@
$cat_arr = $cat_handler->getall($criteria);
$mytree = new TDMObjectTree($cat_arr, 'cat_id', 'cat_pid');
//asigne les URL
- define("TDM_CAT_URL", TDMPICTURE_CAT_URL);
- define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH);
+ //define("TDM_CAT_URL", TDMPICTURE_CAT_URL);
+ //define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH);
define("TDM_CAT_LINK", "viewcat.php");
//$cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
//$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
@@ -131,10 +131,10 @@
//
$file['cat_nav'] = 'ct='.$file_arr[$f]->getVar('file_cat');
//on test l'existance de l'image
- $imgpath = TDMPICTURE_UPLOADS_PATH . "/thumb/".$file_arr[$f]->getVar("file_file");
+ $imgpath = TDMPICTURE_THUMB_PATH.$file_arr[$f]->getVar("file_file");
if (file_exists($imgpath)) {
- $file['img'] = TDMPICTURE_UPLOADS_URL. "/thumb/".$file_arr[$f]->getVar("file_file");
- $file['img_popup'] = TDMPICTURE_UPLOADS_URL. "/".$file_arr[$f]->getVar("file_file");
+ $file['img'] = TDMPICTURE_THUMB_URL.$file_arr[$f]->getVar("file_file");
+ $file['img_popup'] = TDMPICTURE_UPLOADS_URL.$file_arr[$f]->getVar("file_file");
} else {
$file['img'] = false;
}
@@ -164,12 +164,12 @@
if (@$moyen == 0) {
$file['moyen'] = "";
} else {
- $file['moyen'] = "<img src='".TDMPICTURE_IMAGES_URL."/rate".$moyen.".png'/>";
+ $file['moyen'] = "<img src='".TDMPICTURE_IMAGES_URL."rate".$moyen.".png'/>";
}
//favorie
if ($file['counts'] >= $xoopsModuleConfig['tdmpicture_favourite']) {
- $file['favourite'] = "<img src='".TDMPICTURE_IMAGES_URL."/flag.png'/>";
+ $file['favourite'] = "<img src='".TDMPICTURE_IMAGES_URL."flag.png'/>";
} else {
$file['favourite'] = "";
}
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php 2012-07-14 18:11:32 UTC (rev 9877)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php 2012-07-14 18:25:12 UTC (rev 9878)
@@ -91,8 +91,8 @@
$cat_arr = $cat_handler->getall($criteria);
$mytree = new TDMObjectTree($cat_arr, 'cat_id', 'cat_pid');
//asigne les URL
- define("TDM_CAT_URL", TDMPICTURE_CAT_URL);
- define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH);
+ //define("TDM_CAT_URL", TDMPICTURE_CAT_URL);
+ //define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH);
//$cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
//$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
$display_cat = $mytree->makeCatBox($file_handler, 'cat_title','-', $ct);
@@ -145,17 +145,17 @@
$file['file_cat_id'] = $file_arr[$f]->getVar('file_cat');
//
//on test l'existance de l'image
- $imgpath = TDMPICTURE_UPLOADS_PATH . "/thumb/".$file_arr[$f]->getVar("file_file");
+ $imgpath = TDMPICTURE_THUMB_PATH.$file_arr[$f]->getVar("file_file");
if (file_exists($imgpath)) {
- $file['img'] = TDMPICTURE_UPLOADS_URL. "/thumb/".$file_arr[$f]->getVar("file_file");
- $file['img_popup'] = TDMPICTURE_UPLOADS_URL. "/".$file_arr[$f]->getVar("file_file");
+ $file['img'] = TDMPICTURE_THUMB_URL.$file_arr[$f]->getVar("file_file");
+ $file['img_popup'] = TDMPICTURE_UPLOADS_URL.$file_arr[$f]->getVar("file_file");
} else {
$file['img'] = false;
}
$file['id'] = $file_arr[$f]->getVar("file_id");
$file['title'] = $myts->displayTarea($file_arr[$f]->getVar("file_title"));
- $file['text'] = $myts->displayTarea($file_arr[$f]->getVar("file_text"));
+ $file['text'] = $file_arr[$f]->getVar("file_text");
$file['file_catum'] = $file_arr[$f]->getVar("file_catum");
@@ -178,12 +178,12 @@
if (@$moyen == 0) {
$file['moyen'] = "";
} else {
- $file['moyen'] = "<img src='".TDMPICTURE_IMAGES_URL."/rate".$moyen.".png'/>";
+ $file['moyen'] = "<img src='".TDMPICTURE_IMAGES_URL."rate".$moyen.".png'/>";
}
//favorie
if ($file['counts'] >= $xoopsModuleConfig['tdmpicture_favourite']) {
- $file['favourite'] = "<img src='".TDMPICTURE_IMAGES_URL."/flag.png'/>";
+ $file['favourite'] = "<img src='".TDMPICTURE_IMAGES_URL."flag.png'/>";
} else {
$file['favourite'] = "";
}
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php 2012-07-14 18:11:32 UTC (rev 9877)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php 2012-07-14 18:25:12 UTC (rev 9878)
@@ -132,17 +132,17 @@
$nav_page = "";
if ($pos != 0) {
- $path = TDMPICTURE_THUMB_PATH . "/".$array_files[$pos-1];
+ $path = TDMPICTURE_THUMB_PATH.$array_files[$pos-1];
if (file_exists($path)) {
- $previmg = "<img src=".TDMPICTURE_THUMB_URL. "/".$array_files[$pos-1]." class='detail_img'>";
+ $previmg = "<img src=".TDMPICTURE_THUMB_URL.$array_files[$pos-1]." class='detail_img'>";
$prev_page = "<a title='".$array_titles[$pos-1]."' href='viewfile.php?st=".$array_ids[$pos-1]."&tris=".$tris."'>".$previmg."</a>";
$xoopsTpl->assign('prev_page', $prev_page);
} }
if ($pos != $numrows) {
- $path = TDMPICTURE_THUMB_PATH . "/".$array_files[$pos+1];
+ $path = TDMPICTURE_THUMB_PATH.$array_files[$pos+1];
if (file_exists($path)) {
- $nextimg = "<img src=".TDMPICTURE_THUMB_URL. "/".$array_files[$pos+1]." class='detail_img'>";
+ $nextimg = "<img src=".TDMPICTURE_THUMB_URL.$array_files[$pos+1]." class='detail_img'>";
$next_page = "<a title='".$array_titles[$pos+1]."' href='viewfile.php?st=".$array_ids[$pos+1]."&tris=".$tris."'>".$nextimg."</a>" ;
$xoopsTpl->assign('next_page', $next_page);
} }
@@ -174,11 +174,12 @@
$file['file_cat_id'] = $file_arr[$f]->getVar('file_cat');
//
//on test l'existance de l'image
- $imgpath = TDMPICTURE_UPLOADS_PATH . "/".$file_arr[$f]->getVar("file_file");
+ $imgpath = TDMPICTURE_UPLOADS_PATH.$file_arr[$f]->getVar("file_file");
if (file_exists($imgpath)) {
//$dst = redimage( $imgpath,$xoopsModuleConfig['tdmpicture_width'],$xoopsModuleConfig['tdmpicture_heigth']);
- $file['img'] = "<img src=".TDMPICTURE_UPLOADS_URL. "/".$file_arr[$f]->getVar("file_file")." class='detail_img' style='max-width:".$xoopsModuleConfig['tdmpicture_width']."px;max-height:".$xoopsModuleConfig['tdmpicture_heigth']."px;' >";
- $file['img_popup'] = TDMPICTURE_UPLOADS_URL. "/".$file_arr[$f]->getVar("file_file");
+ //$file['img'] = "<img src=".TDMPICTURE_UPLOADS_URL. "/".$file_arr[$f]->getVar("file_file")." class='detail_img' style='max-width:".$xoopsModuleConfig['tdmpicture_width']."px;max-height:".$xoopsModuleConfig['tdmpicture_heigth']."px;' >";
+ $file['img'] = TDMPICTURE_UPLOADS_URL.$file_arr[$f]->getVar("file_file");
+ $file['img_popup'] = TDMPICTURE_UPLOADS_URL.$file_arr[$f]->getVar("file_file");
} else {
$file['img'] = false;
}
@@ -211,7 +212,7 @@
$xoopsTpl->assign('file_edit', true);
}
$meta_desc = $file_arr[$f]->getVar("file_text");
- $file['text'] = $myts->displayTarea($file_arr[$f]->getVar("file_text"));
+ $file['text'] = $file_arr[$f]->getVar("file_text");
$file['indate'] = formatTimeStamp($file_arr[$f]->getVar('file_indate'),"S");
$file['votes'] = $file_arr[$f]->getVar('file_votes');
$file['counts'] = $file_arr[$f]->getVar("file_counts");
@@ -222,11 +223,11 @@
if (@$moyen == 0) {
$file['moyen'] = "";
} else {
- $file['moyen'] = "<img src='".TDMPICTURE_IMAGES_URL."/rate".$moyen.".png'/>";
+ $file['moyen'] = "<img src='".TDMPICTURE_IMAGES_URL."rate".$moyen.".png'/>";
}
//favorie
if ($file['counts'] >= $xoopsModuleConfig['tdmpicture_favourite']) {
- $file['favourite'] = "<img src='".TDMPICTURE_IMAGES_URL."/flag.png'/>";
+ $file['favourite'] = "<img src='".TDMPICTURE_IMAGES_URL."flag.png'/>";
} else {
$file['favourite'] = "";
}
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-07-14 18:11:32 UTC (rev 9877)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-07-14 18:25:12 UTC (rev 9878)
@@ -22,7 +22,7 @@
}
$modversion['name'] = "TDMPicture";
-$modversion['version'] = 1.06;
+$modversion['version'] = 1.063;
$modversion['description'] = 'Image manager';
$modversion['credits'] = "none";
$modversion['author'] = 'TDM';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-14 23:46:20
|
Revision: 9879
http://xoops.svn.sourceforge.net/xoops/?rev=9879&view=rev
Author: lord_venom
Date: 2012-07-14 23:46:12 +0000 (Sat, 14 Jul 2012)
Log Message:
-----------
minitable
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/blocks/tdmpicture_minitable.php
XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
XoopsModules/TDMPicture/trunk/TDMPicture/index.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php
XoopsModules/TDMPicture/trunk/TDMPicture/templates/blocks/tdmpicture_minitable.html
XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/blocks/tdmpicture_minitable.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/blocks/tdmpicture_minitable.php 2012-07-14 18:25:12 UTC (rev 9878)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/blocks/tdmpicture_minitable.php 2012-07-14 23:46:12 UTC (rev 9879)
@@ -21,6 +21,10 @@
die("XOOPS root path not defined");
}
+global $xoopsModuleConfig, $xoopsModule;
+include_once XOOPS_ROOT_PATH."/modules/".basename(dirname(dirname(__FILE__)))."/include/common.php";
+
+echo TDMPICTURE_URL."passe";
function addCatSelect($cats) {
if(is_array($cats)) {
$cat_sql = '('.current($cats);
@@ -37,9 +41,9 @@
global $xoopsConfig, $xoopsModule, $xoTheme, $xoopsTpl;
if(isset($xoTheme) && is_object($xoTheme)) {
- $xoTheme->addStylesheet(XOOPS_URL."/modules/".basename(dirname(dirname(__FILE__)))."/css/tdmpicture.css");
- $xoTheme->addScript(XOOPS_URL."/modules/".basename(dirname(dirname(__FILE__)))."/js/jquery-1.4.4.js");
- $xoTheme->addScript(XOOPS_URL."/modules/".basename(dirname(dirname(__FILE__)))."/js/AudioPlayer.js");
+ $xoTheme->addStylesheet(TDMPICTURE_URL."/css/tdmpicture.css");
+ $xoTheme->addScript(TDMPICTURE_URL."/js/jquery-1.4.4.js");
+ $xoTheme->addScript(TDMPICTURE_URL."/js/AudioPlayer.js");
}
xoops_loadLanguage('main', 'TDMPicture');
@@ -84,12 +88,12 @@
$blocks[$i]['file_cat_id'] = $file_arr[$i]->getVar('file_cat');
//on test l'existance de l'image
- $imgpath = XOOPS_ROOT_PATH . "/modules/TDMPicture/upload/thumb/".$file_arr[$i]->getVar("file_file");
+ $imgpath = TDMPICTURE_THUMB_PATH.$file_arr[$i]->getVar("file_file");
if (file_exists($imgpath)) {
- $blocks[$i]['img'] = XOOPS_URL. "/modules/TDMPicture/upload/thumb/".$file_arr[$i]->getVar("file_file");
- $blocks[$i]['img_popup'] = XOOPS_URL. "/modules/TDMPicture/upload/".$file_arr[$i]->getVar("file_file");
+ $blocks[$i]['img'] = TDMPICTURE_THUMB_URL.$file_arr[$i]->getVar("file_file");
+ $blocks[$i]['img_popup'] = TDMPICTURE_UPLOADS_URL.$file_arr[$i]->getVar("file_file");
} else {
- $blocks[$i]['img'] = XOOPS_URL. "/modules/TDMPicture/images/blank.png";
+ $blocks[$i]['img'] = TDMPICTURE_UPLOADS_URL."blank.png";
}
$blocks[$i]['i'] = $e;
$blocks[$i]['id'] = $file_arr[$i]->getVar('file_id');
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-14 18:25:12 UTC (rev 9878)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-14 23:46:12 UTC (rev 9879)
@@ -94,7 +94,7 @@
$GLOBALS['cat_title'] = $this->_tree[$key]['obj']->getVar('cat_title');
$select = $this->makeSelBox('cat_pid', 'cat_title','-', $selected, '', $this->_tree[$key]['obj']->getVar('cat_id'), "OnChange='window.document.location=this.options[this.selectedIndex].value;'", 'tdmpicture_catview');
- $ret .= '<li class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="tree_form">'.$GLOBALS['navbar'].$select.' | '._MD_TDMPICTURE_TRIBY.' > '.$navtrie.'</div></li>';
+ $ret .= '<li class="'.$GLOBALS['class'].'"><div><div id="img">'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div id="tree_detail"><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><span id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><br style="clear: both;" /><div id="tree_form">'.$GLOBALS['navbar'].$select.' | '._MD_TDMPICTURE_TRIBY.' > '.$navtrie.'</div></div></div></li>';
}
@@ -104,7 +104,7 @@
$select = $this->makeSelBox('cat_pid', 'cat_title','-', 0, '', $this->_tree[$key]['obj']->getVar('cat_id'), "OnChange='window.document.location=this.options[this.selectedIndex].value;'", 'tdmpicture_catview');
- $ret .= '<li style="width:47%;" class="'.$GLOBALS['class'].'"><div>'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><pan id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><div id="tree_form">'.$select.'</div></div></li>';
+ $ret .= '<li style="width:47%;" class="'.$GLOBALS['class'].'"><div><div id="img">'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div id="tree_detail"><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><span id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><br style="clear: both;" /><div id="tree_form">'.$select.'</div></div></div></li>';
}
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-14 18:25:12 UTC (rev 9878)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-14 23:46:12 UTC (rev 9879)
@@ -27,7 +27,8 @@
list-style: none;
float:left;
width:97%;
- height: 130px;
+ min-height:140px;
+ /*height: 130px;*/
margin: 10px; padding: 0px;
-webkit-border-radius: 4px;
border-radius: 4px;
@@ -36,7 +37,7 @@
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
overflow: auto;
}
- ul#tree_menu img {
+ ul#tree_menu #img {
float:left;
padding-left:20px;
padding-right:20px;
@@ -46,22 +47,28 @@
ul#tree_menu h2{
left:0;
text-align:left;
-padding-top:10px;
+padding-top:5px;
padding-bottom:5px;
+margin-bottom:0px;
}
+ ul#tree_menu #tree_detail{
+ text-align:left;
+ }
ul#tree_menu div{
- float:left;
+
}
#tdmpicture_text, ul#tree_menu #tree_text {
- float:left;
font-size: 13px;
font-weight: normal;
color: #728DA9;
text-shadow: 0 1px 0 white;
line-height: 20px;
+max-height:60px;
+overflow:auto;
+display:block;
}
#tdmpicture_num, #tdmpicture_num a, ul#tree_menu #tree_num{
@@ -78,7 +85,7 @@
ul#tree_menu #tree_form{
float:right;
- padding-top:100px;
+ padding-top:10px;
padding-right:20px;
text-align: center;
font-size: 11px;
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/index.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/index.php 2012-07-14 18:25:12 UTC (rev 9878)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/index.php 2012-07-14 23:46:12 UTC (rev 9879)
@@ -131,7 +131,7 @@
$file['id'] = $file_arr[$f]->getVar("file_id");
$file['title'] = $myts->displayTarea($file_arr[$f]->getVar("file_title"));
- $file['text'] = $myts->displayTarea($file_arr[$f]->getVar("file_text"));
+ $file['text'] = $file_arr[$f]->getVar("file_text");
$file['file_catum'] = $file_arr[$f]->getVar("file_catum");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php 2012-07-14 18:25:12 UTC (rev 9878)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/main.php 2012-07-14 23:46:12 UTC (rev 9879)
@@ -46,7 +46,7 @@
define("_MD_TDMPICTURE_COMMENT","Réaction");
define("_MD_TDMPICTURE_FILECD","Nombre de CD");
define("_MD_TDMPICTURE_FILEEDITOR","Editeur");
-define("_MD_TDMPICTURE_NBFILE","Nombre de fichier");
+//define("_MD_TDMPICTURE_NBFILE","Nombre de fichier");
define("_MD_TDMPICTURE_ALBUM","Album de");
define("_MD_TDMPICTURE_DESC","Présentation:");
define("_MD_TDMPICTURE_VOTEADD","Ajouter un vote");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/blocks/tdmpicture_minitable.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/blocks/tdmpicture_minitable.html 2012-07-14 18:25:12 UTC (rev 9878)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/blocks/tdmpicture_minitable.html 2012-07-14 23:46:12 UTC (rev 9879)
@@ -5,7 +5,7 @@
<{foreach item=blocks from=$block.blocks}>
<tr class="<{cycle values="even,odd"}>">
- <td><a href="<{$xoops_url}>/modules/TDMPicture/viewfile.php?st=<{$blocks.id}>"><{$blocks.title}></a> (<{$smarty.const._MD_TDMPICTURE_COMMENT}>: <{$blocks.comments}> - <{$smarty.const._MD_TDMPICTURE_VOTE}>: <{$blocks.counts}>/<{$blocks.votes}>)</td>
+ <td><a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$blocks.id}>"><{$blocks.title}></a> (<{$smarty.const._MD_TDMPICTURE_COMMENT}>: <{$blocks.comments}> - <{$smarty.const._MD_TDMPICTURE_VOTE}>: <{$blocks.counts}>/<{$blocks.votes}>)</td>
</tr>
<{/foreach}>
@@ -21,7 +21,7 @@
<{foreach item=blocks from=$block.blocks}>
<li>
<div class="switch_img">
- <a href="<{$xoops_url}>/modules/TDMPicture/viewfile.php?st=<{$blocks.id}>"><img src="<{$blocks.img}>" title="<{$blocks.title}>" alt="<{$blocks.title}>" /></a>
+ <a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$blocks.id}>"><img src="<{$blocks.img}>" title="<{$blocks.title}>" alt="<{$blocks.title}>" /></a>
</div>
</li>
@@ -40,7 +40,7 @@
<li>
<div class="switch_img">
- <a href="<{$xoops_url}>/modules/TDMPicture/viewfile.php?st=<{$blocks.id}>"><img src="<{$blocks.img}>" title="<{$blocks.title}>" alt="<{$blocks.title}>" /></a>
+ <a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$blocks.id}>"><img src="<{$blocks.img}>" title="<{$blocks.title}>" alt="<{$blocks.title}>" /></a>
</div>
<div style="float:left; text-align:left;">
@@ -119,7 +119,7 @@
<{foreach item=blocks from=$block.blocks}>
<li style="display: none; list-style-type: none; float:left;">
<div class="switch_img">
- <a href="<{$xoops_url}>/modules/TDMPicture/viewfile.php?st=<{$blocks.id}>"><img src="<{$blocks.img}>" alt="<{$blocks.title}>" title="<{$blocks.title}>" /></a></li>
+ <a href="<{$smarty.const.TDMPICTURE_URL}>/viewfile.php?st=<{$blocks.id}>"><img src="<{$blocks.img}>" alt="<{$blocks.title}>" title="<{$blocks.title}>" /></a></li>
</div>
<{/foreach}>
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-07-14 18:25:12 UTC (rev 9878)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-07-14 23:46:12 UTC (rev 9879)
@@ -22,7 +22,7 @@
}
$modversion['name'] = "TDMPicture";
-$modversion['version'] = 1.063;
+$modversion['version'] = 1.064;
$modversion['description'] = 'Image manager';
$modversion['credits'] = "none";
$modversion['author'] = 'TDM';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-15 11:14:43
|
Revision: 9884
http://xoops.svn.sourceforge.net/xoops/?rev=9884&view=rev
Author: lord_venom
Date: 2012-07-15 11:14:37 +0000 (Sun, 15 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-15 09:39:30 UTC (rev 9883)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-15 11:14:37 UTC (rev 9884)
@@ -102,9 +102,12 @@
if ((!$prefix_curr) && ($this->_tree[$key]['obj']->getVar('cat_pid') == $selected)) {
$select = $this->makeSelBox('cat_pid', 'cat_title','-', 0, '', $this->_tree[$key]['obj']->getVar('cat_id'), "OnChange='window.document.location=this.options[this.selectedIndex].value;'", 'tdmpicture_catview');
+
+ $cat_title = (strlen($this->_tree[$key]['obj']->getVar('cat_title')) > 30 ? substr($this->_tree[$key]['obj']->getVar('cat_title'),0,(30)) : $this->_tree[$key]['obj']->getVar('cat_title'));
+ $cat_text = (strlen($this->_tree[$key]['obj']->getVar('cat_text')) > 120 ? substr($this->_tree[$key]['obj']->getVar('cat_text'),0,(120))."..." : $this->_tree[$key]['obj']->getVar('cat_text'));
+
-
- $ret .= '<li style="width:47%;" class="'.$GLOBALS['class'].'"><div><div id="img">'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div id="tree_detail"><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><span id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><br style="clear: both;" /><div id="tree_form">'.$select.'</div></div></div></li>';
+ $ret .= '<li style="width:47%;" class="'.$GLOBALS['class'].'"><div><div id="img">'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div id="tree_detail"><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $cat_title. '</h2></a><span id="tree_text">'. $cat_text. '</span></div><br style="clear: both;" /><div id="tree_form">'.$select.'</div></div></div></li>';
}
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-15 09:39:30 UTC (rev 9883)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-15 11:14:37 UTC (rev 9884)
@@ -23,11 +23,12 @@
width:100%;
}
+ /* pour regler les problemes de hauteur des categories modifier min-height*/
ul#tree_menu li {
list-style: none;
float:left;
width:97%;
- min-height:140px;
+ min-height:130px;
/*height: 130px;*/
margin: 10px; padding: 0px;
-webkit-border-radius: 4px;
@@ -60,16 +61,25 @@
}
- #tdmpicture_text, ul#tree_menu #tree_text {
+ #tree_text {
+ display:block;
+ height:50px;
font-size: 13px;
font-weight: normal;
color: #728DA9;
text-shadow: 0 1px 0 white;
line-height: 20px;
-max-height:60px;
-overflow:auto;
-display:block;
+word-wrap: break-word;
+overflow:hidden;
}
+
+ #tdmpicture_text {
+ font-size: 13px;
+ font-weight: normal;
+color: #728DA9;
+text-shadow: 0 1px 0 white;
+line-height: 20px;
+}
#tdmpicture_num, #tdmpicture_num a, ul#tree_menu #tree_num{
text-align: center;
@@ -85,7 +95,6 @@
ul#tree_menu #tree_form{
float:right;
- padding-top:10px;
padding-right:20px;
text-align: center;
font-size: 11px;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-16 08:12:58
|
Revision: 9885
http://xoops.svn.sourceforge.net/xoops/?rev=9885&view=rev
Author: lord_venom
Date: 2012-07-16 08:12:51 +0000 (Mon, 16 Jul 2012)
Log Message:
-----------
tree and language
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php
XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php
XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-15 11:14:37 UTC (rev 9884)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-16 08:12:51 UTC (rev 9885)
@@ -99,10 +99,14 @@
}
- if ((!$prefix_curr) && ($this->_tree[$key]['obj']->getVar('cat_pid') == $selected)) {
+ //if ((!$prefix_curr) && ($this->_tree[$key]['obj']->getVar('cat_pid') == $selected)) {
+ if ($this->_tree[$key]['obj']->getVar('cat_pid') == $selected) {
+ if (!empty( $this->_tree[$key]['child'] )) {
$select = $this->makeSelBox('cat_pid', 'cat_title','-', 0, '', $this->_tree[$key]['obj']->getVar('cat_id'), "OnChange='window.document.location=this.options[this.selectedIndex].value;'", 'tdmpicture_catview');
-
+ } else {
+ $select = false;
+ }
$cat_title = (strlen($this->_tree[$key]['obj']->getVar('cat_title')) > 30 ? substr($this->_tree[$key]['obj']->getVar('cat_title'),0,(30)) : $this->_tree[$key]['obj']->getVar('cat_title'));
$cat_text = (strlen($this->_tree[$key]['obj']->getVar('cat_text')) > 120 ? substr($this->_tree[$key]['obj']->getVar('cat_text'),0,(120))."..." : $this->_tree[$key]['obj']->getVar('cat_text'));
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php 2012-07-15 11:14:37 UTC (rev 9884)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/language/french/admin.php 2012-07-16 08:12:51 UTC (rev 9885)
@@ -140,7 +140,7 @@
define("_AM_TDMPICTURE_PERM_512","Supprimer Image (Aucune validation)");
define('_AM_TDMPICTURE_PERM_USER','Permissions des membres enregistrer');
define('_AM_TDMPICTURE_PERM_GLOBAL','Permissions pour tous les visiteurs');
-define("_MD_TDMPICTURE_MULTIUPLOAD","Vous pouvez charger %s fichier(s).");
+define("_AM_TDMPICTURE_MULTIUPLOAD","Vous pouvez charger %s fichier(s).");
//1.5
//2.5
define("_AM_TDMPICTURE_PERM_1024","Proposer Catégorie");
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php 2012-07-15 11:14:37 UTC (rev 9884)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/viewcat.php 2012-07-16 08:12:51 UTC (rev 9885)
@@ -80,7 +80,7 @@
$criteria = new CriteriaCompo();
if ($cat_index) {
$criteria->add(new Criteria('cat_display', 1));
- $criteria->add(new Criteria('cat_index', 1));
+ //$criteria->add(new Criteria('cat_index', 1));
$xoopsTpl->assign('nav', "<a href='".XOOPS_URL. "/modules/".$xoopsModule->dirname()."'/>".$xoopsModule->name()."</a>");
} else {
$criteria->add(new Criteria('cat_display', 1));
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-07-15 11:14:37 UTC (rev 9884)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/xoops_version.php 2012-07-16 08:12:51 UTC (rev 9885)
@@ -22,7 +22,7 @@
}
$modversion['name'] = "TDMPicture";
-$modversion['version'] = 1.064;
+$modversion['version'] = 1.065;
$modversion['description'] = 'Image manager';
$modversion['credits'] = "none";
$modversion['author'] = 'TDM';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-16 08:29:20
|
Revision: 9886
http://xoops.svn.sourceforge.net/xoops/?rev=9886&view=rev
Author: lord_venom
Date: 2012-07-16 08:29:14 +0000 (Mon, 16 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-16 08:12:51 UTC (rev 9885)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-16 08:29:14 UTC (rev 9886)
@@ -56,6 +56,7 @@
$gperm_handler =& xoops_gethandler('groupperm');
$parent = "";
+ $scat_display = isset($GLOBALS['scat_display']) ? $GLOBALS['scat_display'] : true;
//$GLOBALS['navbar'] .= "";
@@ -100,7 +101,7 @@
//if ((!$prefix_curr) && ($this->_tree[$key]['obj']->getVar('cat_pid') == $selected)) {
- if ($this->_tree[$key]['obj']->getVar('cat_pid') == $selected) {
+ if (($scat_display) && $this->_tree[$key]['obj']->getVar('cat_pid') == $selected) {
if (!empty( $this->_tree[$key]['child'] )) {
$select = $this->makeSelBox('cat_pid', 'cat_title','-', 0, '', $this->_tree[$key]['obj']->getVar('cat_id'), "OnChange='window.document.location=this.options[this.selectedIndex].value;'", 'tdmpicture_catview');
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php 2012-07-16 08:12:51 UTC (rev 9885)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/viewfile.php 2012-07-16 08:29:14 UTC (rev 9886)
@@ -79,7 +79,7 @@
$criteria = new CriteriaCompo();
if ($cat_index) {
$criteria->add(new Criteria('cat_display', 1));
- $criteria->add(new Criteria('cat_index', 1));
+ //$criteria->add(new Criteria('cat_index', 1));
$xoopsTpl->assign('nav', "<a href='".XOOPS_URL. "/modules/".$xoopsModule->dirname()."'/>".$xoopsModule->name()."</a>");
} else {
$criteria->add(new Criteria('cat_display', 1));
@@ -92,6 +92,7 @@
//asigne les URL
define("TDM_CAT_URL", TDMPICTURE_CAT_URL);
define("TDM_CAT_PATH", TDMPICTURE_CAT_PATH);
+ $GLOBALS['scat_display'] = false;
//$cat_display = $xoopsModuleConfig['tdmpicture_cat_display'];
//$cat_cel = $xoopsModuleConfig['tdmpicture_cat_cel'];
$display_cat = $mytree->makeCatBox($file_handler, 'cat_title','-', $ct);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lor...@us...> - 2012-07-17 08:07:21
|
Revision: 9896
http://xoops.svn.sourceforge.net/xoops/?rev=9896&view=rev
Author: lord_venom
Date: 2012-07-17 08:07:10 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
bug IE
Modified Paths:
--------------
XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-16 20:46:31 UTC (rev 9895)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/class/tree.php 2012-07-17 08:07:10 UTC (rev 9896)
@@ -50,7 +50,7 @@
return $ret;
}
- function _makeCatBoxOptions( $item_handler, $fieldName, $selected, $key, &$ret, &$select, $prefix_orig, $prefix_curr = '', $chcount) {
+ function _makeCatBoxOptions( $item_handler, $fieldName, $selected, $key, &$ret, &$ret2, $prefix_orig, $prefix_curr = '', $chcount) {
Global $xoopsModule, $xoopsModuleConfig, $cat_display, $cat_cel, $groups, $start, $limit, $tris ;
@@ -95,7 +95,7 @@
$GLOBALS['cat_title'] = $this->_tree[$key]['obj']->getVar('cat_title');
$select = $this->makeSelBox('cat_pid', 'cat_title','-', $selected, '', $this->_tree[$key]['obj']->getVar('cat_id'), "OnChange='window.document.location=this.options[this.selectedIndex].value;'", 'tdmpicture_catview');
- $ret .= '<li class="'.$GLOBALS['class'].'"><div><div id="img">'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div id="tree_detail"><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><span id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><br style="clear: both;" /><div id="tree_form">'.$GLOBALS['navbar'].$select.' | '._MD_TDMPICTURE_TRIBY.' > '.$navtrie.'</div></div></div></li>';
+ $ret2 = '<li class="'.$GLOBALS['class'].'"><div><div id="img">'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div id="tree_detail"><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $this->_tree[$key]['obj']->getVar( $fieldName ). '</h2></a><span id="tree_text">'. $this->_tree[$key]['obj']->getVar('cat_text'). '</span></div><br style="clear: both;" /><div id="tree_form">'.$GLOBALS['navbar'].$select.' | '._MD_TDMPICTURE_TRIBY.' > '.$navtrie.'</div></div></div></li>';
}
@@ -112,14 +112,13 @@
$cat_text = (strlen($this->_tree[$key]['obj']->getVar('cat_text')) > 120 ? substr($this->_tree[$key]['obj']->getVar('cat_text'),0,(120))."..." : $this->_tree[$key]['obj']->getVar('cat_text'));
- $ret .= '<li style="width:47%;" class="'.$GLOBALS['class'].'"><div><div id="img">'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div id="tree_detail"><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $cat_title. '</h2></a><span id="tree_text">'. $cat_text. '</span></div><br style="clear: both;" /><div id="tree_form">'.$select.'</div></div></div></li>';
+ $ret .= '<li style="width:46%;" class="'.$GLOBALS['class'].'"><div><div id="img">'.$picture. '<br/><span id="tree_num"> ('.$count.')</span></div><div id="tree_detail"><h2><a href ="'.$cat_link.'" title="'. $this->_tree[$key]['obj']->getVar('cat_title').'">'. $cat_title. '</h2></a><span id="tree_text">'. $cat_text. '</span></div><br style="clear: both;" /><div id="tree_form">'.$select.'</div></div></div></li>';
}
//}
$prefix_curr .= $prefix_orig;
-
//}
@@ -127,7 +126,7 @@
if ( isset( $this->_tree[$key]['child'] ) && !empty( $this->_tree[$key]['child'] ) ) {
foreach ( $this->_tree[$key]['child'] as $childkey ) {
$GLOBALS['class'] = ($GLOBALS['class'] == "even") ? "odd" : "even";
- $this->_makeCatBoxOptions( $item_handler, $fieldName, $selected, $childkey, $ret, $select, $prefix_orig, $prefix_curr , $chcount);
+ $this->_makeCatBoxOptions( $item_handler, $fieldName, $selected, $childkey, $ret, $ret2, $prefix_orig, $prefix_curr , $chcount);
}
}
@@ -234,10 +233,12 @@
Global $cat_display;
$ret = '<div style="text-align:right"><a href="javascript:;" onclick="javascript:masque(\'1\')" >+-</a></div>';
- $ret .= '<table cellpadding="0" id="masque_1" cellspacing="0" style="margin:5px;"><tr><td><ul id="tree_menu">';
+ $ret .= '<table cellpadding="0" id="masque_1" cellspacing="0" style="border-collapse: separate; margin:5px;"><tr><td><ul id="tree_menu">';
+
$chcount = 1;
$GLOBALS['class'] = "odd";
- $this->_makeCatBoxOptions( $item_handler, $fieldName, $selected, $key, $ret, $select, $prefix, '', $chcount );
+ $this->_makeCatBoxOptions( $item_handler, $fieldName, $selected, $key, $ret, $ret2, $prefix, '', $chcount );
+ $ret .= $ret2;
$ret .= '<br style="clear: both;" /></ul></td></tr></table><br />';
return $ret;
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-16 20:46:31 UTC (rev 9895)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/css/tdmpicture.css 2012-07-17 08:07:10 UTC (rev 9896)
@@ -17,8 +17,6 @@
*/
ul#tree_menu {
- margin: 0 auto;
- padding:0 auto;
text-align: center;
width:100%;
@@ -29,15 +27,23 @@
float:left;
width:97%;
min-height:130px;
- /*height: 130px;*/
- margin: 10px; padding: 0px;
+ /*height: 130px;*/
+ border: 2px solid white;
+ margin: 10px;
+ padding: 5px;
+
-webkit-border-radius: 4px;
border-radius: 4px;
- border: 2px solid white;
- /* background: whiteSmoke url(../images/decos/downloads-bg.gif) repeat-x left top; */
+ -moz-border-radius: 4px;
+
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
- overflow: auto;
+ -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+
+
}
+
+
ul#tree_menu #img {
float:left;
padding-left:20px;
@@ -67,7 +73,6 @@
font-size: 13px;
font-weight: normal;
color: #728DA9;
-text-shadow: 0 1px 0 white;
line-height: 20px;
word-wrap: break-word;
overflow:hidden;
@@ -262,10 +267,8 @@
+ ----------------------------------------------------- */
-.tdmp_table {
-background-color: #e9e9e9;
-border: 1px solid #cccccc;
-width: 100%;
+.tdmpicture_table {
+border-collapse: separate;
}
ul.display {
@@ -307,7 +310,10 @@
text-align:center;
border: 1px solid #FFF;
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
- box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+ -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+
+
}
@@ -446,15 +452,20 @@
DETAIL
+ ----------------------------------------------------- */
-.detail_img{
+.detail_img img{
padding: 2px;
background: #fff;
- margin: 0 15px 0 0;
text-align:center;
- border: 1px solid #FFF;
+ border: 1px solid #FFF;
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
- box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+ -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+
+
}
+
+
+}
.detail_info {
width: 150px;
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html 2012-07-16 20:46:31 UTC (rev 9895)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_tpfile.html 2012-07-17 08:07:10 UTC (rev 9896)
@@ -1,5 +1,5 @@
-<table class="outer"><tr>
+<table class="outer tdmpicture_table"><tr>
<td class="even">
<{if $numfile != 0}>
<ul id="display" class="<{$display}>">
Modified: XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html
===================================================================
--- XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-16 20:46:31 UTC (rev 9895)
+++ XoopsModules/TDMPicture/trunk/TDMPicture/templates/tdmpicture_viewfile.html 2012-07-17 08:07:10 UTC (rev 9896)
@@ -34,11 +34,11 @@
<br class="clear"/>
-<table><tr>
+<table class="tdmpicture_table"><tr>
<th align="center"><span class="switch_title"><h2><{$file.title}></h2></span></th></tr>
<tr><td class="even" align="center">
-<div class="boxgrid">
+<div class="detail_img">
<a href="javascript:;" slide="<{$file.img_popup}>" class="group1" title="<{$file.title}>" alt="<{$file.title}>" >
<img style="max-width:<{$smarty.const.TDMPICTURE_WIDTH}>px; max-height:<{$smarty.const.TDMPICTURE_HEIGHT}>px;" src="<{$file.img}>" slide="<{$file.img_popup}>" rel="group1" title="<{$file.title}>" alt="<{$file.title}>" />
</a></div>
@@ -130,8 +130,8 @@
<br /><br />
<!-- Display navigation -->
-<div style="float:left;"><{$prev_page}></div>
-<div style="float:right;"><{$next_page}></div>
+<div style="float:left;border-collapse: separate;" class="detail_img"><{$prev_page}></div>
+<div style="float:right;border-collapse: separate;" class="detail_img"><{$next_page}></div>
<br class="clear"/> <br /><br />
<!-- AddThis Button BEGIN -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|