From f77e79e1733950434487c99d09b7864c50c113c9 Mon Sep 17 00:00:00 2001 From: Angelo Rocha Date: Fri, 7 Apr 2017 14:01:57 -0300 Subject: [PATCH] xBootstrap 1.04 Final --- docs/changelog.txt | 10 ++- js/js.js | 65 ++++++++++++------- modules/system/blocks/_system_block_user.html | 18 ----- theme.html | 57 +++++----------- 4 files changed, 65 insertions(+), 85 deletions(-) delete mode 100644 modules/system/blocks/_system_block_user.html diff --git a/docs/changelog.txt b/docs/changelog.txt index 35638d8..9669c1b 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -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)); @@ -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) diff --git a/js/js.js b/js/js.js index fbdaaf2..9018a62 100644 --- a/js/js.js +++ b/js/js.js @@ -1,31 +1,40 @@ // 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"); @@ -33,13 +42,19 @@ jQuery(document).ready(function($){ $(".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'); }); \ No newline at end of file diff --git a/modules/system/blocks/_system_block_user.html b/modules/system/blocks/_system_block_user.html deleted file mode 100644 index 0a10ba6..0000000 --- a/modules/system/blocks/_system_block_user.html +++ /dev/null @@ -1,18 +0,0 @@ -
- -
\ No newline at end of file diff --git a/theme.html b/theme.html index 7e585d8..7faa206 100644 --- a/theme.html +++ b/theme.html @@ -16,25 +16,22 @@ - - - - - - - - - - - <{if $xoops_dirname=='newbb'}> - - <{/if}> - - + + + + + + + + + + +<{if $xoops_dirname=='newbb'}> + +<{/if}> - @@ -53,23 +50,7 @@ <{$xoops_module_header}> - - + <{includeq file="$theme_name/tpl/nav-menu.tpl"}> @@ -87,9 +68,7 @@

<{$smarty.const.THEME_ABOUTUS}>

<{$smarty.const.THEME_LEARNINGMORE}>

- <{if $xoops_banner != ""}>
<{$xoops_banner}>
<{/if}> - <{/if}> @@ -136,25 +115,21 @@

<{$smarty.const.THEME_ABOUTUS}>

-