|
From: <be...@us...> - 2014-06-14 05:07:49
|
Revision: 12585
http://sourceforge.net/p/xoops/svn/12585
Author: beckmi
Date: 2014-06-14 05:07:43 +0000 (Sat, 14 Jun 2014)
Log Message:
-----------
Updating xBootstrap to 1.02 Final (Angelo Rocha)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/docs/changelog.txt
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/js/js.js
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/pm/pm_viewpmsg.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/xoops_and_module_changes/class/pagenav.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/system_block_login.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/system_block_newusers.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/style.css
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/theme.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/theme.ini
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/nav-menu.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/slider.html
Added Paths:
-----------
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/code.png
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/language/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/language/english/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/language/english/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/language/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/newbb/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/newbb/index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/newbb/newbb_index.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/system_block_search.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/system_block_topusers.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/shot.gif
Removed Paths:
-------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/lang/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/samples/
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/shot.png
XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/template.html
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/docs/changelog.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/docs/changelog.txt 2014-06-13 17:49:48 UTC (rev 12584)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/docs/changelog.txt 2014-06-14 05:07:43 UTC (rev 12585)
@@ -1,3 +1,28 @@
+1.02 2014-06-08 Final
+--------------------
+- Update pt-br lang (Angelo Rocha)
+- Add XOOPS Banners Support (Angelo Rocha)
+
+1.02 2014-06-08 Beta 2
+--------------------
+- Newbb index finished (Angelo Rocha)
+- Add Newbb viewtopic template (Angelo Rocha)
+- Add Newbb viewforum template (Angelo Rocha)
+
+1.02 2014-06-04 Beta 1
+--------------------
+- Add newbb template - Developing... (Angelo Rocha)
+- Add language support (Angelo Rocha)
+- Some bug fix in PM template (Angelo Rocha)
+- Add search block template (Angelo Rocha)
+- Add new users template (Angelo Rocha)
+- Add top users template (Angelo Rocha)
+- Add XOOPS Code Style (Angelo Rocha)
+- Add XOOPS Quote Style (Angelo Rocha)
+- Add search block template (Angelo Rocha)
+- Add shot theme in block of theme select (Angelo Rocha)
+- Add top search box (Angelo Rocha)
+
1.01.3 2014-03-30
--------------------
- Add reads count in publisher template (Angelo Rocha)
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/code.png
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/code.png
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/code.png 2014-06-13 17:49:48 UTC (rev 12584)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/code.png 2014-06-14 05:07:43 UTC (rev 12585)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/images/code.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/js/js.js
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/js/js.js 2014-06-13 17:49:48 UTC (rev 12584)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/js/js.js 2014-06-14 05:07:43 UTC (rev 12585)
@@ -7,4 +7,12 @@
)
)
document.getElementsByTagName("head")[0].appendChild(msViewportStyle)
-}
\ No newline at end of file
+}
+
+jQuery(document).ready(function($) {
+ $('.carousel').carousel({
+ interval: 5000,
+ pause: "hover",
+ wrap: true
+ })
+});
\ No newline at end of file
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/language/english/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/language/english/main.php (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/language/english/main.php 2014-06-14 05:07:43 UTC (rev 12585)
@@ -0,0 +1,30 @@
+<?php
+
+//Nav Menu
+define("THEME_HOME", "Home");
+define("THEME_MODULE1", "About");
+define("THEME_MODULE2", "News");
+define("THEME_MODULE3", "Forum");
+define("THEME_MODULE4", "Contact");
+define("THEME_SEARCH_TEXT", "Search here...");
+define("THEME_SEARCH_BUTTON", "Go");
+
+//Slider
+define("THEME_READMORE", "Read More");
+
+//Home Message
+define("THEME_ABOUTUS", "About Us");
+define("THEME_LEARNINGMORE", "Learning More...");
+
+//NewBB
+define("THEME_NEWBB_TOPIC", "More");
+define("THEME_FORUM_SPONSORBY", "Sponsor By.: ");
+define("THEME_GOTOTHEFORUM", "Go to Forum");
+define("THEME_FORUM_DESCRIPTION", "Description");
+define("THEME_NEWBB_SEARCH_FORUM", "Search in forum...");
+define("THEME_NEWBB_SEARCH_TOPIC", "Search in topic...");
+define("THEME_FORUM_DESC", "About This Forum");
+
+//Block login
+define("THEME_LOGIN", "Your Username");
+define("THEME_PASS", "Your Password");
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/language/english/main.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/language/index.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/language/index.html (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/language/index.html 2014-06-14 05:07:43 UTC (rev 12585)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/newbb/index.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/newbb/index.html (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/newbb/index.html 2014-06-14 05:07:43 UTC (rev 12585)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/newbb/newbb_index.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/newbb/newbb_index.html (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/newbb/newbb_index.html 2014-06-14 05:07:43 UTC (rev 12585)
@@ -0,0 +1,310 @@
+<div class="newbb">
+
+<div class="jumbotron newbb-header">
+<h3>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php" title="<{$index_title}>">
+ <{$index_title}>
+ </a>
+</h3>
+
+<p><{$index_desc}></p>
+<div class="text-right"><{includeq file="db:newbb_index_menu.html"}></div>
+
+<div class="newbb-header-icons hidden-xs">
+<{if $viewer_level gt 1}>
+<div>
+ <strong><{$smarty.const._MD_TOPIC}>:</strong>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=active#admin" title="<{$smarty.const._MD_TYPE_ADMIN}>" class="btn btn-xs btn-primary">
+ <{$smarty.const._MD_TYPE_ADMIN}>
+ </a>
+
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=pending#admin" title="<{$smarty.const._MD_TYPE_PENDING}>" class="btn btn-xs btn-primary">
+ <{if $wait_new_topic}><span class="badge"><{$wait_new_topic}></span><{/if}> <{$smarty.const._MD_TYPE_PENDING}>
+ </a>
+
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=deleted#admin" title="<{$smarty.const._MD_TYPE_DELETED}>" class="btn btn-xs btn-danger">
+ <{if $delete_topic}><span class="badge"><{$delete_topic}></span><{/if}> <{$smarty.const._MD_TYPE_DELETED}>
+ </a>
+</div>
+<div>
+ <strong><{$smarty.const._MD_POST2}>:</strong>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=active#admin" title="<{$smarty.const._MD_TYPE_ADMIN}>" class="btn btn-xs btn-primary">
+ <{$smarty.const._MD_TYPE_ADMIN}>
+ </a>
+
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=pending#admin" title="<{$smarty.const._MD_TYPE_PENDING}>" class="btn btn-xs btn-primary">
+ <{if $wait_new_post}>(<font color="red"><{$wait_new_post}></font>)<{/if}> <{$smarty.const._MD_TYPE_PENDING}>
+ </a>
+
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=deleted#admin" title="<{$smarty.const._MD_TYPE_DELETED}>" class="btn btn-xs btn-primary">
+ <{if $delete_post}>(<font color="red"><{$delete_post}></font>)<{/if}> <{$smarty.const._MD_TYPE_DELETED}>
+ </a>
+
+ <{if $report_post}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/admin_report.php" title="<{$report_post}>" class="btn btn-xs btn-primary">
+ <{$report_post}>
+ </a>
+ <{/if}>
+
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/moderate.php" title="<{$smarty.const._MD_TYPE_SUSPEND}>" class="btn btn-xs btn-primary">
+ <{$smarty.const._MD_TYPE_SUSPEND}>
+ </a>
+
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/index.php" title="<{$smarty.const._MD_ADMINCP}>" class="btn btn-xs btn-primary">
+ <{$smarty.const._MD_ADMINCP}>
+ </a>
+</div>
+<{/if}>
+</div><!-- .newbb-header-icons -->
+</div><!-- .newbb-header -->
+
+<div class="panel-group xoops-newbb-category-list" id="accordion">
+<{foreachq item=category from=$categories}><!-- Forum categories -->
+ <div class="panel panel-default mb10">
+ <div class="panel-heading">
+ <h4 class="panel-title xoops-mewbb-forum-title">
+ <{if $category.forums}>
+ <a data-toggle="collapse" data-parent="#accordion" href="#<{$category.cat_element_id}>" title="<{$smarty.const.THEME_NEWBB_TOPIC}>">
+ <span class="glyphicon glyphicon-plus-sign"></span>
+ </a>
+ <{/if}>
+ <{if $category.cat_image}>
+ <img src="<{$category.cat_image}>" alt="<{$category.cat_title}>">
+ <{/if}>
+
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?cat=<{$category.cat_id}>" title="<{$category.cat_title}>">
+ <{$category.cat_title}>
+ </a>
+
+ <{if $category.cat_sponsor}>
+ <a href="<{$category.cat_sponsor.link}>" title="<{$smarty.const.THEME_FORUM_SPONSORBY}> <{$category.cat_sponsor.title}>" target="_blank" class="pull-right btn btn-xs btn-success">
+ <{$category.cat_sponsor.title}>
+ </a>
+ <{/if}>
+
+ <{if $category.cat_description}>
+ <a href="#forum-desc-<{$category.cat_element_id}>" title="<{$smarty.const.THEME_FORUM_DESCRIPTION}>" data-toggle="modal" data-target="#forum-desc-<{$category.cat_element_id}>" class="btn btn-xs btn-info pull-right">
+ <span class="glyphicon glyphicon-info-sign"></span>
+ </a>
+ <{/if}>
+ </h4>
+<{if $category.cat_description}>
+<div class="modal fade" id="forum-desc-<{$category.cat_element_id}>" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+ <h4 class="modal-title" id="myModalLabel"><{$category.cat_title}></h4>
+ </div>
+ <div class="modal-body">
+ <p><{$category.cat_description}></p>
+ </div>
+ <div class="modal-footer">
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?cat=<{$category.cat_id}>" title="<{$smarty.const.THEME_GOTOTHEFORUM}>" class="btn btn-default">
+ <{$smarty.const.THEME_GOTOTHEFORUM}>
+ </a>
+ </div>
+ </div>
+ </div>
+</div>
+<{/if}>
+ </div><!-- .panel-heading -->
+
+<div id="<{$category.cat_element_id}>" class="panel-collapse collapse <{if $subforum_display == 'expand'}>in<{/if}>">
+ <div class="panel-body">
+ <{if $category.forums}>
+ <div class="row hidden-xs">
+ <{if $subforum_display == "expand"}>
+ <div class="col-sm-6 col-md-6"><strong><{$smarty.const._MD_FORUM}></strong></div>
+ <{else}>
+ <div class="col-sm-6 col-md-6"><strong><{$smarty.const._MD_FORUM}></strong></div>
+ <{/if}>
+ <div class="col-sm-1 col-md-1"><strong><{$smarty.const._MD_TOPICS}></strong></div>
+ <div class="col-sm-1 col-md-1"><strong><{$smarty.const._MD_POSTS}></strong></div>
+ <div class="col-sm-4 col-md-4"><strong><{$smarty.const._MD_LASTPOST}></strong></div>
+ </div>
+ <{/if}>
+ <{foreachq item=forum from=$category.forums}>
+ <div class="row xoops-newbb-list-foruns mb10">
+ <div class="col-sm-6 col-md-6">
+ <{if $forum.subforum}>
+ <div class="<{if $forum.forum_read eq 1 }>forum-read<{else}>forum-new2<{/if}> pull-left">
+ <{$forum.forum_folder}>
+ </div>
+ <{else}>
+ <div class="<{if $forum.forum_read eq 1 }>forum-read<{else}>forum-new2<{/if}> pull-left">
+ <{$forum.forum_folder}>
+ </div>
+ <{/if}>
+
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum.forum_id}>" title="<{$forum.forum_name}>">
+ <{$forum.forum_name}>
+ </a>
+
+ <{if $rss_enable}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?f=<{$forum.forum_id}>" target="_blank" title="RSS feed" class="pull-right btn btn-xs btn-warning">
+ RSS
+ </a>
+ <{/if}>
+ <!-- Forum description -->
+ <{if $forum.forum_desc != ""}>
+ <button class="btn btn-primary btn-xs pull-right" data-toggle="modal" data-target="#forumDesc-<{$forum.forum_id}>"><span class="glyphicon glyphicon-info-sign"></span></button>
+
+ <div class="modal fade" id="forumDesc-<{$forum.forum_id}>" tabindex="-1" role="dialog" aria-labelledby="ForumDescription" aria-hidden="true">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+ <h4 class="modal-title" id="ForumDescription"><{$smarty.const.THEME_FORUM_DESC}>: <{$category.cat_title}> - <{$forum.forum_name}></h4>
+ </div>
+ <div class="modal-body">
+ <{$forum.forum_desc}>
+ </div>
+ <div class="modal-footer">
+ <{if $forum.forum_moderators}>
+ <div class="pull-left"><span class="label label-info"><{$smarty.const._MD_MODERATOR}>: <{$forum.forum_moderators}></span></div>
+ <{/if}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?cat=<{$category.cat_id}>" class="btn btn-default" title="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?cat=<{$category.cat_id}>">
+ <{$smarty.const.THEME_GOTOTHEFORUM}>
+ </a>
+ </div>
+ </div>
+ </div>
+ </div>
+ <{/if}>
+ <!-- End forum description-->
+ </div>
+
+ <div class="col-sm-1 col-md-1 text-center hidden-xs">
+ <{if $stats[$forum.forum_id].topic.day}>
+ <strong><{$stats[$forum.forum_id].topic.day}></strong>/
+ <{/if}>
+ <{$forum.forum_topics}>
+ </div>
+
+ <div class="col-sm-1 col-md-1 text-center hidden-xs">
+ <{if $stats[$forum.forum_id].post.day}>
+ <strong><{$stats[$forum.forum_id].post.day}></strong>/
+ <{/if}>
+ <{$forum.forum_posts}>
+ </div>
+
+ <div class="col-sm-4 col-md-4 hidden-xs">
+ <{if $forum.forum_lastpost_subject}>
+ <{$forum.forum_lastpost_time}> <{$smarty.const._MD_BY}> <{$forum.forum_lastpost_user}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$forum.forum_lastpost_id}>">
+ <{$forum.forum_lastpost_subject}>
+ <{$forum.forum_lastpost_icon}>
+ </a>
+ <{else}>
+ <{$smarty.const._AM_NEWBB_NOTOPIC}>
+ <{/if}>
+
+ <{if $forum.subforum}>
+ <{$smarty.const._MD_SUBFORUMS}><{$img_subforum}>
+ <{foreachq item=subforum from=$forum.subforum}>
+ [<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$subforum.forum_id}>"><{$subforum.forum_name}></a>]
+ <{/foreach}>
+ <{/if}>
+ </div>
+ </div>
+ <{/foreach}>
+ </div><!-- .panel-body -->
+ </div><!-- .panel-collapse .collapse -->
+ </div><!-- .panel .panel-default -->
+<{/foreach}><!-- End Forum Categories -->
+</div><!-- .panel-group -->
+
+<div class="row mb10">
+ <div class="col-md-12">
+ <{$img_forum_new}> = <{$smarty.const._MD_NEWPOSTS}>
+ <{$img_forum}> = <{$smarty.const._MD_NONEWPOSTS}>
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-md-8 mb10">
+ <form class="input-group" action="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php" method="post" name="search" id="search" role="search">
+ <input name="term" id="term" type="text" class="form-control" placeholder="<{$smarty.const.THEME_NEWBB_SEARCH_FORUM}>">
+ <input type="hidden" name="forum" id="forum" value="all">
+ <input type="hidden" name="sortby" id="sortby" value="p.post_time desc">
+ <input type="hidden" name="searchin" id="searchin" value="both">
+
+ <span class="input-group-btn">
+ <button class="btn btn-primary" type="submit" id="submit"><{$smarty.const._MD_SEARCH}></button>
+ </span>
+ </form>
+ </div>
+ <div class="col-md-4">
+ <a class="btn btn-primary btn-block" href="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php"><{$smarty.const._MD_ADVSEARCH}></a>
+ </div>
+</div>
+
+<{if $currenttime}>
+<div class="row">
+ <div class="col-lg-12"><h3 class="nompl"><{$online.statistik}> <{$smarty.const._MD_NEWBB_STATS}></h3></div>
+ <div class="col-sm-6 col-md-6">
+ <ul class="list-unstyled lw30">
+ <li><{$currenttime}></li>
+ <li><{$lastvisit}></li>
+
+ <li><{$smarty.const._MD_TOTALTOPICSC}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php" title="<{$smarty.const._MD_ALL}>">
+ <{$stats[0].topic.total}>
+ </a></li>
+
+ <li><{$smarty.const._MD_TOTALPOSTSC}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php" title="<{$smarty.const._MD_ALLPOSTS}>">
+ <{$stats[0].post.total}>
+ </a></li>
+ <{if $stats[0].digest.total}>
+ <li><{$smarty.const._MD_TOTALDIGESTSC}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/list.topic.php?status=digest" title="<{$smarty.const._MD_TOTALDIGESTSC}>">
+ <{$stats[0].digest.total}>
+ </a></li>
+ <{/if}>
+
+ <li><a class="btn btn-xs btn-primary" href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewpost.php?status=new" title="<{$smarty.const._MD_VIEW_NEWPOSTS}>">
+ <{$smarty.const._MD_VIEW_NEWPOSTS}>
+ </a></li>
+ </ul>
+ </div>
+
+ <div class="col-sm-6 col-md-6">
+ <ul class="list-unstyled lw30">
+ <{if $userstats}>
+ <li><{*$userstats.lastvisit*}>
+ <{$userstats.lastpost}></li>
+ <{/if}>
+
+ <li><{$smarty.const._MD_TODAYTOPICSC}> <{$stats[0].topic.day|default:0}></li>
+ <li><{$smarty.const._MD_TODAYPOSTSC}> <{$stats[0].post.day|default:0}></li>
+
+ <{if $userstats}>
+ <li><{$userstats.topics}> | <{$userstats.posts}></li>
+ <{if $userstats.digests}>
+ <li><{$userstats.digests}></li>
+ <{/if}>
+ <{/if}>
+ </ul>
+ </div>
+
+</div>
+<{/if}>
+
+<{if $online}>
+ <{includeq file="db:newbb_online.html"}>
+<{/if}>
+
+<ul class="list-unstyled">
+<li><a title="NewBB" href="http://www.simple-xoops.de" class="btn btn-xs btn-success">NewBB Version <{$version/100}></a></li>
+<{if $rss_button}>
+ <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/rss.php?c=<{$viewcat}>" target="_blank" title="RSS FEED">
+ <{$rss_button}>
+ </a>
+<{/if}>
+</ul>
+
+<{includeq file='db:newbb_notification_select.html'}>
+
+</div><!-- .xoops-newbb -->
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/pm/pm_viewpmsg.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/pm/pm_viewpmsg.html 2014-06-13 17:49:48 UTC (rev 12584)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/pm/pm_viewpmsg.html 2014-06-14 05:07:43 UTC (rev 12585)
@@ -89,8 +89,8 @@
</div><!-- .xoops-message-header -->
<{if $total_messages == 0}>
-<div class="clearfix"></div>
-<div class="container">
+
+<div class="col-md-12">
<div class="alert alert-warning">
<{$smarty.const._PM_YOUDONTHAVE}>
</div>
@@ -156,4 +156,4 @@
<{if $pagenav}>
<{$pagenav}>
-<{/if}>
\ No newline at end of file
+<{/if}>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/xoops_and_module_changes/class/pagenav.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/xoops_and_module_changes/class/pagenav.php 2014-06-13 17:49:48 UTC (rev 12584)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/publisher/xoops_and_module_changes/class/pagenav.php 2014-06-14 05:07:43 UTC (rev 12585)
@@ -17,7 +17,7 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') || die('Restricted access');
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
class XoopsPageNav
{
@@ -185,3 +185,4 @@
}
}
+?>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/system_block_login.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/system_block_login.html 2014-06-13 17:49:48 UTC (rev 12584)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/system_block_login.html 2014-06-14 05:07:43 UTC (rev 12585)
@@ -2,12 +2,12 @@
<form action="<{xoAppUrl user.php}>" method="post" role="form">
<div class="form-group">
<{$block.lang_username}>
- <input class="form-control" type="text" name="uname" placeholder="Your Login">
+ <input class="form-control" type="text" name="uname" placeholder="<{$smarty.const.THEME_LOGIN}>">
</div>
<div class="form-group">
<{$block.lang_password}>
- <input class="form-control" type="password" name="pass" placeholder="Your Password">
+ <input class="form-control" type="password" name="pass" placeholder="<{$smarty.const.THEME_PASS}>">
</div>
<div class="checkbox">
@@ -26,4 +26,4 @@
<a class="btn btn-info btn-xs btn-block" href="<{xoAppUrl user.php#lost}>" title="<{$block.lang_lostpass}>"><{$block.lang_lostpass}></a>
<a class="btn btn-info btn-xs btn-block" href="<{xoAppUrl register.php}>" title="<{$block.lang_registernow}>"><{$block.lang_registernow}></a>
-</div>
\ No newline at end of file
+</div>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/system_block_newusers.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/system_block_newusers.html 2014-06-13 17:49:48 UTC (rev 12584)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/system_block_newusers.html 2014-06-14 05:07:43 UTC (rev 12585)
@@ -1,21 +1,13 @@
-<div class="newusers container">
- <{foreach item=user from=$block.users}>
- <div class="row user">
- <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
- <{if $user.avatar != ""}>
- <img src="<{$user.avatar}>" alt="<{$user.name}>" class="img-responsive">
- <{else}>
- <img src="<{$xoops_imageurl}>images/blank.gif" alt="<{$user.name}>" class="img-responsive">
- <{/if}>
- </div>
-
- <div class="col-xs-4 col-sm-4 col-md-4 col-lg-5">
- <a href="<{$xoops_url}>/userinfo.php?uid=<{$user.id}>" title="<{$user.name}>"><{$user.name}></a>
- </div>
-
- <div class="col-xs-4 col-sm-4 col-md-4 col-lg-5">
- <{$user.joindate}>
- </div>
- </div>
- <{/foreach}>
-</div>
\ No newline at end of file
+<{foreach item=user from=$block.users}>
+<ul class="userblock list-unstyled">
+ <{if $user.avatar != ""}>
+ <li class="avatar-image"><img src="<{$user.avatar}>" alt="<{$user.name}>" class="img-circle"></li>
+ <{else}>
+ <li class="avatar-image"><img src="<{$xoops_imageurl}>images/blank.gif" alt="<{$user.name}>" class="img-circle"></li>
+ <{/if}>
+
+ <li class="user-name"><a href="<{$xoops_url}>/userinfo.php?uid=<{$user.id}>" title="<{$user.name}>"><{$user.name}></a></li>
+
+ <li class="join-date text-right hidden-sm join-date"><{$user.joindate}></li>
+</ul>
+<{/foreach}>
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/system_block_search.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/system_block_search.html (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/system_block_search.html 2014-06-14 05:07:43 UTC (rev 12585)
@@ -0,0 +1,30 @@
+<div class="text-center">
+
+ <form role="search" action="<{xoAppUrl search.php}>" method="get">
+
+ <div class="input-group">
+
+ <input class="form-control" type="text" name="query" placeholder="<{$smarty.const.THEME_SEARCH_TEXT}>">
+
+ <input type="hidden" name="action" value="results">
+
+ <span class="input-group-btn">
+
+ <button class="btn btn-primary" type="submit">
+
+ <span class="glyphicon glyphicon-search"></span>
+
+ </button>
+
+ </span>
+
+ </div>
+
+ </form>
+
+ <p class="text-right">
+ <a href="<{xoAppUrl search.php}>" title="<{$block.lang_advsearch}>">
+ <{$block.lang_advsearch}>
+ </a>
+ </p>
+</div>
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/system_block_topusers.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/system_block_topusers.html (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/modules/system/blocks/system_block_topusers.html 2014-06-14 05:07:43 UTC (rev 12585)
@@ -0,0 +1,21 @@
+<{foreach item=user from=$block.users}>
+
+<ul class="userblock list-unstyled">
+
+ <{if $user.avatar != ""}>
+ <li class="avatar-image">
+ <img src="<{$user.avatar}>" alt="<{$user.name}>" class="img-circle">
+ <span class="badge pull-right"><{$user.rank}></span>
+ </li>
+ <{else}>
+ <li class="avatar-image">
+ <img src="<{$xoops_imageurl}>images/blank.gif" alt="<{$user.name}>" class="img-circle">
+ <span class="badge pull-right"><{$user.rank}></span>
+ </li>
+ <{/if}>
+
+ <li class="user-name"><a href="<{$xoops_url}>/userinfo.php?uid=<{$user.id}>" title="<{$user.name}>"><{$user.name}></a></li>
+
+ <li class="join-date text-right"><{$user.posts}></li>
+</ul>
+<{/foreach}>
Added: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/shot.gif
===================================================================
(Binary files differ)
Index: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/shot.gif
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/shot.gif 2014-06-13 17:49:48 UTC (rev 12584)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/shot.gif 2014-06-14 05:07:43 UTC (rev 12585)
Property changes on: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/shot.gif
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/shot.png
===================================================================
(Binary files differ)
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/style.css
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/style.css 2014-06-13 17:49:48 UTC (rev 12584)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/style.css 2014-06-14 05:07:43 UTC (rev 12585)
@@ -30,6 +30,7 @@
* 4.9. eXtgallery Module
* 4.10. TDMDownloads
* 4.11. XOOPS Tube
+ * 4.12. NewBB Module
* 5. Useful Classes
**/
@@ -51,16 +52,21 @@
div.slideshow .item img{display:inline-block;}
div.maincontainer{margin-top:20px; margin-bottom:20px;}
-div.home-message{background: #FFF; padding-top:5px; border-left: 3px solid #9C6; margin-top:-60px; position:relative; z-index:5;}
+div.home-message{background: #FAFAFA; padding-top:5px; border-left: 3px solid #9C6; margin-top:-60px; position:relative; z-index:5;}
div.bottom-blocks{background: url(images/cover.jpg) 50% 50% no-repeat fixed; background-size:cover; margin-top: 20px; padding: 20px 0 20px 0;}
footer.footer{background:#111; color:#EAEAEA;}
footer.footer > h3{font-size:0.9em; margin:0; line-height:inherit; max-width:960px; margin:0 auto 0 auto; padding:10px 0 10px 0; text-align:center; position:relative;}
footer.footer > h3 > a.credits{position:absolute; top:3px; right:10px;}
+.xoops-banner{position: relative; top: 40px;}
+.xoops-banner *{max-width: 100%;}
+
/* 2. XOOPS Codes */
.xoopsQuote{padding:10px 20px; margin:0 0 20px;border-left:5px solid #eeeeee; font-style:italic;}
-.xoopsCode {background: #FAFAFA; padding: 5px; overflow-x: scroll; border: 1px solid #EEE;}
+.xoopsCode {background:url(images/code.png); overflow-x: auto; border: 1px solid #EEE; padding-left: 10px}
+.xoopsCode code{background-color: transparent; line-height: 25px; position: relative;}
+.xoopsCode code > span{position: relative; z-index: 5;}
/* 3. XOOPS Blocks*/
div.xoops-side-blocks > aside{margin-bottom:20px;}
@@ -114,11 +120,20 @@
div.xoops-theme-select{text-align:center;}
div.xoops-theme-select form select{border:1px solid #D6D6D6; width:100%;}
+div.xoops-theme-select img {max-width: 100%;}
-div.newusers > .row.user{margin-bottom:10px; border-bottom:1px solid #D6D6D6; padding-top:5px;}
-div.newusers > .row.user > [class*="col-"]{padding:0; text-align:center;}
-div.newusers > .row.user:nth-child(odd){background:#EEE;}
+ul.userblock{border-bottom:1px solid #EEE; margin-bottom: 0; padding: 5px 0 5px 0;}
+ul.userblock:nth-child(odd){background: #F9F9F9;}
+ul.userblock:hover{background: #EEE;}
+ul.userblock:last-child{border-bottom: none;}
+ul.userblock > li{display: inline-block; position: relative;}
+ul.userblock > li.avatar-image{max-width: 20%;}
+ul.userblock > li.avatar-image img{max-width: 100%;}
+ul.userblock > li.user-name{padding: 0 0 0 10px; width: 49%;}
+ul.userblock > li.join-date{padding: 0 5px 0 0; width: 9%;}
+ul.userblock > li span.badge{background: #47A447; position: absolute; bottom: 0; right: 0;}
+
/* 4.4. System Comments */
div.xoops-comment-body{margin-top:20px;}
div.xoops-comment-template{margin-bottom:20px;}
@@ -297,6 +312,23 @@
.xoopstube-video-play{}
.xoopstube-video-play embed{max-width: 100%;}
+/* 4.12. NewBB Module */
+.newbb{}
+.newbb-header{}
+.newbb-menu{}
+.newbb-header-icons{}
+.newbb-header-icons div{margin-bottom: 10px;}
+.xoops-newbb-category-list{}
+.xoops-newbb-category-list a.pull-right{margin-left: 5px}
+.xoops-newbb-list-foruns{border-bottom: 1px solid #EAEAEA; padding-bottom: 5px;}
+.xoops-newbb-list-foruns:last-child{border-bottom: none;}
+
+.xoops-newbb-viewtopic{}
+.xoops-newbb-viewtopic table{max-width: 100%; border: 1px solid #000;}
+
+.xoops-mewbb-forum-title{}
+.xoops-mewbb-forum-title a.btn{color: #FFF;}
+
/* 5. Useful Classes */
.big-info-icon-link{color:#333; font-size:1.8em; margin:10px 0 10px 0; display:inline-table; cursor:pointer;}
.xoops-default-title{font-size:1.3em; margin:0; line-height:inherit;}
@@ -307,8 +339,17 @@
.generic-pagination .xo-pagact{background:#09C; color:#FFF; border:1px solid #EEE; padding:5px; border-radius:5px;}
div.order-by{font-size:1.2em;}
div.order-by a{color:#999; font-size:1.2em;}
+.mb10{margin-bottom: 10px;} /* Only Add Margin Bottom of 10px */
+.lw30{line-height: 30px;} /* Only Add Line Height 30px */
+.nompl{margin: 0; padding: 0; line-height: inherit;}/* No margin, paddind and lineweight -> use in title tags if necessary... */
+/* Media Queries */
+@media (min-width:320px) and (max-width:768px){
+ .xoops-banner{top: 0;}
+ .xoops-banner.pull-right{float: none !important;}
+}
+
/* bla, bla, bla */
.aligncenter{text-align:center; margin-left:auto; margin-right:auto;}
.alignleft{text-align:left; float:left;}
-.alignright{text-align:right; float:right;}
\ No newline at end of file
+.alignright{text-align:right; float:right;}
Deleted: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/template.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/template.html 2014-06-13 17:49:48 UTC (rev 12584)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/template.html 2014-06-14 05:07:43 UTC (rev 12585)
@@ -1,131 +0,0 @@
-<!doctype html>
-<html class="no-js" lang="pt-br">
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<!-- disable zoom in mobile devices:
-<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
--->
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css">
-<link rel="stylesheet" type="text/css" href="css/reset.css">
-<link rel="stylesheet" type="text/css" href="style.css">
-<script src="js/jquery-1.10.2.js"></script>
-<script src="js/bootstrap.min.js"></script>
-<script src="js/modernizr.custom.95845.js"></script>
-<script src="js/js.js"></script>
-<title>XOOPS Responsive Layout</title>
-</head>
-<body>
-<div class="navbar-wrapper">
- <div class="navbar navbar-inverse navbar-static-top global-nav">
- <div class="container">
- <div class="navbar-header">
- <button data-target=".navbar-collapse" data-toggle="collapse" class="navbar-toggle" type="button">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a href="javascript:;" class="navbar-brand xlogo"><img src="images/logo.png" alt=""></a>
- </div>
- <div class="navbar-collapse collapse">
- <ul class="nav navbar-nav">
- <li class="active"><a href="#">Home</a></li>
- <li><a href="#about">About</a></li>
- <li class="dropdown"> <a data-toggle="dropdown" class="dropdown-toggle" href="javascript:;">News <b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="javascript:;">Topic 1</a></li>
- <li><a href="javascript:;">Topic 2</a></li>
- <li><a href="javascript:;">Topic 3</a></li>
- <li><a href="javascript:;">Topic 4</a></li>
- <li><a href="javascript:;">Topic 5</a></li>
- </ul>
- </li>
- <li><a href="javascript:;">Contact</a></li>
- </ul>
- </div>
- </div>
- </div>
-</div><!-- .navbar-wrapper -->
-
-<div class="carousel slide" id="myCarousel">
- <!-- Indicators -->
- <ol class="carousel-indicators">
- <li class="active" data-slide-to="0" data-target="#myCarousel"></li>
- <li data-slide-to="1" data-target="#myCarousel" class=""></li>
- <li data-slide-to="2" data-target="#myCarousel" class=""></li>
- </ol>
- <div class="carousel-inner">
- <div class="item active"> <img alt="First slide" src="images/slider.png">
- <div class="container">
- <div class="carousel-caption">
- <h1>Lorem ipsum dolor sit amet</h1>
- <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
- <p><a href="javascript:;" class="btn btn-large btn-primary">Read More</a></p>
- </div>
- </div>
- </div>
- <div class="item"> <img alt="First slide" src="images/slider.png">
- <div class="container">
- <div class="carousel-caption">
- <h1>Lorem ipsum dolor sit amet</h1>
- <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
- <p><a href="javascript:;" class="btn btn-large btn-primary">Read More</a></p>
- </div>
- </div>
- </div>
- <div class="item"> <img alt="First slide" src="images/slider.png">
- <div class="container">
- <div class="carousel-caption">
- <h1>Lorem ipsum dolor sit amet</h1>
- <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
- <p><a href="javascript:;" class="btn btn-large btn-primary">Read More</a></p>
- </div>
- </div>
- </div>
- </div>
- <a class="left carousel-control" href="#myCarousel" data-slide="prev"> <span class="icon-prev"></span> </a> <a data-slide="next" href="#myCarousel" class="right carousel-control"> <span class="icon-next"></span> </a>
-</div><!-- .carousel -->
-
-<div class="container maincontainer">
-<div class="aligncenter home-message">
- <h2>About Us</h2>
- <p class="lead">Ut auctor elit mi, non adipiscing quam accumsan sed. Vivamus consequat massa eget purus volutpat, et placerat elit pharetra. Maecenas quis mauris eros. Morbi consequat mattis diam, a laoreet est egestas id.</p>
- <p><a href="javascript:;" class="btn btn-md btn-success">Learn More...</a></p>
-</div>
-
-<div class="row">
-<div class="col-md-8 col-sm-8 content-area">
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur a metus ac augue tempus sagittis. Etiam ullamcorper, enim quis rutrum luctus, dui quam auctor ante, eu consequat sem ipsum tincidunt lacus. Sed est dolor, dictum in egestas ac, accumsan eu lorem! Nulla sagittis libero nec massa aliquet, vitae molestie felis consequat. Pellentesque sodales bibendum ipsum, eu cursus velit rutrum eget
-</div><!-- .content-area -->
-
-<div class="col-md-4 col-sm-4 sidebar-blocks">
- <aside>
- <h3>Lorem ipsum dolor</h3>
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur a metus ac augue tempus sagittis. Etiam ullamcorper, enim quis rutrum luctus, dui quam auctor ante, eu consequat sem ipsum tincidunt lacus.
- </aside>
-</div><!-- .sidebar-blocks -->
-</div>
-</div><!-- .maincontainer -->
-
-<div class="bottom-blocks">
- <div class="container">
- <div class="row">
- <aside class="col-sm-4 col-md-4">
- <h3>Lorem ipsum dolor</h3>
- Phasellus iaculis feugiat leo, vitae sodales dolor elementum eu. Duis eu feugiat risus, sit amet aliquet nisl. Suspendisse potenti. Phasellus magna tortor, tempor sed turpis ut, eleifend mollis risus? Phasellus lacinia molestie felis sed dictum. </aside>
- <aside class="col-sm-4 col-md-4">
- <h3>Lorem ipsum dolor</h3>
- Phasellus iaculis feugiat leo, vitae sodales dolor elementum eu. Duis eu feugiat risus, sit amet aliquet nisl. Suspendisse potenti. Phasellus magna tortor, tempor sed turpis ut, eleifend mollis risus? Phasellus lacinia molestie felis sed dictum. </aside>
- <aside class="col-sm-4 col-md-4">
- <h3>Lorem ipsum dolor</h3>
- Phasellus iaculis feugiat leo, vitae sodales dolor elementum eu. Duis eu feugiat risus, sit amet aliquet nisl. Suspendisse potenti. Phasellus magna tortor, tempor sed turpis ut, eleifend mollis risus? Phasellus lacinia molestie felis sed dictum. </aside>
- </div>
- </div>
-</div><!-- .bottom-blocks -->
-
-<footer class="footer">
-<h3>© 2014 - XOOPS Project - All rights reserveds</h3>
-</footer>
-</body>
-</html>
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/theme.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/theme.html 2014-06-13 17:49:48 UTC (rev 12584)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/theme.html 2014-06-14 05:07:43 UTC (rev 12585)
@@ -48,10 +48,17 @@
<div class="container maincontainer">
<{if $xoops_dirname == "system"}>
- <div class="aligncenter home-message">
- <h2>About Us</h2>
- <p class="lead"><{$xoops_meta_description}></p>
- <p><a href="javascript:;" class="btn btn-md btn-success">Learn More...</a></p>
+ <div class="aligncenter home-message row">
+ <div class="<{if $xoops_banner != ""}>col-md-6<{else}>col-md-12<{/if}>">
+ <h2><{$smarty.const.THEME_ABOUTUS}></h2>
+
+ <p class="lead"><{$xoops_meta_description}></p>
+
+ <p><a href="javascript:;" class="btn btn-md btn-success"><{$smarty.const.THEME_LEARNINGMORE}></a></p>
+ </div>
+
+ <{if $xoops_banner != ""}><div class="col-md-6"><div class="xoops-banner pull-right"><{$xoops_banner}></div></div><{/if}>
+
</div><!-- .home-message -->
<{/if}>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/theme.ini
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/theme.ini 2014-06-13 17:49:48 UTC (rev 12584)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/theme.ini 2014-06-14 05:07:43 UTC (rev 12585)
@@ -17,6 +17,6 @@
Licence="GPL v3"
-thumbnail="shot.png"
+thumbnail="shot.gif"
-screenshot="screenshot.png"
\ No newline at end of file
+screenshot="screenshot.png"
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/nav-menu.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/nav-menu.html 2014-06-13 17:49:48 UTC (rev 12584)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/nav-menu.html 2014-06-14 05:07:43 UTC (rev 12585)
@@ -7,12 +7,15 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a href="<{$xoops_url}>" class="navbar-brand xlogo"><img src="<{$xoops_imageurl}>images/logo.png" alt=""></a> </div>
+ <a href="<{$xoops_url}>" class="navbar-brand xlogo" title="<{$xoops_sitename}>">
+ <img src="<{$xoops_imageurl}>images/logo.png" alt="<{$xoops_sitename}>">
+ </a>
+ </div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
- <li class="active"><a href="<{$xoops_url}>">Home</a></li>
- <li><a href="javascript:;">About</a></li>
- <li class="dropdown"> <a data-toggle="dropdown" class="dropdown-toggle" href="javascript:;">News <b class="caret"></b></a>
+ <li class="active"><a href="<{$xoops_url}>"><{$smarty.const.THEME_HOME}></a></li>
+ <li><a href="javascript:;"><{$smarty.const.THEME_MODULE1}></a></li>
+ <li class="dropdown"> <a data-toggle="dropdown" class="dropdown-toggle" href="javascript:;"><{$smarty.const.THEME_MODULE2}><b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="javascript:;">Topic 1</a></li>
<li><a href="javascript:;">Topic 2</a></li>
@@ -21,9 +24,17 @@
<li><a href="javascript:;">Topic 5</a></li>
</ul>
</li>
- <li><a href="<{$xoops_url}>/modules/contact">Contact</a></li>
+ <li><a href="<{$xoops_url}>/modules/newbb"><{$smarty.const.THEME_MODULE3}></a></li>
+ <li><a href="<{$xoops_url}>/modules/contact"><{$smarty.const.THEME_MODULE4}></a></li>
</ul>
+ <form class="navbar-form navbar-right" role="search" action="<{xoAppUrl search.php}>" method="get">
+ <div class="form-group">
+ <input type="text" name="query" class="form-control" placeholder="<{$smarty.const.THEME_SEARCH_TEXT}>">
+ <input type="hidden" name="action" value="results">
+ </div>
+ <button class="btn btn-primary" type="submit"><{$smarty.const.THEME_SEARCH_BUTTON}></button>
+ </form>
</div>
</div>
</div>
-</div><!-- .navbar-wrapper -->
\ No newline at end of file
+</div><!-- .navbar-wrapper -->
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/slider.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/slider.html 2014-06-13 17:49:48 UTC (rev 12584)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/themes/xBootstrap/tpl/slider.html 2014-06-14 05:07:43 UTC (rev 12585)
@@ -10,18 +10,18 @@
<div class="carousel-caption hidden-xs">
<h1>Lorem ipsum dolor sit amet</h1>
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
- <p><a href="javascript:;" class="btn btn-large btn-primary">Read More</a></p>
+ <p><a href="javascript:;" class="btn btn-large btn-primary"><{$smarty.const.THEME_READMORE}></a></p>
</div>
</div>
<div class="item"> <img alt="XOOPS" src="<{$xoops_imageurl}>images/slider2.jpg">
<div class="carousel-caption hidden-xs">
<h1>Lorem ipsum dolor sit amet</h1>
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
- <p><a href="javascript:;" class="btn btn-large btn-primary">Read More</a></p>
+ <p><a href="javascript:;" class="btn btn-large btn-primary"><{$smarty.const.THEME_READMORE}></a></p>
</div>
</div>
</div>
<a class="left carousel-control" href="#myCarousel" data-slide="prev"><span class="icon-prev"></span></a>
<a data-slide="next" href="#myCarousel" class="right carousel-control"><span class="icon-next"></span></a>
</div><!-- .carousel -->
-<{/if}>
\ No newline at end of file
+<{/if}>
|