Because we have 3 different types of tables (toastertable, toastertable-simple and non-toastertable), making all the controls look the same required some fiddling with the mark up and the css rules.
Signed-off-by: Belen Barros Pena <[email protected]> --- .../toaster/toastergui/static/css/bootstrap3-transition.css | 10 +++++----- bitbake/lib/toaster/toastergui/templates/basetable_top.html | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bitbake/lib/toaster/toastergui/static/css/bootstrap3-transition.css b/bitbake/lib/toaster/toastergui/static/css/bootstrap3-transition.css index 24f6b63..c5e400e 100644 --- a/bitbake/lib/toaster/toastergui/static/css/bootstrap3-transition.css +++ b/bitbake/lib/toaster/toastergui/static/css/bootstrap3-transition.css @@ -96,12 +96,12 @@ fieldset[disabled] .btn-primary:hover { width: 200px; } -/* Table controls in layer details pages */ +/* Table controls */ -div[id^="table-chrome-"] .navbar-search { - margin-bottom: 20px; +.navbar-inner > .navbar-search .input-append { + margin-bottom: 5px; } -div[id^="table-chrome-"] .navbar-inner > .navbar-search { - margin-bottom: 0px; +.navbar-search.input-append { + margin-bottom: 20px; } diff --git a/bitbake/lib/toaster/toastergui/templates/basetable_top.html b/bitbake/lib/toaster/toastergui/templates/basetable_top.html index afd6aad..65ee17f 100644 --- a/bitbake/lib/toaster/toastergui/templates/basetable_top.html +++ b/bitbake/lib/toaster/toastergui/templates/basetable_top.html @@ -161,11 +161,13 @@ <!-- control header --> <div class="navbar"> <div class="navbar-inner"> - <form class="navbar-search input-append" id="searchform"> + <form class="navbar-search" id="searchform"> + <div class="input-append"> <input id="search" name="search" type="text" placeholder="Search {%if object_search_display %}{{object_search_display}}{%else%}{{objectname}}{%endif%}" value="{%if request.GET.search %}{{request.GET.search}}{% endif %}"/>{% if request.GET.search %}<a href="javascript:$('#search').val('');searchform.submit()" class="input-append-addon btn" tabindex="-1"><i class="glyphicon glyphicon-remove"></i></a>{%endif%} <input type="hidden" name="orderby" value="{{request.GET.orderby}}"> <input type="hidden" name="page" value="1"> <button class="btn" id="search-button" type="submit" value="Search">Search</button> + </div> </form> <div class="pull-right"> {% if tablecols %} -- 1.9.1 -- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
