From eb9f19e89e34eb4d573b67d9a2a7ad45ea71f393 Mon Sep 17 00:00:00 2001 From: gebele Date: Mon, 1 Feb 2016 15:35:08 +0100 Subject: top scroll, tox colum changes, added ID links --- public/css/style.css | 53 ++++--------- public/css/style2.css | 31 -------- public/javascripts/jquery.doubleScroll.js | 126 ++++++++++++++++++++++++++++++ public/javascripts/nanolazar.js | 11 +++ 4 files changed, 152 insertions(+), 69 deletions(-) delete mode 100644 public/css/style2.css create mode 100644 public/javascripts/jquery.doubleScroll.js create mode 100644 public/javascripts/nanolazar.js (limited to 'public') diff --git a/public/css/style.css b/public/css/style.css index eb41f70..b28c15d 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -1,39 +1,16 @@ -/* tables */ -table.tablesorter { - font-family:arial; - background-color: #CDCDCD; - margin:10px 0pt 15px; - font-size: 8pt; - width: 100%; - text-align: left; -} -table.tablesorter thead tr th, table.tablesorter tfoot tr th { - background-color: #e6EEEE; - border: 1px solid #FFF; - font-size: 8pt; - padding: 4px; -} -table.tablesorter thead tr .header { - background-image: url(bg.gif); - background-repeat: no-repeat; - background-position: center right; - cursor: pointer; -} -table.tablesorter tbody td { - color: #3D3D3D; - padding: 4px; - background-color: #FFF; - vertical-align: top; -} -table.tablesorter tbody tr.odd td { - background-color:#F0F0F6; -} -table.tablesorter thead tr .headerSortUp { - background-image: url(asc.gif); -} -table.tablesorter thead tr .headerSortDown { - background-image: url(desc.gif); -} -table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp { -background-color: #8dbdd8; +.tablesorter thead tr + th { + border: 1px solid black;} +.tablesorter thead tr + th.physchem { + min-width: 60px;} + th.tox { + background-color: #CCFFCC !important} +.tablesorter tbody tr + td.physchem { + min-width: 60px;} + td.tox { + background-color: #CCFFCC } +.tablesorter tbody tr.static td { + background-color: #CCFFCC; } diff --git a/public/css/style2.css b/public/css/style2.css deleted file mode 100644 index 5b0b8ae..0000000 --- a/public/css/style2.css +++ /dev/null @@ -1,31 +0,0 @@ -.tablesorter-scroller-bar-spacer { - background: #eee; -} -.tablesorter-scroller-fixed:after { - content: ''; - border-right: 1px solid #444; - width: 1px; - position: absolute; - top: 0; - bottom: 0; - z-index: 2; - right: 0; - margin: 10px 0 15px; -} -.tablesorter thead tr - th { - border: 1px solid black;} -.tablesorter thead tr - th.physchem { - min-width: 60px;} - th.tox { - white-space: nowrap;} -.tablesorter tbody tr - td { - border: 1px solid black;} -.tablesorter tbody tr - td.physchem { - min-width: 60px;} -.tablesorter tbody tr.static td { - background-color: #CCFFCC; -} diff --git a/public/javascripts/jquery.doubleScroll.js b/public/javascripts/jquery.doubleScroll.js new file mode 100644 index 0000000..8b19df8 --- /dev/null +++ b/public/javascripts/jquery.doubleScroll.js @@ -0,0 +1,126 @@ +/* + * @name DoubleScroll + * @desc displays scroll bar on top and on the bottom of the div + * @requires jQuery + * + * @author Pawel Suwala - http://suwala.eu/ + * @author Antoine Vianey - http://www.astek.fr/ + * @version 0.5 (11-11-2015) + * + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + * + * Usage: + * https://github.com/avianey/jqDoubleScroll + */ + (function( $ ) { + + jQuery.fn.doubleScroll = function(userOptions) { + + // Default options + var options = { + contentElement: undefined, // Widest element, if not specified first child element will be used + scrollCss: { + 'overflow-x': 'auto', + 'overflow-y': 'hidden' + }, + contentCss: { + 'overflow-x': 'auto', + 'overflow-y': 'hidden' + }, + onlyIfScroll: true, // top scrollbar is not shown if the bottom one is not present + resetOnWindowResize: false, // recompute the top ScrollBar requirements when the window is resized + timeToWaitForResize: 30 // wait for the last update event (usefull when browser fire resize event constantly during ressing) + }; + + $.extend(true, options, userOptions); + + // do not modify + // internal stuff + $.extend(options, { + topScrollBarMarkup: '
', + topScrollBarWrapperSelector: '.doubleScroll-scroll-wrapper', + topScrollBarInnerSelector: '.doubleScroll-scroll' + }); + + var _showScrollBar = function($self, options) { + + if (options.onlyIfScroll && $self.get(0).scrollWidth <= $self.width()) { + // content doesn't scroll + // remove any existing occurrence... + $self.prev(options.topScrollBarWrapperSelector).remove(); + return; + } + + // add div that will act as an upper scroll only if not already added to the DOM + var $topScrollBar = $self.prev(options.topScrollBarWrapperSelector); + + if ($topScrollBar.length == 0) { + + // creating the scrollbar + // added before in the DOM + $topScrollBar = $(options.topScrollBarMarkup); + $self.before($topScrollBar); + + // apply the css + $topScrollBar.css(options.scrollCss); + $self.css(options.contentCss); + + // bind upper scroll to bottom scroll + $topScrollBar.bind('scroll.doubleScroll', function() { + $self.scrollLeft($topScrollBar.scrollLeft()); + }); + + // bind bottom scroll to upper scroll + var selfScrollHandler = function() { + $topScrollBar.scrollLeft($self.scrollLeft()); + }; + $self.bind('scroll.doubleScroll', selfScrollHandler); + } + + // find the content element (should be the widest one) + var $contentElement; + + if (options.contentElement !== undefined && $self.find(options.contentElement).length !== 0) { + $contentElement = $self.find(options.contentElement); + } else { + $contentElement = $self.find('>:first-child'); + } + + // set the width of the wrappers + $(options.topScrollBarInnerSelector, $topScrollBar).width($contentElement.outerWidth()); + $topScrollBar.width($self.width()); + $topScrollBar.scrollLeft($self.scrollLeft()); + + } + + return this.each(function() { + + var $self = $(this); + + _showScrollBar($self, options); + + // bind the resize handler + // do it once + if (options.resetOnWindowResize) { + + var id; + var handler = function(e) { + _showScrollBar($self, options); + }; + + $(window).bind('resize.doubleScroll', function() { + // adding/removing/replacing the scrollbar might resize the window + // so the resizing flag will avoid the infinite loop here... + clearTimeout(id); + id = setTimeout(handler, options.timeToWaitForResize); + }); + + } + + }); + + } + +}( jQuery )); diff --git a/public/javascripts/nanolazar.js b/public/javascripts/nanolazar.js new file mode 100644 index 0000000..60602c6 --- /dev/null +++ b/public/javascripts/nanolazar.js @@ -0,0 +1,11 @@ +$(document).ready(function() { + addExternalLinks(); +}); + +addExternalLinks = function() { + $('A[rel="external"]').each(function() { + $(this).attr('alt', 'Link opens in new window.'); + $(this).attr('title', 'Link opens in new window.'); + $(this).attr('target', '_blank'); + }); +}; -- cgit v1.2.3 From 6697948a6c925b165ab5d4dda87849a5f450003a Mon Sep 17 00:00:00 2001 From: gebele Date: Tue, 2 Feb 2016 10:55:28 +0100 Subject: final adjustments, issue tracker link --- public/css/style.css | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'public') diff --git a/public/css/style.css b/public/css/style.css index b28c15d..93500a6 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -1,16 +1,13 @@ -.tablesorter thead tr - th { - border: 1px solid black;} .tablesorter thead tr th.physchem { min-width: 60px;} th.tox { - background-color: #CCFFCC !important} + background-color: #ffcc80 !important} .tablesorter tbody tr td.physchem { min-width: 60px;} td.tox { - background-color: #CCFFCC } + background-color: #ffcc80 } .tablesorter tbody tr.static td { background-color: #CCFFCC; } -- cgit v1.2.3