Merge remote-tracking branch 'origin/master'

Conflicts: frontpage.html graph.html lights.html logs.html news.html settings/settings.js weather.html
galadril · Sep 28, 2015 · 7e6b713 · 7e6b713
2 parents 7650b4b + eea6460
commit 7e6b713
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 6 deletions.
diff --git a/frontpage.html b/frontpage.html
@@ -55,10 +55,13 @@
 						{document.write('<li><a class="stay" href="graph.html"><i class="icon-th icon-white"></i> Graph</a></li>');}
 				  </script>
 				  <script>
+<<<<<<< HEAD
 					if ($.Camera) 
 						{document.write('<li><a class="stay" href="camera.html"><i class="icon-th icon-white"></i> Camera</a></li>');}
 				  </script>
 				  <script>
+=======
+>>>>>>> origin/master
 					if ($.Weather) 
 						{document.write('<li ><a class="stay" href="weather.html"><i class="icon-th icon-white"></i> Weather</a></li>');}
 				  </script>
@@ -251,4 +254,4 @@ <h2 id="cell10"></h2>
          }
       </script>
    </body>
-</html>
+</html>
diff --git a/graph.html b/graph.html
@@ -56,10 +56,13 @@
 						{document.write('<li class="active"><a class="stay" href="graph.html"><i class="icon-th icon-white"></i> Graph</a></li>');}
 				  </script>
 				  <script>
+<<<<<<< HEAD
 					if ($.Camera) 
 						{document.write('<li><a class="stay" href="camera.html"><i class="icon-th icon-white"></i> Camera</a></li>');}
 				  </script>
 				  <script>
+=======
+>>>>>>> origin/master
 					if ($.Weather) 
 						{document.write('<li ><a class="stay" href="weather.html"><i class="icon-th icon-white"></i> Weather</a></li>');}
 				  </script>
@@ -182,4 +185,4 @@ <h4 id="cell10" style="margin-top:-35px;></h4>
 
       </script>
    </body>
-</html>
+</html>
diff --git a/lights.html b/lights.html
@@ -75,10 +75,13 @@
 						{document.write('<li><a class="stay" href="graph.html"><i class="icon-th icon-white"></i> Graph</a></li>');}
 				  </script>
 				  <script>
+<<<<<<< HEAD
 					if ($.Camera) 
 						{document.write('<li><a class="stay" href="camera.html"><i class="icon-th icon-white"></i> Camera</a></li>');}
 				  </script>
 				  <script>
+=======
+>>>>>>> origin/master
 					if ($.Weather) 
 						{document.write('<li ><a class="stay" href="weather.html"><i class="icon-th icon-white"></i> Weather</a></li>');}
 				  </script>
@@ -270,4 +273,4 @@
 
       </script>
    </body>
-</html>
+</html>
diff --git a/logs.html b/logs.html
@@ -70,10 +70,13 @@
 						{document.write('<li><a class="stay" href="graph.html"><i class="icon-th icon-white"></i> Graph</a></li>');}
 				  </script>
 				  <script>
+<<<<<<< HEAD
 					if ($.Camera) 
 						{document.write('<li><a class="stay" href="camera.html"><i class="icon-th icon-white"></i> Camera</a></li>');}
 				  </script>
 				  <script>
+=======
+>>>>>>> origin/master
 					if ($.Weather) 
 						{document.write('<li ><a class="stay" href="weather.html"><i class="icon-th icon-white"></i> Weather</a></li>');}
 				  </script>
@@ -171,4 +174,4 @@
 
       </script>
    </body>
-</html>
+</html>
diff --git a/news.html b/news.html
@@ -73,10 +73,13 @@
 						{document.write('<li><a class="stay" href="graph.html"><i class="icon-th icon-white"></i> Graph</a></li>');}
 				  </script>
 				  <script>
+<<<<<<< HEAD
 					if ($.Camera) 
 						{document.write('<li><a class="stay" href="camera.html"><i class="icon-th icon-white"></i> Camera</a></li>');}
 				  </script>
 				  <script>
+=======
+>>>>>>> origin/master
 					if ($.Weather) 
 						{document.write('<li ><a class="stay" href="weather.html"><i class="icon-th icon-white"></i> Weather</a></li>');}
 				  </script>
@@ -173,4 +176,4 @@
          }); 
       </script>
    </body>
-</html>
+</html>
diff --git a/settings/settings.js b/settings/settings.js
@@ -18,8 +18,11 @@ $.News = true;//false or true
 $.Log = true;//false or true
 $.Lights = true;//false or true
 $.Weather = true;//false or true
+<<<<<<< HEAD
 $.Camera = true;//false or true
 
+=======
+>>>>>>> origin/master
 
 
 // Dashboard screen User settings >>> 

diff --git a/weather.html b/weather.html
@@ -58,10 +58,13 @@
 						{document.write('<li><a class="stay" href="graph.html"><i class="icon-th icon-white"></i> Graph</a></li>');}
 				  </script>
 				  <script>
+<<<<<<< HEAD
 					if ($.Camera) 
 						{document.write('<li><a class="stay" href="camera.html"><i class="icon-th icon-white"></i> Camera</a></li>');}
 				  </script>
 				  <script>
+=======
+>>>>>>> origin/master
 					if ($.Weather) 
 						{document.write('<li class="active" ><a class="stay" href="weather.html"><i class="icon-th icon-white"></i> Weather</a></li>');}
 				  </script>
@@ -165,4 +168,4 @@
          }); 
       </script>
    </body>
-</html>
+</html>