From 5b908819bbc441b0d125d23fa633bb18658b919a Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Thu, 18 Sep 2014 15:12:14 +0900
Subject: [PATCH] Removing unnecessary form tags, improving options dialog

---
 client/application.js |   3 --
 client/index.html     | 104 ++++++++++++++++++++----------------------
 2 files changed, 50 insertions(+), 57 deletions(-)

diff --git a/client/application.js b/client/application.js
index 74b2367..8b40bc8 100644
--- a/client/application.js
+++ b/client/application.js
@@ -90,9 +90,6 @@
 
         ready: function() {
             $('#keywords').selectpicker();
-            $('.btn').click(function(e) {
-                e.preventDefault();
-            });
 
             $.getJSON('/node/keywords', function(keywords) {
                 for (var i = 0, count = keywords.length; i < count; ++i) {
diff --git a/client/index.html b/client/index.html
index f118916..d80e6e7 100644
--- a/client/index.html
+++ b/client/index.html
@@ -17,60 +17,58 @@
                 </h1>
             </div>
 
-            <div id="input">
-                <form class="form-horizontal">
-                    <div class="form-group">
-                        <label for="keywords" class="col-md-2 control-label">Keywords</label>
-                        <div class="col-md-10">
-                            <select id="keywords" class="form-control" multiple="multiple" data-max-options="4" data-live-search="data-live-search" name="keywords"></select>
-                        </div>
+            <div id="input" class="form-horizontal">
+                <div class="form-group">
+                    <label for="keywords" class="col-md-2 control-label">Keywords</label>
+                    <div class="col-md-10">
+                        <select id="keywords" class="form-control" multiple="multiple" data-max-options="4" data-live-search="data-live-search" name="keywords"></select>
                     </div>
-                    <div class="form-group">
-                        <label for="minScore" class="col-md-2 control-label">Minimum score</label>
-                        <div class="col-md-10">
-                            <input class="form-control" type="number" step="any" value="0.25" id="minScore" name="minScore">
-                        </div>
+                </div>
+                <div class="form-group">
+                    <label for="minScore" class="col-md-2 control-label">Minimum score</label>
+                    <div class="col-md-10">
+                        <input class="form-control" type="number" step="any" value="0.25" id="minScore" name="minScore">
                     </div>
-                    <div class="form-group">
-                        <label for="hintSteps" class="col-md-2 control-label">Hint steps</label>
-                        <div class="col-md-10">
-                            <input class="form-control" type="number" value="20" id="hintSteps" name="hintSteps">
-                        </div>
+                </div>
+                <div class="form-group">
+                    <label for="hintSteps" class="col-md-2 control-label">Hint steps</label>
+                    <div class="col-md-10">
+                        <input class="form-control" type="number" value="20" id="hintSteps" name="hintSteps">
                     </div>
-                    <div class="form-group">
-                        <label for="maxResults" class="col-md-2 control-label">Max results</label>
-                        <div class="col-md-10">
-                            <input class="form-control" type="number" value="100" id="maxResults" name="maxResults">
-                        </div>
+                </div>
+                <div class="form-group">
+                    <label for="maxResults" class="col-md-2 control-label">Max results</label>
+                    <div class="col-md-10">
+                        <input class="form-control" type="number" value="100" id="maxResults" name="maxResults">
                     </div>
-                    <div class="form-group">
-                        <div class="col-md-offset-2 col-md-10">
-                            <button class="btn btn-primary" id="search" type="button" disabled="disabled">
-                                <span class="glyphicon glyphicon-search"></span> Search
-                            </button>
-                        </div>
+                </div>
+                <div class="form-group">
+                    <div class="col-md-offset-2 col-md-10">
+                        <button class="btn btn-primary" id="search" type="button" disabled="disabled">
+                            <span class="glyphicon glyphicon-search"></span> Search
+                        </button>
                     </div>
-                </form>
+                </div>
             </div>
 
             <div class="modal fade options" tabindex="-1">
                 <div class="modal-dialog modal-sm">
                     <div class="modal-content">
-                        <div class="modal-header"><big>Options</big></div>
+                        <div class="modal-header"><big>Visualization Options</big></div>
                         <div class="modal-body">
-                            <form>
+                            <div class="form-group">
                                 <label class="checkbox-inline">
                                     <input type="checkbox" id="useLocalScale" name="useLocalScale" checked="checked"> Use local scale
                                 </label>
+                            </div>
+                            <div class="form-group">
                                 <label class="checkbox-inline">
                                     <input type="checkbox" id="useRelativeScale" name="useRelativeScale" checked="checked"> Use relative scale
                                 </label>
-                            </form>
+                            </div>
                         </div>
                         <div class="modal-footer">
-                            <form>
-                                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                            </form>
+                            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
                         </div>
                     </div>
                 </div>
@@ -81,10 +79,8 @@
                     <div class="panel-heading">
                         <big>Semantic tweaks to <span id="query" class="text-primary"></span></big>
                         <div class="btn-group pull-right">
-                            <form>
-                                <button class="btn btn-xs btn-success">Learn...</button>
-                                <button class="btn btn-xs btn-default" data-toggle="modal" data-target=".options">Options...</button>
-                            </form>
+                            <button class="btn btn-xs btn-success">Learn...</button>
+                            <button class="btn btn-xs btn-default" data-toggle="modal" data-target=".options">Options...</button>
                         </div>
                     </div>
                     <div style="padding: 10px;" class="unselectable">
@@ -97,21 +93,21 @@
                     <div style="padding: 10px;">
                         <script id="template" type="text/x-handlers-template">
                             {{#if results}}
-                            <table class="table table-striped table-condensed">
-                                <thead>
-                                    <tr>
-                                        <th>#</th>
-                                        <th>Name</th>
-                                        <th>Score</th>
-                                    </tr>
-                                </thead>
-                                {{#each results}}
-                                <tr>
-                                    <td>{{@index}}</td>
-                                    <td><a href="{{url}}">{{name}}</a></td>
-                                    <td>{{score}}</td>
-                                </tr>
-                                {{/each}}
+                                <table class="table table-striped table-condensed">
+                            <thead>
+                            <tr>
+                            <th>#</th>
+                            <th>Name</th>
+                            <th>Score</th>
+                            </tr>
+                            </thead>
+                            {{#each results}}
+                            <tr>
+                            <td>{{@index}}</td>
+                            <td><a href="{{url}}">{{name}}</a></td>
+                            <td>{{score}}</td>
+                            </tr>
+                            {{/each}}
                             </table>
                             {{/if}}
                         </script>