#832: Polished

hawtio · Dec 12, 2013 · 5a38ce1 · 5a38ce1
1 parent 71a3851
commit 5a38ce1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 21 deletions.
diff --git a/hawtio-web/src/main/webapp/app/core/doc/img/help-topic-nav.png b/hawtio-web/src/main/webapp/app/core/doc/img/help-topic-nav.png
diff --git a/hawtio-web/src/main/webapp/app/core/doc/preference.md b/hawtio-web/src/main/webapp/app/core/doc/preference.md
@@ -2,14 +2,15 @@
 
 The preference is used to configure **hawtio** and the plugins.
 
-##### Core #####
+##### Core Plugins #####
 
 ###### Behaviour ######
 - **Welcome Page** - Whether to show welcome page on startup.
 - **Update Rate** - How often [{{branding.appName}}](http://hawt.io "{{branding.appName}}") polls the [Jolokia](http://jolokia.org) backend for JMX metrics.  Can be set to "No Refreshes" and intervals of 1, 2, 5, 10, and 30 seconds.
-
   <i class='yellow text-shadowed icon-warning-sign'></i> **Note:** Setting this to "No Refreshes" will disable charting, as charting requires fetching periodic metric updates.
 - **Auto Refresh** - Automatically refresh the browser window if [{{branding.appName}}](http://hawt.io "{{branding.appName}}") detects a change in available plugins.
+- **Log Level** - Logging level used by the logging console (<i class='icon-desktop'></i>)
+- **Log Buffer** - Number of log lines to keep in the logging console (<i class='icon-desktop'></i>)
 - **Host Identification** - To associate a label and colour to host(s) when [connecting](#/help/jvm) to containers.
 
 ###### Logs ######
@@ -19,15 +20,8 @@ The preference is used to configure **hawtio** and the plugins.
 - **User Name** - The git username to use when committing updates to the [Dashboard](#/help/dashboard/) or [Wiki](#/help/wiki).
 - **Email address** - The e-mail address to associate with git commits.
 
-###### ActiveMQ ######
-- **User Name** - The username to use when connecting to the [ActiveMQ](#/help/activemq/) broker.
-- **Password** - The password for the username.
-
 ###### Editor ######
 - **Theme** - The theme to be used by the CodeMirror code editor
 - **Tab Size** - The tab stop size to be used by the CodeMirror code editor.
 
 
-##### Camel #####
-
-TODO: Some options here
diff --git a/hawtio-web/src/main/webapp/app/core/html/preferences.html b/hawtio-web/src/main/webapp/app/core/html/preferences.html
@@ -30,6 +30,14 @@
           </div>
         </div>
 
+        <div class="control-group">
+          <label class="control-label">Auto Refresh</label>
+          <div class="controls">
+            <input type="checkbox" ng-model="autoRefresh">
+            <span class="help-block">Automatically refresh the app when a plugin is updated</span>
+          </div>
+        </div>
+
         <div class="control-group">
           <label class="control-label" for="logLevel">Log Level</label>
           <div class="controls">
@@ -40,23 +48,15 @@
               <option value='{"value": 2, "name": "INFO"}'>Info</option>
               <option value='{"value": 1, "name": "DEBUG"}'>Debug</option>
             </select>
-            <span class="help-block">Level of logging for the web console frontend</span>
+            <span class="help-block">Level of logging for the logging console (<i class='icon-desktop'></i>)</span>
           </div>
         </div>
 
         <div class="control-group">
           <label class="control-label" for="logBuffer">Log Buffer</label>
           <div class="controls">
             <input type="number" id="logBuffer" ng-model="logBuffer">
-            <span class="help-block">The number of log statements to keep available in the frontend log panel</span>
-          </div>
-        </div>
-
-        <div class="control-group">
-          <label class="control-label">Auto Refresh</label>
-          <div class="controls">
-            <input type="checkbox" ng-model="autoRefresh">
-            <span class="help-block">Automatically refresh the app when a plugin is updated</span>
+            <span class="help-block">The number of log statements to keep available in the logging console (<i class='icon-desktop'></i>)</span>
           </div>
         </div>
 
@@ -96,6 +96,7 @@
                 </div>
               </div>
             </div>
+            <span class="help-block">To associate a label and colour to host(s) when connecting to containers</span>
           </div>
         </div>
 
@@ -257,9 +258,9 @@
 
       </div>
 
-
-
       <div>
+        <p></p>
+        <p></p>
         <p></p>
         <p></p>
         <strong>Reset Settings</strong>
@@ -268,6 +269,7 @@
         <p></p>
         <p></p>
         <p></p>
+        <p></p>
       </div>
 
     </div>