[LNT] r194517 - Bootstrapify summary report edit UI.

Chris Matthews cmatthews5 at apple.com
Tue Nov 12 13:50:28 PST 2013


Author: cmatthews
Date: Tue Nov 12 15:50:28 2013
New Revision: 194517

URL: http://llvm.org/viewvc/llvm-project?rev=194517&view=rev
Log:
Bootstrapify summary report edit UI.

Modified:
    lnt/trunk/lnt/server/ui/static/v4_summary_report_ui.js
    lnt/trunk/lnt/server/ui/templates/v4_summary_report_ui.html

Modified: lnt/trunk/lnt/server/ui/static/v4_summary_report_ui.js
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/static/v4_summary_report_ui.js?rev=194517&r1=194516&r2=194517&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/static/v4_summary_report_ui.js (original)
+++ lnt/trunk/lnt/server/ui/static/v4_summary_report_ui.js Tue Nov 12 15:50:28 2013
@@ -25,7 +25,7 @@ function init() {
   for (var i = 0; i != g.config.orders.length; ++i) {
     var order = g.config.orders[i];
     var name = order[0];
-    var item = $('<li class="list-item"></li>');
+    var item = $('<button class="btn" style="width:90%;" ></button>');
     g.list_items.push(item);
 
     // Add the item contents.
@@ -44,7 +44,7 @@ function init() {
   // Initialize the machines list.
   var machines = $('#report-machines');
   machines.empty();
-  var machine_select = $('<select multiple="multiple" size="10"></select>');
+  var machine_select = $('<select multiple="multiple"  style="width:300px;" size=20></select>');
   for (var j = 0; j != g.all_machines.length; ++j) {
     var selected_str = '';
     if ($.inArray(g.all_machines[j], g.config.machine_names) != -1)
@@ -101,7 +101,7 @@ function update_machine_items(select_elt
     if (option.selected)
       g.config.machine_names.push(g.all_machines[option.value]);
   }
-}
+} s
 
 // Select a report order entry to edit.
 function select_order(index) {
@@ -116,7 +116,7 @@ function select_order(index) {
   name_elt.change(function() { update_selected_order_name(name_elt[0]); });
 
   elt.append('<br>');
-  var order_select = $('<select multiple="multiple" size="10"></select>');
+  var order_select = $('<select multiple="multiple"  style="width:300px;" size=20></select>');
   for (var i = 0; i != g.all_orders.length; ++i) {
     var selected_str = '';
     if ($.inArray(g.all_orders[i], g.selected_order[1]) != -1)

Modified: lnt/trunk/lnt/server/ui/templates/v4_summary_report_ui.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/v4_summary_report_ui.html?rev=194517&r1=194516&r2=194517&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/v4_summary_report_ui.html (original)
+++ lnt/trunk/lnt/server/ui/templates/v4_summary_report_ui.html Tue Nov 12 15:50:28 2013
@@ -8,60 +8,58 @@
                            filename='jquery/1.5/jquery.min.js') }}"></script>
   <script src="{{ url_for('.static',filename='v4_summary_report_ui.js')}}"></script>
 
-<style>
-.ui-box {
-    border  :  1px dashed #000;
-    padding :  3px;
-    margin  : 20px;
-}
 
-.list {
-    list-style-type : none;
-    margin: 0;
-    padding : 0;
-}
+<script>
+  g.config = {{ config|tojson(indent=2)|safe }};
+  g.all_orders = {{ all_orders|tojson(indent=2)|safe }};
+  g.all_machines = {{ all_machines|tojson(indent=2)|safe }};
+  g.save_url = {{ db_url_for("v4_summary_report_ui")|tojson|safe }};
+</script>
 
-.list-item {
-    border  : 1px solid #672;
-    padding : 1px;
-    margin  : 2px;
+<style>
+/* Base class */
+.smbox {
+  position: relative;
+  height: 550px;
+  margin: 15px 0;
+  padding: 39px 19px 14px;
+  *padding-top: 19px;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  
 }
 </style>
 
-<script>
-g.config = {{ config|tojson(indent=2)|safe }};
-g.all_orders = {{ all_orders|tojson(indent=2)|safe }};
-g.all_machines = {{ all_machines|tojson(indent=2)|safe }};
-g.save_url = {{ db_url_for("v4_summary_report_ui")|tojson|safe }};
-</script>
 {% endblock %}
 {% block title %}Summary Report Editor{% endblock %}
 {% block body %}
 
-<div>
-<div style="width : 250px; float : left;">
-  <h2><center>Report Orders</center></h2>
-  <div class="ui-box" style="width : 200px; height : 200px">
-    <ul class="list" id="report-order-list">
-    </ul>
-
-    <br>
-    <input type="button" value="Add" onclick="add_order();">
+<div class="span2 smbox">
+  <h3><center>Report Orders</center></h3>
+  <div class="btn-group btn-group-vertical" style="width:100%"  id="report-order-list">
   </div>
+  <br>
+  <br>
+  <input type="button" value="Add" onclick="add_order();">
 </div>
-<div style="width : 250px; float : left;">
-  <h2><center>Order Items</center></h2>
-  <div class="ui-box" style="width : 200px; height : 200px;" id="report-order-items">
+
+<div  class="span4 smbox">
+  <h3><center>Order Items</center></h3>
+  <div class="ui-box"  id="report-order-items">
   </div>
 </div>
-<div style="width : 280px; float : left;">
-  <h2><center>Machines</center></h2>
-  <div class="ui-box" style="width : 230px; height : 200px" id="report-machines">
+
+<div class="span4 smbox">
+  <h3><center>Machines</center></h3>
+  <div class="ui-box"  id="report-machines">
   </div>
 </div>
-<br style="clear: left;" />
-</div>
-
-<input type="button" value="Save" onclick="save_config();">
 
+<div class="span9 form-actions" >
+  <button type="submit" class="btn btn-primary" onclick="save_config();">Save changes</button>
+  <button type="button" class="btn" onClick="document.location.reload(true)">Cancel</button>
+</div>
 {% endblock %}





More information about the llvm-commits mailing list