[xoops-svn] SF.net SVN: xoops-svn:[10292] XoopsCore/branches/2.6.x/2.6.0/htdocs/modules /page

[<ma...@us...>]

Revision: 10292
          http://sourceforge.net/p/xoops/svn/10292
Author:   mageg
Date:     2012-11-30 20:44:24 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
add plugin "xoosocialnetwork" in page module

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/index.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/templates/page_viewpage.html
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/viewpage.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/index.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/index.php	2012-11-30 20:27:36 UTC (rev 10291)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/admin/index.php	2012-11-30 20:44:24 UTC (rev 10292)
@@ -46,13 +46,8 @@
 $admin_page->addInfoBoxLine(sprintf(_AM_PAGE_INDEX_TOTALDISPLAY, '<span class="green">' . $content_display . '</span>'), 'content');
 $admin_page->addInfoBoxLine(sprintf(_AM_PAGE_INDEX_TOTALNOTDISPLAY, '<span class="red">' . $content_notdisplay . '</span>'), 'content');
 
-// configs
-/*$admin_page->addConfigBoxLine($folder_path, 'folder');
-$admin_page->addConfigBoxLine(array($folder_path, '777'), 'chmod');
-$admin_page->addConfigBoxLine($folder_path . '/images', 'folder');
-$admin_page->addConfigBoxLine(array($folder_path . '/images', '777'), 'chmod');
-$admin_page->addConfigBoxLine($folder_path . '/images/category', 'folder');
-$admin_page->addConfigBoxLine(array($folder_path . '/images/category', '777'), 'chmod');*/
+// extension
+$admin_page->addConfigBoxLine(array('xoosocialnetwork', 'warning'), 'extension');
 
 $admin_page->renderIndex();
 $xoops->footer();
\ No newline at end of file

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-11-30 20:27:36 UTC (rev 10291)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/class/form/page_content.php	2012-11-30 20:44:24 UTC (rev 10292)
@@ -122,7 +122,9 @@
         $checkbox->addOption('pdf', _AM_PAGE_CONTENT_DOPDF);
         $checkbox->addOption('print', _AM_PAGE_CONTENT_DOPRINT);
         $checkbox->addOption('mail', _AM_PAGE_CONTENT_DOMAIL);
-        $checkbox->addOption('social', _AM_PAGE_CONTENT_DOSOCIAL);        
+        if ($xoops->isActiveModule('xoosocialnetwork') == true) {
+            $checkbox->addOption('social', _AM_PAGE_CONTENT_DOSOCIAL);
+        }
         $checkbox->setDescription(_AM_PAGE_CONTENT_OPTIONS_DSC);
         $this->addElement($checkbox);
         //maindisplay

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_viewpage.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_viewpage.html	2012-11-30 20:27:36 UTC (rev 10291)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/templates/page_viewpage.html	2012-11-30 20:44:24 UTC (rev 10292)
@@ -43,7 +43,11 @@
     <{$content_shorttext}>
     <br />
     <{$content_text}>
-
+    <{if $navigation}>
+    <div class="clear"></div>
+        <{includeq file="module:page|page_navigation.html"}>
+    <div class="clear"></div>
+    <{/if}>
 </div>
 <{if $content_dofooter}>
 <div class="page_footer">
@@ -58,8 +62,6 @@
     <{/if}>
 </div>
 <{/if}>
-<{if $navigation}>
-    <div class="clear"></div>
-    <{includeq file="module:page|page_navigation.html"}>
-    <div class="clear"></div>
+<{if $content_dosocial}>
+<{includeq file='module:xoosocialnetwork|xoosocialnetwork.html'}>
 <{/if}>
\ No newline at end of file

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/viewpage.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/viewpage.php	2012-11-30 20:27:36 UTC (rev 10291)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/page/viewpage.php	2012-11-30 20:44:24 UTC (rev 10292)
@@ -108,6 +108,7 @@
 $xoopsTpl->assign('content_dohits', $view_content->getVar('content_dohits'));
 $xoopsTpl->assign('content_dorating', $view_content->getVar('content_dorating'));
 $xoopsTpl->assign('content_dotitle', $view_content->getVar('content_dotitle'));
+$xoopsTpl->assign('content_dosocial', $view_content->getVar('content_dosocial'));
 $xoopsTpl->assign('content_donotifications', $view_content->getVar('content_donotifications'));
 $xoopsTpl->assign('content_docoms', $view_content->getVar('content_docoms'));
 if ($view_content->getVar('content_docoms') == false){