Fix the layout and the lists of layers and targets in the project configuration page.
Signed-off-by: Belen Barros Pena <[email protected]> --- .../static/css/bootstrap3-transition.css | 10 +++++ .../toastergui/templates/baseprojectpage.html | 34 +++++++------- .../toastergui/templates/projecttopbar.html | 52 +++++++++++----------- 3 files changed, 53 insertions(+), 43 deletions(-) diff --git a/bitbake/lib/toaster/toastergui/static/css/bootstrap3-transition.css b/bitbake/lib/toaster/toastergui/static/css/bootstrap3-transition.css index 2fd7caf..0be56bf 100644 --- a/bitbake/lib/toaster/toastergui/static/css/bootstrap3-transition.css +++ b/bitbake/lib/toaster/toastergui/static/css/bootstrap3-transition.css @@ -22,3 +22,13 @@ .modal-footer { background-color: #f5f5f5; } + +/* Project configuration page */ + +ul.configuration-list { + margin-left: 0px; +} + +.configuration-list .checkbox { + margin-top: 0; +} diff --git a/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html b/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html index 8020376..0d12a36 100644 --- a/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html +++ b/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html @@ -21,24 +21,22 @@ }); </script> -<div class="row"> - <!-- only on config pages --> - <div id="config-nav" class="col-md-2"> - <ul class="nav nav-list well"> - <li><a class="nav-parent" href="{% url 'project' project.id %}">Configuration</a></li> - <li class="nav-header">Compatible metadata</li> - <li><a href="{% url 'projectcustomimages' project.id %}">Custom images</a></li> - <li><a href="{% url 'projectimagerecipes' project.id %}">Image recipes</a></li> - <li><a href="{% url 'projectsoftwarerecipes' project.id %}">Software recipes</a></li> - <li><a href="{% url 'projectmachines' project.id %}">Machines</a></li> - <li><a href="{% url 'projectlayers' project.id %}">Layers</a></li> - <li class="nav-header">Extra configuration</li> - <li><a href="{% url 'projectconf' project.id %}">BitBake variables</a></li> - </ul> - </div> - <div class="col-md-10"> - {% block projectinfomain %}{% endblock %} - </div> +<!-- only on config pages --> +<div id="config-nav" class="col-md-2"> + <ul class="nav nav-list well"> + <li><a class="nav-parent" href="{% url 'project' project.id %}">Configuration</a></li> + <li class="nav-header">Compatible metadata</li> + <li><a href="{% url 'projectcustomimages' project.id %}">Custom images</a></li> + <li><a href="{% url 'projectimagerecipes' project.id %}">Image recipes</a></li> + <li><a href="{% url 'projectsoftwarerecipes' project.id %}">Software recipes</a></li> + <li><a href="{% url 'projectmachines' project.id %}">Machines</a></li> + <li><a href="{% url 'projectlayers' project.id %}">Layers</a></li> + <li class="nav-header">Extra configuration</li> + <li><a href="{% url 'projectconf' project.id %}">BitBake variables</a></li> + </ul> +</div> +<div class="col-md-10"> + {% block projectinfomain %}{% endblock %} </div> {% endblock %} diff --git a/bitbake/lib/toaster/toastergui/templates/projecttopbar.html b/bitbake/lib/toaster/toastergui/templates/projecttopbar.html index 426ded0..042599d 100644 --- a/bitbake/lib/toaster/toastergui/templates/projecttopbar.html +++ b/bitbake/lib/toaster/toastergui/templates/projecttopbar.html @@ -22,11 +22,12 @@ </div> <!-- project name --> -<div class="page-header"> - <h1 id="project-name-container"> - <span id="project-name">{{project.name}}</span> +<div class="col-md-12"> + <div class="page-header"> + <h1 id="project-name-container"> + <span id="project-name">{{project.name}}</span> - <i class="glyphicon glyphicon-pencil" data-original-title="" id="project-change-form-toggle" title=""></i> + <i class="glyphicon glyphicon-pencil" data-original-title="" id="project-change-form-toggle" title=""></i> {% if project.is_default %} <i class="icon-question-sign get-help heading-help" title="" data-original-title="This project shows information about the builds you start from the command line while Toaster is running"></i> @@ -42,38 +43,39 @@ </form> </div> -{% if not project.is_default %} + {% if not project.is_default %} <div id="project-topbar"> <ul class="nav nav-pills"> <li id="topbar-configuration-tab"> - <a href="{% url 'project' project.id %}"> - Configuration - </a> + <a href="{% url 'project' project.id %}"> + Configuration + </a> </li> <li> - <a href="{% url 'projectbuilds' project.id %}"> - Builds ({{project.get_number_of_builds}}) - </a> + <a href="{% url 'projectbuilds' project.id %}"> + Builds ({{project.get_number_of_builds}}) + </a> </li> <li> - <a href="{% url 'importlayer' project.id %}"> - Import layer - </a> + <a href="{% url 'importlayer' project.id %}"> + Import layer + </a> </li> <li> - <a href="{% url 'newcustomimage' project.id %}"> - New custom image - </a> + <a href="{% url 'newcustomimage' project.id %}"> + New custom image + </a> </li> <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-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> + <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-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> </ul> </div> -{% endif %} + {% endif %} +</div> -- 1.9.1 -- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
