Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9537] XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/ system
|
From: <for...@us...> - 2012-05-17 11:51:44
|
Revision: 9537
http://xoops.svn.sourceforge.net/xoops/?rev=9537&view=rev
Author: forxoops
Date: 2012-05-17 11:51:37 +0000 (Thu, 17 May 2012)
Log Message:
-----------
Update all template with HTML5 and bootstrap
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_comments.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_login.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_mainmenu.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_newusers.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_notification.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_online.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_search.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_siteinfo.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_themes.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_topusers.html
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_waiting.html
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/system_blocks.php 2012-05-17 11:51:37 UTC (rev 9537)
@@ -300,7 +300,7 @@
function b_system_info_show($options)
{
- global $xoopsConfig, $xoopsUser;
+ global $xoopsUser;
$xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
$myts = MyTextSanitizer::getInstance();
$block = array();
@@ -318,20 +318,19 @@
if (isset($xoopsUser) && is_object($xoopsUser)) {
$block['groups'][$i]['users'][] = array(
'id' => $userinfo['uid'], 'name' => $myts->htmlspecialchars($userinfo['uname']),
- 'msglink' => "<a href=\"javascript:openWithSelfMain('" . XOOPS_URL . "/pmlite.php?send2=1&to_userid=" . $userinfo['uid'] . "','pmlite',450,370);\"><img src=\"" . XOOPS_URL . "/images/icons/pm_small.gif\" border=\"0\" width=\"27\" height=\"17\" alt=\"\" /></a>",
+ 'pm_link' => XOOPS_URL . "/pmlite.php?send2=1&to_userid=" . $userinfo['uid'],
'avatar' => XOOPS_UPLOAD_URL . '/' . $userinfo['user_avatar']
);
} else {
if ($userinfo['user_viewemail']) {
$block['groups'][$i]['users'][] = array(
'id' => $userinfo['uid'], 'name' => $myts->htmlspecialchars($userinfo['uname']),
- 'msglink' => '<a href="mailto:' . $userinfo['email'] . '"><img src="' . XOOPS_URL . '/images/icons/em_small.gif" border="0" width="16" height="14" alt="" /></a>',
+ 'msg_link' => $userinfo['email'],
'avatar' => XOOPS_UPLOAD_URL . '/' . $userinfo['user_avatar']
);
} else {
$block['groups'][$i]['users'][] = array(
- 'id' => $userinfo['uid'], 'name' => $myts->htmlspecialchars($userinfo['uname']),
- 'msglink' => ' ', 'avatar' => XOOPS_UPLOAD_URL . '/' . $userinfo['user_avatar']
+ 'id' => $userinfo['uid'], 'name' => $myts->htmlspecialchars($userinfo['uname'])
);
}
}
@@ -603,7 +602,7 @@
if ($options[0] == 1) {
$block['theme_select'] = "<img vspace=\"2\" id=\"xoops_theme_img\" src=\"" . XOOPS_THEME_URL . "/" . $xoopsConfig['theme_set'] . "/shot.gif\" alt=\"screenshot\" width=\"" . intval($options[1]) . "\" /><br /><select id=\"xoops_theme_select\" name=\"xoops_theme_select\" onchange=\"showImgSelected('xoops_theme_img', 'xoops_theme_select', 'themes', '/shot.gif', '" . XOOPS_URL . "');\">" . $theme_options . "</select><input type=\"submit\" value=\"" . _GO . "\" />";
} else {
- $block['theme_select'] = '<select name="xoops_theme_select" onchange="submit();" size="3">' . $theme_options . '</select>';
+ $block['theme_select'] = '<select class="span2" name="xoops_theme_select" onchange="submit();" size="3">' . $theme_options . '</select>';
}
$block['theme_select'] .= '<br />(' . sprintf(_MB_SYSTEM_NUMTHEME, '<strong>' . count($xoopsConfig['theme_set_allowed']) . '</strong>') . ')<br />';
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_comments.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_comments.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_comments.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,11 +1,15 @@
-<table cellspacing="1" class="outer width100">
- <{foreach item=comment from=$block.comments}>
- <tr class="<{cycle values='even,odd'}>">
- <td class="txtcenter"><img src="<{$xoops_url}>/images/subject/<{$comment.icon}>" alt="" /></td>
- <td><{$comment.title}></td>
- <td class="txtcenter"><{$comment.module}></td>
- <td class="txtcenter"><{$comment.poster}></td>
- <td class="txtright"><{$comment.time}></td>
- </tr>
- <{/foreach}>
-</table>
\ No newline at end of file
+<div class="xo-block-comment">
+ <table class="table table-striped table-condensed">
+ <tbody>
+ <{foreach item=comment from=$block.comments}>
+ <tr>
+ <td class="txtcenter"><img src="<{$xoops_url}>/images/subject/<{$comment.icon}>" alt="" /></td>
+ <td><{$comment.title}></td>
+ <td class="txtcenter"><{$comment.module}></td>
+ <td class="txtcenter"><{$comment.poster}></td>
+ <td class="txtright"><{$comment.time}></td>
+ </tr>
+ <{/foreach}>
+ </tbody>
+ </table>
+</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_login.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_login.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_login.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,20 +1,43 @@
-<div class="txtcenter">
- <form style="margin-top: 0;" action="<{xoAppUrl user.php}>" method="post">
- <{$block.lang_username}><br />
- <input type="text" name="uname" size="12" value="<{$block.unamevalue}>" maxlength="25" /><br />
- <{$block.lang_password}><br />
- <input type="password" name="pass" size="12" maxlength="32" /><br />
- <{if isset($block.lang_rememberme)}>
- <input type="checkbox" name="rememberme" value="On" class ="formButton" /><{$block.lang_rememberme}><br />
- <{/if}>
- <br />
- <input type="hidden" name="xoops_redirect" value="<{$xoops_requesturi}>" />
- <input type="hidden" name="op" value="login" />
- <input type="submit" value="<{$block.lang_login}>" /><br />
- <{$block.sslloginlink}>
- </form>
- <br />
- <a href="<{xoAppUrl user.php#lost}>" title="<{$block.lang_lostpass}>"><{$block.lang_lostpass}></a>
- <br /><br />
- <a href="<{xoAppUrl register.php}>" title="<{$block.lang_registernow}>"><{$block.lang_registernow}></a>
+<div class="xo-block-login">
+ <form class="form" action="<{xoAppUrl user.php}>" method="post">
+ <div class="control-group">
+ <label class="control-label" for="xo-login-uname"><{$block.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="<{$block.unamevalue}>" placeholder="Login…">
+ </div>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label" for="xo-login-pass"><{$block.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">
+ </div>
+ </div>
+ </div>
+ <{if isset($block.lang_rememberme)}>
+ <label class="checkbox">
+ <input type="checkbox" name="rememberme" value="On" class="formButton"/><{$block.lang_rememberme}>
+ </label>
+ <{/if}>
+ <br/>
+ <input type="hidden" name="xoops_redirect" value="<{$xoops_requesturi}>"/>
+ <input type="hidden" name="op" value="login"/>
+ <div class="pagination-centered">
+ <button class="btn btn-primary" type="submit">
+ <i class="icon-white icon-user"></i>
+ <{$block.lang_login}>
+ </button>
+ <hr />
+ <a class="btn btn-mini pull-left" href="<{xoAppUrl user.php#lost}>" title="<{$block.lang_lostpass}>"><{$block.lang_lostpass}></a>
+ <a class="btn btn-mini btn-info pull-right" href="<{xoAppUrl register.php}>" title="<{$block.lang_registernow}>"><{$block.lang_registernow}></a>
+ <div class="clear"></div>
+ </div>
+ <{$block.sslloginlink}>
+ </form>
</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_mainmenu.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_mainmenu.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_mainmenu.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,11 +1,27 @@
-<div id="mainmenu">
- <a class="menuTop <{if !$block.nothome}>maincurrent<{/if}>" href="<{xoAppUrl }>" title="<{$block.lang_home}>"><{$block.lang_home}></a>
+<ul class="nav nav-list">
+ <li class="<{if !$block.nothome}>active<{/if}>">
+ <a href="<{xoAppUrl }>" title="<{$block.lang_home}>">
+ <i class="icon-home <{if !$block.nothome}>icon-white<{/if}>"></i>
+ <{$block.lang_home}>
+ </a>
+ </li>
<!-- start module menu loop -->
<{foreach item=module from=$block.modules}>
- <a class="menuMain <{if $module.highlight}>maincurrent<{/if}>" href="<{$xoops_url}>/modules/<{$module.directory}>/" title="<{$module.name}>"><{$module.name}></a>
- <{foreach item=sublink from=$module.sublinks}>
- <a class="menuSub" href="<{$sublink.url}>" title="<{$sublink.name}>"><{$sublink.name}></a>
- <{/foreach}>
+ <li class="<{if $module.highlight}>active<{/if}>">
+ <a class="" href="<{$xoops_url}>/modules/<{$module.directory}>/" title="<{$module.name}>">
+ <i class="icon-tags <{if $module.highlight}>icon-white<{/if}>"></i>
+ <{$module.name}>
+ </a>
+ <{if $module.sublinks}>
+ <ul class="nav nav-list">
+ <{foreach item=sublink from=$module.sublinks}>
+ <li>
+ <a class="" href="<{$sublink.url}>" title="<{$sublink.name}>"><{$sublink.name}></a>
+ </li>
+ <{/foreach}>
+ </ul>
+ <{/if}>
+ </li>
<{/foreach}>
<!-- end module menu loop -->
-</div>
\ No newline at end of file
+</ul>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_newusers.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_newusers.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_newusers.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,13 +1,19 @@
-<table cellspacing="1" class="outer">
- <{foreach item=user from=$block.users}>
- <tr class="<{cycle values='even,odd'}> alignmiddle">
- <td class="txtcenter">
- <{if $user.avatar != ""}>
- <img style="width:32px;" src="<{$user.avatar}>" alt="<{$user.name}>" /><br />
- <{/if}>
- <a href="<{$xoops_url}>/userinfo.php?uid=<{$user.id}>" title="<{$user.name}>"><{$user.name}></a>
- </td>
- <td class="txtcenter"><{$user.joindate}></td>
- </tr>
- <{/foreach}>
-</table>
+<div class="xo-block-newuser">
+ <table class="table table-striped table-condensed">
+ <tbody>
+ <{foreach item=user from=$block.users}>
+ <tr>
+ <td class="span2 txt-centered">
+ <{if $user.avatar != ""}>
+ <img class="thumbnail" src="<{$user.avatar}>" alt="<{$user.name}>" />
+ <{/if}>
+ <h5>
+ <a href="<{$xoops_url}>/userinfo.php?uid=<{$user.id}>" title="<{$user.name}>"><{$user.name}></a>
+ </h5>
+ </td>
+ <td class="txt-centered"><{$user.joindate}></td>
+ </tr>
+ <{/foreach}>
+ </tbody>
+ </table>
+</div>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_notification.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_notification.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_notification.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,28 +1,28 @@
<form action="<{$block.target_page}>" method="post">
-<table class="outer">
- <{foreach item=category from=$block.categories}>
- <{foreach name=inner item=event from=$category.events}>
- <{if $smarty.foreach.inner.first}>
- <tr>
- <td class="head" colspan="2"><{$category.title}></td>
- </tr>
- <{/if}>
- <tr>
- <td class="odd">
- <{counter assign=index}>
- <input type="hidden" name="not_list[<{$index}>][params]" value="<{$category.name}>,<{$category.itemid}>,<{$event.name}>" />
- <input type="checkbox" name="not_list[<{$index}>][status]" value="1" <{if $event.subscribed}>checked="checked"<{/if}> />
- </td>
- <td class="odd"><{$event.caption}></td>
- </tr>
- <{/foreach}>
- <{/foreach}>
- <tr>
- <td class="foot" colspan="2">
- <input type="hidden" name="not_redirect" value="<{$block.redirect_script}>">
- <input type="hidden" value="<{$block.notification_token}>" name="XOOPS_TOKEN_REQUEST" />
- <input type="submit" name="not_submit" value="<{$block.submit_button}>" />
- </td>
- </tr>
-</table>
+ <table class="outer">
+ <{foreach item=category from=$block.categories}>
+ <{foreach name=inner item=event from=$category.events}>
+ <{if $smarty.foreach.inner.first}>
+ <tr>
+ <td class="head" colspan="2"><{$category.title}></td>
+ </tr>
+ <{/if}>
+ <tr>
+ <td class="odd">
+ <{counter assign=index}>
+ <input type="hidden" name="not_list[<{$index}>][params]" value="<{$category.name}>,<{$category.itemid}>,<{$event.name}>" />
+ <input type="checkbox" name="not_list[<{$index}>][status]" value="1" <{if $event.subscribed}>checked="checked"<{/if}> />
+ </td>
+ <td class="odd"><{$event.caption}></td>
+ </tr>
+ <{/foreach}>
+ <{/foreach}>
+ <tr>
+ <td class="foot" colspan="2">
+ <input type="hidden" name="not_redirect" value="<{$block.redirect_script}>">
+ <input type="hidden" value="<{$block.notification_token}>" name="XOOPS_TOKEN_REQUEST" />
+ <input type="submit" name="not_submit" value="<{$block.submit_button}>" />
+ </td>
+ </tr>
+ </table>
</form>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_online.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_online.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_online.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,10 +1,20 @@
-<{$block.online_total}>
-<br /><br />
-<{$block.lang_members}>: <{$block.online_members}>
-<br />
-<{$block.lang_guests}>: <{$block.online_guests}>
-<br /><br />
-<{$block.online_names}>
-<a href="javascript:openWithSelfMain('<{$xoops_url}>/misc.php?action=showpopups&type=online','Online',420,350);" title="<{$block.lang_more}>">
- <{$block.lang_more}>
-</a>
\ No newline at end of file
+<div class="xo-block-online">
+ <ul class="nav nav-list">
+ <li class="nav-header">
+ <{$block.online_total}>
+ </li>
+ <li>
+ <i class="icon-user"></i>
+ <{$block.lang_members}>: <{$block.online_members}>
+ </li>
+ <li>
+ <i class="icon-globe"></i>
+ <{$block.lang_guests}>: <{$block.online_guests}>
+ </li>
+ </ul>
+ <hr />
+ <{$block.online_names}>
+ <a href="javascript:openWithSelfMain('<{$xoops_url}>/misc.php?action=showpopups&type=online','Online',420,350);" title="<{$block.lang_more}>">
+ <{$block.lang_more}>
+ </a>
+</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_search.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_search.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_search.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,8 +1,10 @@
-<div class="txtcenter">
-<form style="margin-top: 0;" action="<{xoAppUrl search.php}>" method="get">
- <input type="text" name="query" size="14" />
- <input type="hidden" name="action" value="results" /><br />
- <input type="submit" value="<{$block.lang_search}>" />
-</form>
-<a href="<{xoAppUrl search.php}>" title="<{$block.lang_advsearch}>"><{$block.lang_advsearch}></a>
+<div class="xo-block-search">
+ <form action="<{xoAppUrl search.php}>" method="get">
+ <input class="span2" type="text" name="query">
+ <input type="hidden" name="action" value="results" />
+ <div class="btn-group">
+ <button class="btn btn-primary btn-small" type="submit"><{$block.lang_search}></button>
+ <a class="btn btn-small" href="<{xoAppUrl search.php}>" title="<{$block.lang_advsearch}>"><{$block.lang_advsearch}></a>
+ </div>
+ </form>
</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_siteinfo.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_siteinfo.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_siteinfo.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,34 +1,43 @@
-<table class="outer collapse">
-
- <{if $block.showgroups == true}>
-
- <!-- start group loop -->
- <{foreach item=group from=$block.groups}>
- <tr>
- <th colspan="2"><{$group.name}></th>
- </tr>
-
- <!-- start group member loop -->
- <{foreach item=user from=$group.users}>
- <tr>
- <td class="even txtcenter alignmiddle">
- <img style="width:32px;" src="<{$user.avatar}>" alt="<{$user.name}>" /><br />
- <a href="<{$xoops_url}>/userinfo.php?uid=<{$user.id}>" title="<{$user.name}>"><{$user.name}></a>
- </td>
- <td class="odd width20 txtright alignmiddle">
- <{$user.msglink}>
- </td>
- </tr>
- <{/foreach}>
- <!-- end group member loop -->
-
- <{/foreach}>
- <!-- end group loop -->
- <{/if}>
-</table>
-
-<br />
-
-<div class="txtcenter marg3">
- <img src="<{$block.logourl}>" alt="" /><br /><{$block.recommendlink}>
+<div class="xo-block-siteinfo">
+ <ul class="nav nav-list">
+ <{if $block.showgroups == true}>
+ <!-- start group loop -->
+ <{foreach item=group from=$block.groups}>
+ <li class="nav-header">
+ <{$group.name}>
+ </li>
+ <!-- start group member loop -->
+ <{foreach item=user from=$group.users}>
+ <li>
+ <img class="thumbnail pull-left" src="<{$user.avatar}>" alt="<{$user.name}>">
+ <div class="pull-left">
+ <h5>
+ <a href="<{$xoops_url}>/userinfo.php?uid=<{$user.id}>" title="<{$user.name}>">
+ <i class="icon-user"></i>
+ <{$user.name}>
+ </a>
+ </h5>
+ <{if $user.pm_link}>
+ <a class="pull-left" href="javascript:openWithSelfMain('<{$user.pm_link}>','pmlite',500,450)">
+ <i class="ico-email"></i>
+ </a>
+ <{/if}>
+ <{if $user.msg_link}>
+ <a class="pull-left" href="mailto:<{$user.msg_link}>">
+ <i class="ico-email"></i>
+ </a>
+ <{/if}>
+ </div>
+ </li>
+ <{/foreach}>
+ <!-- end group member loop -->
+ <{/foreach}>
+ <!-- end group loop -->
+ <{/if}>
+ </ul>
+</div>
+<div class="clear"></div>
+<hr />
+<div class="pagination-centered">
+ <img src="<{$block.logourl}>" alt=""><br /><{$block.recommendlink}>
</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_themes.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_themes.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_themes.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,5 +1,5 @@
-<div class="txtcenter">
-<form action="<{xoAppUrl index.php}>" method="post">
-<{$block.theme_select}>
-</form>
+<div class="xo-block-theme">
+ <form action="<{xoAppUrl index.php}>" method="post">
+ <{$block.theme_select}>
+ </form>
</div>
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_topusers.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_topusers.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_topusers.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,14 +1,18 @@
-<table cellspacing="1" class="outer">
- <{foreach item=user from=$block.users}>
- <tr class="<{cycle values='even,odd'}> alignmiddle">
- <td><{$user.rank}></td>
- <td class="txtcenter">
- <{if $user.avatar != ""}>
- <img style="width:32px;" src="<{$user.avatar}>" alt="<{$user.name}>" /><br />
- <{/if}>
- <a href="<{$xoops_url}>/userinfo.php?uid=<{$user.id}>" title="<{$user.name}>"><{$user.name}></a>
- </td>
- <td class="txtcenter"><{$user.posts}></td>
- </tr>
- <{/foreach}>
-</table>
+<div class="xo-block-topuser">
+ <table class="table table-striped table-condensed">
+ <tbody>
+ <{foreach item=user from=$block.users}>
+ <tr>
+ <td class="txt-centered"><{$user.rank}></td>
+ <td class="txt-centered span1">
+ <{if $user.avatar != ""}>
+ <img class="thumbnail" src="<{$user.avatar}>" alt="<{$user.name}>" />
+ <{/if}>
+ <h5><a href="<{$xoops_url}>/userinfo.php?uid=<{$user.id}>" title="<{$user.name}>"><{$user.name}></a></h5>
+ </td>
+ <td class="txt-centered"><{$user.posts}></td>
+ </tr>
+ <{/foreach}>
+ </tbody>
+ </table>
+</div>
\ 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-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,16 +1,49 @@
-<div id="usermenu">
- <{if $xoops_isadmin}>
- <a class="menuTop" href="<{xoAppUrl admin.php}>" title="<{$block.lang_adminmenu}>"><{$block.lang_adminmenu}></a>
- <a href="<{xoAppUrl user.php}>" title="<{$block.lang_youraccount}>"><{$block.lang_youraccount}></a>
- <{else}>
- <a class="menuTop" href="<{xoAppUrl user.php}>" title="<{$block.lang_youraccount}>"><{$block.lang_youraccount}></a>
- <{/if}>
- <a href="<{xoAppUrl edituser.php}>" title="<{$block.lang_editaccount}>"><{$block.lang_editaccount}></a>
- <a href="<{xoAppUrl notifications.php}>" title="<{$block.lang_notifications}>"><{$block.lang_notifications}></a>
- <{if $block.new_messages > 0}>
- <a class="highlight" href="<{xoAppUrl viewpmsg.php}>" title="<{$block.lang_inbox}>"><{$block.lang_inbox}> (<strong><{$block.new_messages}></strong>)</a>
- <{else}>
- <a href="<{xoAppUrl viewpmsg.php}>" title="<{$block.lang_inbox}>"><{$block.lang_inbox}></a>
- <{/if}>
- <a href="<{xoAppUrl user.php?op=logout}>" title="<{$block.lang_logout}>"><{$block.lang_logout}></a>
-</div>
+<ul class="nav nav-list">
+ <{if $xoops_isadmin}>
+ <li>
+ <a href="<{xoAppUrl admin.php}>" title="<{$block.lang_adminmenu}>">
+ <i class="icon-wrench"></i>
+ <{$block.lang_adminmenu}>
+ </a>
+ </li>
+ <{/if}>
+ <li>
+ <a href="<{xoAppUrl user.php}>" title="<{$block.lang_youraccount}>">
+ <i class="icon-user"></i>
+ <{$block.lang_youraccount}>
+ </a>
+ </li>
+ <li>
+ <a href="<{xoAppUrl edituser.php}>" title="<{$block.lang_editaccount}>">
+ <i class="icon-edit"></i>
+ <{$block.lang_editaccount}>
+ </a>
+ </li>
+ <li>
+ <a href="<{xoAppUrl notifications.php}>" title="<{$block.lang_notifications}>">
+ <i class="icon-comment"></i>
+ <{$block.lang_notifications}>
+ </a>
+ </li>
+ <{if $block.new_messages > 0}>
+ <li>
+ <a class="highlight" href="<{xoAppUrl viewpmsg.php}>" title="<{$block.lang_inbox}>">
+ <i class="icon-envelope"></i>
+ <{$block.lang_inbox}> (<strong><{$block.new_messages}></strong>)
+ </a>
+ </li>
+ <{else}>
+ <li>
+ <a href="<{xoAppUrl viewpmsg.php}>" title="<{$block.lang_inbox}>">
+ <i class="icon-envelope"></i>
+ <{$block.lang_inbox}>
+ </a>
+ </li>
+ <{/if}>
+ <li>
+ <a href="<{xoAppUrl user.php?op=logout}>" title="<{$block.lang_logout}>">
+ <i class="icon-off"></i>
+ <{$block.lang_logout}>
+ </a>
+ </li>
+</ul>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_waiting.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_waiting.html 2012-05-17 11:50:23 UTC (rev 9536)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_waiting.html 2012-05-17 11:51:37 UTC (rev 9537)
@@ -1,5 +1,10 @@
-<ul>
- <{foreach item=module from=$block.modules}>
- <li><a href="<{$module.adminlink}>" title="<{$module.lang_linkname}>"><{$module.lang_linkname}></a>: <{$module.pendingnum}></li>
- <{/foreach}>
+<ul class="nav nav-list">
+ <{foreach item=module from=$block.modules}>
+ <li>
+ <a href="<{$module.adminlink}>" title="<{$module.lang_linkname}>">
+ <i class="icon-time"></i>
+ <{$module.lang_linkname}> : <{$module.pendingnum}>
+ </a>
+ </li>
+ <{/foreach}>
</ul>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
