Make sure it displays correctly with Bootstrap 3, both when showing the list of packages installed, and when showing not packages.
Signed-off-by: Belen Barros Pena <[email protected]> --- .../lib/toaster/toastergui/static/css/default.css | 1 + .../toastergui/templates/recipedetails.html | 76 ++++++++++------------ 2 files changed, 36 insertions(+), 41 deletions(-) diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css b/bitbake/lib/toaster/toastergui/static/css/default.css index 20bf498..c343645 100644 --- a/bitbake/lib/toaster/toastergui/static/css/default.css +++ b/bitbake/lib/toaster/toastergui/static/css/default.css @@ -50,6 +50,7 @@ img.logo { height: 30px; vertical-align: bottom; } .form-control[id^="search-input-"], .form-control[id^="new-search-input-"] { width: 30em; } #search-input-selectpackagestable, +#search-input-packagestable, .form-control[id^="no-results-search-input-"]{ width: 20em; } #edit-columns-button { margin-right: 30px; } .navbar-default[id^="table-chrome-"] { background-color: transparent; } diff --git a/bitbake/lib/toaster/toastergui/templates/recipedetails.html b/bitbake/lib/toaster/toastergui/templates/recipedetails.html index 4dc88fa..64e0c21 100644 --- a/bitbake/lib/toaster/toastergui/templates/recipedetails.html +++ b/bitbake/lib/toaster/toastergui/templates/recipedetails.html @@ -4,25 +4,23 @@ {% load static %} {% block pagecontent %} -<div class="row"> - <ul class="breadcrumb"> - <li> - <a href="{% url 'project' project.id %}">{{project.name}}</a> - <span class="divider">→</span> - </li> - <li> - {% if recipe.is_image %} - <a href="{% url 'projectimagerecipes' project.id %}">Image recipes</a> - {% else %} - <a href="{% url 'projectsoftwarerecipes' project.id %}">Software recipes</a> - {% endif %} - <span class="divider">→</span> - </li> - <li class="active"> - {{recipe.name}} ({{recipe.layer_version.layer.name}}) - </li> - </ul> -</div> +<ul class="breadcrumb"> + <li> + <a href="{% url 'project' project.id %}">{{project.name}}</a> + <span class="divider">→</span> + </li> + <li> + {% if recipe.is_image %} + <a href="{% url 'projectimagerecipes' project.id %}">Image recipes</a> + {% else %} + <a href="{% url 'projectsoftwarerecipes' project.id %}">Software recipes</a> + {% endif %} + <span class="divider">→</span> + </li> + <li class="active"> + {{recipe.name}} ({{recipe.layer_version.layer.name}}) + </li> +</ul> <script src="{% static 'js/recipedetails.js' %}"></script> <script> @@ -51,19 +49,15 @@ {% include 'newcustomimage_modal.html' %} -<div class="row"> - <div class="col-md-12"> - <div class="alert alert-success lead" id="image-created-notification" style="margin-top: 15px; display: none"> - <button type="button" data-dismiss="alert" class="close">x</button> - Your custom image <strong>{{recipe.name}}</strong> has been created. You can now add or remove packages as needed. - </div> - <div class="page-header"> - <h1> - {{recipe.name}} - <small>({{recipe.layer_version.layer.name}})</small> - </h1> - </div> - </div> +<div class="alert alert-success lead" id="image-created-notification" style="margin-top: 15px; display: none"> + <button type="button" data-dismiss="alert" class="close">x</button> + Your custom image <strong>{{recipe.name}}</strong> has been created. You can now add or remove packages as needed. +</div> +<div class="page-header"> + <h1> + {{recipe.name}} + <small>({{recipe.layer_version.layer.name}})</small> + </h1> </div> <div class="row"> @@ -73,17 +67,17 @@ {% if not in_project %} display:none; {% endif %}"> - <button class="btn btn-large col-md-6 build-recipe-btn" style="width: 50%"> + <button class="btn btn-default btn-lg build-recipe-btn" style="width: 50%"> Build {{recipe.name}} </button> {% if recipe.is_image %} - <button class="btn btn-large col-md-6 customise-btn" data-recipe="{{recipe.pk}}" style="width: 50%"> + <button class="btn btn-default btn-lg customise-btn" data-recipe="{{recipe.pk}}" style="width: 50%"> Customise {{recipe.name}} </button> {% endif %} </div> <div class="button-place"> - <button class="btn btn-block btn-large" id="add-layer-btn" + <button class="btn btn-default btn-block btn-lg" id="add-layer-btn" style="width:100%; {% if in_project %} display:none; @@ -108,7 +102,7 @@ style="display:none" {% endif %} > <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-large build-recipe-btn" style="margin:20px 0 10px 0;">Build {{recipe.name}}</button> + <button class="btn btn-info btn-lg build-recipe-btn" style="margin:20px 0 10px 0;">Build {{recipe.name}}</button> </div> <div class="alert alert-info air" id="packages-alert" @@ -123,29 +117,29 @@ </div> <div class="col-md-4"> <div class="well"> - <h2 style="margin-bottom:20px;">About {{recipe.name}}</h2> + <h2>About {{recipe.name}}</h2> <dl> <dt> Approx. packages included - <i class="icon-question-sign get-help" title="" data-original-title="The number of packages included is based on information from previous builds and from parsing layers, so we can never be sure it is 100% accurate"></i> + <span class="glyphicon glyphicon-question-sign get-help" title="The number of packages included is based on information from previous builds and from parsing layers, so we can never be sure it is 100% accurate"></span> </dt> <dd class="no-packages">{{packages.count}}</dd> <dt> Approx. package size - <i class="icon-question-sign get-help" title="" data-original-title="Package size is based on information from previous builds, so we can never be sure it is 100% accurate"></i> + <span class="glyphicon glyphicon-question-sign get-help" title="Package size is based on information from previous builds, so we can never be sure it is 100% accurate"></span> </dt> <dd>{{approx_pkg_size.size__sum|filtered_filesizeformat}}</dd> {% if last_build %} <dt>Last build</dt> <dd> - <i class="icon-ok-sign success"></i> + <span class="glyphicon glyphicon-ok-circle"></span> <a href="{% url 'projectbuilds' project.id%}">{{last_build.completed_on|date:"d/m/y H:i"}}</a> </dd> {% endif %} <dt>Recipe file</dt> <dd> <code>{{recipe.file_path|cut_path_prefix:recipe.layer_version.local_path}}</code> - <a href="{{recipe.get_vcs_recipe_file_link_url}}"><i class="glyphicon glyphicon-share" title="" data-original-title="View recipe file"></i></a> + <a href="{{recipe.get_vcs_recipe_file_link_url}}"><span class="glyphicon glyphicon-new-window" title="View recipe file" data-toggle="tooltip"></span></a> </dd> <dt>Layer</dt> <dd><a href="{% url 'layerdetails' project.id recipe.layer_version.pk %}">{{recipe.layer_version.layer.name}}</a></dd> -- 1.9.1 -- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
