Skip to content

Commit

Permalink
code improvement
Browse files Browse the repository at this point in the history
  • Loading branch information
@vil1driver
vil1driver committed Mar 4, 2017
1 parent 782a1d6 commit 7125620
Show file tree
Hide file tree
Showing 26 changed files with 102 additions and 310 deletions.
43 changes: 42 additions & 1 deletion css/global.css
View file
Expand Up @@ -37,7 +37,6 @@
display:none;
}


body,html
{
height: 95%;
Expand All @@ -46,6 +45,7 @@ body,html
cursor: default;
}


@media screen and (min-height: 610px) {
.autoHide {
display:block;
Expand All @@ -57,6 +57,8 @@ body,html
}
}



body
{
background-color: #000;
Expand Down Expand Up @@ -281,6 +283,7 @@ img[alt] {
margin-left: -430px;
margin-top: -180px;
}

.highcharts-container {
text-shadow: none;
}
Expand Down Expand Up @@ -403,6 +406,44 @@ img[alt] {
100% { opacity: 1.0; }
}

.T35 { color: #FF0000;}
.T34 { color: #FE1400;}
.T33 { color: #FD2800;}
.T32 { color: #FD3C00;}
.T31 { color: #FC5000;}
.T30 { color: #FC6500;}
.T29 { color: #FC6F0A;}
.T28 { color: #FC7A14;}
.T27 { color: #FC841E;}
.T26 { color: #FC8F28;}
.T25 { color: #FC9A32;}
.T24 { color: #FCA43C;}
.T23 { color: #FCAF46;}
.T22 { color: #FCB950;}
.T21 { color: #FCC45A;}
.T20 { color: #FCCF65;}
.T19 { color: #FCD270;}
.T18 { color: #FDD67B;}
.T17 { color: #FDDA87;}
.T16 { color: #FEDE92;}
.T15 { color: #FFE29E;}
.T14 { color: #F8E5A1;}
.T13 { color: #F1E9A4;}
.T12 { color: #EAEDA7;}
.T11 { color: #E3F1AA;}
.T10 { color: #DDF5AE;}
.T9 { color: #D3F5B7;}
.T8 { color: #CAF5C0;}
.T7 { color: #C0F5C9;}
.T6 { color: #B7F5D2;}
.T5 { color: #AEF5DC;}
.T4 { color: #AEF1E1;}
.T3 { color: #AEEDE6;}
.T2 { color: #AEEAEB;}
.T1 { color: #AEE6F0;}
.T0 { color: #AEE3F5;}
.T00 { color: #EBF4F7;}

button.yellow{
-moz-box-shadow: 0px 1px 0px 0px #fff6af;
-webkit-box-shadow: 0px 1px 0px 0px #fff6af;
Expand Down
0 icons/meteo/day-sun.png → icons/meteo/day/Cle.png
View file
File renamed without changes
0 icons/meteo/day-cloudy.png → icons/meteo/day/Clo.png
View file
File renamed without changes
0 icons/meteo/day-fog.png → icons/meteo/day/Fog.png
View file
File renamed without changes
0 icons/meteo/day-hail.png → icons/meteo/day/Hai.png
View file
File renamed without changes
0 icons/meteo/day-partlycloudy.png → icons/meteo/day/Par.png
View file
File renamed without changes
0 icons/meteo/day-rain.png → icons/meteo/day/Rai.png
View file
File renamed without changes
0 icons/meteo/day-sleet.png → icons/meteo/day/Sle.png
View file
File renamed without changes
0 icons/meteo/day-snow.png → icons/meteo/day/Sno.png
View file
File renamed without changes
Binary file added icons/meteo/day/Sun.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 icons/meteo/day-thunder.png → icons/meteo/day/Thu.png
View file
File renamed without changes
0 icons/meteo/night-clear.png → icons/meteo/night/Cle.png
View file
File renamed without changes
0 icons/meteo/night-cloudy.png → icons/meteo/night/Clo.png
View file
File renamed without changes
0 icons/meteo/night-fog.png → icons/meteo/night/Fog.png
View file
File renamed without changes
0 icons/meteo/night-hail.png → icons/meteo/night/Hai.png
View file
File renamed without changes
0 icons/meteo/night-partlycloudy.png → icons/meteo/night/Par.png
View file
File renamed without changes
0 icons/meteo/night-rain.png → icons/meteo/night/Rai.png
View file
File renamed without changes
0 icons/meteo/night-sleet.png → icons/meteo/night/Sle.png
View file
File renamed without changes
0 icons/meteo/night-snow.png → icons/meteo/night/Sno.png
View file
File renamed without changes
Binary file added icons/meteo/night/Sun.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 icons/meteo/night-thunder.png → icons/meteo/night/Thu.png
View file
File renamed without changes
239 changes: 50 additions & 189 deletions js/frontpage.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/frontpage.min.js
View file

Large diffs are not rendered by default.

39 changes: 0 additions & 39 deletions js/frontpage_settings.js
View file
Expand Up @@ -33,45 +33,6 @@ var bg_size = 'cover'; // taille de l'image de fond (ex: '1024px 768px') 'co
var bg_dayBright = 0.5; // luminosité du fond le jour (0=normal 1=noir)
var bg_nightBright = 0.5; // luminosité du fond la nuit (0=normal 1=noir)

// Change colors of temps
var T35 = '#FF0000'; // couleur de la température à 35°C
var T34 = '#FE1400';
var T33 = '#FD2800';
var T32 = '#FD3C00';
var T31 = '#FC5000';
var T30 = '#FC6500';
var T29 = '#FC6F0A';
var T28 = '#FC7A14';
var T27 = '#FC841E';
var T26 = '#FC8F28';
var T25 = '#FC9A32';
var T24 = '#FCA43C';
var T23 = '#FCAF46';
var T22 = '#FCB950';
var T21 = '#FCC45A';
var T20 = '#FCCF65'; // couleur de la température à 20°C
var T19 = '#FCD270';
var T18 = '#FDD67B';
var T17 = '#FDDA87';
var T16 = '#FEDE92';
var T15 = '#FFE29E';
var T14 = '#F8E5A1';
var T13 = '#F1E9A4';
var T12 = '#EAEDA7';
var T11 = '#E3F1AA';
var T10 = '#DDF5AE';
var T09 = '#D3F5B7';
var T08 = '#CAF5C0';
var T07 = '#C0F5C9';
var T06 = '#B7F5D2';
var T05 = '#AEF5DC';
var T04 = '#AEF1E1';
var T03 = '#AEEDE6';
var T02 = '#AEEAEB';
var T01 = '#AEE6F0';
var T00 = '#AEE3F5';
var T000 = '#EBF4F7'; // couleur de la température sous 0°C

// Change the timeout of the PopUp
var switch_timeout = 1000; // durée d'affichage (en milisecondes) [ 0 = désactivée ]
var wrongCode_timeout = 1500; // durée d'affichage (en milisecondes)
Expand Down
39 changes: 0 additions & 39 deletions js/frontpage_settings_exemple.js
View file
Expand Up @@ -33,45 +33,6 @@ var bg_size = 'cover'; // taille de l'image de fond (ex: '1024px 768p
var bg_dayBright = 0.5; // luminosité du fond le jour (0=normal 1=noir)
var bg_nightBright = 0.5; // luminosité du fond la nuit (0=normal 1=noir)

// Change colors of temps
var T35 = '#FF0000'; // couleur de la température à 35°C
var T34 = '#FE1400';
var T33 = '#FD2800';
var T32 = '#FD3C00';
var T31 = '#FC5000';
var T30 = '#FC6500';
var T29 = '#FC6F0A';
var T28 = '#FC7A14';
var T27 = '#FC841E';
var T26 = '#FC8F28';
var T25 = '#FC9A32';
var T24 = '#FCA43C';
var T23 = '#FCAF46';
var T22 = '#FCB950';
var T21 = '#FCC45A';
var T20 = '#FCCF65'; // couleur de la température à 20°C
var T19 = '#FCD270';
var T18 = '#FDD67B';
var T17 = '#FDDA87';
var T16 = '#FEDE92';
var T15 = '#FFE29E';
var T14 = '#F8E5A1';
var T13 = '#F1E9A4';
var T12 = '#EAEDA7';
var T11 = '#E3F1AA';
var T10 = '#DDF5AE';
var T09 = '#D3F5B7';
var T08 = '#CAF5C0';
var T07 = '#C0F5C9';
var T06 = '#B7F5D2';
var T05 = '#AEF5DC';
var T04 = '#AEF1E1';
var T03 = '#AEEDE6';
var T02 = '#AEEAEB';
var T01 = '#AEE6F0';
var T00 = '#AEE3F5';
var T000 = '#EBF4F7'; // couleur de la température sous 0°C

// Change the timeout of the PopUp
var switch_timeout = 0; // durée d'affichage (en milisecondes) [ 0 = désactivée ]
var wrongCode_timeout = 1500; // durée d'affichage (en milisecondes)
Expand Down
48 changes: 8 additions & 40 deletions pages/meteo.html
View file
Expand Up @@ -17,47 +17,15 @@

var JsonAddress = "http://www.prevision-meteo.ch/services/json/"+city;


function color(temp) {
if (parseInt(temp, 10) >= 35) { return '<span style="color:'+T35+'">'+temp; }
else if (parseInt(temp, 10) >= 34) { return '<span style="color:'+T34+'">'+temp; }
else if (parseInt(temp, 10) >= 33) { return '<span style="color:'+T33+'">'+temp; }
else if (parseInt(temp, 10) >= 32) { return '<span style="color:'+T32+'">'+temp; }
else if (parseInt(temp, 10) >= 31) { return '<span style="color:'+T31+'">'+temp; }
else if (parseInt(temp, 10) >= 30) { return '<span style="color:'+T30+'">'+temp; }
else if (parseInt(temp, 10) >= 29) { return '<span style="color:'+T29+'">'+temp; }
else if (parseInt(temp, 10) >= 28) { return '<span style="color:'+T28+'">'+temp; }
else if (parseInt(temp, 10) >= 27) { return '<span style="color:'+T27+'">'+temp; }
else if (parseInt(temp, 10) >= 26) { return '<span style="color:'+T26+'">'+temp; }
else if (parseInt(temp, 10) >= 25) { return '<span style="color:'+T25+'">'+temp; }
else if (parseInt(temp, 10) >= 24) { return '<span style="color:'+T24+'">'+temp; }
else if (parseInt(temp, 10) >= 23) { return '<span style="color:'+T23+'">'+temp; }
else if (parseInt(temp, 10) >= 22) { return '<span style="color:'+T22+'">'+temp; }
else if (parseInt(temp, 10) >= 21) { return '<span style="color:'+T21+'">'+temp; }
else if (parseInt(temp, 10) >= 20) { return '<span style="color:'+T20+'">'+temp; }
else if (parseInt(temp, 10) >= 19) { return '<span style="color:'+T19+'">'+temp; }
else if (parseInt(temp, 10) >= 18) { return '<span style="color:'+T18+'">'+temp; }
else if (parseInt(temp, 10) >= 17) { return '<span style="color:'+T17+'">'+temp; }
else if (parseInt(temp, 10) >= 16) { return '<span style="color:'+T16+'">'+temp; }
else if (parseInt(temp, 10) >= 15) { return '<span style="color:'+T15+'">'+temp; }
else if (parseInt(temp, 10) >= 14) { return '<span style="color:'+T14+'">'+temp; }
else if (parseInt(temp, 10) >= 13) { return '<span style="color:'+T13+'">'+temp; }
else if (parseInt(temp, 10) >= 12) { return '<span style="color:'+T12+'">'+temp; }
else if (parseInt(temp, 10) >= 11) { return '<span style="color:'+T11+'">'+temp; }
else if (parseInt(temp, 10) >= 10) { return '<span style="color:'+T10+'">'+temp; }
else if (parseInt(temp, 10) >= 9) { return '<span style="color:'+T09+'">'+temp; }
else if (parseInt(temp, 10) >= 8) { return '<span style="color:'+T08+'">'+temp; }
else if (parseInt(temp, 10) >= 7) { return '<span style="color:'+T07+'">'+temp; }
else if (parseInt(temp, 10) >= 6) { return '<span style="color:'+T06+'">'+temp; }
else if (parseInt(temp, 10) >= 5) { return '<span style="color:'+T05+'">'+temp; }
else if (parseInt(temp, 10) >= 4) { return '<span style="color:'+T04+'">'+temp; }
else if (parseInt(temp, 10) >= 3) { return '<span style="color:'+T03+'">'+temp; }
else if (parseInt(temp, 10) >= 2) { return '<span style="color:'+T02+'">'+temp; }
else if (parseInt(temp, 10) >= 1) { return '<span style="color:'+T01+'">'+temp; }
else if (parseInt(temp, 10) >= 0) { return '<span style="color:'+T00+'">'+temp; }
else { return '<span style="color:'+T000+'">'+temp; }
}

var vtemp = 'T00';
if (parseInt(temp, 10) >= 0) {
vtemp = ['T'+parseInt(temp, 10)];
}else if (parseInt(temp, 10) >= 35) {
vtemp = 'T35';
}
return '<span class="'+vtemp+'">'+temp;
}

$.getJSON(JsonAddress, function (json) {

Expand Down

0 comments on commit 7125620

Please sign in to comment.