Merge branch 'master' into rules

* master: Ensure all scripts are defined UTF-8 (#121) Conflicts: index.html
cdjackson · Apr 27, 2014 · 7d1f9ea · 7d1f9ea
2 parents 4c8c9a4 + c3181a0
commit 7d1f9ea
Showing 1 changed file with 13 additions and 16 deletions.
diff --git a/index.html b/index.html
@@ -1,27 +1,24 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>openHAB Administration Interface</title>
     <link rel="shortcut icon" href="../images/favicon.ico" />
 
     <link rel="stylesheet" type="text/css" href="resources/css/ext-all.css" />
     <link rel="stylesheet" type="text/css" href="./app/habmin.css" />
-    <script type="text/javascript" src="./app/language/language.js"></script>
-    <script type="text/javascript" src="./js/jsprintf.js"></script>
-    <script type="text/javascript" src="./js/ext-all.js"></script>
-    <script type="text/javascript" src="./js/jquery.min.js"></script>
-    <script type="text/javascript" src="./js/highcharts.js"></script>
-    <script type="text/javascript" src="./js/highcharts-more.js"></script>
-    <script type="text/javascript" src="./js/moment.js"></script>
-    <script type="text/javascript" src="./js/jquery.atmosphere.js"></script>
-    <script type="text/javascript" src="./js/extux/aceeditor/ace/ace.js" charset="utf-8"></script>
-    <script type="text/javascript" src="./js/jit.js"></script>
-    <script type="text/javascript" src="./js/extux/blockly/core.js"></script>
-    <script type="text/javascript" src="./js/extux/blockly/blocks.js"></script>
-    <script type="text/javascript" src="./js/extux/blockly/openhabBlocks.js"></script>
-    <script type="text/javascript" src="./js/extux/blockly/msg/en.js"></script>
-    <script type="text/javascript" src="./app/app.js"></script>
+
+    <script type="text/javascript" charset="UTF-8" src="./app/language/language.js"></script>
+    <script type="text/javascript" charset="UTF-8" src="./js/jsprintf.js"></script>
+    <script type="text/javascript" charset="UTF-8" src="./js/ext-all.js"></script>
+    <script type="text/javascript" charset="UTF-8" src="./js/jquery.min.js"></script>
+    <script type="text/javascript" charset="UTF-8" src="./js/highcharts.js"></script>
+    <script type="text/javascript" charset="UTF-8" src="./js/highcharts-more.js"></script>
+    <script type="text/javascript" charset="UTF-8" src="./js/moment.js"></script>
+    <script type="text/javascript" charset="UTF-8" src="./js/jquery.atmosphere.js"></script>
+    <script type="text/javascript" charset="UTF-8" src="./js/extux/aceeditor/ace/ace.js"></script>
+    <script type="text/javascript" charset="UTF-8" src="./js/jit.js"></script>
+    <script type="text/javascript" charset="UTF-8" src="./app/app.js"></script>
 </head>
 <body>