Commit b5be8916 authored by born's avatar born
Browse files

Added new data file; show number of issuers in search box; re-ordered clustering in settings drawer

parent 7e3a00c8

data/graph_v12.json

0 → 100644
+0 −0

File added.

Preview suppressed by a .gitattributes entry or the file's encoding is unsupported.

View file

index.html

+6 −4
Original line number Diff line number Diff line
@@ -149,7 +149,8 @@ 
                            <p>

                                <label class="inline-radio"><input name="jsonfile" type="radio" ng-model="vissettings.ownfile" ng-value="true" ng-click="setOwnFile();" required> Upload saved JSON file</label>

                                <label class="inline-radio"><input name="jsonfile" type="radio" ng-model="vissettings.paperdatafile" ng-value="true" ng-click="setDataFile(10);" required> graph_v10.json</label>

                                <label class="inline-radio"><input name="jsonfile" type="radio" ng-model="vissettings.otherdatafile" ng-value="true" ng-click="setDataFile(11);" required> graph_v11.json</label>

                                <!--<label class="inline-radio"><input name="jsonfile" type="radio" ng-model="vissettings.otherdatafile" ng-value="true" ng-click="setDataFile(11);" required> graph_v11.json</label>-->

                                <label class="inline-radio"><input name="jsonfile" type="radio" ng-model="vissettings.otherdatafile" ng-value="true" ng-click="setDataFile(12);" required> graph_v12.json</label>

                            </p>

                        </div>

                    </div>
@@ -159,7 +160,7 @@ 
                        <label class="inline-checkbox"><input type="checkbox" ng-model="vissettings.selectAllIssuers" ng-change="toggleAll()"> Select all</label>

                        <div class="group">

                            <div class="col span_a_half">

                                <input type="text" spellcheck="false" class="form-control glyphicon glyphicon-search search-box" placeholder="Search..." ng-model="vissettings.query" ng-change="updateFilteredIssuers()"></input>

                                <input type="text" spellcheck="false" class="form-control glyphicon glyphicon-search search-box" placeholder="Search... ({{ resultsIssuers.length }})" ng-model="vissettings.query" ng-change="updateFilteredIssuers()"></input>

                            </div>

                            <div class="col span_a_half">

                                <label>Selected:</label>
@@ -303,13 +304,14 @@ 
                                <li><label class="checkbox-inline"><input type="checkbox" ng-model="vissettings.physicsEnabled" ng-change="togglePhysics();"> Enable physics</label></li>

                                <li><label class="checkbox-inline"><input type="checkbox" ng-model="vissettings.networkLocked" ng-change="toggleNetworkLock();"> Lock network</label></li>

                                <hr class="style-one" />

                                <li>Cluster by nobility title: <select class="form-control" ng-model="titletocluster" ng-options="x for x in allnobilitytitles"></select></li>

                                <hr class="style-one" />

                            </ul>

                            <form name="clusterform" ng-submit="clusterBy()">

                                <fieldset>

                                    <ul class="drawer-nav">

                                        <li>Cluster By: <input type="text" spellcheck="false" class="form-control" placeholder="term1, term2, term3 ..." ng-model="clustering.query"></input></li>

                                        <li>Cluster by term: <input type="text" spellcheck="false" class="form-control" placeholder="term1, term2, term3 ..." ng-model="clustering.query"></input></li>

                                        <li><a type="submit" ng-disabled="clustering.query == ''" class="btn btn-default btn-md" ng-click="clusterBy()">Cluster</a></li>

                                        <li><select class="form-control input-sm" ng-model="titletocluster" ng-options="x for x in allnobilitytitles"></select></li>

                                    </ul>

                                </fieldset>

                            </form>