main toolbar: clarify element ordering, fix some indents

index.php

@@ -159,25 +159,30 @@
         <div id="toolbar-frame" dojoType="dijit.layout.ContentPane" region="top">
             <div id="toolbar" dojoType="fox.Toolbar">
 
-            <i class="material-icons net-alert" style="display : none"
-                title="<?= __("Communication problem with server.") ?>">error_outline</i>
-
-            <i class="material-icons log-alert" style="display : none" onclick="App.openPreferences('system')"
-                 title="<?= __("Recent entries found in event log.") ?>">warning</i>
-
-            <i id="updates-available" class="material-icons icon-new-version" style="display : none"
-               title="<?= __('Updates are available from Git.') ?>">new_releases</i>
+			 	<!-- order 0, default -->
 
 				<?php
-
 					PluginHost::getInstance()->run_hooks_callback(PluginHost::HOOK_MAIN_TOOLBAR_BUTTON, function ($result) {
 						echo $result;
 					});
 				?>
 
-            <div id="toolbar-headlines" dojoType="fox.Toolbar" style="order : 10">
+				<!-- order 5: alert icons -->
 
-            </div>
+            <i class="material-icons net-alert" style="display : none; order : 5"
+                title="<?= __("Communication problem with server.") ?>">error_outline</i>
+
+            <i class="material-icons log-alert" style="display : none; order : 5" onclick="App.openPreferences('system')"
+                 title="<?= __("Recent entries found in event log.") ?>">warning</i>
+
+            <i id="updates-available" class="material-icons icon-new-version" style="display : none; order: 5"
+               title="<?= __('Updates are available from Git.') ?>">new_releases</i>
+
+				<!-- order 10: headlines toolbar -->
+
+            <div id="toolbar-headlines" dojoType="fox.Toolbar" style="order : 10"> </div>
+
+				<!-- order 20: main toolbar contents (dropdowns) -->
 
             <form id="toolbar-main" dojoType="dijit.form.Form" action="" style="order : 20" onsubmit="return false">
 
@@ -227,6 +232,8 @@
 
             </form>
 
+				<!-- toolbar actions dropdown: order 30 -->
+
             <div class="action-chooser" style="order : 30">
 
                 <?php