1 files changed, 71 insertions, 51 deletions
diff --git a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/toastertable.html b/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/toastertable.html
index 21c3d36c7..aa148955e 100644
--- a/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/toastertable.html
+++ b/import-layers/yocto-poky/bitbake/lib/toaster/toastergui/templates/toastertable.html
@@ -25,14 +25,20 @@
 
 {% include 'toastertable-filter.html' %}
 
-<div class="row-fluid" id="no-results-{{table_name}}" style="display:none">
-  <div class="alert">
-    <form class="no-results input-append">
-      <input class="input-xxlarge" id="new-search-input-{{table_name}}" name="search" type="text" placeholder="Search {{title|lower}}" value="{%if request.GET.search %}{{request.GET.search}}{%endif%}"/>
-      <a href="#" class="add-on btn remove-search-btn-{{table_name}}" tabindex="-1">
-        <i class="icon-remove"></i>
-      </a>
-      <button class="btn search-submit-{{table_name}}">
+<div class="row-fluid" id="empty-state-{{table_name}}" style="display:none">
+  <div class="alert alert-info">{{empty_state|safe}}</div>
+</div>
+
+<div id="no-results-{{table_name}}" style="display:none">
+  <div class="alert alert-warning">
+    <form class="form-inline">
+      <div class="form-group">
+        <div class="btn-group">
+          <input class="form-control" id="new-search-input-{{table_name}}" name="search" type="text" placeholder="Search {{title|lower}}" value="{%if request.GET.search %}{{request.GET.search}}{%endif%}"/>
+          <span class="remove-search-btn-{{table_name}} glyphicon glyphicon-remove-circle" tabindex="-1"></a>
+        </div>
+      </div>
+      <button class="btn btn-default search-submit-{{table_name}}">
         Search
       </button>
       <button class="btn btn-link show-all-{{table_name}} remove-search-btn-{{table_name}}">
@@ -44,62 +50,76 @@
 
 <div id="table-container-{{table_name}}" style="visibility: hidden">
   <!-- control header -->
-  <div class="navbar" id="table-chrome-{{table_name}}">
-    <div class="navbar-inner">
-      <div class="navbar-search input-append pull-left span6">
-
-        <input id="search-input-{{table_name}}" name="search" type="text" placeholder="Search {{title|lower}}" value="{%if request.GET.search%}{{request.GET.search}}{%endif%}"/>
-        <a href="#" style="display:none" class="add-on btn remove-search-btn-{{table_name}}" tabindex="-1">
-          <i class="icon-remove"></i>
-        </a>
-        <button class="btn" id="search-submit-{{table_name}}" >Search</button>
+  <div class="navbar navbar-default" id="table-chrome-{{table_name}}">
+    <div class="container-fluid">
+      <div class="navbar-header">
+        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#table-chrome-collapse-{{table_name}}" aria-expanded="false">
+          <span class="sr-only">Toggle navigation</span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
       </div>
-
-      <div class="pull-right">
-        <div class="btn-group">
-          <button id="edit-columns-button" class="btn dropdown-toggle" data-toggle="dropdown">Edit columns
+      <div class="collapse navbar-collapse" id="table-chrome-collapse-{{table_name}}">
+        <form class="navbar-form navbar-left">
+          <div class="form-group">
+            <div class="btn-group">
+              <input id="search-input-{{table_name}}" class="form-control" name="search" type="text" placeholder="Search {{title|lower}}" value="{%if request.GET.search%}{{request.GET.search}}{%endif%}"/>
+              <span class="remove-search-btn-{{table_name}} glyphicon glyphicon-remove-circle" tabindex="-1" style="display:none;">
+            </div>
+          </div>
+          <button class="btn btn-default" id="search-submit-{{table_name}}" >Search</button>
+        </form>
+        <form class="navbar-form navbar-right">
+          <div clas="form-group">
+            <label>Show rows:</label>
+            <select class="form-control pagesize-{{table_name}}">
+              {% with "10 25 50 100 150" as list%}
+              {% for i in list.split %}
+              <option value="{{i}}">{{i}}</option>
+              {% endfor %}
+              {% endwith %}
+            </select>
+          </div>
+        </form>
+        <div class="btn-group navbar-right">
+          <button id="edit-columns-button" class="btn btn-default navbar-btn dropdown-toggle" data-toggle="dropdown">Edit columns
             <span class="caret"></span>
           </button>
           <ul class="dropdown-menu editcol">
           </ul>
         </div>
-        <div style="display:inline">
-          <span class="divider-vertical"></span>
-          <span class="help-inline" style="padding-top:5px;">Show rows:</span>
-          <select style="margin-top:5px;margin-bottom:0px;" class="pagesize-{{table_name}}">
-            {% with "10 25 50 100 150" as list%}
-            {% for i in list.split %}
-            <option value="{{i}}">{{i}}</option>
-            {% endfor %}
-            {% endwith %}
-          </select>
-        </div>
       </div>
     </div>
   </div>
 
   <!-- The actual table -->
-  <table class="table table-bordered table-hover tablesorter" id="{{table_name}}">
-    <thead>
-      <tr><th></th></tr>
-    </thead>
-    <tbody></tbody>
-  </table>
+  <div class="table-responsive">
+    <table class="table table-bordered table-hover" id="{{table_name}}">
+      <thead>
+        <tr><th></th></tr>
+      </thead>
+      <tbody></tbody>
+    </table>
+  </div>
 
   <!-- Pagination controls -->
-  <div class="pagination pagination-centered" id="pagination-{{table_name}}">
-    <ul class="pagination" style="display: block-inline">
+  <div id="pagination-{{table_name}}">
+    <ul class="pagination">
     </ul>
 
-    <div class="pull-right">
-      <span class="help-inline" style="padding-top:5px;">Show rows:</span>
-      <select style="margin-top:5px;margin-bottom:0px;" class="pagesize-{{table_name}}">
-        {% with "10 25 50 100 150" as list%}
-        {% for i in list.split %}
-        <option value="{{i}}">{{i}}</option>
-        {% endfor %}
-        {% endwith %}
-      </select>
-    </div>
+    <form class="navbar-form navbar-right">
+      <div class="form-group">
+        <label>Show rows:</label>
+        <select class="form-control pagesize-{{table_name}}">
+          {% with "10 25 50 100 150" as list%}
+          {% for i in list.split %}
+          <option value="{{i}}">{{i}}</option>
+          {% endfor %}
+          {% endwith %}
+        </select>
+      </div>
+    </form>
   </div>
-</div>
+
+</div> <!--end table container -->