Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9426] XoopsModules/xpdf/trunk/modules/xpdf
|
From: <txm...@us...> - 2012-05-02 21:29:39
|
Revision: 9426
http://xoops.svn.sourceforge.net/xoops/?rev=9426&view=rev
Author: txmodxoops
Date: 2012-05-02 21:29:32 +0000 (Wed, 02 May 2012)
Log Message:
-----------
Fixed small bugs
Modified Paths:
--------------
XoopsModules/xpdf/trunk/modules/xpdf/admin/documents.php
XoopsModules/xpdf/trunk/modules/xpdf/class/xpdf_cat.php
XoopsModules/xpdf/trunk/modules/xpdf/class/xpdf_doc.php
XoopsModules/xpdf/trunk/modules/xpdf/css/style.css
XoopsModules/xpdf/trunk/modules/xpdf/index.php
XoopsModules/xpdf/trunk/modules/xpdf/language/english/admin.php
XoopsModules/xpdf/trunk/modules/xpdf/language/english/modinfo.php
XoopsModules/xpdf/trunk/modules/xpdf/templates/xpdf_footer.html
XoopsModules/xpdf/trunk/modules/xpdf/templates/xpdf_header.html
XoopsModules/xpdf/trunk/modules/xpdf/templates/xpdf_viewcat.html
XoopsModules/xpdf/trunk/modules/xpdf/viewcat.php
XoopsModules/xpdf/trunk/modules/xpdf/xoops_version.php
Modified: XoopsModules/xpdf/trunk/modules/xpdf/admin/documents.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/admin/documents.php 2012-05-02 15:28:19 UTC (rev 9425)
+++ XoopsModules/xpdf/trunk/modules/xpdf/admin/documents.php 2012-05-02 21:29:32 UTC (rev 9426)
@@ -104,9 +104,9 @@
echo "<td class='center'>".$doc_arr[$i]->getVar("doc_weight")."</td>";
if ( $doc_arr[$i]->getVar("doc_online") == 1 ) {
- echo "<td class='center'><a href='./documents.php?op=update_online&doc_id=".$i."&doc_online=0'><img src=".$pathImageIcon."/on.png border='0' alt='"._ONLINE."' title='"._ONLINE."'></a></td>";
+ echo "<td class='center'><a href='./documents.php?op=update_online&doc_id=".$i."&doc_online=0'><img src=".$pathImageIcon."/on.png border='0' alt='"._AM_XPDF_ONLINE."' title='"._AM_XPDF_ONLINE."'></a></td>";
} else {
- echo "<td class='center'><a href='./documents.php?op=update_online&doc_id=".$i."&doc_online=1'><img src=".$pathImageIcon."/off.png border='0' alt='"._OFFLINE."' title='"._OFFLINE."'></a></td>";
+ echo "<td class='center'><a href='./documents.php?op=update_online&doc_id=".$i."&doc_online=1'><img src=".$pathImageIcon."/off.png border='0' alt='"._AM_XPDF_OFFLINE."' title='"._AM_XPDF_OFFLINE."'></a></td>";
}
echo "<td class='center width5'>
Modified: XoopsModules/xpdf/trunk/modules/xpdf/class/xpdf_cat.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/class/xpdf_cat.php 2012-05-02 15:28:19 UTC (rev 9425)
+++ XoopsModules/xpdf/trunk/modules/xpdf/class/xpdf_cat.php 2012-05-02 21:29:32 UTC (rev 9426)
@@ -99,7 +99,7 @@
$editor_configs["cols"] = 80;
$editor_configs["width"] = "100%";
$editor_configs["height"] = "400px";
- $editor_configs["editor"] = $GLOBALS["xoopsModuleConfig"]["xpdf_editor"];
+ $editor_configs["editor"] = $GLOBALS["xoopsModuleConfig"]["xpdf_editor_cat"];
$form->addElement( new XoopsFormEditor(_AM_XPDF_CAT_DESCRIPTION, "cat_description", $editor_configs), false );
// Weight
$form->addElement(new XoopsFormText(_AM_XPDF_CAT_WEIGHT, "cat_weight", 10, 25, $this->getVar("cat_weight")), true);
Modified: XoopsModules/xpdf/trunk/modules/xpdf/class/xpdf_doc.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/class/xpdf_doc.php 2012-05-02 15:28:19 UTC (rev 9425)
+++ XoopsModules/xpdf/trunk/modules/xpdf/class/xpdf_doc.php 2012-05-02 21:29:32 UTC (rev 9426)
@@ -114,7 +114,7 @@
$editor_configs["cols"] = 80;
$editor_configs["width"] = "100%";
$editor_configs["height"] = "400px";
- $editor_configs["editor"] = $GLOBALS["xoopsModuleConfig"]["xpdf_editor"];
+ $editor_configs["editor"] = $GLOBALS["xoopsModuleConfig"]["xpdf_editor_doc"];
$form->addElement( new XoopsFormEditor(_AM_XPDF_DOC_PDFTEXT, "doc_pdftext", $editor_configs), true );
$doc_image = $this->getVar("doc_image") ? $this->getVar("doc_image") : 'blank.gif';
@@ -198,14 +198,15 @@
}
function getPdf($dest = 'I')
- {
- include_once XOOPS_ROOT_PATH.'/Frameworks/tcpdf/tcpdf.php';
+ {
+ include_once XOOPS_ROOT_PATH.'/Frameworks/tcpdf/tcpdf.php';
$filename = XOOPS_ROOT_PATH.'/Frameworks/tcpdf/config/lang/'._LANGCODE.'.php';
if(file_exists($filename)) {
include_once $filename;
} else {
- include_once XOOPS_ROOT_PATH.'/Frameworks/tcpdf/config/lang/en.php';
+ include_once XOOPS_ROOT_PATH.'/Frameworks/tcpdf/config/lang/eng.php';
}
+
$pdfdocHandler =& xoops_getModuleHandler("xpdf_doc", XPDF_DIRNAME);
$pdfdoc = $pdfdocHandler->get($this->getVar('doc_id'));
@@ -231,7 +232,7 @@
define ('XPDF_HEADER_TITLE', $pdf_data['title']);
define ('XPDF_HEADER_STRING', $pdf_data['subject']);
define ('XPDF_HEADER_LOGO', 'logo.gif');
- define ('K_PATH_IMAGES', XOOPS_ROOT_PATH.'/images/');
+ define ('XK_PATH_IMAGES', XOOPS_ROOT_PATH.'/images/');
$myts =& MyTextSanitizer::getInstance();
$content = '';
Modified: XoopsModules/xpdf/trunk/modules/xpdf/css/style.css
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/css/style.css 2012-05-02 15:28:19 UTC (rev 9425)
+++ XoopsModules/xpdf/trunk/modules/xpdf/css/style.css 2012-05-02 21:29:32 UTC (rev 9426)
@@ -22,7 +22,7 @@
}
.xpdf-categories {
- height: 50px;
+ height: auto;
background-color: #eee;
border-right: 1px solid #aaa;
border-bottom: 1px solid #aaa;
Modified: XoopsModules/xpdf/trunk/modules/xpdf/index.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/index.php 2012-05-02 15:28:19 UTC (rev 9425)
+++ XoopsModules/xpdf/trunk/modules/xpdf/index.php 2012-05-02 21:29:32 UTC (rev 9426)
@@ -61,7 +61,7 @@
$count = 1;
$keywords = '';
foreach (array_keys($catArray) as $i) {
- if ($catArray[$i]->getVar('cat_pid') == 0){
+ if ($catArray[$i]->getVar('cat_pid') == 0) {
$totaldocuments = xpdf_NumbersOfEntries($mytree, $categories, $docArray, $catArray[$i]->getVar('cat_id'));
$subcats_arr = $mytree->getFirstChild($catArray[$i]->getVar('cat_id'));
$chcount = 0;
@@ -78,7 +78,7 @@
$chcount++;
}
- $image = XPDF_UPLOAD_CAT_PATH ."/". $catArray[$i]->getVar('cat_image');
+ $image = XPDF_UPLOAD_CAT_URL ."/". $catArray[$i]->getVar('cat_image');
$cat_description = $myts->displayTarea($catArray[$i]->getVar('cat_description'), 0);
$xoopsTpl->append('categories', array('image' => $image, 'cid' => $catArray[$i]->getVar('cat_id'), 'title' => $catArray[$i]->getVar('cat_title'), 'description' => $cat_description, 'subcategories' => $subcategories, 'totaldocuments' => $totaldocuments, 'count' => $count));
$count++;
@@ -166,6 +166,7 @@
$xoTheme->addMeta('meta', 'keywords', strip_tags($GLOBALS['xoopsModuleConfig']['keywords']));
$xoopsTpl->assign('nb_coldoc', $GLOBALS['xoopsModuleConfig']['nb_coldoc']);
+$xoopsTpl->assign('adv', $GLOBALS['xoopsModuleConfig']['advertise']);
if($GLOBALS['xoopsModuleConfig']['social_active'] == 1) {
$social = $GLOBALS['xoopsModuleConfig']['social_code'];
$act_social = $GLOBALS['xoopsModuleConfig']['social_active'];
Modified: XoopsModules/xpdf/trunk/modules/xpdf/language/english/admin.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/language/english/admin.php 2012-05-02 15:28:19 UTC (rev 9425)
+++ XoopsModules/xpdf/trunk/modules/xpdf/language/english/admin.php 2012-05-02 21:29:32 UTC (rev 9426)
@@ -45,8 +45,10 @@
define("_AM_XPDF_FORMUPLOAD","Upload");
define("_AM_XPDF_FORMIMAGE_PATH","File presents in %s");
define("_AM_XPDF_FORMACTION","Action");
-define("_AM_XPDF_OFF","Offline");
-define("_AM_XPDF_ON","Online");
+define("_AM_XPDF_OFFLINE","Offline");
+define("_AM_XPDF_ONLINE","Online");
+define("_AM_XPDF_CREATEPDF","Create PDF");
+define("_AM_XPDF_DELETEPDF","Delete PDF");
define("_AM_XPDF_CAT_ADD","Add a Category");
define("_AM_XPDF_CAT_EDIT","Edit Category");
Modified: XoopsModules/xpdf/trunk/modules/xpdf/language/english/modinfo.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/language/english/modinfo.php 2012-05-02 15:28:19 UTC (rev 9425)
+++ XoopsModules/xpdf/trunk/modules/xpdf/language/english/modinfo.php 2012-05-02 21:29:32 UTC (rev 9426)
@@ -69,7 +69,10 @@
define('_MI_XPDF_IMGFLOAT_RIGHT', "Float image to Right");
define('_MI_XPDF_NEWDOCS', "New Documents");
define('_MI_XPDF_NEWDOCS_DESC', "New Documents in index page");
-define("_MI_XPDF_EDITOR","Editor");
+define("_MI_XPDF_EDITOR_CAT","Categories Editor");
+define("_MI_XPDF_EDITOR_CAT_DESC","Choose an editor for categories");
+define("_MI_XPDF_EDITOR_DOC","Documents Editor");
+define("_MI_XPDF_EDITOR_DOC_DESC","Choose an editor for documents");
define("_MI_XPDF_KEYWORDS","Keywords");
define("_MI_XPDF_KEYWORDS_DESC","Insert here the keywords (separate by comma)");
define("_MI_XPDF_ADVERTISE","Code of advertise");
Modified: XoopsModules/xpdf/trunk/modules/xpdf/templates/xpdf_footer.html
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/templates/xpdf_footer.html 2012-05-02 15:28:19 UTC (rev 9425)
+++ XoopsModules/xpdf/trunk/modules/xpdf/templates/xpdf_footer.html 2012-05-02 21:29:32 UTC (rev 9426)
@@ -1,4 +1,4 @@
-<{if $adv != ''}>
+<{if $adv != '' && !$xoops_isadmin}>
<div class="center"><{$adv}></div>
<{/if}>
<{if $social_active != 0}>
Modified: XoopsModules/xpdf/trunk/modules/xpdf/templates/xpdf_header.html
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/templates/xpdf_header.html 2012-05-02 15:28:19 UTC (rev 9425)
+++ XoopsModules/xpdf/trunk/modules/xpdf/templates/xpdf_header.html 2012-05-02 21:29:32 UTC (rev 9426)
@@ -2,6 +2,6 @@
<span class="left"><b>Title</b>: <{$smarty.const._MA_XPDF_TITLE}></span><br />
<span class="left"><b>Description</b>: <{$smarty.const._MA_XPDF_DESC}></span>
</div>
-<{if $adv != ''}>
-<br /><div class="xpdf-itemAdv center"><{$adv}></div><br />
+<{if $adv != '' && !$xoops_isadmin}>
+<div class="xpdf-itemAdv"><{$adv}></div>
<{/if}>
Modified: XoopsModules/xpdf/trunk/modules/xpdf/templates/xpdf_viewcat.html
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/templates/xpdf_viewcat.html 2012-05-02 15:28:19 UTC (rev 9425)
+++ XoopsModules/xpdf/trunk/modules/xpdf/templates/xpdf_viewcat.html 2012-05-02 21:29:32 UTC (rev 9426)
@@ -17,12 +17,12 @@
<div class="floatleft title">
<h2><a title="<{$category.title}>" href="<{$xpdf_url}>/viewcat.php?cid=<{$category.cid}>"><{$category.title}></a></h2>
</div>
- <div class="floatright total xo-pagact"><a title="<{$category.title}>" href="<{$xpdf_url}>/viewcat.php?cid=<{$category.id}>"><{$category.totaldocuments}></a></div>
- <div class="endline"></div>
+ <div class="marg2 pad2 xo-pagact"> <{$category.totaldocuments}></div>
+ <div class="clear"></div>
</div>
<div class="xpdf-body justify">
<{if $category.image != ""}>
- <a class="marg1 pad1" title="<{$category.title}>" href="<{$xpdf_url}>/viewcat.php?cid=<{$category.id}>"><img class="<{$img_float}>" src="<{$category.image}>" alt="<{$category.title}>" /></a>
+ <a class="marg1 pad1" title="<{$category.title}>" href="<{$xpdf_url}>/viewcat.php?cid=<{$category.cid}>"><img class="<{$img_float}>" src="<{$category.image}>" alt="<{$category.title}>" /></a>
<{/if}>
<{$category.description}>
<div class="clear"></div>
Modified: XoopsModules/xpdf/trunk/modules/xpdf/viewcat.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/viewcat.php 2012-05-02 15:28:19 UTC (rev 9425)
+++ XoopsModules/xpdf/trunk/modules/xpdf/viewcat.php 2012-05-02 21:29:32 UTC (rev 9426)
@@ -64,7 +64,7 @@
$xoopsTpl->assign('lang_thereare', sprintf(_MA_XPDF_INDEX_THEREARE, count($doc_arr)));
// Navigation
-$nav_category = xpdf_PathTreeUrl($mytree, $cid, $cat_arr, 'cat_title', $prefix = ' <img src="images/icons/arrow.gif" alt="arrow" /> ', true, 'ASC');
+$nav_category = xpdf_PathTreeUrl($mytree, $cid, $cat_arr, 'cat_title', $prefix = '<img src="images/icons/arrow.gif" alt="arrow" /> ', true, 'ASC');
$xoopsTpl->assign('category_path', $nav_category);
// Info category
@@ -84,8 +84,9 @@
$subcategories_arr = $mytree->getFirstChild($cat_id);
$chcount = 0;
$subcategories = '';
+ $cat_title = $cat_arr[$i]->getVar('cat_title');
// For keywords
- $keywords .= $cat_arr[$i]->getVar('cat_title') . ',';
+ $keywords .= $cat_title . ',';
foreach (array_keys($subcategories_arr) as $j) {
if ($chcount >= $GLOBALS['xoopsModuleConfig']['nb_subcat']) {
$subcategories .= '<li>[<a href="'. XPDF_URL .'/viewcat.php?cid=' . $cat_id . '">+</a>]</li>';
@@ -93,9 +94,10 @@
}
$subcategories .= '<li><a href="'. XPDF_URL .'/viewcat.php?cid=' . $subcategories_arr[$j]->getVar('cat_id') . '">' . $subcategories_arr[$j]->getVar('cat_title') . '</a></li>';
$keywords .= $cat_arr[$i]->getVar('cat_title') . ',';
+ $image = XPDF_UPLOAD_CAT_PATH ."/". $cat_arr[$i]->getVar('cat_image');
$chcount++;
}
- $xoopsTpl->append('subcategories', array('image' => $cat_arr[$i]->getVar('cat_image'), 'cid' => $cat_id, 'title' => $cat_arr[$i]->getVar('cat_title'), 'description' => $cat_arr[$i]->getVar('cat_description'), 'infercategories' => $subcategories, 'totaldocuments' => $totaldocuments, 'count' => $count));
+ $xoopsTpl->append('subcategories', array('image' => $image, 'cid' => $cat_id, 'title' => $cat_title, 'description' => $cat_arr[$i]->getVar('cat_description'), 'subsubcategories' => $subcategories, 'totaldocuments' => $totaldocuments, 'count' => $count));
$count++;
}
}
@@ -165,21 +167,22 @@
$categories = xpdf_MygetItemIds('xpdf_view', XPDF_DIRNAME);
$item = xpdf_MygetItemIds('xpdf_doc_item', XPDF_DIRNAME);
foreach (array_keys($doc_arr) as $i) {
- if ($doc_arr[$i]->getVar('doc_image') == 'blank.gif'){
- $doc_image = '';
+ $doc_image = XPDF_UPLOAD_DOC_URL ."/". $doc_arr[$i]->getVar('doc_image');
+ if ($doc_image == 'blank.gif'){
+ $image = '';
}else{
- $doc_image = XPDF_UPLOAD_DOC_PATH ."/". $doc_arr[$i]->getVar('doc_image');
+ $image = $doc_image;
}
$datetime = formatTimestamp($doc_arr[$i]->getVar('doc_published'),'s');
$submitter = XoopsUser::getUnameFromId($doc_arr[$i]->getVar('doc_submitter'));
$slogan = $doc_arr[$i]->getVar('doc_slogan');
- //to view only the short description
+ // To view only the short description
if (strpos($slogan,'[pagebreak]')==false){
$slogan_short = $slogan;
}else{
- $slogan_short = substr($slogan,0,strpos($slogan,'[pagebreak]'));
+ $slogan_short = substr($slogan, 0, strpos($slogan,'[pagebreak]'));
}
- // pour les vignettes "new" et "mis \xE0 jour"
+ // Images for "new" and "updated"
$new = xpdf_NewOrUpdate($doc_arr[$i]->getVar('doc_published'), $doc_arr[$i]->getVar('doc_status'));
$pop = xpdf_Popular($doc_arr[$i]->getVar('doc_hits'));
@@ -217,7 +220,7 @@
$title = $doc_arr[$i]->getVar('doc_title');
$pdfdoc = "<a href='" . XPDF_URL . "/viewdoc.php?did=".$did."' title='"._MA_XPDF_IMG_VIEWPDF."' target='_blank'>";
$pdfdoc .= "<img src='" . XPDF_URL . "/images/22/view_pdf.png' width='22px' height='22px' border='0' alt='".$title."'/></a>";
- $xoopsTpl->append('file', array('did' => $did, 'cid' => $cid, 'title' => $title, 'new' => $new, 'pop' => $pop, 'image' => $doc_image, 'updated' => $datetime, 'slogan' => $slogan_short, 'adminlink' => $adminlink, 'submitter' => $submitter, 'perm_view' => $perm_view, 'online' => $online, 'count' => $cpt, 'pdfdoc' => $pdfdoc));
+ $xoopsTpl->append('file', array('did' => $did, 'cid' => $cid, 'title' => $title, 'new' => $new, 'pop' => $pop, 'image' => $image, 'updated' => $datetime, 'slogan' => $slogan_short, 'adminlink' => $adminlink, 'submitter' => $submitter, 'perm_view' => $perm_view, 'online' => $online, 'count' => $cpt, 'pdfdoc' => $pdfdoc));
//For keywords
$keywords .= $doc_arr[$i]->getVar('title') . ',';
}
@@ -232,10 +235,13 @@
$xoTheme->addMeta( 'meta', 'keywords', $keywords);
$xoopsTpl->assign('xpdf_url', XPDF_URL);
+$xoopsTpl->assign('adv', $GLOBALS['xoopsModuleConfig']['advertise']);
-if($GLOBALS['xoopsModuleConfig']['show_social']== 1){
-$social = $GLOBALS['xoopsModuleConfig']['social_code'];
-$xoopsTpl->assign('social', $social); }
+if($GLOBALS['xoopsModuleConfig']['social_active'] == 1) {
+$social = $GLOBALS['xoopsModuleConfig']['social_code'];
+$act_social = $GLOBALS['xoopsModuleConfig']['social_active'];
+$xoopsTpl->assign('social_active', $act_social);
+$xoopsTpl->assign('social_code', $social); }
include_once XOOPS_ROOT_PATH."/footer.php";
?>
\ No newline at end of file
Modified: XoopsModules/xpdf/trunk/modules/xpdf/xoops_version.php
===================================================================
--- XoopsModules/xpdf/trunk/modules/xpdf/xoops_version.php 2012-05-02 15:28:19 UTC (rev 9425)
+++ XoopsModules/xpdf/trunk/modules/xpdf/xoops_version.php 2012-05-02 21:29:32 UTC (rev 9426)
@@ -112,15 +112,24 @@
// Config
$i = 1;
-$modversion['config'][$i]['name'] = "xpdf_editor";
-$modversion['config'][$i]['title'] = "_MI_XPDF_EDITOR";
-$modversion['config'][$i]['description'] = "_MI_XPDF_EDITOR_DESC";
+$modversion['config'][$i]['name'] = "xpdf_editor_cat";
+$modversion['config'][$i]['title'] = "_MI_XPDF_EDITOR_CAT";
+$modversion['config'][$i]['description'] = "_MI_XPDF_EDITOR_CAT_DESC";
$modversion['config'][$i]['formtype'] = "select";
$modversion['config'][$i]['valuetype'] = "text";
$modversion['config'][$i]['default'] = "dhtmltextarea";
$modversion['config'][$i]['options'] = XoopsLists::getEditorList();
$modversion['config'][$i]['category'] = "global";
$i++;
+$modversion['config'][$i]['name'] = "xpdf_editor_doc";
+$modversion['config'][$i]['title'] = "_MI_XPDF_EDITOR_DOC";
+$modversion['config'][$i]['description'] = "_MI_XPDF_EDITOR_DOC_DESC";
+$modversion['config'][$i]['formtype'] = "select";
+$modversion['config'][$i]['valuetype'] = "text";
+$modversion['config'][$i]['default'] = "tinymce";
+$modversion['config'][$i]['options'] = XoopsLists::getEditorList();
+$modversion['config'][$i]['category'] = "global";
+$i++;
$modversion['config'][$i]['name'] = "keywords";
$modversion['config'][$i]['title'] = "_MI_XPDF_KEYWORDS";
$modversion['config'][$i]['description'] = "_MI_XPDF_KEYWORDS_DESC";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
