浏览代码

Updated table colors and table variables.

Updated table colors and color intervals in skin.conf. There is a bug in historygenerator.py that won't allow for float values for the rain scale. Can't use 0.01". This is only a problem for US units. Also, changed the location of the error pages for the CopyGenerator in Skin.conf.
Josh Smith 8 年之前
父节点
当前提交
e0bd178d22
共有 2 个文件被更改,包括 21 次插入19 次删除
  1. 19 17
      skin.conf
  2. 2 2
      summary.html.tmpl

+ 19 - 17
skin.conf

@@ -43,7 +43,6 @@
     googleAnalyticsId = UA-88526004-1
 
     #CWOP
-    #used in all the templates pages
     cwop = CW9009
     cwop_url = http://www.findu.com/cgi-bin/wxpage.cgi?call=CW9009&last=24
 
@@ -57,9 +56,9 @@
 
     #CoCoRaHS
     crahs = ID-AD-36
-    crahs_url = http://www.cocorahs.org/ViewData/ViewDailyPrecipReport.aspx?DailyPrecipReportID=1dbd316d-4350-42d2-934b-11b8fc01927d
+    crahs_url = http://www.cocorahs.org/ViewData/CountyDailyPrecipReports.aspx?state=ID&county=AD
     
-###############################################################################
+###############################################################################################
 
 [Units]
     # This section is for managing the selection and formatting of units.
@@ -294,7 +293,7 @@
     # This section is used by the generator CopyGenerator
 
     # List of files to be copied only the first time the generator runs
-    copy_once = css/main.css, js/*, .htaccess, 404.html, robots.txt, touch-icon.png
+    copy_once = css/main.css, js/*, .htaccess, error/*, robots.txt, touch-icon.png, favicon.ico
 
 ###############################################################################
 
@@ -344,30 +343,33 @@
     [[avg_htemp]]
         obs_type = inTemp
         aggregate_type = avg
+	minvalues =  50, 60, 65, 68, 70, 72, 74, 76, 78, 80, 82
+    	maxvalues =  60, 65, 68, 70, 72, 74, 76, 78, 80, 82, 90
 
     [[temp_count]]
         obs_type = outTemp
         aggregate_type = sum_ge
 	aggregate_threshold = -50, degree_F
-	#minvalues =  0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20
-	#maxvalues =  0, 3, 6, 9, 12, 15, 18, 21, 24, 27, 32
+	minvalues =  0, 2, 4, 6, 8, 12, 15, 18, 21, 24, 27
+	maxvalues =  2, 4, 6, 8, 12, 15, 18, 21, 24, 27, 32
+	colours =   "#0029E5", "#0186E7", "#02E3EA", "#04EC97", "#05EF3D2", "#2BF207", "#8AF408", "#E9F70A", "#F9A90B", "#FC4D0D", "#FFFFFF"
 
-    [[rain]]
+    #number of days of rainfall
+    [[rain_count]]
         obs_type = rain
         aggregate_type = sum_ge
         aggregate_threshold = 0.02, inch
-	units = Days
-        minvalues = 0, 3, 6, 9, 12, 18   # Override default temperature colour scheme with rain specific scale
-        maxvalues = 6, 12, 18, 24, 30, 50
-	colours = "#E0F8E0", "#A9F5A9", "#58FA58", "#2EFE2E", "#01DF01", "#01DF01"
+	minvalues = 0, 2, 4, 8, 12, 20   # Override default temperature colour scheme with rain specific scale
+        maxvalues = 2, 4, 8, 12, 20, 32
+	colours = "#E0F8E0", "#A9F5A9", "#58FA58", "#2EFE2E", "#41E741", "#01DF01"
     
-    [[rain_sum]]
+    #total monthly rainfall
+    [[rain]]
 	obs_type = rain
-        aggregate_type = sum
-        
-        #minvalues = 0.00, 0.02, 0.05, 0.10, 0.20, 0.30   # Override default temperature colour scheme with rain specific scale
-        #maxvalues = 0.06, 0.10, 0.25, 0.50, 1.00, 1.50
-	colours = "#E0F8E0", "#A9F5A9", "#58FA58", "#2EFE2E", "#01DF01", "#01DF01"
+        aggregate_type = sum     
+        minvalues = 0, 1, 2, 3, 4, 5   # Override default temperature colour scheme with rain specific scale
+        maxvalues = 1, 2, 3, 4, 5, 10
+	colours = "#E0F8E0", "#A9F5A9", "#58FA58", "#2EFE2E", "#41E741", "#01DF01"
 
     [[NOAA]]
         #

+ 2 - 2
summary.html.tmpl

@@ -144,14 +144,14 @@
 		<div class="card">
                     <h1><i class="fa fa-umbrella m-blau" ></i> Total Monthly Rainfall </h1>
 			<div class="tablefix">
-                    	$rain_sum_table
+                    	$rain_table
 			</div>
                 </div>
 
 		<div class="card">
                     <h1><i class="fa fa-umbrella m-blau" ></i> Number of Days it Rained (>=0.02")</h1>
 			<div class="tablefix">
-                    	$rain_table
+                    	$rain_count_table
 			</div>
                 </div>