Skip to content

Commit

Permalink
xBootstrap 1.04 Final
Browse files Browse the repository at this point in the history
  • Loading branch information
angelorocha committed Apr 7, 2017
1 parent ebac0b5 commit f77e79e
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 85 deletions.
10 changes: 9 additions & 1 deletion docs/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
1.04 Final 2017-04-07
-------------------
- Add tpl module templates (mamba)
- Add Animated Header (mamba)
- Update bootstrap to 3.3.7 (mamba)
- Shareaholic removed (angelo)
- Add profile template dropdown (oswaldo)

1.04 Beta 2 NOT RELEASED
-------------------
- Add extgallery bootstrap slide in blocks: extgallery_block.html and extgallery_block_ajax.html (Angelo Rocha, (thanks Andrax));
Expand All @@ -10,7 +18,7 @@
- Update Masonry to 3.3.0 (mamba)
- Added Multi-level Menu option (mamba)
- Added "responsive image" to wf-section in Publisher
=======

1.04 2015-09-8 Beta 2
-------------------
- Update Bootstrap (3.3.5)
Expand Down
65 changes: 40 additions & 25 deletions js/js.js
Original file line number Diff line number Diff line change
@@ -1,45 +1,60 @@
// JavaScript Document
if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
var msViewportStyle = document.createElement("style")
msViewportStyle.appendChild(
document.createTextNode(
"@-ms-viewport{width:auto!important}"
)
)
document.getElementsByTagName("head")[0].appendChild(msViewportStyle)
}

jQuery(document).ready(function($) {
/* Scroll Top */
jQuery(function ($) {
$.scrollUp({
scrollName: 'scrollUp', // Element ID
topDistance: '300', // Distance from top before showing element (px)
topSpeed: 300, // Speed back to top (ms)
animation: 'fade', // Fade, slide, none
animationInSpeed: 200, // Animation in speed (ms)
animationOutSpeed: 200, // Animation out speed (ms)
scrollText: 'Scroll to top', // Text for element
activeOverlay: false, // Set CSS color to display scrollUp active point, e.g '#00FFFF'
// activeOverlay:'#00FFFF', // Set CSS color to display scrollUp active point, e.g '#00FFFF'
scrollImg: true // Set true to use image
});
});

/* Bootstrap Carousel */
jQuery(document).ready(function ($) {
$('.carousel').carousel({
interval: 5000,
pause: "hover",
wrap: true
})
interval: 5000,
pause: "hover",
wrap: true
})
});

jQuery(document).ready(function($){
/* Masonry Grid */
jQuery(document).ready(function ($) {
var $container = $('#xoopsgrid').masonry();
$container.imagesLoaded( function() {
$container.masonry();
$container.imagesLoaded(function () {
$container.masonry();
});
});

/* Newbb */
jQuery(document).ready(function($){
jQuery(document).ready(function ($) {
/* Bootstrap Style: Horizontal Form */
$(".xoopsform").find('form').addClass("form-inline");
$(".xoopsform").find('select').addClass("form-control");
$(".xoopsform").find('input[type="submit"]').addClass("btn btn-primary");
$(".newbb-links").find('span').removeClass('forum_icon forum_button');
$('.newbb-thread-attachment').find('br').remove();
$('.newbb-thread-attachment').find('hr').remove();
})
});

/* Profile */
jQuery(document).ready(function($){
$('#userinfo table, #regform table').addClass('table table-condensed table-hover').css('width','100%');
$('.profile-form input[type="text"], .profile-form input[type="password"]').addClass('form-control');
$('.profile-form select').addClass('form-control').css('width','100%');
$('.profile-form textarea').addClass('form-control');
$('.profile-form input.formButton').addClass('btn btn-primary pull-right');
jQuery(document).ready(function ($) {
$('#userinfo table, #regform table').addClass('table table-condensed table-hover').css('width', '100%');
$('.profile-form input[type="text"], .profile-form input[type="password"]').addClass('form-control');
$('.profile-form select').addClass('form-control').css('width', '100%');
$('.profile-form textarea').addClass('form-control');
$('.profile-form input.formButton').addClass('btn btn-primary pull-right');
});

/* Add Form Classes */
jQuery(function ($) {
$('#xoops_theme_select').addClass('form-control');
$('.formButton').addClass('btn btn-primary');
});
18 changes: 0 additions & 18 deletions modules/system/blocks/_system_block_user.html

This file was deleted.

57 changes: 16 additions & 41 deletions theme.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,22 @@
<link href="<{xoImgUrl}>js/owl/owl.carousel.css" rel="stylesheet">
<link href="<{xoImgUrl}>js/owl/owl.theme.css" rel="stylesheet">

<link href="<{$xoops_url}>/favicon.ico" rel="shortcut icon">
<link rel="stylesheet" type="text/css" href="<{xoImgUrl}>css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="<{xoImgUrl}>css/xoops.css">
<link rel="stylesheet" type="text/css" href="<{xoImgUrl}>css/reset.css">
<link rel="stylesheet" type="text/css" media="all" href="<{$xoops_themecss}>">
<link rel="stylesheet" type="text/css" media="screen" href="<{xoImgUrl}>css/labs.css"/>
<link rel="stylesheet" type="text/css" media="screen" href="<{xoImgUrl}>css/headhesive.css"/>
<!-- Multi-level Menu -->
<link rel="stylesheet" type="text/css" href="<{xoImgUrl}>css/multilevelmenu.css">

<{if $xoops_dirname=='newbb'}>
<link rel="stylesheet" type="text/css" media="screen" href="<{xoImgUrl}>css/forums.css"/>
<{/if}>

<!--<script src="<{xoImgUrl}>js/jquery-1.10.2.js"></script>-->
<link href="<{$xoops_url}>/favicon.ico" rel="shortcut icon">
<link rel="stylesheet" type="text/css" href="<{xoImgUrl}>css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="<{xoImgUrl}>css/xoops.css">
<link rel="stylesheet" type="text/css" href="<{xoImgUrl}>css/reset.css">
<link rel="stylesheet" type="text/css" media="all" href="<{$xoops_themecss}>">
<link rel="stylesheet" type="text/css" media="screen" href="<{xoImgUrl}>css/labs.css"/>
<link rel="stylesheet" type="text/css" media="screen" href="<{xoImgUrl}>css/headhesive.css"/>
<!-- Multi-level Menu -->
<link rel="stylesheet" type="text/css" href="<{xoImgUrl}>css/multilevelmenu.css">

<{if $xoops_dirname=='newbb'}>
<link rel="stylesheet" type="text/css" media="screen" href="<{xoImgUrl}>css/forums.css"/>
<{/if}>

<script src="<{$xoops_url}>/browse.php?Frameworks/jquery/jquery.js" type="text/javascript"></script>


<script src="<{xoImgUrl}>js/bootstrap.min.js"></script>
<script src="<{xoImgUrl}>js/masonry.pkgd.min.js"></script>
<script src="<{xoImgUrl}>js/headhesive.min.js"></script>
Expand All @@ -53,23 +50,7 @@
<{$xoops_module_header}>

</head>
<script>
$(function () {
$.scrollUp({
scrollName: 'scrollUp', // Element ID
topDistance: '300', // Distance from top before showing element (px)
topSpeed: 300, // Speed back to top (ms)
animation: 'fade', // Fade, slide, none
animationInSpeed: 200, // Animation in speed (ms)
animationOutSpeed: 200, // Animation out speed (ms)
scrollText: 'Scroll to top', // Text for element
activeOverlay: false, // Set CSS color to display scrollUp active point, e.g '#00FFFF'
// activeOverlay:'#00FFFF', // Set CSS color to display scrollUp active point, e.g '#00FFFF'
scrollImg : true // Set true to use image
});
});
</script>


<body id="<{$xoops_dirname}>">

<{includeq file="$theme_name/tpl/nav-menu.tpl"}>
Expand All @@ -87,9 +68,7 @@ <h2><{$smarty.const.THEME_ABOUTUS}></h2>

<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}>

Expand Down Expand Up @@ -136,25 +115,21 @@ <h2><{$smarty.const.THEME_ABOUTUS}></h2>
<!-- end of new footer blocks -->

<script>

// Set options
var options = {
offset: '#showHere',
classes: {
clone: 'adhesiveHeader--clone',
stick: 'adhesiveHeader--stick',
clone: 'adhesiveHeader--clone',
stick: 'adhesiveHeader--stick',
unstick: 'adhesiveHeader--unstick'
}
};

// Initialise with options
var adhesiveHeader = new Headhesive('.adhesiveHeader', options);

// Headhesive destroy
// adhesiveHeader.destroy();
</script>


<footer class="footer">
<h3>
<{$xoops_footer}>
Expand Down

0 comments on commit f77e79e

Please sign in to comment.