From: Michael Wood <[email protected]>

- Adds the modal-dialog  modal-content divs as per bootstrap 3
- Update modal close handler in table.js after dom tree change
- Remove redundant default.css hack for positioning
- Restore grey footer for modals

Signed-off-by: Michael Wood <[email protected]>
---
 .../static/css/bootstrap3-transition.css           |   5 +
 .../lib/toaster/toastergui/static/css/default.css  |   6 +-
 .../toastergui/static/html/layer_deps_modal.html   |  38 +++----
 bitbake/lib/toaster/toastergui/static/js/table.js  |   5 +-
 .../toaster/toastergui/templates/configvars.html   |  96 ++++++++---------
 .../toaster/toastergui/templates/customrecipe.html |  73 +++++++------
 .../toastergui/templates/filtersnippet.html        | 113 +++++++++++----------
 .../lib/toaster/toastergui/templates/project.html  |  39 +++----
 .../toastergui/templates/toastertable-filter.html  |  32 +++---
 9 files changed, 224 insertions(+), 183 deletions(-)

diff --git 
a/bitbake/lib/toaster/toastergui/static/css/bootstrap3-transition.css 
b/bitbake/lib/toaster/toastergui/static/css/bootstrap3-transition.css
index 6f5b1f0..832f681 100644
--- a/bitbake/lib/toaster/toastergui/static/css/bootstrap3-transition.css
+++ b/bitbake/lib/toaster/toastergui/static/css/bootstrap3-transition.css
@@ -21,3 +21,8 @@
 .pagination-centered {
   margin-left: 50%;
 }
+
+/* Modal dialog */
+.modal-footer {
+  background-color: #f5f5f5;
+}
diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css 
b/bitbake/lib/toaster/toastergui/static/css/default.css
index b024d96..87da629 100644
--- a/bitbake/lib/toaster/toastergui/static/css/default.css
+++ b/bitbake/lib/toaster/toastergui/static/css/default.css
@@ -48,8 +48,10 @@ dd li { line-height: 25px; }
 .item-info dd { line-height: 20px; margin-bottom: 10px; }
 
 /* Style the filter modal dialogs */
-.modal { width: 800px; margin-left: -400px; }
-.modal-footer .btn { float: left; }
+.modal-footer .btn {
+  float: left;
+ }
+
 .modal-body { max-height: 300px; }
 
 /* Hover style for the clear search icon */
diff --git a/bitbake/lib/toaster/toastergui/static/html/layer_deps_modal.html 
b/bitbake/lib/toaster/toastergui/static/html/layer_deps_modal.html
index f95a382..7826fb5 100644
--- a/bitbake/lib/toaster/toastergui/static/html/layer_deps_modal.html
+++ b/bitbake/lib/toaster/toastergui/static/html/layer_deps_modal.html
@@ -1,17 +1,21 @@
-<div id="dependencies-modal" class="modal hide fade" tabindex="-1" 
role="dialog" aria-hidden="false">
-  <form id="dependencies-modal-form">
-    <div class="modal-header">
-      <button type="button" class="close" data-dismiss="modal" 
aria-hidden="true">x</button>
-      <h3><span id="title"></span> dependencies</h3>
-    </div>
-    <div class="modal-body">
-      <p id="body-text"> <strong id="layer-name"></strong> depends on some 
layers that are not added to your project. Select the ones you want to add:</p>
-      <ul class="list-unstyled" id="dependencies-list">
-      </ul>
-    </div>
-    <div class="modal-footer">
-      <button class="btn btn-primary" type="submit">Add layers</button>
-      <button class="btn" type="reset" data-dismiss="modal">Cancel</button>
-    </div>
-  </form>
-</div>
+<div id="dependencies-modal" class="modal fade" tabindex="-1" role="dialog" 
aria-hidden="false">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <form id="dependencies-modal-form">
+       <div class="modal-header">
+         <button type="button" class="close" data-dismiss="modal" 
aria-hidden="true">x</button>
+         <h3><span id="title"></span> dependencies</h3>
+       </div>
+       <div class="modal-body">
+         <p id="body-text"> <strong id="layer-name"></strong> depends on some 
layers that are not added to your project. Select the ones you want to add:</p>
+         <ul class="list-unstyled" id="dependencies-list">
+         </ul>
+       </div>
+       <div class="modal-footer">
+         <button class="btn btn-primary" type="submit">Add layers</button>
+         <button class="btn" type="reset" data-dismiss="modal">Cancel</button>
+       </div>
+      </form>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
diff --git a/bitbake/lib/toaster/toastergui/static/js/table.js 
b/bitbake/lib/toaster/toastergui/static/js/table.js
index 0f0a1db..fbf0f07 100644
--- a/bitbake/lib/toaster/toastergui/static/js/table.js
+++ b/bitbake/lib/toaster/toastergui/static/js/table.js
@@ -602,7 +602,7 @@ function tableInit(ctx){
             queryset on the table
           */
           var filterActionRadios = $('#filter-actions-' + ctx.tableName);
-          var filterApplyBtn = $('[data-role="filter-apply"]');
+          var filterApplyBtn = $('[data-cat="filter-apply"]');
 
           var setApplyButtonState = function (e, filterActionValue) {
             if (filterActionValue !== undefined) {
@@ -769,6 +769,7 @@ function tableInit(ctx){
 
     loadData(tableParams);
 
-    $(this).parent().modal('hide');
+
+    $('#filter-modal-'+ctx.tableName).modal('hide');
   });
 }
diff --git a/bitbake/lib/toaster/toastergui/templates/configvars.html 
b/bitbake/lib/toaster/toastergui/templates/configvars.html
index 70e4d89..b959b56 100644
--- a/bitbake/lib/toaster/toastergui/templates/configvars.html
+++ b/bitbake/lib/toaster/toastergui/templates/configvars.html
@@ -79,52 +79,56 @@
 {% for variable in objects %}
     {% if variable.vhistory.count %}
     <div id="variable-{{variable.pk}}" class="modal hide fade" tabindex="-1" 
role="dialog">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" 
aria-hidden="true">x</button>
-            <h3>History of {{variable.variable_name}}</h3>
-        </div>
-        <div class="modal-body">
-            {% if variable.variable_value %}
-              {% if variable.variable_value|length < 570 %}
-                <h4>{{variable.variable_name}} value is:</h4>
-                <p>
-                    {{variable.variable_value}}
-                </p>
-              {% else %}
-                <h4>{{variable.variable_name}} value is:</h4>
-                <p>
-                    <span>{{variable.variable_value|string_slice:':570'}}
-                        <span class="full"> 
{{variable.variable_value|string_slice:'570:'}}
-                        </span>
-                        <a class="btn btn-xs full-show">...</a>
-                    </span>
-                </p>
-                <a class="btn btn-xs full-hide">Collapse variable value <i 
class="icon-caret-up"></i>
-                </a>
-              {% endif %}
-            {% else %}
-                <div class="alert alert-info">The value of 
<strong>{{variable.variable_name}}</strong> is an empty string</div>
-            {% endif %}
-            <h4>The value was set in the following configuration files:</h4>
-            <table class="table table-bordered table-hover">
-                <thead>
-                    <tr>
-                        <th>Order</th>
-                        <th>Configuration file</th>
-                        <th>Operation</th>
-                        <th>Line number</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {% for vh in variable.vhistory.all %}
-                    <tr>
-                        
<td>{{forloop.counter}}</td><td>{{vh.file_name}}</td><td>{{vh.operation}}</td><td>{{vh.line_number}}</td>
-                    </tr>
-                    {%endfor%}
-                </tbody>
-            </table>
-        </div>
-    </div>
+      <div class="modal-dialog">
+       <div class="modal-content">
+         <div class="modal-header">
+           <button type="button" class="close" data-dismiss="modal" 
aria-hidden="true">x</button>
+           <h3>History of {{variable.variable_name}}</h3>
+         </div>
+         <div class="modal-body">
+           {% if variable.variable_value %}
+           {% if variable.variable_value|length < 570 %}
+           <h4>{{variable.variable_name}} value is:</h4>
+           <p>
+           {{variable.variable_value}}
+           </p>
+           {% else %}
+           <h4>{{variable.variable_name}} value is:</h4>
+           <p>
+           <span>{{variable.variable_value|string_slice:':570'}}
+             <span class="full"> 
{{variable.variable_value|string_slice:'570:'}}
+             </span>
+             <a class="btn btn-xs full-show">...</a>
+           </span>
+           </p>
+           <a class="btn btn-xs full-hide">Collapse variable value <i 
class="icon-caret-up"></i>
+           </a>
+           {% endif %}
+           {% else %}
+           <div class="alert alert-info">The value of 
<strong>{{variable.variable_name}}</strong> is an empty string</div>
+           {% endif %}
+           <h4>The value was set in the following configuration files:</h4>
+           <table class="table table-bordered table-hover">
+             <thead>
+               <tr>
+                 <th>Order</th>
+                 <th>Configuration file</th>
+                 <th>Operation</th>
+                 <th>Line number</th>
+               </tr>
+             </thead>
+             <tbody>
+               {% for vh in variable.vhistory.all %}
+               <tr>
+                 
<td>{{forloop.counter}}</td><td>{{vh.file_name}}</td><td>{{vh.operation}}</td><td>{{vh.line_number}}</td>
+               </tr>
+               {%endfor%}
+             </tbody>
+           </table>
+         </div>
+       </div><!-- /.modal-content -->
+      </div><!-- /.modal-dialog -->
+    </div><!-- /.modal -->
     {% endif %}
 {% endfor %}
 
diff --git a/bitbake/lib/toaster/toastergui/templates/customrecipe.html 
b/bitbake/lib/toaster/toastergui/templates/customrecipe.html
index cfe6df0..ee41c68 100644
--- a/bitbake/lib/toaster/toastergui/templates/customrecipe.html
+++ b/bitbake/lib/toaster/toastergui/templates/customrecipe.html
@@ -42,42 +42,51 @@
   });
 </script>
 <!-- package dependencies modal -->
-<div style="display:none" id="package-deps-modal" class="modal hide fade in" 
tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="false">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" 
aria-hidden="true">x</button>
-    <h3><span class="package-to-add-name"></span> dependencies</h3>
-  </div>
-  <div class="modal-body">
-    <p>Based on information from a previous build it is likely that adding 
<strong class="package-to-add-name"></strong> will also add the following 
packages to your custom image:</p>
-    <ul id="package-add-dep-list">
-    </ul>
-  </div>
-  <div class="modal-footer">
-    <p class="help-block text-left">Total package size: <strong 
id="package-deps-total-size"></strong></p>
-    <button id="add-package-deps-modal-btn" type="submit" class="btn 
btn-primary" data-dismiss="modal">Add package</button>
-    <button class="btn" data-dismiss="modal">Cancel</button>
-  </div>
-</div>
+<div id="package-deps-modal" class="modal fade" tabindex="-1" role="dialog" 
aria-labelledby="myModalLabel" aria-hidden="false">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+       <button type="button" class="close" data-dismiss="modal" 
aria-hidden="true">x</button>
+       <h3><span class="package-to-add-name"></span> dependencies</h3>
+      </div>
+      <div class="modal-body">
+       <p>Based on information from a previous build it is likely that adding 
<strong class="package-to-add-name"></strong> will also add the following 
packages to your custom image:
+       </p>
+       <ul id="package-add-dep-list">
+       </ul>
+      </div>
+      <div class="modal-footer">
+       <p class="help-block text-left">Total package size: <strong 
id="package-deps-total-size"></strong></p>
+       <button id="add-package-deps-modal-btn" type="submit" class="btn 
btn-primary" data-dismiss="modal">Add package</button>
+       <button class="btn" data-dismiss="modal">Cancel</button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
 <!-- end package dependencies modal -->
 
 <!-- package reverse dependencies modal -->
 <div style="display:none" id="package-reverse-deps-modal" class="modal hide 
fade in" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" 
aria-hidden="false">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" 
aria-hidden="true">x</button>
-    <h3><span class="package-to-rm-name"></span> reverse dependencies</h3>
-  </div>
-  <div class="modal-body">
-    <p> <strong class="reverse-deps-count"></strong> <span 
class="reverse-deps-package"></span> in your image <span 
class="reverse-deps-depends"></span> on <strong 
class="package-to-rm-name"></strong>:</p>
-    <ul id="package-reverse-dep-list">
-    </ul>
-    <p>In order to remove <strong class="package-to-rm-name"></strong>, you 
must remove <span class="reverse-deps-this"></span> <strong 
class="reverse-deps-count"></strong> <span class="reverse-deps-package"></span> 
as well.</p>
-  </div>
-  <div class="modal-footer">
-    <p class="help-block text-left">Total package size: <strong 
id="package-reverse-deps-total-size"></strong></p>
-    <button id="rm-package-reverse-deps-modal-btn" type="submit" class="btn 
btn-primary" data-dismiss="modal">Remove all <span 
class="reverse-deps-count-plus1"></button>
-    <button class="btn" data-dismiss="modal">Cancel</button>
-  </div>
-</div>
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+       <button type="button" class="close" data-dismiss="modal" 
aria-hidden="true">x</button>
+       <h3><span class="package-to-rm-name"></span> reverse dependencies</h3>
+      </div>
+      <div class="modal-body">
+       <p> <strong class="reverse-deps-count"></strong> <span 
class="reverse-deps-package"></span> in your image <span 
class="reverse-deps-depends"></span> on <strong 
class="package-to-rm-name"></strong>:</p>
+       <ul id="package-reverse-dep-list">
+       </ul>
+       <p>In order to remove <strong class="package-to-rm-name"></strong>, you 
must remove <span class="reverse-deps-this"></span> <strong 
class="reverse-deps-count"></strong> <span class="reverse-deps-package"></span> 
as well.</p>
+      </div>
+      <div class="modal-footer">
+       <p class="help-block text-left">Total package size: <strong 
id="package-reverse-deps-total-size"></strong></p>
+       <button id="rm-package-reverse-deps-modal-btn" type="submit" class="btn 
btn-primary" data-dismiss="modal">Remove all <span 
class="reverse-deps-count-plus1"></button>
+       <button class="btn" data-dismiss="modal">Cancel</button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
 <!-- end package dependencies modal -->
 
 
diff --git a/bitbake/lib/toaster/toastergui/templates/filtersnippet.html 
b/bitbake/lib/toaster/toastergui/templates/filtersnippet.html
index ea772de..4c2c53e 100644
--- a/bitbake/lib/toaster/toastergui/templates/filtersnippet.html
+++ b/bitbake/lib/toaster/toastergui/templates/filtersnippet.html
@@ -1,57 +1,64 @@
 {% load projecttags %}
 <!-- '{{f.class}}' filter -->
 {% with f.class as  key %}
-<form id="filter_{{f.class}}" class="modal hide fade" tabindex="-1" 
role="dialog" aria-hidden="true">
-        <input type="hidden" name="search" value="{%if request.GET.search 
%}{{request.GET.search}}{%endif%}"/>
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" 
aria-hidden="true">x</button>
-            {% if search_term %}
-                 <h3>Filter {{total_count}} {%if 
filter_search_display%}{{filter_search_display|title}}{%else%}{{objectname|title}}{%endif%}
 matching '{{search_term}}' by '{{tc.name}}'</h3>
-            {% else %}
-                <h3>Filter {%if 
filter_search_display%}{{filter_search_display|title}}{%else%}{{objectname|title}}{%endif%}
 by '{{tc.name}}'</h3>
-            {% endif %}
-        </div>
-        <div class="modal-body">
-            <p>{{f.label}}</p>
-            <label class="radio">
-                <input type="radio" name="filter" {%if 
request.GET.filter%}{{f.options|check_filter_status:request.GET.filter}} 
{%else%} checked {%endif%} value="" data-key="{{key}}">  All {%if 
filter_search_display%}{{filter_search_display|title}}{%else%}{{objectname|title}}{%endif%}
-            </label>
-            {% for option in f.options %}
-                {% if option.1 == 'daterange' %}
-                  <div class="form-inline">
-                      <label class="radio">
-                          <input type="radio" name="filter" 
id="filter_value_{{key}}" {%if key == daterange_selected %}checked{%endif%} 
value="{{option.1}}" data-key="{{key}}"> {{option.0}}
-                {% else %}
-                  {% if 1 %}
-                      <label class="radio">
-                          <input type="radio" name="filter" {%if 
request.GET.filter == option.1 %}checked{%endif%}  value="{{option.1}}" 
data-key="{{key}}"> {{option.0}}
-                  {% comment "do not disable radio selections by count for 
now" %}{% else %}
-                      <label class="radio muted">
-                          <input type="radio" name="filter" disabled {%if 
request.GET.filter == option.1 %}checked{%endif%}  value="{{option.1}}" 
data-key="{{key}}"> {{option.0}}
-                  {% endcomment %}{% endif %}
-                {% endif %}
-                {% if option.3 %}<i class="icon-question-sign get-help" 
data-placement="right" title="{{option.3}}"></i>{% endif %}
-                  </label>
-                {% if option.1 == 'daterange' %}
-                  <input type="text" id="date_from_{{key}}" 
name="date_from_{{key}}" disabled class="input-sm" /><label 
class="help-inline">to</label>
-                  <input type="text" id="date_to_{{key}}" 
name="date_to_{{key}}" disabled class="input-sm"  />
-                  <label class="help-inline get-help" >(dd/mm/yyyy)</label>
-                  </div>
-                {% endif %}
-            {% endfor %}
-        <!-- daterange persistence -->
-        {% if last_date_from and last_date_to %}
-        <input type="hidden" id="last_date_from_{{key}}" name="last_date_from" 
value="{{last_date_from}}"/>
-        <input type="hidden" id="last_date_to_{{key}}" name="last_date_to"   
value="{{last_date_to}}"/>
-        {% endif %}
-        </div>
-        <div class="modal-footer">
-            <button type="submit" class="btn btn-primary" 
data-key="{{key}}">Apply</button>
-            {% if request.GET.filter %}
-                {% if request.GET.filter|string_remove_regex:':.*' != 
f.options.0.1|string_remove_regex:':.*' %}
-                <span class="help-inline pull-left">You can only apply one 
filter to the table. This filter will override the current filter.</span>
-                {% endif %}
-            {% endif %}
-        </div>
-</form>
+
+<div id="filter_{{f.class}}" class="modal fade"  tabindex="-1" role="dialog" 
aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <form>
+       <input type="hidden" name="search" value="{%if request.GET.search 
%}{{request.GET.search}}{%endif%}"/>
+       <div class="modal-header">
+         <button type="button" class="close" data-dismiss="modal" 
aria-hidden="true">x</button>
+         {% if search_term %}
+         <h3>Filter {{total_count}} {%if 
filter_search_display%}{{filter_search_display|title}}{%else%}{{objectname|title}}{%endif%}
 matching '{{search_term}}' by '{{tc.name}}'</h3>
+         {% else %}
+         <h3>Filter {%if 
filter_search_display%}{{filter_search_display|title}}{%else%}{{objectname|title}}{%endif%}
 by '{{tc.name}}'</h3>
+         {% endif %}
+       </div>
+       <div class="modal-body">
+         <p>{{f.label}}</p>
+         <label class="radio">
+           <input type="radio" name="filter" {%if 
request.GET.filter%}{{f.options|check_filter_status:request.GET.filter}} 
{%else%} checked {%endif%} value="" data-key="{{key}}">  All {%if 
filter_search_display%}{{filter_search_display|title}}{%else%}{{objectname|title}}{%endif%}
+         </label>
+         {% for option in f.options %}
+         {% if option.1 == 'daterange' %}
+         <div class="form-inline">
+           <label class="radio">
+             <input type="radio" name="filter" id="filter_value_{{key}}" {%if 
key == daterange_selected %}checked{%endif%} value="{{option.1}}" 
data-key="{{key}}"> {{option.0}}
+             {% else %}
+             {% if 1 %}
+             <label class="radio">
+               <input type="radio" name="filter" {%if request.GET.filter == 
option.1 %}checked{%endif%}  value="{{option.1}}" data-key="{{key}}"> 
{{option.0}}
+               {% comment "do not disable radio selections by count for now" 
%}{% else %}
+               <label class="radio muted">
+                 <input type="radio" name="filter" disabled {%if 
request.GET.filter == option.1 %}checked{%endif%}  value="{{option.1}}" 
data-key="{{key}}"> {{option.0}}
+                 {% endcomment %}{% endif %}
+                 {% endif %}
+                 {% if option.3 %}<i class="icon-question-sign get-help" 
data-placement="right" title="{{option.3}}"></i>{% endif %}
+               </label>
+               {% if option.1 == 'daterange' %}
+               <input type="text" id="date_from_{{key}}" 
name="date_from_{{key}}" disabled class="input-sm" /><label 
class="help-inline">to</label>
+               <input type="text" id="date_to_{{key}}" name="date_to_{{key}}" 
disabled class="input-sm"  />
+               <label class="help-inline get-help" >(dd/mm/yyyy)</label>
+         </div>
+         {% endif %}
+         {% endfor %}
+         <!-- daterange persistence -->
+         {% if last_date_from and last_date_to %}
+         <input type="hidden" id="last_date_from_{{key}}" 
name="last_date_from" value="{{last_date_from}}"/>
+         <input type="hidden" id="last_date_to_{{key}}" name="last_date_to"   
value="{{last_date_to}}"/>
+         {% endif %}
+       </div>
+       <div class="modal-footer">
+         <button type="submit" class="btn btn-primary" 
data-key="{{key}}">Apply</button>
+         {% if request.GET.filter %}
+         {% if request.GET.filter|string_remove_regex:':.*' != 
f.options.0.1|string_remove_regex:':.*' %}
+         <span class="help-inline pull-left">You can only apply one filter to 
the table. This filter will override the current filter.</span>
+         {% endif %}
+         {% endif %}
+       </div>
+      </form>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div> <!--/.modal -->
 {% endwith %}
diff --git a/bitbake/lib/toaster/toastergui/templates/project.html 
b/bitbake/lib/toaster/toastergui/templates/project.html
index ac411a3..3096ad2 100644
--- a/bitbake/lib/toaster/toastergui/templates/project.html
+++ b/bitbake/lib/toaster/toastergui/templates/project.html
@@ -24,25 +24,30 @@
   });
 </script>
 
+{% comment %}
 <!-- Comment out the ability to change the project release, until we decide 
what to do this functionality -->
+<div id="change-release-modal" class="modal hide fade in" tabindex="-1" 
role="dialog" aria-labelledby="change-release-modal" aria-hidden="false">
+  <div class="modal-dialog">
+    <div class="modal-content">
 
-<!--div id="change-release-modal" class="modal hide fade in" tabindex="-1" 
role="dialog" aria-labelledby="change-release-modal" aria-hidden="false">
-  <div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" 
aria-hidden="true">x</button>
-    <h3>Changing Yocto Project release to <span 
class="proposed-release-change-name"></span></h3>
-  </div>
-  <div class="modal-body">
-    <p>The following added layers do not exist for <span 
class="proposed-release-change-name"></span>: </p>
-    <ul id="layers-to-remove-list">
-    </ul>
-    <p>If you change the Yocto Project release to <span 
class="proposed-release-change-name"></span>, the above layers will be deleted 
from your added layers.</p>
-  </div>
-  <div class="modal-footer">
-    <button id="change-release-and-rm-layers" data-dismiss="modal" 
type="submit" class="btn btn-primary">Change release and delete layers</button>
-    <button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
-  </div>
-</div-->
-
+      <div class="modal-header">
+       <button type="button" class="close" data-dismiss="modal" 
aria-hidden="true">x</button>
+       <h3>Changing Yocto Project release to <span 
class="proposed-release-change-name"></span></h3>
+      </div>
+      <div class="modal-body">
+       <p>The following added layers do not exist for <span 
class="proposed-release-change-name"></span>: </p>
+       <ul id="layers-to-remove-list">
+       </ul>
+       <p>If you change the Yocto Project release to <span 
class="proposed-release-change-name"></span>, the above layers will be deleted 
from your added layers.</p>
+      </div>
+      <div class="modal-footer">
+       <button id="change-release-and-rm-layers" data-dismiss="modal" 
type="submit" class="btn btn-primary">Change release and delete layers</button>
+       <button class="btn" data-dismiss="modal" 
aria-hidden="true">Cancel</button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+{% endcomment %}
 
 <div class="row" id="project-page" style="display:none">
   <div class="col-md-6">
diff --git a/bitbake/lib/toaster/toastergui/templates/toastertable-filter.html 
b/bitbake/lib/toaster/toastergui/templates/toastertable-filter.html
index 4d28793..25eef52 100644
--- a/bitbake/lib/toaster/toastergui/templates/toastertable-filter.html
+++ b/bitbake/lib/toaster/toastergui/templates/toastertable-filter.html
@@ -1,20 +1,24 @@
 <!-- filter modal -->
-<div id="filter-modal-{{table_name}}" class="modal hide fade" tabindex="-1" 
role="dialog" aria-hidden="false">
-  <form id="filter-modal-form-{{table_name}}" style="margin-bottom: 0px">
-    <div class="modal-header">
-      <button type="button" class="close" data-dismiss="modal" 
aria-hidden="true">x</button>
-      <h3 id="filter-modal-title-{{table_name}}">&nbsp;</h3>
-    </div>
-    <div class="modal-body">
-      <p>Show:</p>
-      <span id="filter-actions-{{table_name}}"></span>
-    </div>
-    <div class="modal-footer">
-      <button class="btn btn-primary" type="submit" data-role="filter-apply">
+<div id="filter-modal-{{table_name}}" class="modal fade" tabindex="-1" 
role="dialog" aria-hidden="false">
+  <div class="modal-dialog">
+    <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" 
aria-hidden="true">x</button>
+          <h3 id="filter-modal-title-{{table_name}}">&nbsp;</h3>
+       </div>
+       <div class="modal-body">
+         <form id="filter-modal-form-{{table_name}}" style="margin-bottom: 
0px">
+         <p>Show:</p>
+         <span id="filter-actions-{{table_name}}"></span>
+       </div>
+       <div class="modal-footer">
+          <button class="btn btn-primary" type="submit" 
data-role="filter-apply">
         Apply
-      </button>
+         </button>
+       </div>
+      </form>
     </div>
-  </form>
+  </div>
 </div>
 <button id="clear-filter-btn-{{table_name}}" style="display:none"></button>
 <!-- end filter modal -->
-- 
1.9.1

-- 
_______________________________________________
toaster mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/toaster

Reply via email to