Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10618] XoopsCore/branches/2.6.x/2.6.0/htdocs/modules /page
|
From: <ma...@us...> - 2013-01-01 14:16:12
|
Revision: 10618
http://sourceforge.net/p/xoops/svn/10618
Author: mageg
Date: 2013-01-01 14:16:08 +0000 (Tue, 01 Jan 2013)
Log Message:
-----------
update page module
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/blocks/page_blocks.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/docs/changelog.txt
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/blocks/page_blocks_id.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_navigation.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/xoops_version.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/blocks/page_blocks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/blocks/page_blocks.php 2012-12-31 19:08:35 UTC (rev 10617)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/blocks/page_blocks.php 2013-01-01 14:16:08 UTC (rev 10618)
@@ -73,17 +73,8 @@
if (count($view_content) == 0 || $view_content->getVar('content_status') == 0){
$content = array();
} else {
- $parsed = parse_url(XOOPS_URL);
- $url = isset($parsed['scheme']) ? $parsed['scheme'] . '://' : 'http://';
- if (isset($parsed['host'])) {
- $url .= $parsed['host'];
- if (isset($parsed['port'])) {
- $url .= ':' . $parsed['port'];
- }
- } else {
- $url .= $_SERVER['HTTP_HOST'];
- }
- $url = $url . $_SERVER['REQUEST_URI'];
+ $request = Xoops_Request::getInstance();
+ $url = $request->getUrl();
// add module css
$xoops->theme()->addStylesheet( $xoops->url('/modules/page/css/styles.css'), null );
$xoops->theme()->addStylesheet( $xoops->url('/modules/page/css/rating.css'), null );
@@ -153,7 +144,8 @@
}
$content['content_dofooter'] = $footer;
- /*$page = new Page();
+ include_once XOOPS_ROOT_PATH. '/modules/page/class/page.php';
+ $page = new Page();
$related = $page->menu_related($content_id);
@@ -163,7 +155,7 @@
if ($related['navigation'] != '' ) {
$content['navigation'] = $related['navigation'];
$content['related'] = $related;
- }*/
+ }
}
}
return $content;
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-31 19:08:35 UTC (rev 10617)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/page.php 2013-01-01 14:16:08 UTC (rev 10618)
@@ -28,7 +28,7 @@
{
$xoops = Xoops::getInstance();
// Get handler
- $related_Handler = $xoops->getModuleHandler('page_related');
+ $related_Handler = $xoops->getModuleHandler('page_related', 'page');
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('related_contentid', $content_id));
$criteria->setLimit(1);
@@ -63,7 +63,7 @@
$previous = $save_previous;
$save_next = true;
} else {
- $summary[] = '<a href="viewpage.php?id=' . $related_arr[$i]->getVar('related_contentid') . '" title="' . $related_arr[$i]->getVar('content_title') . '">' . $related_arr[$i]->getVar('content_title') . '</a>';
+ $summary[] = '<a href="' . XOOPS_URL . '/modules/page/viewpage.php?id=' . $related_arr[$i]->getVar('related_contentid') . '" title="' . $related_arr[$i]->getVar('content_title') . '">' . $related_arr[$i]->getVar('content_title') . '</a>';
if ($save_next == true){
$next = $related_arr[$i]->getVar('related_contentid');
$save_next = false;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/docs/changelog.txt 2012-12-31 19:08:35 UTC (rev 10617)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/docs/changelog.txt 2013-01-01 14:16:08 UTC (rev 10618)
@@ -1,4 +1,4 @@
Version 0.1
-------------------
-Create module page
+Create page module
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/blocks/page_blocks_id.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/blocks/page_blocks_id.html 2012-12-31 19:08:35 UTC (rev 10617)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/blocks/page_blocks_id.html 2013-01-01 14:16:08 UTC (rev 10618)
@@ -30,11 +30,11 @@
<{/if}>
<{/if}>
<div class="page_content">
- <{if $summary}>
+ <{if $block.summary}>
<h4><{$smarty.const._MD_PAGE_VIEWPAGE_SUMMARY}>:</h4>
<div>
<ul>
- <{foreach item=summary from=$summary}>
+ <{foreach item=summary from=$block.summary}>
<li><{$summary}></li>
<{/foreach}>
</ul>
@@ -43,8 +43,9 @@
<{$block.content_shorttext}>
<br />
<{$block.content_text}>
- <{if $navigation}>
+ <{if $block.navigation}>
<div class="clear"></div>
+ <{assign var='related' value=$block.related}>
<{includeq file="module:page|page_navigation.html"}>
<div class="clear"></div>
<{/if}>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_navigation.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_navigation.html 2012-12-31 19:08:35 UTC (rev 10617)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_navigation.html 2013-01-01 14:16:08 UTC (rev 10618)
@@ -15,7 +15,7 @@
<{/if}>
<{if $related.navigation == 2}>
<div class="page_navigation">
- <form class="form-inline" name='nav_form' id='nav_form' action='viewpage.php' method='get'>
+ <form class="form-inline" name='nav_form' id='nav_form' action='<{$xoops_url}>/modules/page/viewpage.php' method='get'>
<{if $related.previous_id != 0}>
<a href="<{$xoops_url}>/modules/page/viewpage.php?id=<{$related.previous_id}>" title="<{$related.previous_title}>"><img src="<{$xoops_url}>/modules/page/images/previous.png" alt="<{$related.previous_title}>"/></a>
<{/if}>
@@ -27,7 +27,7 @@
<option value="<{$id}>"><{$title}></option>
<{/if}>
<{/foreach}>
- </select>
+ </select>
<{if $related.next_id != 0}>
<a href="<{$xoops_url}>/modules/page/viewpage.php?id=<{$related.next_id}>" title="<{$related.next_title}>"><img src="<{$xoops_url}>/modules/page/images/next.png" alt="<{$related.next_title}>"/></a>
<{/if}>
@@ -50,7 +50,7 @@
<{/if}>
<{if $related.navigation == 4}>
<div class="page_navigation" style="width: 250px;">
- <form class="form-inline" name='nav_form' id='nav_form' action='viewpage.php' method='get'>
+ <form class="form-inline" name='nav_form' id='nav_form' action='<{$xoops_url}>/modules/page/viewpage.php' method='get'>
<select class="span2" size="1" onchange="document.forms.nav_form.submit()" name="id" id="select_nav" title="">
<{foreach item=title key=id from=$related.select}>
<{if $id == $content_id}>
@@ -64,16 +64,16 @@
</div>
<{/if}>
<{if $related.navigation == 5}>
-<div class="page_navigation">
+<ul class="pager">
<{if $related.previous_id != 0}>
- <div class="page_navigationL">
+ <li class="previous">
<a href="<{$xoops_url}>/modules/page/viewpage.php?id=<{$related.previous_id}>" title="<{$related.previous_title}>"><{$related.previous_title}></a>
- </div>
+ </li>
<{/if}>
<{if $related.next_id != 0}>
- <div class="page_navigationR">
+ <li class="next">
<a href="<{$xoops_url}>/modules/page/viewpage.php?id=<{$related.next_id}>" title="<{$related.next_title}>"><{$related.next_title}></a>
- </div>
+ </li>
<{/if}>
-</div>
+</ul>
<{/if}>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/xoops_version.php 2012-12-31 19:08:35 UTC (rev 10617)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/xoops_version.php 2013-01-01 14:16:08 UTC (rev 10618)
@@ -34,10 +34,10 @@
$modversion['dirname'] = 'page';
//about
-$modversion['release_date'] = '2012/11/25';
+$modversion['release_date'] = '2013/01/01';
$modversion['module_website_url'] = 'http://www.xoops.org/';
$modversion['module_website_name'] = 'XOOPS';
-$modversion['module_status'] = 'ALPHA 1';
+$modversion['module_status'] = 'Final';
$modversion['min_php'] = '5.2';
$modversion['min_xoops'] = '2.6.0';
$modversion['min_db'] = array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
|
