Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10309] XoopsCore/branches/2.6.x/2.6.0/htdocs/modules /page
|
From: <ma...@us...> - 2012-12-02 21:34:53
|
Revision: 10309
http://sourceforge.net/p/xoops/svn/10309
Author: mageg
Date: 2012-12-02 21:34:50 +0000 (Sun, 02 Dec 2012)
Log Message:
-----------
Update page module
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/content.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form/page_content.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form/page_related.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/page.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_print.html
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/content.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/content.php 2012-12-02 21:18:49 UTC (rev 10308)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/content.php 2012-12-02 21:34:50 UTC (rev 10309)
@@ -16,7 +16,7 @@
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
* @package page
* @since 2.6.0
- * @author Mage Gr\xE9gory (AKA Mage)
+ * @author Mage Gr�gory (AKA Mage)
* @version $Id$
*/
include dirname(__FILE__) . '/header.php';
@@ -188,7 +188,7 @@
}
if (preg_match('/^\d+$/', $_POST["content_weight"]) == false){
$error = true;
- $error_message .= _AM_PAGE_CATEGORY_ERROR_WEIGHT . '<br />';
+ $error_message .= _AM_PAGE_CONTENT_ERROR_WEIGHT . '<br />';
$obj->setVar("content_weight", '');
} else {
$obj->setVar("content_weight", $_POST["content_weight"]);
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form/page_content.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form/page_content.php 2012-12-02 21:18:49 UTC (rev 10308)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form/page_content.php 2012-12-02 21:34:50 UTC (rev 10309)
@@ -16,7 +16,7 @@
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
* @package page
* @since 2.6.0
- * @author Mage Gr\xE9gory (AKA Mage)
+ * @author Mage Gr�gory (AKA Mage)
* @version $Id$
*/
@@ -25,7 +25,7 @@
class PagePage_contentForm extends XoopsThemeForm
{
/**
- * @param XoopsPagePage_content|XoopsObject $obj
+ * @param PagePage_content|XoopsObject $obj
*/
public function __construct(PagePage_content &$obj)
{
@@ -80,7 +80,7 @@
$content_option = array('title', 'author', 'date', 'hits', 'rating', 'coms', 'ncoms', 'notifications', 'pdf', 'print', 'mail', 'social');
$content_status = 1;
$content_maindisplay = 1;
- }
+ }
//title
$this->addElement(new XoopsFormText(_AM_PAGE_CONTENT_TITLE, 'content_title', 6, 255, $obj->getVar('content_title'), ''), true);
//short text
@@ -131,7 +131,7 @@
$this->addElement(new XoopsFormRadioYN(_AM_PAGE_CONTENT_MAINDISPLAY, 'content_maindisplay', $content_maindisplay));
//active
$this->addElement(new XoopsFormRadioYN(_AM_PAGE_CONTENT_STATUS, 'content_status', $content_status));
-
+
if ( $xoops->user->isAdmin($xoops->module->mid()) ) {
//author
if ($obj->isNew()) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form/page_related.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form/page_related.php 2012-12-02 21:18:49 UTC (rev 10308)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form/page_related.php 2012-12-02 21:34:50 UTC (rev 10309)
@@ -16,7 +16,7 @@
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
* @package page
* @since 2.6.0
- * @author Mage Gr\xE9gory (AKA Mage)
+ * @author Mage Gr�gory (AKA Mage)
* @version $Id$
*/
@@ -25,7 +25,7 @@
class PagePage_relatedForm extends XoopsThemeForm
{
/**
- * @param XoopsPagePage_content|XoopsObject $obj
+ * @param PagePage_related|XoopsObject $obj
*/
public function __construct(PagePage_related &$obj)
{
@@ -37,7 +37,7 @@
$title = $obj->isNew() ? sprintf( _AM_PAGE_RELATED_ADD ) : sprintf( _AM_PAGE_RELATED_EDIT );
parent::__construct($title, 'form', 'related.php', 'post', true);
-
+
$secondary_max = 10;
$this->addElement(new XoopsFormHidden( 'secondary_max', $secondary_max ) );
$criteria_related = new CriteriaCompo();
@@ -64,7 +64,7 @@
for ($i = 1; $i <= $secondary_max; $i++) {
$related_secondary[$i] = 0;
}
-
+
}
$compare_related_arr = $related_Handler->getall($criteria_related);
if (count($compare_related_arr) > 0) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/page.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/page.php 2012-12-02 21:18:49 UTC (rev 10308)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/page.php 2012-12-02 21:34:50 UTC (rev 10309)
@@ -16,7 +16,7 @@
* @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
* @package page
* @since 2.6.0
- * @author Mage Gr\xE9gory (AKA Mage)
+ * @author Mage Gr�gory (AKA Mage)
* @version $Id$
*/
@@ -28,7 +28,6 @@
{
$xoops = Xoops::getInstance();
// Get handler
- $content_Handler = $xoops->getModuleHandler('page_content');
$related_Handler = $xoops->getModuleHandler('page_related');
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('related_contentid', $content_id));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_print.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_print.html 2012-12-02 21:18:49 UTC (rev 10308)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_print.html 2012-12-02 21:34:50 UTC (rev 10309)
@@ -27,8 +27,7 @@
<![endif]-->
</head>
-<!--<body class="<{$xoops_langcode}>" onload="window.print()">-->
-<body class="<{$xoops_langcode}>">
+<body class="<{$xoops_langcode}>" onload="window.print()">
<div id="page-print">
<div id="page-logo-print">
<img src="<{$xoops_url}>/images/logo.png" alt="<{$xoops_sitename}>" />
|
