Commit c2515a42 authored by Sven Franck's avatar Sven Franck

first prototype ready

parent 9e5c3495
/*! normalize.css v2.1.0 | MIT License | git.io/normalize */
article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:focus{outline:0/*thindotted*/}a:hover,a:active{outline:0}h1{font-size:2em;margin:.67em 0}abbr[title]{/*border-bottom:1px dotted*/border:0 none;}b,strong{font-weight:bold}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:75%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,htmlinput[type="button"],input[type="reset"],input[type="submit"]{/*cursor:pointer;*/-webkit-appearance:button}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}iinput[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}/*table{border-collapse:collapse;border-spacing:0}*/
/* splash */
.ui-mobile-rendering > * { visibility:visible!important; /* no need */}
/*
.splash:before { width: 100%; position: absolute; top: 0; bottom: 0; left: 0; right: 0; display: block; height: 115%; z-index: 999999; background-color: white; content: "offline version initializing..."; text-align: center; color: #bbb; text-shadow: none; line-height: 150px; vertical-align: bottom; }
*/
/* webfonts
* { font-family: "Open Sans",Arial; font-size: 14.5px; } */
h1,h2,h3,h4, .ui-btn-inner{ font-weight: 400; }
/* custom layouting */
.ui-title {
color: white;
font-weight: bold;
text-shadow: 0 1px 1px #a2a2a2;
font-size: 1.5em !important;
margin: 0.2em 30% !important;
}
.supersize {
font-size: 1.4em !important;
color: #636363;
font-weight: bold;
text-align: center;
}
.super {
font-size: 1.2em !important;
color: #636363;
font-weight: bold;
text-align: center;
}
.regular {
font-size: 1em !important;
color: #636363;
font-weight: bold;
text-align: center;
}
.small {
font-size: .8em !important;
color: #636363;
font-weight: normal;
text-align: left;
}
.mini {
font-size: 0.6em !important;
color: #636363;
font-weight: italic;
text-align: center;
}
/* overwrite icon background */
/* .ui-btn-up-f .ui-icon, .ui-btn-hover-f .ui-icon, .ui-btn-active-f .ui-icon { background-color: #60BFB8; } */
/* overwrite fixed header padding/top, which seems to cause 1px shift */
.ui-header-fixed.ui-fixed-hidden { padding-top: 1px; top: -1px; }
/* center the table, override JQM CSS */
table { margin: 0 auto; }
table.table-inline { width: auto !important; display: table !important; }
.ui-table thead th { padding-bottom: .25em; }
/* remove dotted abbr border */
abbr[title]{border: 0 none !important;}
/* follow us */
.float_left {float:left; padding: 0.5em 1em; margin: 0; }
/* ui-popup */
.ui-popup .ui-header {margin: -15px -15px 15px; }
.ui-popup .ui-header {
-webkit-border-bottom-right-radius: 0 !important;
border-bottom-right-radius: 0 !important;
-webkit-border-bottom-left-radius: 0 !important;
border-bottom-left-radius: 0 !important;
}
/* increase padding for iconpos-notext buttons */
/* BUTTONS - optional - Increase padding for icon-only buttons - just too difficult to click them */
.ui-btn-icon-notext:not(.no-pad) { height: 30px; width: 30px; }
.ui-btn.ui-input-clear { margin: -16px 4px 0 0; }
.ui-btn-icon-notext:not(.no-pad) .ui-btn-inner { padding: 0.25em 3px; }
.ui-fullscreen-mode .ui-btn-icon-notext:not(.no-pad) .ui-btn-inner { padding: 2px 3px !important; /* 4px 5px */ }
.ui-controlgroup-horizontal .ui-btn, .ui-controlgroup-horizontal .ui-select { vertical-align: middle; }
/* ad */
.ad_wrapper {text-align: center;}
.ad_self {height: 80px;}
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
/*! normalize.css v2.1.0 | MIT License | git.io/normalize */ /*! normalize.css v2.1.0 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:focus{outline:0}a:hover,a:active{outline:0}h1{font-size:2em;margin:.67em 0}abbr[title]{border:0 none}b,strong{font-weight:bold}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:75%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,htmlinput[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}iinput[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}.ui-mobile-rendering>*{visibility:visible!important}h1,h2,h3,h4,.ui-btn-inner{font-weight:400}.ui-title{color:white;font-weight:bold;text-shadow:0 1px 1px #a2a2a2;font-size:1.5em!important;margin:.2em 30%!important}.supersize{font-size:1.4em!important;color:#636363;font-weight:bold;text-align:center}.super{font-size:1.2em!important;color:#636363;font-weight:bold;text-align:center}.regular{font-size:1em!important;color:#636363;font-weight:bold;text-align:center}.small{font-size:.8em!important;color:#636363;font-weight:normal;text-align:left}.mini{font-size:.6em!important;color:#636363;font-weight:italic;text-align:center}.ui-header-fixed.ui-fixed-hidden{padding-top:1px;top:-1px}table{margin:0 auto}table.table-inline{width:auto!important;display:table!important}.ui-table thead th{padding-bottom:.25em}abbr[title]{border:0 none!important}.float_left{float:left;padding:.5em 1em;margin:0}.ui-popup .ui-header{margin:-15px -15px 15px}.ui-popup .ui-header{-webkit-border-bottom-right-radius:0!important;border-bottom-right-radius:0!important;-webkit-border-bottom-left-radius:0!important;border-bottom-left-radius:0!important}.ui-btn-icon-notext:not(.no-pad){height:30px;width:30px}.ui-btn.ui-input-clear{margin:-16px 4px 0 0}.ui-btn-icon-notext:not(.no-pad) .ui-btn-inner{padding:.25em 3px}.ui-fullscreen-mode .ui-btn-icon-notext:not(.no-pad) .ui-btn-inner{padding:2px 3px!important}.ui-controlgroup-horizontal .ui-btn,.ui-controlgroup-horizontal .ui-select{vertical-align:middle}.ad_wrapper{text-align:center}.ad_self{height:80px}
article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:focus{outline:0/*thindotted*/}a:hover,a:active{outline:0}h1{font-size:2em;margin:.67em 0}abbr[title]{/*border-bottom:1px dotted*/border:0 none;}b,strong{font-weight:bold}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:75%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}button,input{line-height:normal}button,select{text-transform:none}button,htmlinput[type="button"],input[type="reset"],input[type="submit"]{/*cursor:pointer;*/-webkit-appearance:button}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}iinput[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}/*table{border-collapse:collapse;border-spacing:0}*/ \ No newline at end of file
/* splash */
.ui-mobile-rendering > * { visibility:visible!important; /* no need */}
/*
.splash:before { width: 100%; position: absolute; top: 0; bottom: 0; left: 0; right: 0; display: block; height: 115%; z-index: 999999; background-color: white; content: "offline version initializing..."; text-align: center; color: #bbb; text-shadow: none; line-height: 150px; vertical-align: bottom; }
*/
/* webfonts
* { font-family: "Open Sans",Arial; font-size: 14.5px; } */
h1,h2,h3,h4, .ui-btn-inner{ font-weight: 400; }
/* custom layouting */
.ui-title {
color: white;
font-weight: bold;
text-shadow: 0 1px 1px #a2a2a2;
font-size: 1.5em !important;
margin: 0.2em 30% !important;
}
.supersize {
font-size: 1.4em !important;
color: #636363;
font-weight: bold;
text-align: center;
}
.super {
font-size: 1.2em !important;
color: #636363;
font-weight: bold;
text-align: center;
}
.regular {
font-size: 1em !important;
color: #636363;
font-weight: bold;
text-align: center;
}
.small {
font-size: .8em !important;
color: #636363;
font-weight: normal;
text-align: left;
}
.mini {
font-size: 0.6em !important;
color: #636363;
font-weight: italic;
text-align: center;
}
/* overwrite icon background */
/* .ui-btn-up-f .ui-icon, .ui-btn-hover-f .ui-icon, .ui-btn-active-f .ui-icon { background-color: #60BFB8; } */
/* overwrite fixed header padding/top, which seems to cause 1px shift */
.ui-header-fixed.ui-fixed-hidden { padding-top: 1px; top: -1px; }
/* center the table, override JQM CSS */
table { margin: 0 auto; }
table.table-inline { width: auto !important; display: table !important; }
.ui-table thead th { padding-bottom: .25em; }
/* remove dotted abbr border */
abbr[title]{border: 0 none !important;}
/* follow us */
.float_left {float:left; padding: 0.5em 1em; margin: 0; }
/* ui-popup */
.ui-popup .ui-header {margin: -15px -15px 15px; }
.ui-popup .ui-header {
-webkit-border-bottom-right-radius: 0 !important;
border-bottom-right-radius: 0 !important;
-webkit-border-bottom-left-radius: 0 !important;
border-bottom-left-radius: 0 !important;
}
/* increase padding for iconpos-notext buttons */
/* BUTTONS - optional - Increase padding for icon-only buttons - just too difficult to click them */
.ui-btn-icon-notext:not(.no-pad) { height: 30px; width: 30px; }
.ui-btn.ui-input-clear { margin: -16px 4px 0 0; }
.ui-btn-icon-notext:not(.no-pad) .ui-btn-inner { padding: 0.25em 3px; }
.ui-fullscreen-mode .ui-btn-icon-notext:not(.no-pad) .ui-btn-inner { padding: 2px 3px !important; /* 4px 5px */ }
.ui-controlgroup-horizontal .ui-btn, .ui-controlgroup-horizontal .ui-select { vertical-align: middle; }
/* ad */
.ad_wrapper {text-align: center;}
.ad_self {height: 80px;}
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
<!DOCTYPE html> <!DOCTYPE html>
<head> <head>
<style type="text/css" scoped> <style type="text/css" scoped>
#legal_info .legal_element_wrapper { margin: 4em auto; text-align: center;} #about_info .about_element_wrapper { margin: 4em auto; text-align: center;}
#legal_info .ui-block-a, #legal_info .ui-block-b { padding: 0 .5em;} #about_info .ui-block-a, #about_info .ui-block-b { padding: 0 .5em;}
@media all and (min-width: 30em) { @media all and (min-width: 30em) {
#legal_info .legal_element_wrapper {max-width: 90%;} #about_info .about_element_wrapper {max-width: 90%;}
} }
@media all and (min-width: 45em) { @media all and (min-width: 45em) {
#legal_info .legal_element_wrapper {max-width: 80%;} #about_info .about_element_wrapper {max-width: 80%;}
} }
@media all and (min-width: 60em) { @media all and (min-width: 60em) {
#legal_info .legal_element_wrapper {max-width: 70%;} #about_info .about_element_wrapper {max-width: 70%;}
} }
</style> </style>
</head> </head>
<body> <body>
<div data-role="fieldcontain" class="legal_element_wrapper"> <div data-role="fieldcontain" class="about_element_wrapper">
<div class="ui-grid-a ui-responsive"> <div class="ui-grid-solo ui-responsive">
<div class="ui-block-a"> <div class="ui-block-a">
<div class="ui-body ui-body-d ui-corner-all ui-shadow"> <div class="ui-body ui-body-d ui-corner-all ui-shadow">
<p> <p>
<span class="t regular" data-i18n="legal.site_manager">Site is run and managed by</span>: <span class="t regular" data-i18n="about.q1">Looking for cloud services?</span><br /><br />
<span class="t regular" data-i18n="about.q2">Want to compare different providers and system configurations?</span><br /><br />
<span class="t regular" data-i18n="about.q3">Want to benchmark provider performance and reliability?</span><br /><br />
<span class="t super" data-i18n="about.place">Cloud-Quote is the right place for you!</span>
</p> </p>
<p> <p>
<span class="super"><b>Nexedi SA</b></span><br /><br /> <span class="t" data-i18n="about.how">At Cloud-Quote we maintain a network of machines with several cloud infrastructure providers. Every machine is continuously monitored and performance benchmarked.
<span class="regular">270 bd Clémenceau</span><br /> Use our performance and price comparison engine to pick the machine configuration you prefer and compare across our infrastructure.</span>
<span class="regular">59700 Marcq-en-Baroeul</span><br />
<span class="regular">FRANCE</span>
</p> </p>
<p> <p>
<span class="regular t" data-i18n="legal.contact">Contact</span>:<br /> <span class="t" data-i18n="about.know_more">Want to know more? Get in touch or follow us!</span>
<span class="regular"><a href="http://www.nexedi.com">Nexedi</a></span><br /> </p>
</p> <a href="contact.html" data-inline="true" data-role="button" class="t" data-theme="b" data-i18n="about.contact" data-i18n-target=".ui-btn-text" data-icon="mail">Contact Us!</a>
<p>
<span class="regular t" data-i18n="legal.registered">Registered</span>:<br />
<span class="regular">RCS: 440 047 504 RCD Roubaix Tourcoing</span><br /><br />
<span class="regular t" data-i18n="legal.ceo">General Manager</span>:<br />
<span class="regular">Jean-Paul Smets</span>
</p>
<a href="contact.html" data-inline="true" data-role="button" class="t" data-theme="b" data-i18n="legal.contact" data-i18n-target=".ui-btn-text" data-icon="mail">Contact Us!</a>
</div> </div>
</div> </div>
<div class="ui-block-b">
<!--<div class="ui-body ui-body-d ui-corner-all ui-shadow" style="padding:1em;">
<div id="map_canvas_1"></div>
<p class="mapControls">
<label for="from">From</label>
<input id="from" class="ui-bar-c" type="text" value="click 'Get Directions' to localize" class="lookLikeLabel" />
</p>
<p class="mapControls">
<label for="to">To</label>
<input id="to" class="ui-bar-c" type="text" value="" />
</p>
<a id="submit" href="#" data-role="button" data-icon="search">Get directions</a>
</div>
<div id="results" class="ui-listview ui-listview-inset ui-corner-all ui-shadow" style="display:none;">
<div class="ui-li ui-li-divider ui-btn ui-bar-a ui-corner-top ui-btn-up-undefined">Results</div>
<div id="directions"></div>
<div class="ui-li ui-li-divider ui-btn ui-bar-a ui-corner-bottom ui-btn-up-undefined"></div>
</div>
</div>
</div>-->
</div> </div>
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">
//<![CDATA[ //<![CDATA[
(function () { (function () {
// define(['async!http://maps.google.com/maps/api/js?v=3&sensor=false'],
// function () {
// // google.maps is ready
// var home = new google.maps.LatLng(50.660408,3.098558);
//
// $(document)
// .on('pageshow', '#legal', function () {
// console.log("show...");
// $('#map_canvas_1').gmap('refresh');
// })
// .on('pagebeforeshow', '#map_canvas_1', function () {
// console.log("pagebeforeshow, canvas");
// $('#map_canvas_1').gmap({'center': home, 'zoom':17 })
// .end()
// .gmap('addMarker', { 'position': home, 'animation' : google.maps.Animation.DROP })
// .end()
// .gmap('search', { 'location': home }, function (results) {
// $('#to').val(results[0].formatted_address);
// });
// })
// .on('click', '#submit', function () {
// var latlng, cM;
//
// $('#map_canvas_1').gmap('getCurrentPosition', function(position, status) {
// if (status === 'OK') {
// $.mobile.showPageLoadingMsg();
// latlng = new google.maps.LatLng(position.coords.latitude, position.coords.longitude)
// $('#map_canvas_1').gmap('get', 'map').panTo(latlng)
// .end()
// .gmap('search', { 'location': latlng }, function(results, status) {
// if (status === 'OK') {
// $('#from').val(results[0].formatted_address);
// $('#map_canvas_1').gmap(
// 'displayDirections',
// {'origin': $('#from').val(), 'destination': $('#to').val(), 'travelMode': google.maps.DirectionsTravelMode.DRIVING },
// {'panel': document.getElementById('directions')},
// function(response, status) {
// $('#results').show();
// $.mobile.hidePageLoadingMsg();
// });
// }
// });
// } else {
// $('#results').hide();
// cM = 'unable to localize - please try entering a location manually';
//
// $("<div id='notification' class='ui-loader ui-overlay-shadow ui-body-e ui-corner-all'><h1>"+cM+"</h1></div>")
// .css({ "display": "block", "opacity": 0.96, "top": $(window).scrollTop() + 200})
// .appendTo( $.mobile.pageContainer )
// .delay( 400 )
// .fadeOut( 800, function(){
// $(this).remove();
// });
// }
// });
// }); // end click
// });
$(document).ready(function() { $(document).ready(function() {
var gadget = RenderJs.getSelfGadget(); var gadget = RenderJs.getSelfGadget();
$(this).trigger("render_enhance", {gadget: gadget.dom}); $(this).trigger("render_enhance", {gadget: gadget.dom});
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<head> <head>
</head> </head>
<body> <body>
<div id="about_info" data-gadget="../gadgets/about.html"></div>
<div id="about_social" data-gadget="../gadgets/social.html"></div> <div id="about_social" data-gadget="../gadgets/social.html"></div>
<div id="about_nav" data-gadget="../gadgets/navigation.html"></div> <div id="about_nav" data-gadget="../gadgets/navigation.html"></div>
<!-- interactions --> <!-- interactions -->
......
...@@ -23,22 +23,26 @@ ...@@ -23,22 +23,26 @@
/* graph */ /* graph */
#results_list #graph_container_cell { min-height:360px; padding: .25em; max-width: 80%; margin: 2em auto;} #results_list #graph_container_cell { min-height:360px; padding: .25em; max-width: 80%; margin: 2em auto;}
#results_list .jqplot-table-legend td {padding: 0 .2em;}
#results_list .jqplot-table-legend {margin: 0;}
/* popups */ /* popups */
.ui-collapsible-popup {padding: 0;} .ui-collapsible-popup {padding: 0;}
.ui-collapsible-popup .ui-collapsible-set-horizontal .ui-collapsible-content {margin-top: -15px; border:0 none; padding: 0;} .ui-collapsible-popup .ui-collapsible-set-horizontal .ui-collapsible-content {margin-top: -15px; border:0 none; padding: 0;}
.ui-collapsible-set-horizontal .ui-collapsible-heading {margin: -1px 0;} .ui-collapsible-set-horizontal .ui-collapsible-heading {margin: -1px 0;}
.provider_popup { width: 25em;}
.custom_grid_a, .custom_grid_b {overflow:hidden; width: 100%; float: none;} .custom_grid_a, .custom_grid_b {overflow:hidden; width: 100%; float: none;}
.custom_grid ul { padding: .5em; width: auto;} .custom_grid ul { padding: .5em; width: auto;}
.jqplot-title {top:-1.5em !important; font-size: .8em !important;}
@media all and (min-width: 30em) { @media all and (min-width: 30em) {
.provider_popup { width: 25em;}
} }
@media all and (max-width: 30em) { @media all and (max-width: 30em) {
.provider_popup { width: 25em;}
} }
@media all and (min-width: 45em) { @media all and (min-width: 45em) {
.provider_popup { width: 35em;} .provider_popup { width: 35em;}
.jqplot-title {top:-1em !important; font-size: 1em !important;}
.custom_grid .custom_grid_a, .custom_grid .custom_grid_b { width: 49.95%; } .custom_grid .custom_grid_a, .custom_grid .custom_grid_b { width: 49.95%; }
.custom_grid > :nth-child(n) { width: 50%; margin-right: -.5px; } .custom_grid > :nth-child(n) { width: 50%; margin-right: -.5px; }
.custom_grid .custom_grid_a { clear: left; } .custom_grid .custom_grid_a { clear: left; }
...@@ -133,11 +137,11 @@ ...@@ -133,11 +137,11 @@
<tr> <tr>
<th data-priority="persist"><abbr class="t" data-i18n="[title]gen.provider_info;gen.provider;" title=""></abbr></th> <th data-priority="persist"><abbr class="t" data-i18n="[title]gen.provider_info;gen.provider;" title=""></abbr></th>
<th data-priority="5"><abbr class="t" data-i18n="[title]gen.name;gen.name" title=""></abbr></th> <th data-priority="5"><abbr class="t" data-i18n="[title]gen.name;gen.name" title=""></abbr></th>
<th data-priority="3"><abbr class="t" data-i18n="[title]gen.availability_info;gen.availability" title=""></abbr></th> <th data-priority="4"><abbr class="t" data-i18n="[title]gen.availability_info;gen.availability" title=""></abbr></th>
<th data-priority="4"><abbr class="t" data-i18n="[title]results.pystone;results.pystone" title=""></abbr></th> <th data-priority="3"><abbr class="t" data-i18n="[title]results.pystone;results.pystone" title=""></abbr></th>
<th data-priority="4"><abbr class="t" data-i18n="[title]results.sql;results.sql" title=""></abbr></th> <th data-priority="3"><abbr class="t" data-i18n="[title]results.sql;results.sql" title=""></abbr></th>
<th data-priority="4"><abbr class="t" data-i18n="[title]gen.price_info;gen.price" title=""></abbr></th> <th data-priority="1"><abbr class="t" data-i18n="[title]gen.price_info;gen.price" title=""></abbr></th>
<th data-priority="persist"><abbr class="t" data-i18n="[title]gen.details_info;gen.details" title=""></abbr></th> <th data-priority="4"><abbr class="t" data-i18n="[title]gen.details_info;gen.details" title=""></abbr></th>
</tr> </tr>
</thead> </thead>
<tbody class="rendered_result_wrapper"> <tbody class="rendered_result_wrapper">
...@@ -560,6 +564,7 @@ ...@@ -560,6 +564,7 @@
, '../js/plugins/jqplot/plugins/jqplot.canvasTextRenderer.min.js' , '../js/plugins/jqplot/plugins/jqplot.canvasTextRenderer.min.js'
, '../js/plugins/jqplot/plugins/jqplot.logAxisRenderer.min.js' , '../js/plugins/jqplot/plugins/jqplot.logAxisRenderer.min.js'
, '../js/plugins/jqplot/plugins/jqplot.pointLabels.min.js' , '../js/plugins/jqplot/plugins/jqplot.pointLabels.min.js'
, '../js/plugins/jqplot/plugins/jqplot.enhancedLegendRenderer.min.js'
], function () { ], function () {
var entry, var entry,
series_providers = [], series_providers = [],
...@@ -630,11 +635,17 @@ ...@@ -630,11 +635,17 @@
.append( $('<tr><td colspan="5"><div id="graph_container_cell"></div></td></tr>') ) .append( $('<tr><td colspan="5"><div id="graph_container_cell"></div></td></tr>') )
plotOpts = { plotOpts = {
// title: 'Performance Benchmarks', title: 'Performance (s) vs Uptime (%), Cost ($/h)',
seriesDefaults:{ seriesDefaults:{
renderer:$.jqplot.BarRenderer, renderer:$.jqplot.BarRenderer,
rendererOptions:{ /* varyBarColor : true,*/ barWidth: useBarWidth } rendererOptions:{ /* varyBarColor : true,*/ barWidth: useBarWidth }
}, },
//axesDefaults: {
// showTicks: false,
// tickOptions: {
// showMark: false
// }
//},
tickDefaults: { tickDefaults: {
syncTicks: true, syncTicks: true,
useSeriesColor: true, useSeriesColor: true,
...@@ -645,8 +656,8 @@ ...@@ -645,8 +656,8 @@
axes: { axes: {
xaxis: config_xaxis, xaxis: config_xaxis,
yaxis:{ yaxis:{
label:'Performance (s)', label:'',
renderer:$.jqplot.LogAxisRenderer, renderer:$.jqplot.LogAxisRenderer
// rendererOptions: { tickDistribution: "power" }, // rendererOptions: { tickDistribution: "power" },
// max: 1200, // max: 1200,
// renderer: $.jqplot.CategoryAxisRenderer, // renderer: $.jqplot.CategoryAxisRenderer,
...@@ -657,7 +668,7 @@ ...@@ -657,7 +668,7 @@
// autoscale: true // autoscale: true
}, },
y2axis:{ y2axis:{
label: 'Uptime (%), Cost ($/h)', label: ''
// renderer: $.jqplot.CategoryAxisRenderer, // renderer: $.jqplot.CategoryAxisRenderer,
//btickSpacing: 50, //btickSpacing: 50,
// min: 0, // min: 0,
...@@ -668,10 +679,14 @@ ...@@ -668,10 +679,14 @@
} }
}, },
highlighter: { show: false }, highlighter: { show: false },
legend: { legend:{
show: true, renderer: $.jqplot.EnhancedLegendRenderer,
placement: 'outsideGrid' placement: 'outsideGrid',
// location:'s' location:'s',
show: true,
rendererOptions: {
numberRows: 1
}
} }
}; };
...@@ -711,8 +726,6 @@ ...@@ -711,8 +726,6 @@
plotOpts.legend.labels = plotLables; plotOpts.legend.labels = plotLables;
plotOpts.series = series_colors; plotOpts.series = series_colors;
console.log(plotOpts)
// now we plot - only if a series is shown // now we plot - only if a series is shown
if (plotSeries.length !== 0) { if (plotSeries.length !== 0) {
plot1 = $.jqplot('graph_container_cell', plotSeries, plotOpts); plot1 = $.jqplot('graph_container_cell', plotSeries, plotOpts);
......
...@@ -8639,7 +8639,7 @@ $.mobile.table.prototype.options.columnBtnTheme = null; ...@@ -8639,7 +8639,7 @@ $.mobile.table.prototype.options.columnBtnTheme = null;
$.mobile.table.prototype.options.columnPopupTheme = null; $.mobile.table.prototype.options.columnPopupTheme = null;
$.mobile.table.prototype.options.columnBtnText = "Columns"; $.mobile.table.prototype.options.columnBtnText = "Criteria";
$.mobile.table.prototype.options.slot = 3; $.mobile.table.prototype.options.slot = 3;
$.mobile.table.prototype.options.icon = "gear"; $.mobile.table.prototype.options.icon = "gear";
$.mobile.table.prototype.options.iconpos = "left"; $.mobile.table.prototype.options.iconpos = "left";
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -138,5 +138,14 @@ ...@@ -138,5 +138,14 @@
"highest_score": "Verfügbarkeit (bester Wert)", "highest_score": "Verfügbarkeit (bester Wert)",
"lowest_score": "Verfügbarkeit (niedrigster Wert)" "lowest_score": "Verfügbarkeit (niedrigster Wert)"
} }
},
"about": {
"contact": "Kontakt",
"q1": "Suchen Sie Cloud Anbieter?",
"q2": "Wollen Sie verschiedene Anbieter vergleichen?",
"q3": "Suchen Sie Benchmarks für Zuverlässigkeit, Performance und Kosten?",
"place":"Dann sind Sie bei Cloud-Quote an der richtigen Adresse!",
"how":"Cloud-Quote unterhält ein Netzwerk von Maschinen mit unterschiedlichen Konfigurationen bei den wichtigsten Cloud Infrastruktur-Anbietern. Die Verfügbarkeit und Peformance jeder Maschine wird dabei kontinuierlich kontrolliert. Nutzen Sie unsere Suchmaschine für Performance und Preisvergleich in der Cloud. Wählen Sie Ihre Wunsch-Systemkonfiguration und vergleichen Sie Anbieter.",
"know_more":"Sie wollen mehr erfahren? Kontaktieren Sie uns einfach!"
} }
} }
...@@ -135,5 +135,14 @@ ...@@ -135,5 +135,14 @@
"highest_score": "Availability (best result)", "highest_score": "Availability (best result)",
"lowest_score": "Availability (lowest result)" "lowest_score": "Availability (lowest result)"
} }
},
"about": {
"contact": "Contact",
"q1": "Looking for cloud services?",
"q2": "Want to compare different providers and system configurations?",
"q3": "Want to benchmark provider performance and reliability?",
"place":"Cloud-Quote is the right place for you!",
"how":"At Cloud-Quote we maintain a network of machines with several cloud infrastructure providers. Every machine is continuously monitored and performance benchmarked. Use our performance and price comparison engine to pick the machine configuration you prefer and compare across our infrastructure.",
"know_more":"Want to know more? Get in touch or follow us!"
} }
} }
...@@ -135,5 +135,14 @@ ...@@ -135,5 +135,14 @@
"highest_score": "Availability (meilleur valeur)", "highest_score": "Availability (meilleur valeur)",
"lowest_score": "Availability (le plus bas valeur)" "lowest_score": "Availability (le plus bas valeur)"
} }
},
"about": {
"contact": "Contacter",
"q1": "Vous recherchez services de cloud computing?",
"q2": "Vous voulez comparer les différents fournisseurs et les configurations système?",
"q3": "Voulez-vous la performance des prestataires de référence et de fiabilité?",
"place":"Cloud-Quote est l'endroit idéal pour vous!",
"how":"A Cloud-citation nous maintenons un réseau de machines avec plusieurs fournisseurs d'infrastructure cloud. Chaque machine est contrôlée en permanence et les performances comparées. Utilisez notre moteur de comparaison de la performance et de prix pour choisir la configuration de la machine que vous préférez et comparer l'ensemble de notre infrastructure.",
"know_more":"Vous voulez en savoir plus? Entrer en contact ou suivez-nous!"
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment