Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11971] XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs
|
From: <txm...@us...> - 2013-08-24 15:52:49
|
Revision: 11971
http://sourceforge.net/p/xoops/svn/11971
Author: txmodxoops
Date: 2013-08-24 15:52:40 +0000 (Sat, 24 Aug 2013)
Log Message:
-----------
Added files:
errorpage.php,
class/pagenav.php,
language/english/errors.php,
system/templates/system_barsocials.html,
system/templates/system_errorpage.html,
system/templates/system_fbcomments.html,
system/templates/system_pagenav.html,
Modified files:
system/xoops_version.php updated to version 2.11
To responsive bootstrap design
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/class/pagenav.php
XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/modules/system/templates/system_pagenav.html
XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/modules/system/xoops_version.php
Added Paths:
-----------
XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/errorpage.php
XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/language/
XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/language/english/
XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/language/english/errors.php
XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/modules/system/templates/system_barsocials.html
XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/modules/system/templates/system_errorpage.html
XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/modules/system/templates/system_fbcomments.html
Modified: XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/class/pagenav.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/class/pagenav.php 2013-08-24 14:20:57 UTC (rev 11970)
+++ XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/class/pagenav.php 2013-08-24 15:52:40 UTC (rev 11971)
@@ -198,7 +198,7 @@
$xoopsTpl->assign('pagination_select', true);
$xoopsTpl->assign('showbutton', $showbutton);
$xoopsTpl->assign('align', ' pagination-' . $align);
- $ret = $xoopsTpl->fetch('module:system|system_pagenav.html');
+ $ret = $xoopsTpl->fetch('db:system_pagenav.html');
$xoopsTpl->clear_assign('xo_select');
return $ret;
}
Added: XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/errorpage.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/errorpage.php (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/errorpage.php 2013-08-24 15:52:40 UTC (rev 11971)
@@ -0,0 +1,83 @@
+<?php
+/*
+ * 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.
+ *
+ * HOW TO INSTALL THE SCRIPT:
+ *
+ * Copy and paste this whole script into your root.
+ * Add the following lines to your .htaccess file (change the location of your error page, if needed):
+ * ErrorDocument 400 /errorpage.php?error=400
+ * ErrorDocument 401 /errorpage.php?error=401
+ * ErrorDocument 403 /errorpage.php?error=403
+ * ErrorDocument 404 /errorpage.php?error=404
+ * ErrorDocument 500 /errorpage.php?error=500
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @copyright The TXNod XOOPS Project http://sourceforge.net/projects/txmodxoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package core
+ * @since 2.5.2
+ * @author TXMod Xoops <web...@tx...>
+ * @version $Id: errorpage.php 0005 2011-08-04 10:25:28Z timgno $
+ */
+
+include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php';
+$xoopsOption['show_cblock'] = 0;
+$xoopsOption['template_main'] = 'db:system_errorpage.html';
+include $GLOBALS['xoops']->path('header.php');
+xoops_loadLanguage('errors');
+// Error code
+$error = '';
+if(isset($_GET['error']))
+ $error = $_GET['error'];
+// $errortitle = in language pack (errors.php)
+// $errordesc = in language pack (errors.php)
+// switch different error messages
+switch ($error) {
+ // Error 400 - Bad Request
+ case 400:
+ $errortitle = _XO_ER_TITLE400;
+ $errordesc = _XO_ER_DESC400;
+ break;
+
+ // Error 401 - Authorization Required
+ case 401:
+ $errortitle = _XO_ER_TITLE401;
+ $errordesc = _XO_ER_DESC401;
+ break;
+ // Error 403 - Access Forbidden
+ case 403:
+ $errortitle = _XO_ER_TITLE403;
+ $errordesc = _XO_ER_DESC403;
+ break;
+ // Error 404 - Page Not Found
+ case 404:
+ $errortitle = _XO_ER_TITLE404;
+ $errordesc = _XO_ER_DESC404;
+ break;
+ // Error 500 - Server Configuration Error
+ case 500:
+ $errortitle = _XO_ER_TITLE500;
+ $errordesc = _XO_ER_DESC500;
+ break;
+ // Unknown error
+ default:
+ $errortitle = _XO_ER_TITLE;
+ $errordesc = _XO_ER_DESC;
+ break;
+}
+
+$array_keys = explode(" ", $errortitle);
+$keywords = implode(",", $array_keys);
+$xoTheme->addMeta('meta', 'keywords', $keywords);
+$xoTheme->addMeta('meta', 'description', $errordesc);
+// Display error
+$xoopsTpl->assign('errortitle', $errortitle);
+$xoopsTpl->assign('errordesc', $errordesc);
+
+include $GLOBALS['xoops']->path('footer.php');
\ No newline at end of file
Added: XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/language/english/errors.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/language/english/errors.php (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/language/english/errors.php 2013-08-24 15:52:40 UTC (rev 11971)
@@ -0,0 +1,22 @@
+<?php
+// _LANGCODE: en
+// _CHARSET : UTF-8
+// Translator: XOOPS Translation Team
+define('_XO_ER_FILENOTFOUND','Requested file: <b>%s</b> was not found ');
+define('_XO_ER_CLASSNOTFOUND','Requested class %s was not found');
+// Error Pages by TXMod Xoops
+define ('_XO_ER_TITLE', 'Error not classified (Not Classified)');
+define ('_XO_ER_DESC', 'Sorry, but this error has not been classified.');
+define ('_XO_ER_TITLE400', 'Error 400 - Bad Request (Bad Request)');
+define ('_XO_ER_DESC400', 'Sorry, we made a request was incorrect.');
+define ('_XO_ER_TITLE401', 'Error 401 - Authorization Required (Authorization required)');
+define ('_XO_ER_DESC401', 'Sorry, but access to the requested page is forbidden, necessary authorization.');
+define ('_XO_ER_TITLE403', 'Error 403 - Forbidden (Forbidden)');
+define ('_XO_ER_DESC403', 'Sorry, but access to this page is denied.');
+define ('_XO_ER_TITLE404', 'Error 404 - Page Not Found (Not Found)');
+define ('_XO_ER_DESC404', 'Sorry, but the page requested does not exist, has been moved or has been removed. <br /> <br /> safety Make a search on the site.');
+define ('_XO_ER_TITLE500', 'Error 500 - Internal server error (Internal Server Error)');
+define ('_XO_ER_DESC500', 'Sorry, but the server is not responding at this time due to an internal error.');
+// Last translation update: 04/08/2011
+define ('_XO_ER_ALERT', 'Warning');
+define ('_XO_ER_ERROR', 'Error');
\ No newline at end of file
Added: XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/modules/system/templates/system_barsocials.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/modules/system/templates/system_barsocials.html (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/modules/system/templates/system_barsocials.html 2013-08-24 15:52:40 UTC (rev 11971)
@@ -0,0 +1,7 @@
+<ul class="nav xo-row span8 inline">
+ <li class="fb-like" data-href="<{$xoops_mpageurl}>" data-width="150" data-layout="button_count" data-show-faces="false" data-send="true"></li>
+ <li class="fb-share"><a href="https://www.facebook.com/sharer/sharer.php?u=http%3A%2F%2Fwww.txmodxoops.org/" target="_blank">Share on Facebook</a></li>
+ <li class="twitter-share"><a href="<{$xoops_mpageurl}>" class="twitter-share-button" data-related="jasoncosta" data-lang="<{$xoops_langcode}>" data-size="medium" data-count="horizontal">Tweet</a></li>
+ <li class="g-plus" data-action="share" data-annotation="bubble" data-href="<{$xoops_mpageurl}>"></li>
+</ul>
+<hr class="clear" />
\ No newline at end of file
Added: XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/modules/system/templates/system_errorpage.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/modules/system/templates/system_errorpage.html (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/modules/system/templates/system_errorpage.html 2013-08-24 15:52:40 UTC (rev 11971)
@@ -0,0 +1,8 @@
+<div class='ui-widget'>
+ <div class="alert alert-error" style='padding: 0 1.7em;'>
+ <p style='padding: 2.0em;'><span class='ui-icon ui-icon-alert' style='float: left; margin-right: .5em;'></span>
+ <strong><{$smarty.const._XO_ER_ALERT}></strong>: <{$errortitle}></p>
+ </div>
+ <div class='errorContent'><{$errordesc}></div>
+ <p><a href='javascript:history.go(-1)'><{$smarty.const._BACK}></a></p>
+</div>
\ No newline at end of file
Added: XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/modules/system/templates/system_fbcomments.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/modules/system/templates/system_fbcomments.html (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/modules/system/templates/system_fbcomments.html 2013-08-24 15:52:40 UTC (rev 11971)
@@ -0,0 +1,4 @@
+<div id="fb-comments">
+ <div class="fb-comments"><fb:comments href="<{$xoops_mpageurl}>" num_posts="2" width="320"></fb:comments></div>
+ <div class="clear"></div>
+</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/modules/system/templates/system_pagenav.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/modules/system/templates/system_pagenav.html 2013-08-24 14:20:57 UTC (rev 11970)
+++ XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/modules/system/templates/system_pagenav.html 2013-08-24 15:52:40 UTC (rev 11971)
@@ -1,45 +1,45 @@
-<{if $pagination_nav}>
-<div class="pagination<{$size}><{$align}>">
- <ul>
- <{if $prev_text}>
- <li><a href="<{$prev_url}>"><{$prev_text}></a></li>
- <{/if}>
- <{if $first == 1}>
- <li>
- <a href="<{$first_url}>"><{$first_text}></a>
- </li>
- <{/if}>
- <{foreach item=nav from=$xo_nav}>
- <li <{if $nav.active == 0}>class="disabled"<{/if}>>
- <a href="<{$nav.url}>"><{$nav.text}></a>
- </li>
- <{/foreach}>
- <{if $last == 1}>
- <li>
- <a href="<{$last_url}>"><{$last_text}></a>
- </li>
- <{/if}>
- <{if $next_text}>
- <li><a href="<{$next_url}>"><{$next_text}></a></li>
- <{/if}>
- </ul>
-</div>
-<{/if}>
-<{if $pagination_select}>
-<div class="pagination<{$align}>">
- <form class="form-inline" action="" name="pagenavform">
- <{if $showbutton == 1}>
- <div class="input-append">
- <{/if}>
- <select class="input-small" id="appendedSelectButton" name="pagenavselect" onchange="<{$onchange}>">
- <{foreach item=select from=$xo_select}>
- <option value="<{$select.value}>" <{if $select.selected == 1}>selected="selected"<{/if}>><{$select.text}></option>
- <{/foreach}>
- </select>
- <{if $showbutton == 1}>
- <button class="btn" type="submit"><{$smarty.const._GO}></button>
- </div>
- <{/if}>
- </form>
-</div>
+<{if $pagination_nav}>
+<div class="pagination<{$size}><{$align}>">
+ <ul>
+ <{if $prev_text}>
+ <li class="previous"><a href="<{$prev_url}>"><{$prev_text}></a></li>
+ <{/if}>
+ <{if $first == 1}>
+ <li>
+ <a href="<{$first_url}>"><{$first_text}></a>
+ </li>
+ <{/if}>
+ <{foreach item=nav from=$xo_nav}>
+ <li <{if $nav.active == 0}>class="disabled"<{/if}>>
+ <a href="<{$nav.url}>"><{$nav.text}></a>
+ </li>
+ <{/foreach}>
+ <{if $last == 1}>
+ <li>
+ <a href="<{$last_url}>"><{$last_text}></a>
+ </li>
+ <{/if}>
+ <{if $next_text}>
+ <li class="next"><a href="<{$next_url}>"><{$next_text}></a></li>
+ <{/if}>
+ </ul>
+</div>
+<{/if}>
+<{if $pagination_select}>
+<div class="pagination<{$align}>">
+ <form class="form-inline" action="" name="pagenavform">
+ <{if $showbutton == 1}>
+ <div class="input-append">
+ <{/if}>
+ <select class="input-small" id="appendedSelectButton" name="pagenavselect" onchange="<{$onchange}>">
+ <{foreach item=select from=$xo_select}>
+ <option value="<{$select.value}>" <{if $select.selected == 1}>selected="selected"<{/if}>><{$select.text}></option>
+ <{/foreach}>
+ </select>
+ <{if $showbutton == 1}>
+ <button class="btn" type="submit"><{$smarty.const._GO}></button>
+ </div>
+ <{/if}>
+ </form>
+</div>
<{/if}>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/modules/system/xoops_version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/modules/system/xoops_version.php 2013-08-24 14:20:57 UTC (rev 11970)
+++ XoopsCore/branches/2.5.x/2.5.7_timgno/htdocs/modules/system/xoops_version.php 2013-08-24 15:52:40 UTC (rev 11971)
@@ -30,10 +30,10 @@
// ------------------------------------------------------------------------- //
$modversion['name'] = _MI_SYSTEM_NAME;
-$modversion['version'] = 2.10;
+$modversion['version'] = 2.11;
$modversion['description'] = _MI_SYSTEM_DESC;
$modversion['author'] = '';
-$modversion['credits'] = 'The XOOPS Project; MusS, Kraven30, Mage';
+$modversion['credits'] = 'The XOOPS Project; MusS, Kraven30, Mage, Timgno';
$modversion['help'] = 'system.html';
$modversion['license'] = "GPL see LICENSE";
$modversion['official'] = 1;
@@ -68,6 +68,9 @@
$modversion['templates'][] = array( 'file' => 'system_banner.html', 'description' => '' );
$modversion['templates'][] = array( 'file' => 'system_bannerdisplay.html', 'description' => '' );
$modversion['templates'][] = array( 'file' => 'system_pagenav.html', 'description' => '' );
+$modversion['templates'][] = array( 'file' => 'system_barsocials.html', 'description' => '' );
+$modversion['templates'][] = array( 'file' => 'system_fbcomments.html', 'description' => '' );
+$modversion['templates'][] = array( 'file' => 'system_errorpage.html', 'description' => '' );
// Admin Templates
$modversion['templates'][] = array( 'file' => 'system_header.html', 'description' => '', 'type' => 'admin' );
|
