<div dir="ltr">LGTM.<div><br></div><div>Feel free to commit changes to the summary report directly, I will review post commit if I have comments.<div><br></div><div> - Daniel</div></div></div><div class="gmail_extra"><br><br>
<div class="gmail_quote">On Fri, Oct 18, 2013 at 1:10 PM, Chris Matthews <span dir="ltr"><<a href="mailto:chris.matthews@apple.com" target="_blank">chris.matthews@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div style="word-wrap:break-word">A few updates to the summary report UI.  Make it use bootstrap to do layout. Change some text that was clickable into buttons.<div><div>diff --git a/lnt/server/ui/static/v4_summary_report_ui.js b/lnt/server/ui/static/v4_summary_report_ui.js</div>
<div>index 0015a4d0ff97df0ab6d3b50d51f05a736e4ccdb8..514bd933c6e4860b327aec571a0179d11b31ff66 100644</div><div>--- a/lnt/server/ui/static/v4_summary_report_ui.js</div><div>+++ b/lnt/server/ui/static/v4_summary_report_ui.js</div>
<div>@@ -25,7 +25,7 @@ function init() {</div><div>   for (var i = 0; i != g.config.orders.length; ++i) {</div><div>     var order = g.config.orders[i];</div><div>     var name = order[0];</div><div>-    var item = $('<li class="list-item"></li>');</div>
<div>+    var item = $('<button class="btn" style="width:90%;" ></button>');</div><div>     g.list_items.push(item);</div><div> </div><div>     // Add the item contents.</div><div>@@ -44,7 +44,7 @@ function init() {</div>
<div>   // Initialize the machines list.</div><div>   var machines = $('#report-machines');</div><div>   machines.empty();</div><div>-  var machine_select = $('<select multiple="multiple" size="10"></select>');</div>
<div>+  var machine_select = $('<select multiple="multiple"  style="width:300px;" size=20></select>');</div><div>   for (var j = 0; j != g.all_machines.length; ++j) {</div><div>     var selected_str = '';</div>
<div>     if ($.inArray(g.all_machines[j], g.config.machine_names) != -1)</div><div>@@ -101,7 +101,7 @@ function update_machine_items(select_elt) {</div><div>     if (option.selected)</div><div>       g.config.machine_names.push(g.all_machines[option.value]);</div>
<div>   }</div><div>-}</div><div>+} s</div><div> </div><div> // Select a report order entry to edit.</div><div> function select_order(index) {</div><div>@@ -116,7 +116,7 @@ function select_order(index) {</div><div>   name_elt.change(function() { update_selected_order_name(name_elt[0]); });</div>
<div> </div><div>   elt.append('<br>');</div><div>-  var order_select = $('<select multiple="multiple" size="10"></select>');</div><div>+  var order_select = $('<select multiple="multiple"  style="width:300px;" size=20></select>');</div>
<div>   for (var i = 0; i != g.all_orders.length; ++i) {</div><div>     var selected_str = '';</div><div>     if ($.inArray(g.all_orders[i], g.selected_order[1]) != -1)</div><div>diff --git a/lnt/server/ui/templates/v4_summary_report_ui.html b/lnt/server/ui/templates/v4_summary_report_ui.html</div>
<div>index b1ec24914cee0e8c5e73f9a9235c45048e8e9f09..797db9de924b024fd6aa699af9d30607e48b403b 100644</div><div>--- a/lnt/server/ui/templates/v4_summary_report_ui.html</div><div>+++ b/lnt/server/ui/templates/v4_summary_report_ui.html</div>
<div>@@ -8,60 +8,58 @@</div><div>                            filename='jquery/1.5/jquery.min.js') }}"></script></div><div>   <script src="{{ url_for('.static',filename='v4_summary_report_ui.js')}}"></script></div>
<div> </div><div>-<style></div><div>-.ui-box {</div><div>-    border  :  1px dashed #000;</div><div>-    padding :  3px;</div><div>-    margin  : 20px;</div><div>-}</div><div> </div><div>-.list {</div><div>-    list-style-type : none;</div>
<div>-    margin: 0;</div><div>-    padding : 0;</div><div>-}</div><div>+<script></div><div>+  g.config = {{ config|tojson(indent=2)|safe }};</div><div>+  g.all_orders = {{ all_orders|tojson(indent=2)|safe }};</div>
<div>+  g.all_machines = {{ all_machines|tojson(indent=2)|safe }};</div><div>+  g.save_url = {{ db_url_for("v4_summary_report_ui")|tojson|safe }};</div><div>+</script></div><div> </div><div>-.list-item {</div>
<div>-    border  : 1px solid #672;</div><div>-    padding : 1px;</div><div>-    margin  : 2px;</div><div>+<style></div><div>+/* Base class */</div><div>+.smbox {</div><div>+  position: relative;</div><div>+  height: 550px;</div>
<div>+  margin: 15px 0;</div><div>+  padding: 39px 19px 14px;</div><div>+  *padding-top: 19px;</div><div>+  background-color: #fff;</div><div>+  border: 1px solid #ddd;</div><div>+  -webkit-border-radius: 4px;</div><div>+     -moz-border-radius: 4px;</div>
<div>+          border-radius: 4px;</div><div>+  </div><div> }</div><div> </style></div><div> </div><div>-<script></div><div>-g.config = {{ config|tojson(indent=2)|safe }};</div><div>-g.all_orders = {{ all_orders|tojson(indent=2)|safe }};</div>
<div>-g.all_machines = {{ all_machines|tojson(indent=2)|safe }};</div><div>-g.save_url = {{ db_url_for("v4_summary_report_ui")|tojson|safe }};</div><div>-</script></div><div> {% endblock %}</div><div> {% block title %}Summary Report Editor{% endblock %}</div>
<div> {% block body %}</div><div> </div><div>-<div></div><div>-<div style="width : 250px; float : left;"></div><div>-  <h2><center>Report Orders</center></h2></div><div>-  <div class="ui-box" style="width : 200px; height : 200px"></div>
<div>-    <ul class="list" id="report-order-list"></div><div>-    </ul></div><div>-</div><div>-    <br></div><div>-    <input type="button" value="Add" onclick="add_order();"></div>
<div>+<div class="span2 smbox"></div><div>+  <h3><center>Report Orders</center></h3></div><div>+  <div class="btn-group btn-group-vertical" style="width:100%"  id="report-order-list"></div>
<div>   </div></div><div>+  <br></div><div>+  <br></div><div>+  <input type="button" value="Add" onclick="add_order();"></div><div> </div></div><div>-<div style="width : 250px; float : left;"></div>
<div>-  <h2><center>Order Items</center></h2></div><div>-  <div class="ui-box" style="width : 200px; height : 200px;" id="report-order-items"></div><div>+</div><div>
+<div  class="span4 smbox"></div><div>+  <h3><center>Order Items</center></h3></div><div>+  <div class="ui-box"  id="report-order-items"></div><div>   </div></div>
<div> </div></div><div>-<div style="width : 280px; float : left;"></div><div>-  <h2><center>Machines</center></h2></div><div>-  <div class="ui-box" style="width : 230px; height : 200px" id="report-machines"></div>
<div>+</div><div>+<div class="span4 smbox"></div><div>+  <h3><center>Machines</center></h3></div><div>+  <div class="ui-box"  id="report-machines"></div><div>
   </div></div><div> </div></div><div>-<br style="clear: left;" /></div><div>-</div></div><div>-</div><div>-<input type="button" value="Save" onclick="save_config();"></div>
<div> </div><div>+<div class="span9 form-actions" ></div><div>+  <button type="submit" class="btn btn-primary" onclick="save_config();">Save changes</button></div>
<div>+  <button type="button" class="btn" onClick="document.location.reload(true)">Cancel</button></div><div>+</div></div><div> {% endblock %}</div></div><span class="HOEnZb"><font color="#888888"><div>
<br></div><div><div>
<div style="text-indent:0px;letter-spacing:normal;text-align:start;text-transform:none;white-space:normal;word-wrap:break-word;word-spacing:0px"><div style="text-indent:0px;letter-spacing:normal;text-align:start;text-transform:none;white-space:normal;word-wrap:break-word;word-spacing:0px">
<div style="text-indent:0px;letter-spacing:normal;text-align:start;text-transform:none;white-space:normal;word-wrap:break-word;word-spacing:0px"><div style="text-indent:0px;letter-spacing:normal;text-align:start;text-transform:none;white-space:normal;word-wrap:break-word;word-spacing:0px">
<br><span style="text-indent:0px;letter-spacing:normal;font-variant:normal;text-align:start;font-style:normal;display:inline!important;font-weight:normal;float:none;line-height:normal;text-transform:none;white-space:normal;font-family:Helvetica;word-spacing:0px">Chris Matthews</span><br style="line-height:normal;text-indent:0px;letter-spacing:normal;text-align:start;font-variant:normal;text-transform:none;font-style:normal;white-space:normal;font-family:Helvetica;font-weight:normal;word-spacing:0px">
<span style="text-indent:0px;letter-spacing:normal;font-variant:normal;text-align:start;font-style:normal;display:inline!important;font-weight:normal;float:none;line-height:normal;text-transform:none;white-space:normal;font-family:Helvetica;word-spacing:0px"><a href="mailto:chris.matthews@apple.com" target="_blank">chris.matthews@apple.com</a></span><br style="line-height:normal;text-indent:0px;letter-spacing:normal;text-align:start;font-variant:normal;text-transform:none;font-style:normal;white-space:normal;font-family:Helvetica;font-weight:normal;word-spacing:0px">
</div></div></div></div>
</div>
<br></div></font></span></div><br>_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
<br></blockquote></div><br></div>