diff --git a/htdocs/assets/css/datepicker.css b/htdocs/assets/css/datepicker.css index 76b4a80..39d5ea9 100644 --- a/htdocs/assets/css/datepicker.css +++ b/htdocs/assets/css/datepicker.css @@ -18,10 +18,10 @@ padding: 18px 12px 10px; border-bottom: 1px solid #ECECEC; margin-top: -8px; - background: url('/images/pointer-datepicker.png') no-repeat 20px 0 transparent; + background: url('images/pointer-datepicker.png') no-repeat 20px 0 transparent; } .ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { - background: url('/images/sprites/main-sprite.png') no-repeat scroll 0 -695px transparent; + background: url('images/sprites/main-sprite.png') no-repeat scroll 0 -695px transparent; cursor: pointer; height: 18px; outline: medium none; diff --git a/htdocs/assets/css/git.css b/htdocs/assets/css/git.css index b727530..7f4a540 100644 --- a/htdocs/assets/css/git.css +++ b/htdocs/assets/css/git.css @@ -57,7 +57,7 @@ html,body,#commit .human .message a,#commit .human .actor .name a { border-bottom:1px solid #bedce7; border-left:1px solid #bedce7; border-right:1px solid #bedce7; - background:#eaf2f5 url(/images/bg_gradient.gif) 0 100% repeat-x; + background:#eaf2f5 url(images/bg_gradient.gif) 0 100% repeat-x; overflow:hidden; padding:0 .7em .7em; } diff --git a/htdocs/assets/css/jquery-ui/jquery-ui-1.8.16.custom.css b/htdocs/assets/css/jquery-ui/jquery-ui-1.8.16.custom.css index 7d712b1..4f392cb 100755 --- a/htdocs/assets/css/jquery-ui/jquery-ui-1.8.16.custom.css +++ b/htdocs/assets/css/jquery-ui/jquery-ui-1.8.16.custom.css @@ -59,26 +59,26 @@ .ui-widget { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1.1em; } .ui-widget .ui-widget { font-size: 1em; } .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1em; } -.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(/images/jquery-ui/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color: #333333; } +.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(images/jquery-ui/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color: #333333; } .ui-widget-content a { color: #333333; } -.ui-widget-header { border: 1px solid #e78f08; background: #f6a828 url(/images/jquery-ui/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; } +.ui-widget-header { border: 1px solid #e78f08; background: #f6a828 url(images/jquery-ui/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; } .ui-widget-header a { color: #ffffff; } /* Interaction states ----------------------------------*/ -.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(/images/jquery-ui/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1c94c4; } +.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(images/jquery-ui/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1c94c4; } .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; } -.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url(/images/jquery-ui/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #c77405; } +.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url(images/jquery-ui/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #c77405; } .ui-state-hover a, .ui-state-hover a:hover { color: #c77405; text-decoration: none; } -.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #fbd850; background: #ffffff url(/images/jquery-ui/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; } +.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #fbd850; background: #ffffff url(images/jquery-ui/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; } .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #eb8f00; text-decoration: none; } .ui-widget :active { outline: none; } /* Interaction Cues ----------------------------------*/ -.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fed22f; background: #ffe45c url(/images/jquery-ui/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x; color: #363636; } +.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fed22f; background: #ffe45c url(images/jquery-ui/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x; color: #363636; } .ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; } -.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url(/images/jquery-ui/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; color: #ffffff; } +.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url(images/jquery-ui/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; color: #ffffff; } .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; } .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; } .ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; } @@ -89,14 +89,14 @@ ----------------------------------*/ /* states and images */ -.ui-icon { width: 16px; height: 16px; background-image: url(/images/jquery-ui/ui-icons_222222_256x240.png); } -.ui-widget-content .ui-icon {background-image: url(/images/jquery-ui/ui-icons_222222_256x240.png); } -.ui-widget-header .ui-icon {background-image: url(/images/jquery-ui/ui-icons_ffffff_256x240.png); } -.ui-state-default .ui-icon { background-image: url(/images/jquery-ui/ui-icons_ef8c08_256x240.png); } -.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(/images/jquery-ui/ui-icons_ef8c08_256x240.png); } -.ui-state-active .ui-icon {background-image: url(/images/jquery-ui/ui-icons_ef8c08_256x240.png); } -.ui-state-highlight .ui-icon {background-image: url(/images/jquery-ui/ui-icons_228ef1_256x240.png); } -.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(/images/jquery-ui/ui-icons_ffd27a_256x240.png); } +.ui-icon { width: 16px; height: 16px; background-image: url(images/jquery-ui/ui-icons_222222_256x240.png); } +.ui-widget-content .ui-icon {background-image: url(images/jquery-ui/ui-icons_222222_256x240.png); } +.ui-widget-header .ui-icon {background-image: url(images/jquery-ui/ui-icons_ffffff_256x240.png); } +.ui-state-default .ui-icon { background-image: url(images/jquery-ui/ui-icons_ef8c08_256x240.png); } +.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/jquery-ui/ui-icons_ef8c08_256x240.png); } +.ui-state-active .ui-icon {background-image: url(images/jquery-ui/ui-icons_ef8c08_256x240.png); } +.ui-state-highlight .ui-icon {background-image: url(images/jquery-ui/ui-icons_228ef1_256x240.png); } +.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/jquery-ui/ui-icons_ffd27a_256x240.png); } /* positioning */ .ui-icon-carat-1-n { background-position: 0 0; } @@ -286,8 +286,8 @@ .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } /* Overlays */ -.ui-widget-overlay { background: #666666 url(/images/jquery-ui/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; opacity: .50;filter:Alpha(Opacity=50); } -.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(/images/jquery-ui/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }/* +.ui-widget-overlay { background: #666666 url(images/jquery-ui/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; opacity: .50;filter:Alpha(Opacity=50); } +.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(images/jquery-ui/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }/* * jQuery UI Resizable 1.8.16 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) @@ -565,4 +565,4 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad * http://docs.jquery.com/UI/Progressbar#theming */ .ui-progressbar { height:2em; text-align: left; } -.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } \ No newline at end of file +.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } diff --git a/htdocs/assets/css/modules/buttons-new.css b/htdocs/assets/css/modules/buttons-new.css index 9a3c25a..5445089 100644 --- a/htdocs/assets/css/modules/buttons-new.css +++ b/htdocs/assets/css/modules/buttons-new.css @@ -3,7 +3,7 @@ .button-medium, .button-large, .button-fave{ - background: url("/images/sprites/buttons-master.png") repeat-x scroll 0px -121px transparent; + background: url("images/sprites/buttons-master.png") repeat-x scroll 0px -121px transparent; background-color: #1b9dbc; position: relative; font-size: 12px; @@ -224,7 +224,7 @@ span.button-large-cart, a.button-large-cart{ padding: 0; } .button-large-cart span{ - background: url("/images/sprites/buttons-master.png") no-repeat scroll 10px -233px transparent; + background: url("images/sprites/buttons-master.png") no-repeat scroll 10px -233px transparent; } .button-large-cart input, a.button-large-cart span{ padding: 0 14px 0 53px; @@ -260,7 +260,7 @@ span.button-large-cart, a.button-large-cart{ box-shadow: 0 1px 0 #f4f4f4; } .button-fave span { - background: url("/images/sprites/buttons-master.png") no-repeat scroll 4px -438px transparent; + background: url("images/sprites/buttons-master.png") no-repeat scroll 4px -438px transparent; padding: 0 9px 0 29px; display: inline-block; height: 23px; @@ -269,7 +269,7 @@ span.button-large-cart, a.button-large-cart{ } /* german language override */ .de .button-fave span { - background: url("/images/sprites/buttons-master.png") no-repeat scroll 3px -438px transparent; + background: url("images/sprites/buttons-master.png") no-repeat scroll 3px -438px transparent; padding-right: 8px; white-space: nowrap; } @@ -290,23 +290,23 @@ span.button-large-cart, a.button-large-cart{ } .favorited-button span{ - background: url("/images/sprites/buttons-master.png") no-repeat scroll 4px -466px transparent; + background: url("images/sprites/buttons-master.png") no-repeat scroll 4px -466px transparent; } /* german language override */ .de .favorited-button span{ - background: url("/images/sprites/buttons-master.png") no-repeat scroll 3px -466px transparent; + background: url("images/sprites/buttons-master.png") no-repeat scroll 3px -466px transparent; } /*spinner*/ .favoriting, .favoriting:hover, .favoriting:active { - background: url("/images/sprites/buttons-master.png") repeat-x scroll 4px -354px #fbfaf8; + background: url("images/sprites/buttons-master.png") repeat-x scroll 4px -354px #fbfaf8; } .favoriting span, .favoriting:hover span, .favoriting:active span { - background: url("/images/sprites/buttons-master.png") repeat-x scroll 4px -354px #fbfaf8; + background: url("images/sprites/buttons-master.png") repeat-x scroll 4px -354px #fbfaf8; } .favoriting div.button-spinner { @@ -319,7 +319,7 @@ span.button-large-cart, a.button-large-cart{ } .favoriting div.show { - background: transparent url("/images/spinners/spinner16-trans.gif") no-repeat 0 0px; + background: transparent url("images/spinners/spinner16-trans.gif") no-repeat 0 0px; } @@ -328,7 +328,7 @@ span.button-large-cart, a.button-large-cart{ /*facebook*/ .button-fb span, .button-tw span{ - background: url("/images/sprites/connected-accounts-sprite.png") no-repeat scroll 0 -89px transparent; + background: url("images/sprites/connected-accounts-sprite.png") no-repeat scroll 0 -89px transparent; } .button-fb.button-medium{ @@ -376,7 +376,7 @@ span.button-large-cart, a.button-large-cart{ --------------------------------- */ .button-stack { margin-left: 4px; - background: transparent url("/images/sprites/buttons-favorite-master.png") no-repeat 0 -26px; + background: transparent url("images/sprites/buttons-favorite-master.png") no-repeat 0 -26px; height: 26px; line-height: 26px; margin-bottom: 0px; @@ -390,7 +390,7 @@ span.button-large-cart, a.button-large-cart{ position: relative; } .button-stack span { - background: transparent url("/images/sprites/buttons-favorite-master.png") no-repeat right 0px; + background: transparent url("images/sprites/buttons-favorite-master.png") no-repeat right 0px; display: inline-block; height: 26px; line-height: 26px; @@ -438,7 +438,7 @@ span.button-large-cart, a.button-large-cart{ } .button-circle { - background: transparent url("/images/sprites/buttons-favorite-master.png") no-repeat 0 -234px; + background: transparent url("images/sprites/buttons-favorite-master.png") no-repeat 0 -234px; height: 26px; line-height: 26px; margin-bottom: 0px; @@ -451,7 +451,7 @@ span.button-large-cart, a.button-large-cart{ position: relative; } .button-circle span { - background: transparent url("/images/sprites/buttons-favorite-master.png") no-repeat right 0px; + background: transparent url("images/sprites/buttons-favorite-master.png") no-repeat right 0px; display: inline-block; height: 26px; line-height: 26px; @@ -543,21 +543,21 @@ span.button-large-cart, a.button-large-cart{ } .add-to-circle-spinner{ padding-right: 24px; - background: url('/images/spinners/spinner16.gif') no-repeat right 5px transparent; + background: url('images/spinners/spinner16.gif') no-repeat right 5px transparent; float: left; display: none; height: 26px; } .add-to-circle-spinner.tan{ - background: url('/images/spinners/spinner16-tan.gif') no-repeat right 5px transparent; + background: url('images/spinners/spinner16-tan.gif') no-repeat right 5px transparent; } .add-to-circle-spinner.blue{ - background: url('/images/spinners/spinner16-blue.gif') no-repeat right 5px transparent; + background: url('images/spinners/spinner16-blue.gif') no-repeat right 5px transparent; } .add-to-circle-spinner.blue-darker{ - background: url('/images/spinners/spinner16-blue-darker.gif') no-repeat right 5px transparent; + background: url('images/spinners/spinner16-blue-darker.gif') no-repeat right 5px transparent; } /* The new add to circle button can be mirrored as well */ @@ -584,7 +584,7 @@ span.button-large-cart, a.button-large-cart{ } .tt-add-circle.tt.tt-mini .dismiss{ position: absolute; right: 0; top: 1px; - background: transparent url('/images/sprites/buttons-master.png') no-repeat -64px -1326px; + background: transparent url('images/sprites/buttons-master.png') no-repeat -64px -1326px; display: block; width: 16px; height: 16px; @@ -605,7 +605,7 @@ span.button-large-cart, a.button-large-cart{ input.button-remove, button.button-remove, .button-remove.button-remove-quiet:hover { - background: transparent url("/images/sprites/buttons-master.png") no-repeat 0 -1326px; + background: transparent url("images/sprites/buttons-master.png") no-repeat 0 -1326px; display: block; width: 16px; height: 16px; @@ -613,7 +613,7 @@ button.button-remove, * html .button-remove, * html input.button-remove, * html button.button-remove { - background: transparent url("/images/sprites/buttons-master.png") no-repeat 0 -1326px; + background: transparent url("images/sprites/buttons-master.png") no-repeat 0 -1326px; } .button-remove span { @@ -652,7 +652,7 @@ button.button-remove, .button-edit, input.button-edit, button.button-edit { - background: url("/images/sprites/buttons-master.png") no-repeat scroll 0 -1358px transparent; + background: url("images/sprites/buttons-master.png") no-repeat scroll 0 -1358px transparent; height: 16px; width: 16px; } @@ -688,28 +688,28 @@ button.button-edit { /* Add Button ----------------------------------*/ .button-add { - background: transparent url("/images/sprites/buttons-master.png") no-repeat 0 -1244px; + background: transparent url("images/sprites/buttons-master.png") no-repeat 0 -1244px; display: block; width: 28px; height: 28px; text-indent:-999em; } * html .button-add { - background: transparent url("/images/sprites/buttons-master.png") no-repeat 0 -1244px; + background: transparent url("images/sprites/buttons-master.png") no-repeat 0 -1244px; } /* Favorite Button --------------------------------- */ .button-favorite, .button-favorite.button-favorite-quiet:hover { - background: transparent url("/images/sprites/buttons-master.png") no-repeat 0 -1342px; + background: transparent url("images/sprites/buttons-master.png") no-repeat 0 -1342px; display: block; margin-top:-1px; width: 16px; height: 16px; } * html .button-favorite { - background: transparent url("/images/sprites/buttons-master.png") no-repeat 0 -1342px; + background: transparent url("images/sprites/buttons-master.png") no-repeat 0 -1342px; } .button-favorite.button-favorite-quiet { @@ -777,13 +777,13 @@ ul.listings-listview a.button-favorite { --------------------------------- */ .button-contact, .button-contact.button-contact-quiet:hover { - background: transparent url("/images/sprites/buttons-master.png") no-repeat 0 -1422px; + background: transparent url("images/sprites/buttons-master.png") no-repeat 0 -1422px; display: block; width: 16px; height: 16px; } * html .button-contact { - background: transparent url("/images/sprites/buttons-master.png") no-repeat 0 -1422px; + background: transparent url("images/sprites/buttons-master.png") no-repeat 0 -1422px; } .button-contact.button-contact-quiet { @@ -805,7 +805,7 @@ ul.listings-listview a.button-favorite { .js-checkbox { width: 14px; height: 15px; - background-image: url('/images/sprites/buttons-master.png'); + background-image: url('images/sprites/buttons-master.png'); background-position: 0 -1194px; display: inline-block; } diff --git a/htdocs/assets/css/shop-metrics.css b/htdocs/assets/css/shop-metrics.css index 48f0b9c..b68b0da 100644 --- a/htdocs/assets/css/shop-metrics.css +++ b/htdocs/assets/css/shop-metrics.css @@ -241,7 +241,7 @@ div.event-info { float: right; width: 14px; height: 14px; - background: url('/images/edit-icon.gif') no-repeat; + background: url('images/edit-icon.gif') no-repeat; opacity: .25; } diff --git a/htdocs/assets/css/style.less b/htdocs/assets/css/style.less index d3d31f0..3ea1c08 100644 --- a/htdocs/assets/css/style.less +++ b/htdocs/assets/css/style.less @@ -1,5 +1,5 @@ -@import "/assets/css/definitions.less"; -@import "/assets/css/vendor/fluid.gs.css"; +@import "assets/css/definitions.less"; +@import "assets/css/vendor/fluid.gs.css"; html { background-color: #333; diff --git a/htdocs/assets/css/websymbols.css b/htdocs/assets/css/websymbols.css index cbc3bf2..f780003 100644 --- a/htdocs/assets/css/websymbols.css +++ b/htdocs/assets/css/websymbols.css @@ -1,16 +1,16 @@ @font-face{ font-family: 'WebSymbolsRegular'; - src: url('/assets/fonts/websymbols-regular-webfont.eot'); - src: url('/assets/fonts/websymbols-regular-webfont.eot?#iefix') format('embedded-opentype'), - url('/assets/fonts/websymbols-regular-webfont.woff') format('woff'), - url('/assets/fonts/websymbols-regular-webfont.ttf') format('truetype'), - url('/assets/fonts/websymbols-regular-webfont.svg#WebSymbolsRegular') format('svg'); + src: url('assets/fonts/websymbols-regular-webfont.eot'); + src: url('assets/fonts/websymbols-regular-webfont.eot?#iefix') format('embedded-opentype'), + url('assets/fonts/websymbols-regular-webfont.woff') format('woff'), + url('assets/fonts/websymbols-regular-webfont.ttf') format('truetype'), + url('assets/fonts/websymbols-regular-webfont.svg#WebSymbolsRegular') format('svg'); } @font-face{ font-family: 'IconicStroke'; - src: url('/assets/fonts/iconic_stroke.eot'); - src: url('/assets/fonts/iconic_stroke.eot?#iefix') format('embedded-opentype'), - url('/assets/fonts/iconic_stroke.svg#iconic') format('svg'); + src: url('assets/fonts/iconic_stroke.eot'); + src: url('assets/fonts/iconic_stroke.eot?#iefix') format('embedded-opentype'), + url('assets/fonts/iconic_stroke.svg#iconic') format('svg'); } diff --git a/htdocs/assets/js/zeroclipboard-0.7/ZeroClipboard.js b/htdocs/assets/js/zeroclipboard-0.7/ZeroClipboard.js index fe775da..65284b3 100755 --- a/htdocs/assets/js/zeroclipboard-0.7/ZeroClipboard.js +++ b/htdocs/assets/js/zeroclipboard-0.7/ZeroClipboard.js @@ -5,7 +5,7 @@ var ZeroClipboard = { version: "1.0.7", clients: {}, // registered upload clients on page, indexed by id - moviePath: '/assets/js/zeroclipboard-0.7/ZeroClipboard.swf', // URL to movie + moviePath: 'assets/js/zeroclipboard-0.7/ZeroClipboard.swf', // URL to movie nextId: 1, // ID of next movie $: function(thingy) { diff --git a/htdocs/example_hadoop/overview.php b/htdocs/example_hadoop/overview.php index f30dd1e..2c17bab 100644 --- a/htdocs/example_hadoop/overview.php +++ b/htdocs/example_hadoop/overview.php @@ -6,7 +6,7 @@ require_once '../phplib/Dashboard.php'; $page_js_imports = array( - '/assets/js/jquery-ui-1.8.16.min.js' + 'assets/js/jquery-ui-1.8.16.min.js' ); // The important Ganglia graphs diff --git a/htdocs/example_pgbouncer.php b/htdocs/example_pgbouncer.php index 2ddfef8..2e31956 100644 --- a/htdocs/example_pgbouncer.php +++ b/htdocs/example_pgbouncer.php @@ -19,7 +19,7 @@
-
-{$cluster["name"]} pgBouncer pool status (" . Dashboard::displayTime($time) . ")"; diff --git a/htdocs/index.php b/htdocs/index.php index 93498fd..b348d4f 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -24,38 +24,38 @@ - $dashboard_groups) : ?> + $dashboard_groups) : ?>

- - $dashboards) : ?> + + $dashboards) : ?> - + - - - - + + + + - +
- + diff --git a/htdocs/phplib/Dashboard.php b/htdocs/phplib/Dashboard.php index b3e05e2..dec198e 100644 --- a/htdocs/phplib/Dashboard.php +++ b/htdocs/phplib/Dashboard.php @@ -57,31 +57,31 @@ class Dashboard { */ public static $DB_TABS = array( - 'PGBouncer' => '/example_pgbouncer.php', - 'PostgreSQL Queries' => '/example_postgresql_queries.php', + 'PGBouncer' => 'example_pgbouncer.php', + 'PostgreSQL Queries' => 'example_postgresql_queries.php', ); public static $DEPLOY_TABS = array( - 'FITB' => '/example_fitb.php', - 'New Relic' => '/example_newrelic.php', + 'FITB' => 'example_fitb.php', + 'New Relic' => 'example_newrelic.php', ); public static $HADOOP_TABS = array( - 'Overview' => '/example_hadoop/overview.php', - 'DFS' => '/example_hadoop/dfs.php', - 'Jobs' => '/example_hadoop/jobs.php', - 'Java Process Metrics' => '/example_hadoop/java_process.php', - 'HBase' => '/example_hadoop/hbase.php', + 'Overview' => 'example_hadoop/overview.php', + 'DFS' => 'example_hadoop/dfs.php', + 'Jobs' => 'example_hadoop/jobs.php', + 'Java Process Metrics' => 'example_hadoop/java_process.php', + 'HBase' => 'example_hadoop/hbase.php', ); public static $NETWORK_TABS = array( - 'FITB' => '/example_fitb.php', - 'Netstat' => '/example_netstat.php', - 'Mem info' => '/example_meminfo.php', + 'FITB' => 'example_fitb.php', + 'Netstat' => 'example_netstat.php', + 'Mem info' => 'example_meminfo.php', ); public static $TIME_TABS = array( - 'Time' => '/example_time.php', + 'Time' => 'example_time.php', ); /** diff --git a/htdocs/phplib/Tabs.php b/htdocs/phplib/Tabs.php index 2f13279..ee44d76 100644 --- a/htdocs/phplib/Tabs.php +++ b/htdocs/phplib/Tabs.php @@ -45,7 +45,7 @@ public static function getLinkTarget($url) { * @return string */ public static function getLinkIcon($url) { - return self::isAbsoluteLink($url) ? '' : ''; + return self::isAbsoluteLink($url) ? '' : ''; } /** @@ -60,4 +60,4 @@ public static function buildDefaultTabTitle($url) { $title = ucwords($title); return $title; } -} \ No newline at end of file +} diff --git a/htdocs/phplib/flot_funnel_tpl.php b/htdocs/phplib/flot_funnel_tpl.php index 90396f6..c81930e 100644 --- a/htdocs/phplib/flot_funnel_tpl.php +++ b/htdocs/phplib/flot_funnel_tpl.php @@ -1,4 +1,4 @@ -">
- $funnel) { + $funnel) { $steps = array(); $i++; $j = 0; @@ -43,15 +43,15 @@ var e = $(" .graph"); o.legend.container = " .legend"; - + o = $.extend(true, {}, o, ); - + e.bind("plothover", showFunnelTip); $.plot(e, , o); - +
- + diff --git a/htdocs/phplib/flot_tpl.php b/htdocs/phplib/flot_tpl.php index c17f3f5..445dea5 100644 --- a/htdocs/phplib/flot_tpl.php +++ b/htdocs/phplib/flot_tpl.php @@ -13,15 +13,15 @@ function slugify($str) { - Dashboard <?echo (!empty($page_title) ? ": $page_title" :"");?> - - - - - - - - + Dashboard <?php echo (!empty($page_title) ? ": $page_title" :"");?> + + + + + + + + - + @@ -49,7 +49,7 @@ function slugify($str) { - ">
- $graph) { + $graph) { if (empty($graph)) { print '
'; continue; @@ -89,9 +89,9 @@ function slugify($str) { $data = $g->getData(true); $slug = slugify($title) . '_' . slugify($graph['title']); ?> -
+ @@ -107,9 +107,9 @@ function slugify($str) { var e = $(" .graph"); o.legend.container = " .legend"; o = $.extend(true, {}, o, ); - + o.trendline.show = true; - + e.bind("plothover", showTip); var data = ; if (typeof(dataCallback) === 'function'){ @@ -117,15 +117,15 @@ function slugify($str) { } $.plot(e, data, o); - +
- + - diff --git a/htdocs/phplib/template.php b/htdocs/phplib/template.php index 0506595..f050ca9 100644 --- a/htdocs/phplib/template.php +++ b/htdocs/phplib/template.php @@ -5,30 +5,37 @@ <?= $title ?> - + - - - + + + - - + + - - + + - +<<<<<<< HEAD + + + + +======= + - + +>>>>>>> p/makeerehomeable - - + + - - - + + - +
diff --git a/htdocs/phplib/template_content.php b/htdocs/phplib/template_content.php index 1fd6cd2..5117de3 100644 --- a/htdocs/phplib/template_content.php +++ b/htdocs/phplib/template_content.php @@ -24,8 +24,8 @@
- - + + diff --git a/htdocs/phplib/template_controls.php b/htdocs/phplib/template_controls.php index 2a899c7..248ad2c 100644 --- a/htdocs/phplib/template_controls.php +++ b/htdocs/phplib/template_controls.php @@ -10,7 +10,7 @@
-
- +
- - - - - + + + + +
diff --git a/htdocs/phplib/template_init.inc.php b/htdocs/phplib/template_init.inc.php index fc6b36c..6b23109 100644 --- a/htdocs/phplib/template_init.inc.php +++ b/htdocs/phplib/template_init.inc.php @@ -19,10 +19,10 @@ $page_js_imports = array_merge( isset($page_js_imports) ? $page_js_imports : array(), array( - "/assets/js/flot/jquery.flot.js", - "/assets/js/flot/jquery.flot.pie.js", - "/assets/js/flot.js", - "/assets/js/graphite_percentage.js", + "assets/js/flot/jquery.flot.js", + "assets/js/flot/jquery.flot.pie.js", + "assets/js/flot.js", + "assets/js/graphite_percentage.js", )); } @@ -30,9 +30,9 @@ $page_js_imports = array_merge( isset($page_js_imports) ? $page_js_imports : array(), array( - "/assets/js/d3-2.9.1.min.js", - "/assets/js/graphite_percentage.js", - "/assets/js/graphite_bar_percentage.js", + "assets/js/d3-2.9.1.min.js", + "assets/js/graphite_percentage.js", + "assets/js/graphite_bar_percentage.js", )); } @@ -52,13 +52,13 @@ $page_js_imports = array_merge( isset($page_js_imports) ? $page_js_imports : array(), array( - "/assets/js/zeroclipboard-0.7/ZeroClipboard.js", - "/assets/js/copyurl.js", + "assets/js/zeroclipboard-0.7/ZeroClipboard.js", + "assets/js/copyurl.js", )); $page_css_imports = array_merge( isset($page_css_imports) ? $page_css_imports : array(), array( - "/assets/css/copyurl.css", + "assets/css/copyurl.css", )); } } diff --git a/htdocs/phplib/template_tabs.php b/htdocs/phplib/template_tabs.php index 0e337b5..8ff609e 100644 --- a/htdocs/phplib/template_tabs.php +++ b/htdocs/phplib/template_tabs.php @@ -1,9 +1,9 @@ - -
+ +
- +