Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9829] XoopsCore/branches/2.6.x/2.6.0/htdocs
|
From: <for...@us...> - 2012-07-09 19:35:08
|
Revision: 9829
http://xoops.svn.sourceforge.net/xoops/?rev=9829&view=rev
Author: forxoops
Date: 2012-07-09 19:34:57 +0000 (Mon, 09 Jul 2012)
Log Message:
-----------
Update theme and template for bootstrap
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/xoops.bootstrap.css
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_siteclosed.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userinfo.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/language/english/admin.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/dashboard.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_user.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops.css
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/modules/system/system_redirect.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/modules/system/system_siteclosed.html
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php 2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php 2012-07-09 19:34:57 UTC (rev 9829)
@@ -17,6 +17,65 @@
* @version $Id$
*/
-if (! defined('XOOPS_INSTALL')) {
- header('Location: install/index.php');
+if (!defined("XOOPS_MAINFILE_INCLUDED")) {
+ define("XOOPS_MAINFILE_INCLUDED", 1);
+
+ // XOOPS Physical Paths
+
+ // Physical path to the XOOPS documents (served) directory WITHOUT trailing slash
+ define('XOOPS_ROOT_PATH', 'E:/Wamp/www/xps260/htdocs');
+
+ // For forward compatibility
+ // Physical path to the XOOPS library directory WITHOUT trailing slash
+ define('XOOPS_PATH', 'E:/Wamp/www/xps260/htdocs/xoops_lib');
+ // Physical path to the XOOPS datafiles (writable) directory WITHOUT trailing slash
+ define('XOOPS_VAR_PATH', 'E:/Wamp/www/xps260/htdocs/xoops_data');
+ // Alias of XOOPS_PATH, for compatibility, temporary solution
+ define("XOOPS_TRUST_PATH", XOOPS_PATH);
+
+ // URL Association for SSL and Protocol Compatibility
+ $http = 'http://';
+ if (!empty($_SERVER['HTTPS'])) {
+ $http = ($_SERVER['HTTPS']=='on') ? 'https://' : 'http://';
+ }
+ define('XOOPS_PROT', $http);
+
+ // XOOPS Virtual Path (URL)
+ // Virtual path to your main XOOPS directory WITHOUT trailing slash
+ // Example: define('XOOPS_URL', 'http://localhost/xps260/htdocs');
+ define('XOOPS_URL', 'http://localhost/xps260/htdocs');
+
+ // Shall be handled later, don't forget!
+ define("XOOPS_CHECK_PATH", 0);
+ // Protect against external scripts execution if safe mode is not enabled
+ if (XOOPS_CHECK_PATH && !@ini_get("safe_mode")) {
+ if (function_exists("debug_backtrace")) {
+ $xoopsScriptPath = debug_backtrace();
+ if (!count($xoopsScriptPath)) {
+ die("XOOPS path check: this file cannot be requested directly");
+ }
+ $xoopsScriptPath = $xoopsScriptPath[0]["file"];
+ } else {
+ $xoopsScriptPath = isset($_SERVER["PATH_TRANSLATED"]) ? $_SERVER["PATH_TRANSLATED"] : $_SERVER["SCRIPT_FILENAME"];
+ }
+ if (DIRECTORY_SEPARATOR != "/") {
+ // IIS6 may double the \ chars
+ $xoopsScriptPath = str_replace(strpos($xoopsScriptPath, "\\\\", 2) ? "\\\\" : DIRECTORY_SEPARATOR, "/", $xoopsScriptPath);
+ }
+ if (strcasecmp(substr($xoopsScriptPath, 0, strlen(XOOPS_ROOT_PATH)), str_replace(DIRECTORY_SEPARATOR, "/", XOOPS_ROOT_PATH))) {
+ exit("XOOPS path check: Script is not inside XOOPS_ROOT_PATH and cannot run.");
+ }
+ }
+
+ // Secure file
+ require XOOPS_VAR_PATH . '/data/secure.php';
+
+ define('XOOPS_GROUP_ADMIN', '1');
+ define('XOOPS_GROUP_USERS', '2');
+ define('XOOPS_GROUP_ANONYMOUS', '3');
+
+ if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") {
+ include XOOPS_ROOT_PATH."/include/common.php";
+ }
+
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/xoops.bootstrap.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/xoops.bootstrap.css 2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/xoops.bootstrap.css 2012-07-09 19:34:57 UTC (rev 9829)
@@ -25,7 +25,56 @@
}
.caption-required{color: #b94a48;}
+/* Area style */
+.xo-window {
+ background-color: #222222;
+ background-repeat: repeat-x;
+ background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
+ background-image: -moz-linear-gradient(top, #333333, #222222);
+ background-image: -ms-linear-gradient(top, #333333, #222222);
+ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
+ background-image: -webkit-linear-gradient(top, #333333, #222222);
+ background-image: -o-linear-gradient(top, #333333, #222222);
+ background-image: linear-gradient(top, #333333, #222222);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
+ -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+ -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+ -moz-border-radius: 5px 5px 0 0;
+ -khtml-border-top-left-radius: 5px;
+ -khtml-border-top-right-radius: 5px;
+ -webkit-border-radius-topleft: 5px;
+ -webkit-border-radius-topright: 5px;
+ border-radius: 5px 5px 0 0;
+ border: 1px solid #2D4760;
+ padding: 4px 6px 6px 4px;
+ height: 20px;
+}
+.xo-window-title {
+ padding: 2px 6px 6px 6px;
+ color: #fff;
+ font-weight: bold;
+ text-shadow: 0 0 2px #000;
+ font-family: tahoma, verdana, arial, sans-serif;
+}
+.xo-window-data {
+ float: left;
+ min-height: 50px;
+ padding: 6px;
+ width: 100%;
+}
.clear {
clear: both;
}
+.spacer .spacer-mini {
+ padding:0 0 3px 0;
+}
+.spacer-mid {
+ padding:0 0 6px 0;
+}
+.spacer-large {
+ padding:0 0 12px 0;
+}
+
+.txt-center { text-align: center; }
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html 2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html 2012-07-09 19:34:57 UTC (rev 9829)
@@ -1,7 +1,7 @@
<ul class="nav nav-list">
<{if $xoops_isadmin}>
<li>
- <a href="<{xoAppUrl admin.php}>" title="<{$block.lang_adminmenu}>">
+ <a href="<{xoAppUrl admin.php}>" title="<{$block.lang_adminmenu}>" rel="external">
<i class="icon-wrench"></i>
<{$block.lang_adminmenu}>
</a>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_siteclosed.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_siteclosed.html 2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_siteclosed.html 2012-07-09 19:34:57 UTC (rev 9829)
@@ -1,64 +1,84 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$xoops_langcode}>" lang="<{$xoops_langcode}>">
+<!DOCTYPE html>
+<html lang="<{$xoops_langcode}>">
<head>
- <meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" />
- <meta http-equiv="content-language" content="<{$xoops_langcode}>" />
- <title><{$xoops_sitename}> - <{$xoops_slogan}></title>
- <meta name="robots" content="<{$xoops_meta_robots}>" />
- <meta name="keywords" content="<{$xoops_meta_keywords}>" />
- <meta name="description" content="<{$xoops_meta_description}>" />
- <meta name="rating" content="<{$xoops_meta_rating}>" />
- <meta name="author" content="<{$xoops_meta_author}>" />
- <meta name="copyright" content="<{$xoops_meta_copyright}>" />
- <meta name="generator" content="XOOPS" />
-
- <link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl browse.php?xoops.css}>" />
- <link rel="shortcut icon" type="image/ico" href="<{xoAppUrl favicon.ico}>" />
-
-</head>
-<body>
- <table class="collapse">
- <tr id="header">
- <td class="alignmiddle txtcenter" style="width: 150px; background-color: #2F5376;"><a href="<{xoAppUrl }>" title=""><img src="<{xoAppUrl images/logo.gif}>" alt="" /></a></td>
- <td class="width100 alignmiddle txtcenter" style="background-color: #2F5376;"> </td>
- </tr>
- <tr>
- <td style="height: 8px; border-bottom: 1px solid silver; background-color: #ddd;" colspan="2"> </td>
- </tr>
- </table>
+ <!-- Title and meta -->
+ <meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" />
+ <title><{$xoops_sitename}> - <{$xoops_slogan}></title>
+ <meta name="robots" content="<{$xoops_meta_robots}>" />
+ <meta name="keywords" content="<{$xoops_meta_keywords}>" />
+ <meta name="description" content="<{$xoops_meta_description}>" />
+ <meta name="rating" content="<{$xoops_meta_rating}>" />
+ <meta name="author" content="<{$xoops_meta_author}>" />
+ <meta name="generator" content="XOOPS" />
- <table class="width80 txtcenter bnone" cellspacing="1" cellpadding="10">
- <tr>
- <td class="txtcenter"><div class="txtcenter bold" style="background-color: #DDFFDF; color: #136C99; border-top: 1px solid #DDDDFF; border-left: 1px solid #DDDDFF; border-right: 1px solid #aaa; border-bottom: 1px solid #aaa; padding: 10px;"><{$lang_siteclosemsg}></div></td>
- </tr>
- </table>
-
- <form action="<{xoAppUrl user.php}>" method="post">
- <table class="collapse txtcenter solidsilver" style="width: 200px;">
- <tr>
- <th class="alignmiddle pad2 white" style="background-color: #2F5376;" colspan="2"><{$lang_login}></th>
- </tr>
- <tr>
- <td class="pad2"><{$lang_username}></td><td class="pad2"><input type="text" name="uname" size="12" value="" /></td>
- </tr>
- <tr>
- <td class="pad2"><{$lang_password}></td><td class="pad2"><input type="password" name="pass" size="12" /></td>
- </tr>
- <tr>
- <td class="pad2"> </td>
- <td class="pad2">
- <input type="hidden" name="xoops_redirect" value="<{$xoops_requesturi}>" />
- <input type="hidden" name="xoops_login" value="1" />
- <input type="submit" value="<{$lang_login}>" /></td>
- </tr>
- </table>
- </form>
+ <!-- Favicon -->
+ <link rel="shortcut icon" type="image/ico" href="<{xoImgUrl icons/favicon.ico}>" />
+ <link rel="icon" type="image/png" href="<{xoImgUrl icons/favicon.png}>" />
- <table class="collapse width100">
- <tr>
- <td style="height:8px; border-bottom: 1px solid silver; border-top: 1px solid silver; background-color: #ddd;" colspan="2"> </td>
- </tr>
- </table>
+ <!-- Xoops style sheet -->
+ <link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl xoops.css}>" />
+ <link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl media/xoops/css/icons.css}>" />
+ <link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl media/bootstrap/css/xoops.bootstrap.css}>" />
- </body>
+ <!--[if lte IE 8]>
+ <link rel="stylesheet" href="<{xoImgUrl styleIE8.css}>" type="text/css" />
+ <![endif]-->
+
+ <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+ <!--[if lt IE 9]>
+ <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
+
+</head>
+<body id="<{$xoops_dirname}>" class="<{$xoops_langcode}>">
+<div class="navbar navbar-fixed-top">
+ <div class="navbar-inner">
+ <div class="container">
+ <a class="brand" href="<{xoAppUrl }>" title="<{$xoops_sitename}>">
+ <img src="<{xoImgUrl img/logo.png}>" alt="<{$xoops_sitename}>" />
+ </a>
+ </div>
+ </div>
+</div>
+<div class="container" style="margin-top: 50px;">
+ <div class="row">
+ <div class="span12">
+ <div class="alert alert-info pagination-centered" style="padding: 30px;">
+ <{$lang_siteclosemsg}>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="span6 offset3">
+ <form class="well form-horizontal" action="<{xoAppUrl user.php}>" method="post">
+ <div class="control-group">
+ <label class="control-label" for="xo-login-uname"><{$lang_username}></label>
+ <div class="controls">
+ <div class="input-prepend">
+ <span class="add-on">
+ <i class="icon-user"></i>
+ </span><input class="span2" type="text" name="uname" id="xo-login-uname" value="" placeholder="<{$lang_username}>">
+ </div>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label" for="xo-login-pass"><{$lang_password}></label>
+ <div class="controls">
+ <div class="input-prepend">
+ <span class="add-on">
+ <i class="icon-cog"></i>
+ </span><input class="span2" type="password" name="pass" id="xo-login-pass" placeholder="<{$lang_password}>">
+ </div>
+ </div>
+ </div>
+ <input type="hidden" name="xoops_redirect" value="<{$xoops_requesturi}>" />
+ <input type="hidden" name="xoops_login" value="1" />
+ <div class="form-actions" style="margin-bottom: 0;">
+ <button type="submit" class="btn btn-primary"><{$lang_login}></button>
+ </div>
+ </form>
+ </div>
+ </div>
+</div>
+</body>
</html>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userinfo.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userinfo.html 2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_userinfo.html 2012-07-09 19:34:57 UTC (rev 9829)
@@ -1,182 +1,201 @@
<{if $user_ownpage == true}>
-
-<form name="usernav" action="user.php" method="post">
-
-<br /><br />
-
-<table class="width70 aligncenter bnone">
- <tr class="txtcenter">
- <td><input type="button" value="<{$lang_editprofile}>" onclick="location='edituser.php'" />
+<div class="btn-group">
+ <a class="btn" href="<{xoAppUrl edituser.php}>">
+ <i class="icon-edit"></i>
+ <{$lang_editprofile}>
+ </a>
<{if $avatars == true}>
- <input type="button" value="<{$lang_avatar}>" onclick="location='edituser.php?op=avatarform'" />
+ <a class="btn" href="<{xoAppUrl edituser.php?op=avatarform}>">
+ <i class="icon-fire"></i>
+ <{$lang_avatar}>
+ </a>
<{/if}>
- <input type="button" value="<{$lang_inbox}>" onclick="location='viewpmsg.php'" />
-
+ <a class="btn" href="<{xoAppUrl viewpmsg.php}>">
+ <i class="icon-envelope"></i>
+ <{$lang_inbox}>
+ </a>
<{if $user_candelete == true}>
- <input type="button" value="<{$lang_deleteaccount}>" onclick="location='user.php?op=delete'" />
+ <a class="btn btn-danger" href="<{xoAppUrl user.php?op=delete}>">
+ <i class="icon-trash icon-white"></i>
+ <{$lang_deleteaccount}>
+ </a>
<{/if}>
-
- <input type="button" value="<{$lang_logout}>" onclick="location='user.php?op=logout'" /></td>
- </tr>
-</table>
-</form>
-
-<br /><br />
+ <a class="btn" href="<{xoAppUrl user.php?op=logout}>">
+ <i class="icon-off"></i>
+ <{$lang_logout}>
+ </a>
+</div>
<{elseif $xoops_isadmin != false}>
-
-<br /><br />
-
-<table class="width70 aligncenter bnone">
- <tr class="txtcenter">
- <td><input type="button" value="<{$lang_editprofile}>" onclick="location='<{$xoops_url}>/modules/system/admin.php?fct=users&uid=<{$user_uid}>&op=modifyUser'" />
- <input type="button" value="<{$lang_deleteaccount}>" onclick="location='<{$xoops_url}>/modules/system/admin.php?fct=users&op=delUser&uid=<{$user_uid}>'" />
- </tr>
-</table>
-
-<br /><br />
+<div class="btn-group">
+ <a class="btn" href="<{$xoops_url}>/modules/system/admin.php?fct=users&uid=<{$user_uid}>&op=modifyUser">
+ <i class="icon-edit"></i>
+ <{$lang_editprofile}>
+ </a>
+ <a class="btn btn-danger" href="<{$xoops_url}>/modules/system/admin.php?fct=users&op=delUser&uid=<{$user_uid}>">
+ <i class="icon-trash icon-white"></i>
+ <{$lang_deleteaccount}>
+ </a>
+</div>
<{/if}>
+<div class="spacer-large"></div>
+<div class="tabbable">
+ <ul class="nav nav-tabs">
+ <li class="active"><a href="#tab1" data-toggle="tab"><{$lang_allaboutuser}></a></li>
+ <li><a href="#tab2" data-toggle="tab"><{$lang_statistics}></a></li>
+ </ul>
+ <div class="tab-content">
+ <div class="tab-pane active" id="tab1">
+ <table class="table table-bordered table-striped table-condensed">
+ <thead>
+ <tr>
+ <th colspan="2"><{$lang_allaboutuser}></th>
+ </tr>
+ </thead>
+ <tbody>
+ <{if $user_avatarurl}>
+ <tr>
+ <td><{$lang_avatar}></td>
+ <td><img src="<{$user_avatarurl}>" alt="Avatar" /></td>
+ </tr>
+ <{/if}>
+ <{if $user_realname}>
+ <tr>
+ <td><{$lang_realname}></td>
+ <td><{$user_realname}></td>
+ </tr>
+ <{/if}>
+ <{if $user_websiteurl}>
+ <tr>
+ <td><{$lang_website}></td>
+ <td><{$user_websiteurl}></td>
+ </tr>
-<table class="width100 bnone" cellspacing="5">
- <tr class="aligntop">
- <td class="width50">
- <table class="outer width100" cellpadding="4" cellspacing="1">
- <tr>
- <th colspan="2" class="txtcenter"><{$lang_allaboutuser}></th>
- </tr>
- <{if $user_avatarurl}>
- <tr class="aligntop">
- <td class="head"><{$lang_avatar}></td>
- <td class="even txt center"><img src="<{$user_avatarurl}>" alt="Avatar" /></td>
- </tr>
- <{/if}>
- <{if $user_realname}>
- <tr>
- <td class="head"><{$lang_realname}></td>
- <td class="odd center"><{$user_realname}></td>
- </tr>
- <{/if}>
- <{if $user_websiteurl}>
- <tr>
- <td class="head"><{$lang_website}></td>
- <td class="even"><{$user_websiteurl}></td>
- </tr>
-
- <{/if}>
- <{if $user_email}>
- <tr class="aligntop">
- <td class="head"><{$lang_email}></td>
- <td class="odd"><{$user_email}></td>
- </tr>
- <{/if}>
- <{if !$user_ownpage == true}>
- <tr class="aligntop">
- <td class="head"><{$lang_privmsg}></td>
- <td class="even"><{$user_pmlink}></td>
- </tr>
- <{/if}>
- <{if $user_icq}>
- <tr class="aligntop">
- <td class="head"><{$lang_icq}></td>
- <td class="odd"><{$user_icq}></td>
- </tr>
- <{/if}>
- <{if $user_aim}>
- <tr class="aligntop">
- <td class="head"><{$lang_aim}></td>
- <td class="even"><{$user_aim}></td>
- </tr>
- <{/if}>
- <{if $user_yim}>
- <tr class="aligntop">
- <td class="head"><{$lang_yim}></td>
- <td class="odd"><{$user_yim}></td>
- </tr>
- <{/if}>
- <{if $user_msnm}>
- <tr class="aligntop">
- <td class="head"><{$lang_msnm}></td>
- <td class="even"><{$user_msnm}></td>
- </tr>
- <{/if}>
- <{if $user_location}>
- <tr class="aligntop">
- <td class="head"><{$lang_location}></td>
- <td class="odd"><{$user_location}></td>
- </tr>
- <{/if}>
- <{if $user_occupation}>
- <tr class="aligntop">
- <td class="head"><{$lang_occupation}></td>
- <td class="even"><{$user_occupation}></td>
- </tr>
- <{/if}>
- <{if $user_interest}>
- <tr class="aligntop">
- <td class="head"><{$lang_interest}></td>
- <td class="odd"><{$user_interest}></td>
- </tr>
- <{/if}>
- <{if $user_extrainfo}>
- <tr class="aligntop">
- <td class="head"><{$lang_extrainfo}></td>
- <td class="even"><{$user_extrainfo}></td>
- </tr>
- <{/if}>
- </table>
- </td>
- <td class="width50">
- <table class="outer width100" cellpadding="4" cellspacing="1">
- <tr class="aligntop">
- <th class="txtcenter" colspan="2"><{$lang_statistics}></th>
- </tr>
- <tr class="aligntop">
- <td class="head"><{$lang_membersince}></td>
- <td class="even txtcenter"><{$user_joindate}></td>
- </tr>
- <tr class="aligntop">
- <td class="head"><{$lang_rank}></td>
- <td class="odd txtcenter"><{$user_rankimage}><br /><{$user_ranktitle}></td>
- </tr>
- <tr class="aligntop">
- <td class="head"><{$lang_posts}></td>
- <td class="even txtcenter"><{$user_posts}></td>
- </tr>
- <tr class="aligntop">
- <td class="head"><{$lang_lastlogin}></td>
- <td class="odd center"><{$user_lastlogin}></td>
- </tr>
- </table>
- <{if $user_signature}>
- <br />
- <table class="outer width100" cellpadding="4" cellspacing="1">
- <tr class="aligntop">
- <th colspan="2" class="txtcenter"><{$lang_signature}></th>
- </tr>
- <tr class="aligntop">
- <td class="even"><{$user_signature}></td>
- </tr>
- </table>
- <{/if}>
- </td>
- </tr>
-</table>
-
+ <{/if}>
+ <{if $user_email}>
+ <tr>
+ <td><{$lang_email}></td>
+ <td><{$user_email}></td>
+ </tr>
+ <{/if}>
+ <{if !$user_ownpage == true}>
+ <tr>
+ <td><{$lang_privmsg}></td>
+ <td><{$user_pmlink}></td>
+ </tr>
+ <{/if}>
+ <{if $user_icq}>
+ <tr>
+ <td><{$lang_icq}></td>
+ <td><{$user_icq}></td>
+ </tr>
+ <{/if}>
+ <{if $user_aim}>
+ <tr>
+ <td><{$lang_aim}></td>
+ <td><{$user_aim}></td>
+ </tr>
+ <{/if}>
+ <{if $user_yim}>
+ <tr>
+ <td><{$lang_yim}></td>
+ <td><{$user_yim}></td>
+ </tr>
+ <{/if}>
+ <{if $user_msnm}>
+ <tr>
+ <td><{$lang_msnm}></td>
+ <td><{$user_msnm}></td>
+ </tr>
+ <{/if}>
+ <{if $user_location}>
+ <tr>
+ <td><{$lang_location}></td>
+ <td><{$user_location}></td>
+ </tr>
+ <{/if}>
+ <{if $user_occupation}>
+ <tr>
+ <td><{$lang_occupation}></td>
+ <td><{$user_occupation}></td>
+ </tr>
+ <{/if}>
+ <{if $user_interest}>
+ <tr>
+ <td><{$lang_interest}></td>
+ <td><{$user_interest}></td>
+ </tr>
+ <{/if}>
+ <{if $user_extrainfo}>
+ <tr>
+ <td><{$lang_extrainfo}></td>
+ <td><{$user_extrainfo}></td>
+ </tr>
+ <{/if}>
+ </tbody>
+ </table>
+ </div>
+ <div class="tab-pane" id="tab2">
+ <table class="table table-bordered table-striped table-condensed">
+ <thead>
+ <tr>
+ <th colspan="2"><{$lang_statistics}></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><{$lang_membersince}></td>
+ <td><{$user_joindate}></td>
+ </tr>
+ <tr>
+ <td><{$lang_rank}></td>
+ <td><{$user_rankimage}><br /><{$user_ranktitle}></td>
+ </tr>
+ <tr>
+ <td><{$lang_posts}></td>
+ <td><{$user_posts}></td>
+ </tr>
+ <tr>
+ <td><{$lang_lastlogin}></td>
+ <td><{$user_lastlogin}></td>
+ </tr>
+ </tbody>
+ </table>
+ <{if $user_signature}>
+ <table class="table table-bordered table-striped table-condensed">
+ <thead>
+ <tr>
+ <th colspan="2"><{$lang_signature}></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td><{$user_signature}></td>
+ </tr>
+ </tbody>
+ </table>
+ <{/if}>
+ </div>
+ </div>
+</div>
+<{if $modules}>
+<hr />
<!-- start module search results loop -->
+<ul class="nav nav-list">
<{foreach item=module from=$modules}>
-
-<br class="clear" />
-<h4><{$module.name}></h4>
-
- <!-- start results item loop -->
- <{foreach item=result from=$module.results}>
-
- <img src="<{$result.image}>" alt="<{$module.name}>" /><strong><a href="<{$result.link}>" title="<{$result.title}>"><{$result.title}></a></strong><br /><span class="x-small">(<{$result.time}>)</span><br />
-
- <{/foreach}>
- <!-- end results item loop -->
-
-<{$module.showall_link}>
-
-
+ <li class="nav-header">
+ <{$module.name}>
+ </li>
+ <!-- start results item loop -->
+ <{foreach item=result from=$module.results}>
+ <li>
+ <img src="<{$result.image}>" alt="<{$module.name}>" />
+ <strong><a href="<{$result.link}>" title="<{$result.title}>"><{$result.title}></a></strong><br />
+ <span class="x-small">(<{$result.time}>)</span>
+ </li>
+ <{/foreach}>
+ <!-- end results item loop -->
+ <li><{$module.showall_link}></li>
<{/foreach}>
-<!-- end module search results loop -->
\ No newline at end of file
+</ul>
+<!-- end module search results loop -->
+<{/if}>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php 2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php 2012-07-09 19:34:57 UTC (rev 9829)
@@ -39,7 +39,7 @@
$xoops->theme->addStylesheet('media/xoops/css/moduladmin.css');
$xoops->theme->addStylesheet(XOOPS_ADMINTHEME_URL . '/default/css/style.css');
- $xoops->theme->addStylesheet($xoops->url('/media/bootstrap/css/bootstrap.min.css'));
+ $xoops->theme->addStylesheet($xoops->url('/media/bootstrap/css/xoops.bootstrap.css'));
$xoops->theme->addScript($xoops->url('/media/jquery/jquery.js'));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/language/english/admin.php 2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/language/english/admin.php 2012-07-09 19:34:57 UTC (rev 9829)
@@ -29,6 +29,7 @@
define("_DEFAULT_SYSTEM_EXTENSION","System extensions");
define("_DEFAULT_INSTALLEDMODULES","Installed modules");
define("_DEFAULT_INSTALLEDEXTENSIONS","Installed extensions");
+define("_DEFAULT_NO_MODULE", "There is no modules installed actually");
define("_DEFAULT_XOOPSTHEMES","XOOPS Themes");
define("_DEFAULT_XOOPSMODULES","XOOPS Modules");
@@ -77,4 +78,3 @@
define("_DEFAULT_HELP_DESC_2",'Blocks are discreet sections of content that can be created and configured in the admin interface. Custom blocks can be created and are typically made up of text, graphics and pictures. The content in these blocks may be formatted individually or inherit the site formatting. (<a href="modules/system/help.php?mid=1&page=blocksadmin">more ...</a>)');
define("_DEFAULT_HELP_3","How I can find more help?");
define("_DEFAULT_HELP_DESC_3",'If you need more help and information to using XOOPS you can use <a href="modules/system/help.php">Help pages </a> in system module or use <a href="http://www.xoops.org" rel="external">XOOPS Local support sites </a>');
-?>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/dashboard.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/dashboard.html 2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/dashboard.html 2012-07-09 19:34:57 UTC (rev 9829)
@@ -63,6 +63,7 @@
<a class="down" href="javascript:;"> </a>
</div>
<div class="xo-window-data">
+ <{if count($module_menu) > 1 }>
<table class="condensed-table">
<{foreach item=mod_list from=$module_menu}>
<{if $mod_list->getInfo(dirname) != 'system'}>
@@ -73,6 +74,12 @@
<{/if}>
<{/foreach}>
</table>
+ <{else}>
+ <div class="alert alert-info">
+ <i class="ico-information"></i>
+ <{$smarty.const._DEFAULT_NO_MODULE}>
+ </div>
+ <{/if}>
<div class="mod-link">
<div class="pull-right">
<a class="btn btn-mini btn-info" href="<{xoAppUrl modules/system/admin.php?fct=modulesadmin}>">
@@ -102,6 +109,7 @@
<td><a href="<{$plug_list->getInfo('link_admin')}>"><{$plug_list->getInfo(name)}></a>
</td>
</tr>
+ <{assign var=have-plugins value=true}>
<{/if}>
<{/foreach}>
</table>
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/modules/system/system_redirect.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/modules/system/system_redirect.html 2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/modules/system/system_redirect.html 2012-07-09 19:34:57 UTC (rev 9829)
@@ -1,55 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$xoops_langcode}>" lang="<{$xoops_langcode}>">
-<head>
-<!-- title and metas -->
-<title><{if $xoops_pagetitle !=''}><{$xoops_pagetitle}> : <{/if}><{$xoops_sitename}></title>
-<meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" />
-<meta name="robots" content="<{$xoops_meta_robots}>" />
-<meta name="keywords" content="<{$xoops_meta_keywords}>" />
-<meta name="description" content="<{$xoops_meta_description}>" />
-<meta name="rating" content="<{$xoops_meta_rating}>" />
-<meta name="author" content="<{$xoops_meta_author}>" />
-<meta name="copyright" content="<{$xoops_meta_copyright}>" />
-<meta name="generator" content="XOOPS" />
-<{if $url}>
- <meta http-equiv="Refresh" content="<{$time}>; url=<{$url}>" />
-<{/if}>
-
-<!-- Force MSIE without javascript actived to take the default theme. not conforms to the standards but functional -->
-<{if $isMsie}>
- <noscript>
- <meta http-equiv="refresh" content="0; url=<{xoAppUrl . xoops_theme_select=default}>" />
- </noscript>
-<{/if}>
-
-<!-- path favicon -->
-<link rel="shortcut icon" type="image/ico" href="<{xoImgUrl icons/favicon.ico}>" />
-<link rel="icon" type="image/png" href="<{xoImgUrl icons/favicon.png}>" />
-
-<!-- include xoops.js and others via header.php -->
-<{$xoops_module_header}>
-
-<!-- Xoops style sheet -->
-<link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl xoops.css}>" />
-
-<!-- Theme style sheets -->
-<link rel="stylesheet" type="text/css" media="screen" title="Color" href="<{xoImgUrl style.css}>" />
-
-</head>
-<body id="xo-refresh">
-<div id="xo-wrapper" class="container center">
- <div id="xo-redirect">
- <div class="message">
- <{$message}>
- <br />
- <img src="<{xoImgUrl icons/ajax_indicator_01.gif}>" alt="<{$message}>"/>
- </div>
- <div class="notreload">
- <{$lang_ifnotreload}>
- </div>
- <{if $xoops_logdump != ''}><div><{$xoops_logdump}></div><{/if}>
- </div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/modules/system/system_siteclosed.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/modules/system/system_siteclosed.html 2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/modules/system/system_siteclosed.html 2012-07-09 19:34:57 UTC (rev 9829)
@@ -1,92 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<{$xoops_langcode}>" lang="<{$xoops_langcode}>">
-<head>
- <!-- title and metas -->
- <title><{if $xoops_pagetitle !=''}><{$xoops_pagetitle}> : <{/if}><{$xoops_sitename}></title>
- <meta http-equiv="content-type" content="text/html; charset=<{$xoops_charset}>" />
- <meta name="robots" content="<{$xoops_meta_robots}>" />
- <meta name="keywords" content="<{$xoops_meta_keywords}>" />
- <meta name="description" content="<{$xoops_meta_description}>" />
- <meta name="rating" content="<{$xoops_meta_rating}>" />
- <meta name="author" content="<{$xoops_meta_author}>" />
- <meta name="copyright" content="<{$xoops_meta_copyright}>" />
- <meta name="generator" content="XOOPS" />
- <{if $url}>
- <meta http-equiv="Refresh" content="<{$time}>; url=<{$url}>" />
- <{/if}>
-
- <!-- Force MSIE without javascript actived to take the default theme. not conforms to the standards but functional -->
- <{if $isMsie}>
- <noscript>
- <meta http-equiv="refresh" content="0; url=<{xoAppUrl . xoops_theme_select=default}>" />
- </noscript>
- <{/if}>
-
- <!-- path favicon -->
- <link rel="shortcut icon" type="image/ico" href="<{xoImgUrl icons/favicon.ico}>" />
- <link rel="icon" type="image/png" href="<{xoImgUrl icons/favicon.png}>" />
-
- <!-- include xoops.js and others via header.php -->
- <{$xoops_module_header}>
-
- <!-- Xoops style sheet -->
- <link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl xoops.css}>" />
-
- <!-- Theme style sheets -->
- <link rel="stylesheet" type="text/css" media="screen" title="Color" href="<{xoImgUrl style.css}>" />
-</head>
-<body>
-
-<div id="xo-canvas"<{if $columns_layout}> class="<{$columns_layout}>"<{/if}>>
- <div class="xo-wrapper">
- <div id="xo-bgstatic" class="<{$xoops_dirname}>"></div>
- <div id="xo-header" class="<{$xoops_dirname}>">
- <div id="xo-top">
- <!-- include du bloc Utilisateur dans le header -->
- </div>
- <!-- Start Header -->
- <table cellspacing="0">
- <tr id="header">
- <td id="headerlogo"><a href="<{xoAppUrl /}>" title="<{$xoops_sitename}>"><img src="<{xoImgUrl xoops-logo.png}>" alt="<{$xoops_sitename}>" /></a></td>
- <td id="headerbanner"><{$xoops_banner}></td>
- <td id="xo-userbar_siteclosed">
- <!-- menu in anonymous mode -->
- <form method="post" action="<{xoAppUrl /user.php op=login}>">
- <input name="uname" type="text" title="" />
- <input name="pass" type="password" title=""/>
- <input type="hidden" name="xoops_redirect" value="<{$smarty.server.REQUEST_URI}>" />
- <{if $lang_siteclosemsg}>
- <input type="hidden" name="xoops_login" value="1" />
- <{/if}>
- <input type="hidden" name="op" value="login" />
- <input type="submit" value="<{$lang_login}>" />
- </form>
- </td>
- </tr>
- <tr>
- <td id="headerbar" colspan="3"> </td>
- </tr>
- </table>
- <!-- End header -->
- </div>
-
- <div id="xo-canvas-content">
- <div id="xo-page">
- <div id="xo-siteclose"><{$lang_siteclosemsg}></div>
- </div>
- </div>
-
- <!-- Start footer -->
- <table cellspacing="0">
- <tr id="footerbar">
- <td><{$xoops_footer}></td>
- </tr>
- </table>
- <!-- End footer -->
-
- <!--{xo-logger-output}-->
- </div>
-</div>
-
-</body>
-</html>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme.html 2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/theme.html 2012-07-09 19:34:57 UTC (rev 9829)
@@ -90,6 +90,7 @@
</div>
<!-- End content module -->
<{/if}>
+ <{if $xoBlocks.page_bottomleft or $xoBlocks.page_bottomcenter or $xoBlocks.page_bottomright}>
<div class="row">
<div class="span<{$col_span}> xo-bottom">
<div class="row">
@@ -104,7 +105,7 @@
<div class="row">
<div class="span<{$col_span_mid}> xo-left">
<!-- Start center-left blocks loop -->
- <{foreach item=block from=$xoBlocks.page_bottomright}>
+ <{foreach item=block from=$xoBlocks.page_bottomleft}>
<{includeq file="$theme_tpl/block_center_l.html"}>
<{/foreach}>
<!-- End center-left blocks loop -->
@@ -120,6 +121,7 @@
</div>
</div>
</div>
+ <{/if}>
</div>
<{if $xoops_showrblock}>
<div class="span3 xo-block-right">
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_user.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_user.html 2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_user.html 2012-07-09 19:34:57 UTC (rev 9829)
@@ -16,7 +16,7 @@
<ul class="dropdown-menu">
<{if $xoops_isadmin}>
<li>
- <a href="<{xoAppUrl admin.php}>" title="<{$smarty.const._THEME_ADMIN}>">
+ <a href="<{xoAppUrl admin.php}>" title="<{$smarty.const._THEME_ADMIN}>" rel="external">
<i class="icon-wrench"></i>
<{$smarty.const._THEME_ADMIN}>
</a>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops.css 2012-07-09 17:20:33 UTC (rev 9828)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops.css 2012-07-09 19:34:57 UTC (rev 9829)
@@ -368,7 +368,7 @@
box-shadow: 0 0 20px #787878;
-webkit-box-shadow:0 0 20px #787878;
-moz-box-shadow:0 0 20px #787878;
- filter:progid:DXImageTransform.Microsoft.Shadow(color='#bbbbbb', Direction=135, Strength=5);
+ filter:progid:DXImageTransform.Microsoft.Shadow(color='#bbbbbb', Direction=135, Strength=5);
zoom: 1;
}
.boxrelief {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
