From f3f98eb000139071ccc5281abee81f2f284ded57 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Mon, 19 Dec 2011 15:05:33 +0000 Subject: [PATCH] Add bootstrap JS, and move things from template into external resource files --- public/scripts/3rdparty/bootstrap-alerts.js | 113 ++++++++++++++++++++ public/scripts/main.js | 12 ++- public/styles/normal.css | 2 + source/webui/templates/index.tpl | 8 +- 4 files changed, 128 insertions(+), 7 deletions(-) create mode 100644 public/scripts/3rdparty/bootstrap-alerts.js diff --git a/public/scripts/3rdparty/bootstrap-alerts.js b/public/scripts/3rdparty/bootstrap-alerts.js new file mode 100644 index 0000000..37bb430 --- /dev/null +++ b/public/scripts/3rdparty/bootstrap-alerts.js @@ -0,0 +1,113 @@ +/* ========================================================== + * bootstrap-alerts.js v1.4.0 + * http://twitter.github.com/bootstrap/javascript.html#alerts + * ========================================================== + * Copyright 2011 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + + +!function( $ ){ + + "use strict" + + /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) + * ======================================================= */ + + var transitionEnd + + $(document).ready(function () { + + $.support.transition = (function () { + var thisBody = document.body || document.documentElement + , thisStyle = thisBody.style + , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined + return support + })() + + // set CSS transition event type + if ( $.support.transition ) { + transitionEnd = "TransitionEnd" + if ( $.browser.webkit ) { + transitionEnd = "webkitTransitionEnd" + } else if ( $.browser.mozilla ) { + transitionEnd = "transitionend" + } else if ( $.browser.opera ) { + transitionEnd = "oTransitionEnd" + } + } + + }) + + /* ALERT CLASS DEFINITION + * ====================== */ + + var Alert = function ( content, options ) { + this.settings = $.extend({}, $.fn.alert.defaults, options) + this.$element = $(content) + .delegate(this.settings.selector, 'click', this.close) + } + + Alert.prototype = { + + close: function (e) { + var $element = $(this).parent('.alert-message') + + e && e.preventDefault() + $element.removeClass('in') + + function removeElement () { + $element.remove() + } + + $.support.transition && $element.hasClass('fade') ? + $element.bind(transitionEnd, removeElement) : + removeElement() + } + + } + + + /* ALERT PLUGIN DEFINITION + * ======================= */ + + $.fn.alert = function ( options ) { + + if ( options === true ) { + return this.data('alert') + } + + return this.each(function () { + var $this = $(this) + + if ( typeof options == 'string' ) { + return $this.data('alert')[options]() + } + + $(this).data('alert', new Alert( this, options )) + + }) + } + + $.fn.alert.defaults = { + selector: '.close' + } + + $(document).ready(function () { + new Alert($('body'), { + selector: '.alert-message[data-alert] .close' + }) + }) + +}( window.jQuery || window.ender ); \ No newline at end of file diff --git a/public/scripts/main.js b/public/scripts/main.js index e089232..ee9b978 100644 --- a/public/scripts/main.js +++ b/public/scripts/main.js @@ -2,4 +2,14 @@ * StatusBoard main script file * * - */ \ No newline at end of file + */ + +var sb = { + + init: function() { + $('.alert-data').alert(); + } + +}; + +$('document').ready(sb.init); diff --git a/public/styles/normal.css b/public/styles/normal.css index e28ef70..7793a73 100644 --- a/public/styles/normal.css +++ b/public/styles/normal.css @@ -7,6 +7,8 @@ body { margin: 0em; + margin-top: 60px; + padding: 0em; font-family: verdana, helvetica, sans-serif; } diff --git a/source/webui/templates/index.tpl b/source/webui/templates/index.tpl index df300f8..cde16ed 100644 --- a/source/webui/templates/index.tpl +++ b/source/webui/templates/index.tpl @@ -19,12 +19,8 @@ - - + +