From: Michael Wood <[email protected]> The new input-group in bootstrap3 is not analogous to input-append so revert back to using input-append and co.
Signed-off-by: Michael Wood <[email protected]> --- .../lib/toaster/toastergui/templates/basetable_top.html | 4 ++-- bitbake/lib/toaster/toastergui/templates/bpackage.html | 4 ++-- .../lib/toaster/toastergui/templates/configvars.html | 4 ++-- .../lib/toaster/toastergui/templates/customrecipe.html | 8 ++++---- .../toastergui/templates/detail_search_header.html | 6 +++--- .../lib/toaster/toastergui/templates/importlayer.html | 2 +- .../lib/toaster/toastergui/templates/layerdetails.html | 8 ++++---- bitbake/lib/toaster/toastergui/templates/project.html | 12 +++++++----- .../lib/toaster/toastergui/templates/projectbuilds.html | 4 ++-- .../lib/toaster/toastergui/templates/projectconf.html | 10 +++++----- .../lib/toaster/toastergui/templates/projecttopbar.html | 8 ++++---- bitbake/lib/toaster/toastergui/templates/recipes.html | 4 ++-- bitbake/lib/toaster/toastergui/templates/target.html | 4 ++-- bitbake/lib/toaster/toastergui/templates/tasks.html | 4 ++-- .../toastergui/templates/toastertable-simple.html | 8 ++++---- .../lib/toaster/toastergui/templates/toastertable.html | 17 ++++++++++------- 16 files changed, 56 insertions(+), 51 deletions(-) diff --git a/bitbake/lib/toaster/toastergui/templates/basetable_top.html b/bitbake/lib/toaster/toastergui/templates/basetable_top.html index 7ed9a93..e64be2d 100644 --- a/bitbake/lib/toaster/toastergui/templates/basetable_top.html +++ b/bitbake/lib/toaster/toastergui/templates/basetable_top.html @@ -161,8 +161,8 @@ <!-- control header --> <div class="navbar"> <div class="navbar-inner"> - <form class="navbar-search input-group pull-left col-md-6" id="searchform"> - <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-group-addon btn" tabindex="-1"><i class="glyphicon glyphicon-remove"></i></a>{%endif%} + <form class="navbar-search input-append pull-left col-md-6" id="searchform"> + <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> diff --git a/bitbake/lib/toaster/toastergui/templates/bpackage.html b/bitbake/lib/toaster/toastergui/templates/bpackage.html index d03760c..8e40932 100644 --- a/bitbake/lib/toaster/toastergui/templates/bpackage.html +++ b/bitbake/lib/toaster/toastergui/templates/bpackage.html @@ -45,8 +45,8 @@ {% if objects.paginator.count == 0 %} <div class="row"> <div class="alert"> - <form class="no-results input-group" id="searchform"> - <input id="search" name="search" class="input-xxlarge" type="text" value="{{request.GET.search}}"/>{% if request.GET.search %}<a href="javascript:$('#search').val('');searchform.submit()" class="input-group-addon btn" tabindex="-1"><i class="glyphicon glyphicon-remove"></i></a>{% endif %} + <form class="no-results input-append" id="searchform"> + <input id="search" name="search" class="input-xxlarge" type="text" value="{{request.GET.search}}"/>{% 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 %} <button class="btn" type="submit" value="Search">Search</button> <button class="btn btn-link" onclick="javascript:$('#search').val('');searchform.submit()">Show all packages</button> </form> diff --git a/bitbake/lib/toaster/toastergui/templates/configvars.html b/bitbake/lib/toaster/toastergui/templates/configvars.html index b959b56..fa6ed0f 100644 --- a/bitbake/lib/toaster/toastergui/templates/configvars.html +++ b/bitbake/lib/toaster/toastergui/templates/configvars.html @@ -39,8 +39,8 @@ {% if objects.paginator.count == 0 %} <div class="row"> <div class="alert"> - <form class="no-results input-group" id="searchform"> - <input id="search" name="search" class="input-xxlarge" type="text" value="{% if request.GET.search %}{{request.GET.search}}{% endif %}"/>{% if request.GET.search %}<a href="javascript:$('#search').val('');searchform.submit()" class="input-group-addon btn" tabindex="-1"><i class="glyphicon glyphicon-remove"></i></a>{% endif %} + <form class="no-results input-append" id="searchform"> + <input id="search" name="search" class="input-xxlarge" type="text" 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 %} <button class="btn" type="submit" value="Search">Search</button> <button class="btn btn-link" onclick="javascript:$('#search').val('');searchform.submit()">Show all variables</button> </form> diff --git a/bitbake/lib/toaster/toastergui/templates/customrecipe.html b/bitbake/lib/toaster/toastergui/templates/customrecipe.html index ee41c68..ebf2fd2 100644 --- a/bitbake/lib/toaster/toastergui/templates/customrecipe.html +++ b/bitbake/lib/toaster/toastergui/templates/customrecipe.html @@ -106,7 +106,7 @@ <div class="row col-md-11"> <div class="col-md-8"> <div class="button-place btn-group" style="width: 100%"> - <a class="btn btn-lg col-md-6 build-custom-image" href="#" style="width: 50%"> + <a class="btn btn-large col-md-6 build-custom-image" href="#" style="width: 50%"> Build {{recipe.name}} </a> <a href="{% url 'customrecipedownload' project.id recipe.id %}" class="btn btn-large span6" style="width: 50%" @@ -129,9 +129,9 @@ <li>Build the recipe</li> <li>Once the build completes, come back to this page and search for the package</li> </ol> - <form class="input-group no-results"> + <form class="input-append no-results"> <input type="text" class="input-xlarge no-results-search-input" id="no-results-search-input-{{table_name}}" name="search" placeholder="Search {{title|lower}}" /> - <a href="#" class="input-group-addon btn" id="no-results-remove-search-btn" tabindex="-1"> + <a href="#" class="input-append-addon btn" id="no-results-remove-search-btn" tabindex="-1"> <i class="glyphicon glyphicon-remove"></i> </a> <button class="btn search-submit-{{table_name}}">Search</button> @@ -145,7 +145,7 @@ <h2> Add | Remove packages </h2> <div class="alert alert-info air"> <p class="lead">Toaster has no package information for {{recipe.name}}. To generate package information, build {{recipe.name}}</p> - <button class="btn btn-info btn-lg build-custom-image" style="margin:20px 0 10px 0;">Build {{recipe.name}}</button> + <button class="btn btn-info btn-large build-custom-image" style="margin:20px 0 10px 0;">Build {{recipe.name}}</button> </div> {% else %} {# ToasterTable for Adding remove packages #} diff --git a/bitbake/lib/toaster/toastergui/templates/detail_search_header.html b/bitbake/lib/toaster/toastergui/templates/detail_search_header.html index 2e5a590..ec01fe5 100644 --- a/bitbake/lib/toaster/toastergui/templates/detail_search_header.html +++ b/bitbake/lib/toaster/toastergui/templates/detail_search_header.html @@ -23,16 +23,16 @@ $(document).ready(function() { {% if objects.paginator.count == 0 %} <div class="alert"> <h3>No {{search_what}} found</h3> - <form id="searchform" class="input-group"> + <form id="searchform" class="input-append"> {% else %} - <form id="searchform" class="navbar-search input-group pull-left"> + <form id="searchform" class="navbar-search input-append pull-left"> {% endif %} <input id="search" class="input-xlarge" type="text" placeholder="Search {{search_what}}" name="search" value="{% if request.GET.search %}{{request.GET.search}}{% endif %}"> <input type="hidden" value="name:+" name="orderby"> <input type="hidden" value="l" name="page"> {% if request.GET.search %} - <a class="input-group-addon btn search-clear"> + <a class="input-append-addon btn search-clear"> <i class="glyphicon glyphicon-remove"></i> </a> {% endif %} diff --git a/bitbake/lib/toaster/toastergui/templates/importlayer.html b/bitbake/lib/toaster/toastergui/templates/importlayer.html index fa64d53..798591e 100644 --- a/bitbake/lib/toaster/toastergui/templates/importlayer.html +++ b/bitbake/lib/toaster/toastergui/templates/importlayer.html @@ -110,7 +110,7 @@ </legend> <ul class="list-unstyled configuration-list" id="layer-deps-list"> </ul> - <div class="input-group"> + <div class="input-append"> <input type="text" autocomplete="off" data-minLength="1" data-autocomplete="off" data-provide="typeahead" placeholder="Type a layer name" id="layer-dependency" class="input-xlarge"> <a class="btn" id="add-layer-dependency-btn"> Add layer diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/bitbake/lib/toaster/toastergui/templates/layerdetails.html index 022226f..b4601ed 100644 --- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html +++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html @@ -124,7 +124,7 @@ <a href="{{layerversion.get_vcs_link_url}}/" class="glyphicon glyphicon-share get-info" target="_blank"></a> {% endif %} <form id="change-repo-form" class="control-group" style="display:none"> - <div class="input-group"> + <div class="input-append"> <input type="text" class="input-xlarge" value="{{layerversion.layer.vcs_url}}"> <button data-layer-prop="vcs_url" class="btn change-btn" type="button">Save</button> <a href="#" style="display:none" class="btn btn-link cancel">Cancel</a> @@ -143,7 +143,7 @@ <a href="{{layerversion.get_vcs_dirpath_link_url}}" class="glyphicon glyphicon-share get-info" target="_blank"></a> {% endif %} <form id="change-subdir-form" style="display:none;"> - <div class="input-group"> + <div class="input-append"> <input type="text" value="{{layerversion.dirpath}}"> <button data-layer-prop="dirpath" class="btn change-btn" type="button">Save</button> <a href="#" style="display:none" class="btn btn-link cancel">Cancel</a> @@ -159,7 +159,7 @@ <dd> <span class="current-value">{{layerversion.get_vcs_reference}}</span> <form style="display:none;"> - <div class="input-group"> + <div class="input-append"> <input type="text" value="{{layerversion.get_vcs_reference}}"> <button data-layer-prop="commit" class="btn change-btn" type="button">Save</button> <a href="#" style="display:none" class="btn btn-link cancel">Cancel</a> @@ -180,7 +180,7 @@ </li> {% endfor %} </ul> - <div class="input-group add-deps"> + <div class="input-append add-deps"> <input type="text" autocomplete="off" data-minLength="1" data-autocomplete="off" placeholder="Type a layer name" id="layer-dep-input"> <a class="btn" id="add-layer-dependency-btn" > Add layer diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html index 3096ad2..cdcc83b 100644 --- a/bitbake/lib/toaster/toastergui/templates/project.html +++ b/bitbake/lib/toaster/toastergui/templates/project.html @@ -61,7 +61,7 @@ <strong>Machine changes have a big impact on build outcome.</strong> You cannot really compare the builds for the new machine with the previous ones. </div> - <div class="input-group"> + <div class="input-append"> <input id="machine-change-input" autocomplete="off" value="" data-provide="typeahead" data-minlength="1" data-autocomplete="off" type="text"> <button id="machine-change-btn" class="btn" type="button">Save</button> <a href="#" id="cancel-machine-change" class="btn btn-link">Cancel</a> </div> @@ -121,10 +121,12 @@ <form style="margin-top:20px"> <!--div class="control-group error"--> - <div class="input-group"> - <input id="layer-add-input" autocomplete="off" placeholder="Type a layer name" data-minlength="1" data-autocomplete="off" data-provide="typeahead" data-source="" type="text"> - <button id="add-layer-btn" class="btn" disabled>Add</button> - </div> + <div class="col-lg-ff6"> + <div class="input-append"> + <input id="layer-add-input" autocomplete="off" placeholder="Type a layer name" data-minlength="1" data-autocomplete="off" data-provide="typeahead" data-source="" type="text"> + <button id="add-layer-btn" class="btn" disabled>Add</button> + </div> + </div> <div id="import-alert" class="alert alert-info" style="display:none;"> Toaster does not know about this layer. Please <a href="#">import it</a> diff --git a/bitbake/lib/toaster/toastergui/templates/projectbuilds.html b/bitbake/lib/toaster/toastergui/templates/projectbuilds.html index d0f9af4..50697a1 100644 --- a/bitbake/lib/toaster/toastergui/templates/projectbuilds.html +++ b/bitbake/lib/toaster/toastergui/templates/projectbuilds.html @@ -41,8 +41,8 @@ {% if request.GET.filter or request.GET.search %} <div class="row"> <div class="alert"> - <form class="no-results input-group" id="searchform"> - <input id="search" name="search" class="input-xxlarge" type="text" value="{{request.GET.search}}"/>{% if request.GET.search %}<a href="javascript:$('#search').val('');searchform.submit()" class="input-group-addon btn" tabindex="-1"><i class="glyphicon glyphicon-remove"></i></a>{% endif %} + <form class="no-results input-append" id="searchform"> + <input id="search" name="search" class="input-xxlarge" type="text" value="{{request.GET.search}}"/>{% 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 %} <button class="btn" type="submit" value="Search">Search</button> <button class="btn btn-link" onclick="javascript:$('#search').val('');searchform.submit()">Show all builds</button> </form> diff --git a/bitbake/lib/toaster/toastergui/templates/projectconf.html b/bitbake/lib/toaster/toastergui/templates/projectconf.html index 7ceccee..6f1a141 100644 --- a/bitbake/lib/toaster/toastergui/templates/projectconf.html +++ b/bitbake/lib/toaster/toastergui/templates/projectconf.html @@ -19,7 +19,7 @@ <span id="distro">{{distro}}</span> <i class="glyphicon glyphicon-pencil" id="change-distro-icon"></i> <form id="change-distro-form" style="display:none;"> - <div class="input-group"> + <div class="input-append"> <span id="edit-distro-name-div" class="control-group"> <input type="text" id="new-distro" value="{{distro}}"> <button id="apply-change-distro" class="btn" type="button">Save</button> @@ -43,7 +43,7 @@ <div class="row"> <span class="help-block col-md-4">To set DL_DIR type the absolute path of the download folder.</span> </div> - <div class="input-group" id="validate-dl_dir"> + <div class="input-append" id="validate-dl_dir"> <input type="text" class="input-xlarge" id="new-dl_dir" placeholder="Type absolute path of the DL_DIR folder"> <button id="apply-change-dl_dir" class="btn" type="button">Save</button> <button id="cancel-change-dl_dir" type="button" class="btn btn-link">Cancel</button> @@ -90,7 +90,7 @@ <div class="row"> <span class="help-block col-md-4">To set IMAGE_INSTALL_append to more than one package, type the package names separated by a space.</span> </div> - <div class="input-group"> + <div class="input-append"> <input type="text" class="input-xlarge" id="new-image_install" placeholder="Type one or more package names"> <button id="apply-change-image_install" class="btn" type="button">Save</button> <button id="cancel-change-image_install" type="button" class="btn btn-link">Cancel</button> @@ -147,7 +147,7 @@ <div class="row"> <span class="help-block col-md-4">To set SSTATE_DIR type the absolute path of the download folder.</span> </div> - <div class="input-group" id="validate-sstate_dir"> + <div class="input-append" id="validate-sstate_dir"> <input type="text" class="input-xlarge" id="new-sstate_dir" placeholder="Type absolute path of the SSTATE_DIR folder"> <span class="error">A valid directory name required</span> <button id="apply-change-sstate_dir" class="btn" type="button">Save</button> @@ -425,7 +425,7 @@ orightml += ' <span id="config_var_value_'+configvars_sorted[i][2]+'"></span>' orightml += ' <i class="glyphicon glyphicon-pencil js-icon-pencil-config_var" x-data="'+configvars_sorted[i][2]+'"></i>' orightml += ' <form id="change-config_var-form_'+configvars_sorted[i][2]+'" style="display:none;">' - orightml += ' <div class="input-group">' + orightml += ' <div class="input-append">' orightml += ' <input type="text" class="input-xlarge js-new-config_var" id="new-config_var_'+configvars_sorted[i][2]+'" value="">' orightml += ' <button class="btn js-apply-change-config_var" type="button" x-data="'+configvars_sorted[i][2]+':'+configvars_sorted[i][0]+'" disabled>Save</button>' orightml += ' <button type="button" class="btn btn-link js-cancel-change-config_var" x-data="'+configvars_sorted[i][2]+'">Cancel</button>' diff --git a/bitbake/lib/toaster/toastergui/templates/projecttopbar.html b/bitbake/lib/toaster/toastergui/templates/projecttopbar.html index b2f41e0..426ded0 100644 --- a/bitbake/lib/toaster/toastergui/templates/projecttopbar.html +++ b/bitbake/lib/toaster/toastergui/templates/projecttopbar.html @@ -35,7 +35,7 @@ <form id="project-name-change-form" style="margin-bottom: 0px; display: none;"> <div class="input-group" id="validate-project-name"> <input class="huge input-xxlarge" type="text" id="project-name-change-input" autocomplete="off" value="{{project.name}}"> - <button id="project-name-change-btn" class="btn btn-lg" type="button">Save</button> + <button id="project-name-change-btn" class="btn btn-large" type="button">Save</button> <a href="#" id="project-name-change-cancel" class="btn btn-lg btn-link">Cancel</a> </div> <p class="help-block error" style="display: none;margin-top: 10px;" id="hint-error-project-name">A project with this name exists. Project names must be unique.</p> @@ -68,9 +68,9 @@ <li class="pull-right"> <form class="form-inline" style="margin-bottom:0px;"> <i class="icon-question-sign get-help heading-help" data-placement="left" title="" data-original-title="Type the name of one or more recipes you want to build, separated by a space. You can also specify a task by appending a colon and a task name to the recipe name, like so: <code>busybox:clean</code>"></i> - <div class="input-group"> - <input id="build-input" type="text" class="input-xlarge input-lg build-target-input" placeholder="Type the recipe you want to build" autocomplete="off" disabled> - <button id="build-button" class="btn btn-primary btn-lg build-button" data-project-id="{{project.id}}" disabled>Build</button> + <div class="input-append"> + <input id="build-input" type="text" class="huge input-xlarge build-target-input" placeholder="Type the recipe you want to build" autocomplete="off" disabled> + <button id="build-button" class="btn btn-primary btn-large build-button" data-project-id="{{project.id}}" disabled>Build</button> </div> </form> </li> diff --git a/bitbake/lib/toaster/toastergui/templates/recipes.html b/bitbake/lib/toaster/toastergui/templates/recipes.html index 04e15f7..e879f00 100644 --- a/bitbake/lib/toaster/toastergui/templates/recipes.html +++ b/bitbake/lib/toaster/toastergui/templates/recipes.html @@ -28,8 +28,8 @@ {% if objects.paginator.count == 0 %} <div class="row"> <div class="alert"> - <form class="no-results input-group" id="searchform"> - <input id="search" name="search" class="input-xxlarge" type="text" value="{%if request.GET.search%}{{request.GET.search}}{%endif%}"/>{% if request.GET.search %}<a href="javascript:$('#search').val('');searchform.submit()" class="input-group-addon btn" tabindex="-1"><i class="glyphicon glyphicon-remove"></i></a>{% endif %} + <form class="no-results input-append" id="searchform"> + <input id="search" name="search" class="input-xxlarge" type="text" 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 %} <button class="btn" type="submit" value="Search">Search</button> <button class="btn btn-link" onclick="javascript:$('#search').val('');searchform.submit()">Show all recipes</button> </form> diff --git a/bitbake/lib/toaster/toastergui/templates/target.html b/bitbake/lib/toaster/toastergui/templates/target.html index 3979929..5740cdc 100644 --- a/bitbake/lib/toaster/toastergui/templates/target.html +++ b/bitbake/lib/toaster/toastergui/templates/target.html @@ -53,8 +53,8 @@ {% if objects.paginator.count == 0 %} <div class="row"> <div class="alert"> - <form class="no-results input-group" id="searchform"> - <input id="search" name="search" class="input-xxlarge" type="text" value="{% if request.GET.search %}{{request.GET.search}}{% endif %}"/>{% if request.GET.search %}<a href="javascript:$('#search').val('');searchform.submit()" class="input-group-addon btn" tabindex="-1"><i class="glyphicon glyphicon-remove"></i></a>{% endif %} + <form class="no-results input-append" id="searchform"> + <input id="search" name="search" class="input-xxlarge" type="text" 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 %} <button class="btn" type="submit" value="Search">Search</button> <button class="btn btn-link" onclick="javascript:$('#search').val('');searchform.submit()">Show all packages</button> </form> diff --git a/bitbake/lib/toaster/toastergui/templates/tasks.html b/bitbake/lib/toaster/toastergui/templates/tasks.html index 4c71d9a..c45cf15 100644 --- a/bitbake/lib/toaster/toastergui/templates/tasks.html +++ b/bitbake/lib/toaster/toastergui/templates/tasks.html @@ -66,8 +66,8 @@ {% if objects.paginator.count == 0 %} <div class="row"> <div class="alert"> - <form class="no-results input-group" id="searchform"> - <input id="search" name="search" class="input-xxlarge" type="text" value="{{request.GET.search}}"/>{% if request.GET.search %}<a href="javascript:$('#search').val('');searchform.submit()" class="input-group-addon btn" tabindex="-1"><i class="glyphicon glyphicon-remove"></i></a>{% endif %} + <form class="no-results input-append" id="searchform"> + <input id="search" name="search" class="input-xxlarge" type="text" value="{{request.GET.search}}"/>{% 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 %} <button class="btn" type="submit" value="Search">Search</button> <button class="btn btn-link" onclick="javascript:$('#search').val('');searchform.submit()">Show all tasks</button> </form> diff --git a/bitbake/lib/toaster/toastergui/templates/toastertable-simple.html b/bitbake/lib/toaster/toastergui/templates/toastertable-simple.html index 1e30cae..6ef220b 100644 --- a/bitbake/lib/toaster/toastergui/templates/toastertable-simple.html +++ b/bitbake/lib/toaster/toastergui/templates/toastertable-simple.html @@ -28,9 +28,9 @@ <div class="row" id="no-results-{{table_name}}" style="display:none"> <div class="alert"> - <form class="no-results input-group"> + <form class="no-results input-append"> <input class="input-xlarge" 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="input-group-addon btn remove-search-btn-{{table_name}}" tabindex="-1"> + <a href="#" class="input-append-addon btn remove-search-btn-{{table_name}}" tabindex="-1"> <i class="glyphicon glyphicon-remove"></i> </a> <button class="btn search-submit-{{table_name}}" >Search</button> @@ -42,10 +42,10 @@ <div id="table-container-{{table_name}}" style="visibility: hidden"> <!-- control header --> <div class="row" id="table-chrome-{{table_name}}"> - <div class="navbar-search input-group pull-left"> + <div class="navbar-search input-append pull-left"> <input class="input-xlarge" 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="input-group-addon btn remove-search-btn-{{table_name}}" tabindex="-1"> + <a href="#" style="display:none" class="input-append-addon btn remove-search-btn-{{table_name}}" tabindex="-1"> <i class="glyphicon glyphicon-remove"></i> </a> <button class="btn" id="search-submit-{{table_name}}" >Search</button> diff --git a/bitbake/lib/toaster/toastergui/templates/toastertable.html b/bitbake/lib/toaster/toastergui/templates/toastertable.html index f7b4dfc..f046277 100644 --- a/bitbake/lib/toaster/toastergui/templates/toastertable.html +++ b/bitbake/lib/toaster/toastergui/templates/toastertable.html @@ -27,9 +27,9 @@ <div class="row" id="no-results-{{table_name}}" style="display:none"> <div class="alert"> - <form class="no-results input-group"> + <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="input-group-addon btn remove-search-btn-{{table_name}}" tabindex="-1"> + <a href="#" class="input-append-addon btn remove-search-btn-{{table_name}}" tabindex="-1"> <i class="glyphicon glyphicon-remove"></i> </a> <button class="btn search-submit-{{table_name}}"> @@ -46,13 +46,16 @@ <!-- control header --> <div class="navbar" id="table-chrome-{{table_name}}"> <div class="navbar-inner"> - <div class="navbar-search input-group pull-left col-md-6"> - - <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="input-group-addon btn remove-search-btn-{{table_name}}" tabindex="-1"> + <div class="navbar-search pull-left"> + <div class="input-append"> + <input id="search-input-{{table_name}}" class="input-xxlarge" name="search" type="text" placeholder="Search {{title|lower}}" value="{%if request.GET.search%}{{request.GET.search}}{%endif%}"/> + <a href="#" style="display:none" class="input-append-addon btn remove-search-btn-{{table_name}}" tabindex="-1"> <i class="glyphicon glyphicon-remove"></i> </a> + <span class="input-append-btn"> <button class="btn" id="search-submit-{{table_name}}" >Search</button> + </span> + </div> </div> <div class="pull-right"> @@ -88,7 +91,7 @@ <!-- Pagination controls --> <div id="pagination-{{table_name}}"> - <ul class="pagination pagination-centered"> + <ul class="pagination"> </ul> <div class="pull-right"> -- 1.9.1 -- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
