Set the layout as per the Bootstrap 3 grid rules.
Signed-off-by: Belen Barros Pena <[email protected]>
---
bitbake/lib/toaster/toastergui/static/css/default.css | 2 +-
.../toastergui/templates/detail_pagination_bottom.html | 6 +++---
.../toastergui/templates/detail_search_header.html | 4 ++--
bitbake/lib/toaster/toastergui/templates/recipe.html | 13 ++++++++++---
.../lib/toaster/toastergui/templates/recipe_packages.html | 15 +++++++++++----
5 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css
b/bitbake/lib/toaster/toastergui/static/css/default.css
index 1284de3..47603a7 100644
--- a/bitbake/lib/toaster/toastergui/static/css/default.css
+++ b/bitbake/lib/toaster/toastergui/static/css/default.css
@@ -100,7 +100,7 @@ td > .success:hover { text-decoration: underline; }
th > a, th > span { font-weight: normal; }
/* Force long strings like commit hashes to wrap */
-.iscommit { white-space: pre-wrap; word-break: break-all; word-wrap:
break-word;}
+.iscommit { word-break: break-all; word-wrap: break-word;}
/* Make the popovers scrollable if they are too long */
.popover-content { max-height: 30em; overflow-y: scroll; }
diff --git
a/bitbake/lib/toaster/toastergui/templates/detail_pagination_bottom.html
b/bitbake/lib/toaster/toastergui/templates/detail_pagination_bottom.html
index f40c21d..a2ee6b2 100644
--- a/bitbake/lib/toaster/toastergui/templates/detail_pagination_bottom.html
+++ b/bitbake/lib/toaster/toastergui/templates/detail_pagination_bottom.html
@@ -6,8 +6,8 @@
{# only paginate if 10 or more rows unfiltered, all pages #}
{% if object_count >= 10 %}
-<div class="pagination">
- <ul>
+<div>
+ <ul class="pagination pagination-centered">
{%if objects.has_previous %}
<li><a
href="javascript:reload_params({'page':{{objects.previous_page_number}}})">«</a></li>
{%else%}
@@ -24,7 +24,7 @@
</ul>
<div class="pull-right">
- <span class="help-inline" style="padding-bottom:10px;">Show rows:</span>
+ <span class="help-inline">Show rows:</span>
<select class="pagesize">
{% with "10 25 50 100 150" as list%}
{% for i in list.split %}
diff --git a/bitbake/lib/toaster/toastergui/templates/detail_search_header.html
b/bitbake/lib/toaster/toastergui/templates/detail_search_header.html
index ec01fe5..996b617 100644
--- a/bitbake/lib/toaster/toastergui/templates/detail_search_header.html
+++ b/bitbake/lib/toaster/toastergui/templates/detail_search_header.html
@@ -18,7 +18,7 @@ $(document).ready(function() {
});
});
</script>
-<div class="row">
+
{% if objects.paginator.count > 10 or request.GET.search %}
{% if objects.paginator.count == 0 %}
<div class="alert">
@@ -65,4 +65,4 @@ $(document).ready(function() {
</div>
{% endif %}
{% endif %}
-</div> {# row #}
+
diff --git a/bitbake/lib/toaster/toastergui/templates/recipe.html
b/bitbake/lib/toaster/toastergui/templates/recipe.html
index 2887288..2aaff6b 100644
--- a/bitbake/lib/toaster/toastergui/templates/recipe.html
+++ b/bitbake/lib/toaster/toastergui/templates/recipe.html
@@ -12,13 +12,16 @@
<!-- Begin container -->
-<div class="row col-md-11">
+<div class="row">
+ <div class="col-md-12">
<div class="page-header">
<h1>{{object.name}}_{{object.version}}</h1>
</div>
+ </div>
</div>
-<div class="row col-md-7 tabbable">
+<div class="row">
+ <div class="col-md-8 tabbable">
<ul class="nav nav-pills">
<li class="{{tab_states.1}}">
<a href="#information" data-toggle="tab">
@@ -231,7 +234,8 @@
</div>
</div>
-<div class="row col-md-4 well">
+<div class="col-md-4">
+ <div class="well">
<h2>About {{object.name}}</h2>
<dl class="item-info">
{% if object.summary %}
@@ -262,6 +266,9 @@
<dd>{{object.license}}</dd>
{% endif %}
</dl>
+ </div>
</div>
+</div> <!-- end row -->
+
{% endblock %}
diff --git a/bitbake/lib/toaster/toastergui/templates/recipe_packages.html
b/bitbake/lib/toaster/toastergui/templates/recipe_packages.html
index d337421..2c2efd8 100644
--- a/bitbake/lib/toaster/toastergui/templates/recipe_packages.html
+++ b/bitbake/lib/toaster/toastergui/templates/recipe_packages.html
@@ -11,13 +11,16 @@
<!-- Begin container -->
-<div class="row col-md-11">
+<div class="row">
+ <div class="col-md-12">
<div class="page-header">
<h1>{{recipe.name}}_{{recipe.version}}</h1>
</div>
+ </div>
</div>
-<div class="row col-md-7 tabbable">
+<div class="row">
+ <div class="col-md-8 tabbable">
<ul class="nav nav-pills">
<li>
<a href="{% url "recipe" build.pk recipe.id "1" %}">
@@ -86,9 +89,10 @@
{% endif %}
</div> {# tab-pane #}
</div> {# tab-content #}
-</div> {# col-md-7 #}
+</div> {# col-md-8 #}
-<div class="row col-md-4 well">
+<div class="col-md-4">
+ <div class="well">
<h2>About {{recipe.name}}</h2>
<dl class="item-info">
{% if recipe.summary %}
@@ -119,5 +123,8 @@
<dd>{{recipe.license}}</dd>
{% endif %}
</dl>
+ </div>
</div>
+
+</div> <!-- end row -->
{% endblock pagedetailinfomain %}
--
1.9.1
--
_______________________________________________
toaster mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/toaster
