From 619485212d9fb446d7404532e2aca463f7dfbd14 Mon Sep 17 00:00:00 2001 From: zeeZ Date: Mon, 9 May 2011 07:07:46 +0200 Subject: [PATCH] First iteration of weather icons --- configuration.txt | 1 + web/css/dynmap_style.css | 33 +++++++++++++++++++++++++++++++++ web/images/weather_stormy.png | Bin 0 -> 1285 bytes web/images/weather_sunny.png | Bin 0 -> 905 bytes web/images/weather_thunder.png | Bin 0 -> 627 bytes web/js/timeofdayclock.js | 21 +++++++++++++++++++++ 6 files changed, 55 insertions(+) create mode 100644 web/images/weather_stormy.png create mode 100644 web/images/weather_sunny.png create mode 100644 web/images/weather_thunder.png diff --git a/configuration.txt b/configuration.txt index d92888fa..8bdf9bfa 100644 --- a/configuration.txt +++ b/configuration.txt @@ -107,6 +107,7 @@ web: #- type: digitalclock - type: timeofdayclock showdigitalclock: true + #showweather: true #- type: regions # name: WorldGuard # useworldpath: true diff --git a/web/css/dynmap_style.css b/web/css/dynmap_style.css index 91edc507..8788a1b4 100644 --- a/web/css/dynmap_style.css +++ b/web/css/dynmap_style.css @@ -294,6 +294,39 @@ bottom: 16px; } +/******************* + * Clock weather style + */ + +.weather { + position: absolute; + top: 17px; + right: 5px; + width: 25px; + height: 23px; + display: block; + background-repeat: no-repeat; +} + +.weather.sunny { + background-image: url(../images/weather_sunny.png); +} + +.weather.stormy { + background-image: url(../images/weather_stormy.png); +} +.weather .thunder { + position: absolute; + top: 0; + left: 0; + right: 0; + width: 25px; + height: 25px; + display: none; + background-repeat: no-repeat; + background-image: url(../images/weather_thunder.png); +} + /******************* * map list-specific styling */ diff --git a/web/images/weather_stormy.png b/web/images/weather_stormy.png new file mode 100644 index 0000000000000000000000000000000000000000..45808fb140cdc8742683a387a07153634a537033 GIT binary patch literal 1285 zcmV+g1^W7lP)P000*V1^@s6{^R5m0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$r%6OXRCwC77E4c?M{o=##741=F_1KX zjS?QEsxZQ+X(+`)0`)|4ZrYmOdgy^Fs?^j)a7v@9ynaC-{R0S9>Ln3&$+3|FB2J0| zwh3UDU}Ny}dv|8P&&DQzdgq2b}-u!5&L-fst^!Jvvk!@qfzDag`o@9dsw0SX*PG-0(`As&y1khav<*IP^` z69|F;u~-a}$)peYqZ8v}D|rR7A~XE;I`s%0Q>nfo|)~_B+C-r)N9K>bknR8JElD zJdUOsfOsqpD=RC|-Q5l3RW_StK;DrN@pufq)7>5$`|*(Fq%=HJw{UUBXf!yi)*7(Z zSeff2TSoWMC`OwtW^g*4u)Mqs0|NspAA0JLnYwLvHtbO!n5j09UUzKy|g% zdGDUrL$dYsbN~L&{beSx9Vk*hP-Kwmbrh>okL$tUCg#Wp zX0r)HXJ$E|(cIh&TU+4~Ns{MTxX{Xp*0weDj#4SGN6 zgTuo^*x%oW;N}Ko(rIXHYJzLmuA`?$;5p9CJn?#evZGM;swxI{yPYX{_Utd%c>Nka?Ciua^C4!iC&v%+oEcZFG5AmEHOLj=AjD$w|M!^NDCQ zqLv~8yFeP8CbSsxgA6R@JDpvSPNy808g@uN#mp5R3a7Ca)Hr_Y<8#i!RHnM^?{ zm9pqIgY4ad5s$}?i??kyn`3BbaOBaW-)2;+WLCB$KrP`?kmWp`_XLV)C4teHgUw*5 z1b9gvM^F&@i}}cUh~O!jA0SK*M)Z)Z%V?Jm+6W!RtvCf}E5HbJFwQtJ=Y98-gA5 zawjLUs@oIf(YJ!U(A3xnp{xjDgb0Q!iV)#3@gC0?@AUYuK=y;@OPJo%;*Oum2DzH` zobXe)fjHv&Ub}<}e4AUJr5;cDiAjnN&rBF(P000*V1^@s6{^R5m0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#D@jB_RCwC#R7+12Q562}%(P4ypy=={ z3Kirbno{F)fl^%|X=F-jpm(Ljq( z-jCKgrOe}cr=_)&RyXR(lbqa{Gv|Kao%5Y@$&H)0kjW^e8RHM71`OCL<2j8-?fu51 z;8E_B{Z&q1a92ZpGOy#a63<~yrUHQ!@~hSx;WcHm-4{o z&cEPuesfI@n+Lq|QAuKv$*DkA!0G9kA-1^JUwce<4WIK_T(ZX?j&?{}3yHc2YApo~ zg+OQL`VjWFTeh$GmKy!ROQUOXlCP6f83|@)W}75Q@;aTB;CUXANCeBvD+mvsN9pzo z$kGfbp95Hm0d*N9x(JBXfD(lE&R6*D>|l`NI1oa>nZK6FP0P!ZVg#nyY&JL?<)}H+ zi?Fa4?^g~(m0MwKIRYx51}$m@R=Jw`*F4ze}@PGx10_Jf4p!r+|l)e+*QC*u1A6Ce&Y%zXN)aHWd||-t^-sp0MWysQKm^`2_&e1RJjUm$47gjlpafx=(^s` z%HgT2t$|s`1aPKSPP{6iQHUgp(0mA6M2!)xffyP)6-&?sP$G9}njX_c@cH~LJTJ7> zRPTtN+%S-7MAFH01|U~m!-5jPn12xJVn2$-2r5v5+-;03y3o$jp2alLbiGZM<@iS3 z*a(~`65SjV3wFlbw6faEh<=~M{K$O_j6Fx$hl!Ohx0l+Q?~-^6_da<#)KFjN&d<;L z?Zjuh1yaLNWgZ`%-h(1oy(rx0Idt$qkkd5H$uxAZ#jh>Wt8AVx;NDWWf5B)lIUA`6rFTKd}EK f|4IIy{SaUP?0FoMp=4%e00000NkvXXu0mjf<$|<~ literal 0 HcmV?d00001 diff --git a/web/images/weather_thunder.png b/web/images/weather_thunder.png new file mode 100644 index 0000000000000000000000000000000000000000..07bbfc0a4766796f99f1faa69f226c949ecf9540 GIT binary patch literal 627 zcmV-(0*w8MP)P000*V1^@s6{^R5m0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!6-h)vRCwBA{Qv(y1FZoQ10BGqC8L&% zT0$7GkfOM_q+DN+|JwyY{_j}jpS|Q``0Va*aV-?FCi~ z<}SCm0AwyeFRDllE(HO;?+pL`F{0q7FZdZ|FSGpc?K@k5xrN2Yix)35fG}CX1+qk3 z_!GmwzX*Z%pST$2EVBRw(*l^-hmRl0j}w00?+(BJpn9H%>jy(z@F|7|PlO5{0`bN3 zhaUX+$#wuJwIM7da3jf<{QSl8Vf%hf0XeC63?R(T{s$~BB=8xGjdUJ@eY@v~M#7m( z3Iaej>6WCV<_k`lGR^+vJL`M z&%vovr}wk7{51IXl?mochT|928E)Q}T9BNanD|OSj=VUzeEAB*wFeLJb8~)AkP>;$ z@cA<%!>>Oq40}%+0}}ynLTXC#LV0;vhO^IqlV{15D_7z9MN;^=!23@O44=R9GMu}i z_u<6_B@==6rQ{iVYqhRZAiMwo literal 0 HcmV?d00001 diff --git a/web/js/timeofdayclock.js b/web/js/timeofdayclock.js index 8467b1d4..82c0cb1a 100644 --- a/web/js/timeofdayclock.js +++ b/web/js/timeofdayclock.js @@ -62,6 +62,27 @@ componentconstructors['timeofdayclock'] = function(dynmap, configuration) { setTime(update.servertime); }); } + if(configuration.showweather) { + var weather = $('
') + .addClass('weather') + .appendTo(element); + + var thunder = $('
') + .addClass('thunder') + .css('display','none') + .appendTo(weather); + + var setWeather = function(hasStorm, isThundering) { + weather + .addClass(hasStorm ? 'stormy' : 'sunny') + .removeClass(hasStorm ? 'sunny' : 'stormy'); + thunder.css('display',isThundering ? 'block' : 'none'); + }; + + $(dynmap).bind('worldupdated', function(event, update) { + setWeather(update.hasStorm, update.isThundering); + }); + } $(dynmap).bind('worldupdated', function(event, update) { var sunangle; var time = update.servertime;