Browse code

revision 20151227

Jeff Owrey authored on 12/28/2015 05:14:28
Showing 1 changed files
... ...
@@ -1,145 +1,112 @@
1 1
 <!DOCTYPE html>
2 2
 <html>
3
-<!--<META http-equiv="refresh" content="60">-->
4 3
 <head>
5
-  <title>DIY Radiation Monitor</title>
6
-  <script src="jQuery.min.js"></script>
4
+<title>DIY Radiation</title>
5
+<script src="jQuery.min.js"></script>
6
+<style>
7
+body {
8
+    background-image: url("static/chalk.jpg");
9
+}
10
+#frame {
11
+    width:800px;
12
+    text-align:center;
13
+    margin:auto;
14
+}
15
+#datetime {
16
+    text-align:center;
17
+    display:inline-block;
18
+    margin:1px;
19
+    font-size:21px;
20
+    color:black;
21
+    width:700px;
22
+    padding:10px;
23
+}
24
+div.currentdata {
25
+    font-size:20px;
26
+    display:inline-block;
27
+    margin:1px;
28
+    text-align:center;
29
+    color:black;
30
+    width:342px;
31
+    padding:10px;
32
+    border-style:solid;
33
+    border-width:1px;	 
34
+}
35
+div.chartitem {
36
+    display:inline-block;
37
+    text-align:left;
38
+    margin:1px;
39
+    width: 730px;
40
+    padding:2px;
41
+    border-style:solid;
42
+    border-width:1px;	 
43
+}
44
+img.chart {
45
+    width:100%;
46
+}
47
+</style>
7 48
 </head>
8 49
 
9
-<body background="./static/chalk.jpg">
10
-
11
-<center>
12
-<h1>DIY Radiation Monitor</h1>
50
+<body>
51
+<div id="frame">
52
+<h2>DIY Radiation Monitor</h2>
13 53
 <hr>
14
-
15
-<table width="750" border="0" cellpadding="1">
16
-  <tr>
17
-    <td align="center">
18
-      <b><font size="5">
19
-      <text id="date"></text>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<text id="time"></text>
20
-      </font></b>
21
-    </td>
22
-  </tr>
23
-
24
-  <tr>
25
-    <td>
26
-      <table width="100%" border="1", cellpadding="10">
27
-        <tr>
28
-          <td width="50%" align="center">
29
-            <b><font size="5">
30
-            Current Reading
31
-            </font></b>
32
-            <br><br>
33
-            <b><font size="4">
34
-            Counts per minute: <text id="cpm"></text><br>
35
-            Counts per second: <text id="cps"></text><br>
36
-            uSv per hour: <text id="uSvPerHr"></text>
37
-            </font></b>
38
-          </td>
39
-          <td width="50%" align="center" valign="center">
40
-            <b><font size="5">
41
-            Device Status
42
-            </font></b>
43
-            <br><br>
44
-            <b><font size="4">
45
-            Mode: <text id="mode"></text><br>
46
-            Status: <text id="status"></text>      
47
-            </font></b>
48
-          </td>
49
-        </tr>
50
-      </table>
51
-    </td>
52
-  </tr>
53
-
54
-  <tr>
55
-    <td>
56
-      <table width="100%" border="1", cellpadding="10">
57
-        <tr>
58
-          <td align="center">
59
-          <img id="1-day-cpm">
60
-          </td>
61
-        </tr>
62
-      </table>
63
-    </td>
64
-  </tr>
65
-
66
-  <tr>
67
-    <td>
68
-      <table width="100%" border="1", cellpadding="10">
69
-        <tr>
70
-          <td align="center">
71
-          <img id="1-day-uSv">
72
-          </td>
73
-        </tr>
74
-      </table>
75
-    </td>
76
-  </tr>
77
-
78
-  <tr>
79
-    <td>
80
-      <table width="100%" border="1", cellpadding="10">
81
-        <tr>
82
-          <td align="center">
83
-          <img id="4-week-cpm">
84
-          </td>
85
-        </tr>
86
-      </table>
87
-    </td>
88
-  </tr>
89
-
90
-  <tr>
91
-    <td>
92
-      <table width="100%" border="1", cellpadding="10">
93
-        <tr>
94
-          <td align="center">
95
-          <img id="4-week-uSv">
96
-          </td>
97
-        </tr>
98
-      </table>
99
-    </td>
100
-  </tr>
101
-
102
-  <tr>
103
-    <td>
104
-      <table width="100%" border="1", cellpadding="10">
105
-        <tr>
106
-          <td align="center">
107
-          <img id="1-year-cpm">
108
-          </td>
109
-        </tr>
110
-      </table>
111
-    </td>
112
-  </tr>
113
-
114
-  <tr>
115
-    <td>
116
-      <table width="100%" border="1", cellpadding="10">
117
-        <tr>
118
-          <td align="center">
119
-          <img id="1-year-uSv">
120
-          </td>
121
-        </tr>
122
-      </table>
123
-    </td>
124
-  </tr>
125
-
126
-  <tr>
127
-    <td>
128
-      <table width="100%" border="1", cellpadding="10">
129
-        <tr>
130
-          <td>
131
-            <b>NOTES:</b>
132
-            <li>For more information visit <a href="http://www.eugenemakerspace.com" target="_new"><i>www.eugenemakerspace.com</i></a>
133
-            <li>Project plans and notes available at <a href="http://github.com/fractalxaos/Radmon" target="_new"><i>GitHub.com</i></a>
134
-          </td>
135
-        </tr>
136
-      </table>
137
-    </td>
138
-  </tr>
139
-</table>
140
-</center>
141
-
142
-  <script>
54
+<b>
55
+
56
+<div id="datetime">
57
+<text id="date"></text>
58
+&nbsp;&nbsp;
59
+<text id="time"></text>
60
+</div>
61
+
62
+<div class="currentdata">
63
+<ins>Current Reading</ins><br><br>
64
+Counts per minute: <text id="cpm"></text><br>
65
+Counts per second: <text id="cps"></text><br>
66
+uSv per hour: <text id="uSvPerHr"></text>
67
+</div>
68
+
69
+<div class="currentdata">
70
+<ins>Status</ins><br><br>
71
+Mode: <text id="mode"></text><br>
72
+Device: <text id="status"></text><br>
73
+&nbsp;     
74
+</div>
75
+
76
+<div class="chartitem">
77
+<img class="chart" id="1-day-cpm">
78
+</div>
79
+
80
+<div class="chartitem">
81
+<img class="chart" id="1-day-uSv">
82
+</div>
83
+
84
+<div class="chartitem">
85
+<img class="chart" id="4-week-cpm">
86
+</div>
87
+
88
+<div class="chartitem">
89
+<img class="chart" id="4-week-uSv">
90
+</div>
91
+
92
+<div class="chartitem">
93
+<img class="chart" id="1-year-cpm">
94
+</div>
95
+
96
+<div class="chartitem">
97
+<img class="chart" id="1-year-uSv">
98
+</div>
99
+
100
+<div class="chartitem">
101
+<b>NOTES:</b>
102
+<ul>
103
+<li>For more information visit <a href="http://www.eugenemakerspace.com" target="_new"><i>www.eugenemakerspace.com</i></a>
104
+<li>Project plans and notes available at <a href="http://github.com/fractalxaos/Radmon" target="_new"><i>GitHub.com</i></a>
105
+</ul>
106
+</div>
107
+</div>
108
+<br>
109
+<script>
143 110
 
144 111
     function getRadmon() {
145 112
       $.ajaxSetup({cache:false, url: "dynamic/radmonData.js",
... ...
@@ -169,16 +136,11 @@
169 136
       var hourminute;
170 137
 
171 138
       timeStamp = dataItem.date;
172
-      if (timeStamp != "") { 
173
-        date = timeStamp.split(" ")[0];
174
-        time = timeStamp.split(" ")[1];
175
-        hourminute = time.split(":")[0] + ":" + time.split(":")[1];
176
-        $("#date").text(date);
177
-        $("#time").text(hourminute + " (PDT)");
178
-      } else {
179
-        $("#date").text("");
180
-        $("#time").text("");
181
-      }
139
+      date = timeStamp.split(" ")[0];
140
+      time = timeStamp.split(" ")[1];
141
+      hourminute = time.split(":")[0] + ":" + time.split(":")[1];
142
+      $("#date").text(date);
143
+      $("#time").text(hourminute + " (PDT)");
182 144
       
183 145
       $("#cps").text(dataItem.CPS);
184 146
       $("#cpm").text(dataItem.CPM);