فهرست منبع

Merge pull request #12 from khancyr/html

Correct Html
Will Piper 4 سال پیش
والد
کامیت
baca896193
3فایلهای تغییر یافته به همراه107 افزوده شده و 81 حذف شده
  1. 1 1
      static/styles/main.css
  2. 22 21
      templates/generate.html
  3. 84 59
      templates/index.html

+ 1 - 1
static/styles/main.css

@@ -14,7 +14,7 @@ body {
     background-image:url(/static/images/logo.png);
 	background-repeat:no-repeat;
     height: 140px;
-	width: 420px;
+	width: 407px;
 	-moz-box-shadow: 2px 2px 5px #888;
 	-webkit-box-shadow: 2px 2px 5px #888;
 	box-shadow: 2px 2px 5px #888;

+ 22 - 21
templates/generate.html

@@ -1,31 +1,32 @@
 <!doctype html>
-<html>
+<html lang="en">
 
 <head>
-<link rel= "stylesheet" type= "text/css" href= "{{ url_for('static',filename='styles/main.css') }}">
+    <meta charset="utf-8">
+    <title>ArduPilot Custom Firmware Builder</title>
+    <link rel="stylesheet" type="text/css" href="{{ url_for('static',filename='styles/main.css') }}">
 </head>
 
 
-<title>ArduPilot Custom Firmware Builder</title>
 <h2>ArduPilot Custom Firmware Builder</h2>
 
 {% if error %}
-  <p>{{ error }} {{ex}}</p>
+<p>{{ error }} {{ex}}</p>
 {% else %}
-  <body onload="javascript: reload()">
+<body onload="javascript: reload()">
 
 <div id="main">
-<a href="https://custom.ardupilot.org/">
-<div id="logo">
-</div>
-</a>
+    <a href="https://custom.ardupilot.org/">
+        <div id="logo">
+        </div>
+    </a>
     <div id="menu">
         <p>Build in progress...</p>
         <form action="/builds/{{token}}" target="_blank">
-            <input type="submit" value="Go to build directory" />
+            <input type="submit" value="Go to build directory"/>
         </form>
         <form action="/builds" target="_blank">
-            <input type="submit" value="See all builds" />
+            <input type="submit" value="See all builds"/>
         </form>
         <form action="/">
             <input type="submit" value="Queue another build">
@@ -33,11 +34,11 @@
     </div>
     <p>Build ID: {{ token }}</p>
     <p>Build progress:</p>
-    <textarea  
-        id="build_output" rows="30" cols="100" readonly>
+    <textarea id="build_output" rows="30" cols="100" readonly>
     </textarea>
-    <br><input type="checkbox" id="AutoScroll" checked>AutoScroll<script>
-      function reload() {
+    <br><input type="checkbox" id="AutoScroll" checked>AutoScroll
+    <script>
+        function reload() {
             var output = document.getElementById('build_output');
             var xhr = new XMLHttpRequest();
             xhr.open('GET', "/builds/{{token}}/build.log");
@@ -47,8 +48,8 @@
             xhr.setRequestHeader("Expires", "Tue, 01 Jan 1980 1:00:00 GMT");
             xhr.setRequestHeader("Pragma", "no-cache");
 
-            xhr.onload = function() {
-                if (xhr.status == 200) {
+            xhr.onload = function () {
+                if (xhr.status === 200) {
                     output.textContent = xhr.responseText;
 
                     var scrollcheck = document.getElementById('AutoScroll');
@@ -59,13 +60,13 @@
                         return;
                     }
                 }
-                setTimeout(reload,3000)
+                setTimeout(reload, 3000)
             }
             xhr.send();
-      }
+        }
     </script>
-
-  </body>
+</div>
+</body>
 {% endif %}
 
 </html>

+ 84 - 59
templates/index.html

@@ -1,18 +1,35 @@
 <!doctype html>
-
+<html lang="en">
 
 <head>
-<link rel= "stylesheet" type= "text/css" href= "{{ url_for('static',filename='styles/main.css') }}">
-<script type="text/javascript" src="{{ url_for('static', filename='js/CollapsibleLists.js')}}"></script>
-<title>ArduPilot Custom Firmware Builder</title>
+    <meta charset="utf-8">
+    <title>ArduPilot Custom Firmware Builder</title>
+    <meta name="description"
+          content="ArduPilot Custom Firmware Builder. It allows to build custom ArduPilot firmware by selecting the wanted features.">
+    <meta name="author" content="ArduPilot Team">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <!-- OG Meta Tags to improve the way the post looks when you share the page on LinkedIn, Facebook, Google+ -->
+    <meta property="og:site_name" content="ArduPilot"/>
+    <meta property="og:site" content=""/>
+    <meta property="og:title" content="ArduPilot Custom Firmware Builder"/>
+    <meta property="og:description"
+          content="ArduPilot Custom Firmware Builder. It allows to build custom ArduPilot firmware by selecting the wanted features."/>
+    <!-- description shown in the actual shared post -->
+    <meta property="og:type" content="website">
+    <meta property="og:url" content="https://custom.ardupilot.org/">
+    <meta property="og:image" content="https://ardupilot.org/application/files/6315/7552/1962/ArduPilot-Motto.png">
+
+    <link rel="stylesheet" type="text/css" href="{{ url_for('static',filename='styles/main.css') }}">
+    <script type="text/javascript" src="{{ url_for('static', filename='js/CollapsibleLists.js')}}"></script>
 </head>
 
 <body onload="javascript: reload()">
 <div id="main">
-<a href="https://custom.ardupilot.org/">
-<div id="logo">
-</div>
-</a>
+    <a href="https://custom.ardupilot.org/">
+        <div id="logo">
+        </div>
+    </a>
 
     <div id="menu">
         <h2>ArduPilot Custom Firmware Builder</h2>
@@ -24,56 +41,62 @@
         <textarea style="float:right" readonly>hello</textarea>
 
         <form action="/generate" method="post">
-            <label for="vehicle">Choose a vehicle:</label>
-            <select name="vehicle">
-                {% for vehicle in get_vehicles()[0] %}
+            <label for="vehicle">Choose a vehicle:
+                <select name="vehicle">
+                    {% for vehicle in get_vehicles()[0] %}
                     {% if vehicle == get_vehicles()[1] %}
-                        <option value="{{vehicle}}" selected>{{vehicle}}</option>
+                    <option value="{{vehicle}}" selected>{{vehicle}}</option>
                     {% else %}
-                        <option value="{{vehicle}}">{{vehicle}}</option>
+                    <option value="{{vehicle}}">{{vehicle}}</option>
                     {% endif %}
-                {% endfor %}
-            </select>
-            <p/>
-            <label for="board">Choose a board:</label>
-            <select name="board">
-                {% for board in get_boards()[0] %}
+                    {% endfor %}
+                </select>
+            </label>
+            <p></p>
+            <label for="board">Choose a board:
+                <select name="board">
+                    {% for board in get_boards()[0] %}
                     {% if board == get_boards()[1] %}
-                        <option value="{{board}}" selected>{{board}}</option>
+                    <option value="{{board}}" selected>{{board}}</option>
                     {% else %}
-                        <option value="{{board}}">{{board}}</option>
+                    <option value="{{board}}">{{board}}</option>
                     {% endif %}
-                {% endfor %}
-            </select>
-            <p/>
-            <label for="board">Select Features:</label>
-            <ul class="collapsibleList">
-              {% for c in get_build_categories() %}
-              <li>{{c}}
-                <ul>
-                  {% for f in get_build_options(c) %}
-                    <li>
-                    {% if f.default == 1 %}
-                    <input onclick='dependencies(this, "{{f.label}}", "{{f.dependency}}");' type="checkbox" name="{{f.label}}" id="{{f.label}}" value="1" checked>
-                    {% else %}
-                    <input onclick='dependencies(this, "{{f.label}}", "{{f.dependency}}");' type="checkbox" name="{{f.label}}" id="{{f.label}}" value="1">
-                    {% endif %}
-                    {{f.description}}
+                    {% endfor %}
+                </select>
+            </label>
+            <p></p>
+            <label for="board">Select Features:
+                <ul class="collapsibleList">
+                    {% for c in get_build_categories() %}
+                    <li>{{c}}
+                        <ul>
+                            {% for f in get_build_options(c) %}
+                            <li>
+                                {% if f.default == 1 %}
+                                <input onclick='dependencies(this, "{{f.label}}", "{{f.dependency}}");' type="checkbox"
+                                       name="{{f.label}}" id="{{f.label}}" value="1" checked>
+                                {% else %}
+                                <input onclick='dependencies(this, "{{f.label}}", "{{f.dependency}}");' type="checkbox"
+                                       name="{{f.label}}" id="{{f.label}}" value="1">
+                                {% endif %}
+                                {{f.description}}
+                            </li>
+                            {% endfor %}
+                        </ul>
                     </li>
-                  {% endfor %}
+                    {% endfor %}
                 </ul>
-               </li>
-              {% endfor %}
-            </ul>
+            </label>
             <br>
             <input type="submit" value="Generate">
         </form>
     </div>
-<hr>
+    <hr>
     <div id="build_status"></div>
-<br />
+    <br/>
     <script>
         CollapsibleLists.apply();
+
         function reload() {
             var output = document.getElementById('build_status');
             var xhr = new XMLHttpRequest();
@@ -84,30 +107,32 @@
             xhr.setRequestHeader("Expires", "Tue, 01 Jan 1980 1:00:00 GMT");
             xhr.setRequestHeader("Pragma", "no-cache");
 
-            xhr.onload = function() {
-                if (xhr.status == 200) {
+            xhr.onload = function () {
+                if (xhr.status === 200) {
                     output.innerHTML = xhr.responseText;
                 }
-                setTimeout(reload,5000)
+                setTimeout(reload, 5000)
             }
             xhr.send();
-            }
-        
+        }
+
         function dependencies(cb, f_label, f_dependency1) {
             switch (cb.name) {
-            case f_label:
-                const f_dependency = f_dependency1.split(",")
-                var arrayLength = f_dependency.length;
-                for (var i = 0; i < arrayLength; i++) {
-                    if (document.getElementById(f_dependency[i]).checked == false){
-                        document.getElementById(f_dependency[i]).checked = cb.checked;
-                }
-                }
-            break;
-            }
+                case f_label:
+                    const f_dependency = f_dependency1.split(",")
+                    var arrayLength = f_dependency.length;
+                    for (var i = 0; i < arrayLength; i++) {
+                        if (document.getElementById(f_dependency[i]).checked == false) {
+                            document.getElementById(f_dependency[i]).checked = cb.checked;
+                        }
+                    }
+                    break;
             }
+        }
     </script>
+</div>
 </body>
 
 <hr>
-<footer>Created by Will Piper, <a href=https://github.com/ArduPilot/CustomBuild>Source Code<a>.</footer>
+<footer>Created by Will Piper, <a href=https://github.com/ArduPilot/CustomBuild>Source Code</a>.</footer>
+</html>