From 19897cd574bd5ac1a38eb819e2106a6a66c15f10 Mon Sep 17 00:00:00 2001
From: skaman82 <skaman82@users.noreply.github.com>
Date: Sun, 15 Nov 2015 23:35:22 +0100
Subject: started to work on new GUI functionality

---
 main.html | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

(limited to 'main.html')

diff --git a/main.html b/main.html
index 88320b86..df899eb2 100755
--- a/main.html
+++ b/main.html
@@ -126,6 +126,28 @@
                 </div>
             </div>
             <div class="header-wrapper">
+                <div id="dataflash_wrapper">
+            <div class="noflash" align="center">No dataflash <br>chip found</div>
+                    <ul class="dataflash-contents">
+                        <li class="dataflash-used">
+                            <div class="legend">Used space</div>
+                        </li>
+                        <li class="dataflash-free">
+                            <div class="legend">Free space</div>
+                        </li>
+                    </ul>
+                    <div id="profile_change">
+                        <div class="dropdown dropdown-dark">
+                                <form name="pid-tuning" id="pid-tuning">
+                            <select class="dropdown-select" name="profilechange">
+                            <option value="0">Profile 1</option>
+                            <option value="1">Profile 2</option>
+                            <option value="2">Profile 3</option>
+                            </select>
+                            </form>
+                        </div>
+                    </div>
+                </div>
                 <div id="sensor-status" class="sensor_state mode-connected">
                     <ul>
                         <li class="gyro" title="Gyroscope">
@@ -193,10 +215,10 @@
                         title="Dataflash"></a></li>
                     <li class="tab_cli"><a href="#" i18n="tabCLI" class="tabicon ic_cli" title="CLI"></a></li>
                     <!-- spare icons
-                     <li class=""><a href="#"class="tabicon ic_mission">Mission (spare icon)</a></li>
-                     <li class=""><a href="#"class="tabicon ic_advanced">Advanced (spare icon)</a></li>
-                     <li class=""><a href="#"class="tabicon ic_wizzard">Wizzard (spare icon)</a></li>
-                     -->
+                    <li class=""><a href="#"class="tabicon ic_mission">Mission (spare icon)</a></li>
+                    <li class=""><a href="#"class="tabicon ic_advanced">Advanced (spare icon)</a></li>
+                    <li class=""><a href="#"class="tabicon ic_wizzard">Wizzard (spare icon)</a></li>
+                    -->
                 </ul>
             </div>
             <div class="clear-both"></div>
-- 
cgit v1.2.3


From 6b97eb28092a048459a8f931799368eceb61f9ca Mon Sep 17 00:00:00 2001
From: skaman82 <skaman82@users.noreply.github.com>
Date: Mon, 16 Nov 2015 12:46:59 +0100
Subject: Further work on dataflash and profile switch in the header

---
 main.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'main.html')

diff --git a/main.html b/main.html
index df899eb2..980498ee 100755
--- a/main.html
+++ b/main.html
@@ -130,10 +130,10 @@
             <div class="noflash" align="center">No dataflash <br>chip found</div>
                     <ul class="dataflash-contents">
                         <li class="dataflash-used">
-                            <div class="legend">Used space</div>
+                            <div class="legend">Dataflash: used space</div>
                         </li>
                         <li class="dataflash-free">
-                            <div class="legend">Free space</div>
+                            <div class="legend">Dataflash: free space</div>
                         </li>
                     </ul>
                     <div id="profile_change">
-- 
cgit v1.2.3


From 0aefcd595990b12cf5020e8b83c0badc16baf567 Mon Sep 17 00:00:00 2001
From: NightHawk32 <nighthawk2244@gmail.com>
Date: Mon, 23 Nov 2015 17:00:05 -0500
Subject: Renamed global profile selector to avoid collisions with #pid-tuning

---
 main.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'main.html')

diff --git a/main.html b/main.html
index 980498ee..0bbf6792 100755
--- a/main.html
+++ b/main.html
@@ -138,13 +138,13 @@
                     </ul>
                     <div id="profile_change">
                         <div class="dropdown dropdown-dark">
-                                <form name="pid-tuning" id="pid-tuning">
+                           <form name="profile-change" id="profile-change">
                             <select class="dropdown-select" name="profilechange">
                             <option value="0">Profile 1</option>
                             <option value="1">Profile 2</option>
                             <option value="2">Profile 3</option>
                             </select>
-                            </form>
+                           </form>
                         </div>
                     </div>
                 </div>
-- 
cgit v1.2.3


From 6157c875f9ccb5609ede5ba74387d0671d3dfdb7 Mon Sep 17 00:00:00 2001
From: NightHawk32 <nighthawk2244@gmail.com>
Date: Tue, 24 Nov 2015 18:01:56 -0500
Subject: Renamed global dataflash components, fixed detection for global
 dataflash display.

---
 main.html | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'main.html')

diff --git a/main.html b/main.html
index 0bbf6792..9f042554 100755
--- a/main.html
+++ b/main.html
@@ -126,13 +126,10 @@
                 </div>
             </div>
             <div class="header-wrapper">
-                <div id="dataflash_wrapper">
-            <div class="noflash" align="center">No dataflash <br>chip found</div>
-                    <ul class="dataflash-contents">
-                        <li class="dataflash-used">
-                            <div class="legend">Dataflash: used space</div>
-                        </li>
-                        <li class="dataflash-free">
+                <div id="dataflash_wrapper_global">
+            <div class="noflash_global" align="center">No dataflash <br>chip found</div>
+                    <ul class="dataflash-contents_global">
+                        <li class="dataflash-free_global">
                             <div class="legend">Dataflash: free space</div>
                         </li>
                     </ul>
-- 
cgit v1.2.3