bitbake: toasterui: small changes to empty states

This commit:

* Makes some changes to the layout and styles of the
landing.html template

* Adds the empty state to layers.html

* Changes the message of the empty state of machines.html
to use the same wording used in all other pages

* Adds the project name and the right styles to
the empty state of the project.html template

* Makes small changes in style and wording to the
empty state of targets.html

* Updates all "configure a layer source" links to point
to the new Toaster manual.

(Bitbake rev: d886db3add1351a806ab58ec7519d2321687187b)

Signed-off-by: Belen Barros Pena <belen.barros.pena@linux.intel.com>
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Belen Barros Pena 2015-03-23 17:15:01 +00:00 committed by Richard Purdie
parent 38c3f2ec5e
commit 3190ab6441
6 changed files with 84 additions and 85 deletions

View File

@ -130,10 +130,19 @@ select { width: auto; }
.task-name { margin-left: 7px; } .task-name { margin-left: 7px; }
.icon-hand-right {color: #CCCCCC; } .icon-hand-right {color: #CCCCCC; }
.help-inline { margin: 5px; } .help-inline { margin: 5px; }
.dashboard-section { background-color: transparent; }
/* styles for landing page - analysis mode */
.hero-unit { margin: 20px 0 30px; } .hero-unit { margin: 20px 0 30px; }
.hero-unit > .close { font-size:40px; } .hero-unit > .close { font-size:40px; }
.hero-actions { margin-top: 30px; } .hero-actions { margin-top: 30px; }
.dashboard-section { background-color: transparent; }
/* styles for landing page - build mode */
.hero-unit p { line-height: 25px; }
.hero-unit p, .hero-unit .btn-large { margin-top: 15px; }
.hero-unit ul { margin-top: 20px; }
.hero-unit li { line-height: 30px; }
.hero-unit img { background-color: #eee; margin-top: 15px; }
/* make tables Chrome-happy (me, not so much) */ /* make tables Chrome-happy (me, not so much) */
#otable { table-layout: fixed; word-wrap: break-word; } #otable { table-layout: fixed; word-wrap: break-word; }

View File

@ -9,80 +9,64 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
<!-- Empty - no data in database --> <!-- Empty - no data in database -->
<div class="hero-unit span12" {%if MANAGED%}style="background-color: white"{%endif%}> <div class="hero-unit span12 {%if MANAGED%}well-transparent{%endif%}">
{% if not MANAGED %}
<button class="close" data-dismiss="alert" type="button">
×
</button>
{% endif %}
<div class="row-fluid"> <div class="row-fluid">
<div class="span6"> <div class="span6">
<h1> <h1>
This is Toaster This is Toaster
</h1> </h1>
<p> <p>A web interface to <a href="http://www.yoctoproject.org/tools-resources/projects/bitbake">BitBake</a>, the <a href="http://www.yoctoproject.org">Yocto Project</a> build system.</p>
A web interface to
<a href="http://www.yoctoproject.org/tools-resources/projects/bitbake">
BitBake
</a>
, the
<a href="http://www.yoctoproject.org">
Yocto Project
</a>
build system.
</p>
{% if MANAGED %} {% if MANAGED %}
{% if lvs_nos %} {% if lvs_nos %}
<p class="hero-actions"> <p class="hero-actions">
<a class="btn btn-primary btn-large" href="{% url 'newproject' %}"> <a class="btn btn-primary btn-large" href="{% url 'newproject' %}">
To start building, create your first Toaster project To start building, create your first Toaster project
</a> </a>
</p> </p>
{% else %} {% else %}
<div class="alert alert-info"> <div class="alert alert-info lead air">
<p> Toaster has no layer information. Without layer information, you cannot run builds. To generate layer information you can:
Toaster has no layer information; without layer information, you cannot run builds. To generate layer information you can: <ul>
</p> <li>
<ul> <a href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html#layer-source">Configure a layer source</a>
<li> <a href="https://wiki.yoctoproject.org/wiki/Setting_up_a_hosted_managed_mode_for_Toaster#LayerSources">Configure a layer source</a> </li>
</li> <li>
<li> <a href="{% url 'newproject' %}">Create a project</a>, then import layers <a href="{% url 'newproject' %}">Create a project</a>, then import layers
</ul> </li>
</div> </ul>
{% endif %} </div>
{% endif %}
<p style="margin-top: 2em"> <ul class="unstyled">
<a href="https://www.yoctoproject.org/documentation/toaster-manual"> <li>
Read the Toaster manual <a href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html">Read the Toaster manual</a>
</a> <br/> </li>
<a href="https://wiki.yoctoproject.org/wiki/Contribute_to_Toaster"> <li>
Contribute to Toaster <a href="https://wiki.yoctoproject.org/wiki/Contribute_to_Toaster">Contribute to Toaster</a>
</a> </li>
</p> </ul>
{% else %} {% else %}
<p class="hero-actions"> <p class="hero-actions">
<a class="btn btn-primary btn-large" href="https://www.yoctoproject.org/documentation/toaster-manual"> <a class="btn btn-primary btn-large" href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html">
Show me the manual Show me the manual
</a> </a>
<a class="btn btn-large" href="https://wiki.yoctoproject.org/wiki/Contribute_to_Toaster"> <a class="btn btn-large" href="https://wiki.yoctoproject.org/wiki/Contribute_to_Toaster">
I want to contribute I want to contribute
</a> </a>
</p> </p>
{% endif %} {% endif %}
</div> </div>
<div class="span5"> <div class="span6">
<a href="http://www.yoctoproject.org">
{% if MANAGED %} {% if MANAGED %}
<img alt="Yocto Project" class="thumbnail" src="{% static 'img/toaster_1.7.png' %}"/> <img alt="Yocto Project" class="thumbnail" src="{% static 'img/toaster_1.7.png' %}"/>
{% else %} {% else %}
<img alt="Yocto Project" class="thumbnail" src="{% static 'img/toaster.png' %}"/> <img alt="Yocto Project" class="thumbnail" src="{% static 'img/toaster.png' %}"/>
{% endif %} {% endif %}
</a>
</div> </div>
</div> </div>
</div> </div>

View File

@ -9,9 +9,9 @@
{% block projectinfomain %} {% block projectinfomain %}
<div class="page-header"> <div class="page-header">
<h1> <h1>
{% if request.GET.filter and total_count > 0 or request.GET.search and total_count > 0 %} {% if request.GET.filter and objects.paginator.count > 0 or request.GET.search and objects.paginator.count > 0 %}
{{total_count}} layer{{total_count|pluralize}} found {{objects.paginator.count}} layer{{objects.paginator.count|pluralize}} found
{% elif request.GET.filter and total_count == 0 or request.GET.search and total_count == 0 %} {% elif request.GET.filter and objects.paginator.count == 0 or request.GET.search and objects.paginator.count == 0 %}
No layers found No layers found
{%else%} {%else%}
All compatible layers All compatible layers
@ -24,6 +24,7 @@
</div> </div>
{% if objects.paginator.count == 0 %} {% if objects.paginator.count == 0 %}
{% if request.GET.filter or request.GET.search %}
<div class="row-fluid"> <div class="row-fluid">
<div class="alert"> <div class="alert">
<form class="no-results input-append" id="searchform"> <form class="no-results input-append" id="searchform">
@ -33,6 +34,15 @@
</form> </form>
</div> </div>
</div> </div>
{% else %}
<div class="alert alert-info lead">
<p>Toaster has no layer information. To generate layer information you can:</p>
<ul>
<li><a href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html#layer-source">Configure a layer source</a></li>
<li><a href="{% url 'importlayer' %}">Import a layer</a></li>
</ul>
</div>
{% endif %}
{% else %} {% else %}

View File

@ -59,10 +59,8 @@
</form> </form>
</div> </div>
{% else %} {% else %}
<div class="alert alert-info"> <div class="alert alert-info lead">
<p class="lead"> Toaster has no machine information. To generate machine information you should <a href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html#layer-source">configure a layer source</a>
Toaster has no machine information. To fetch machine information you should <a href="https://wiki.yoctoproject.org/wiki/Setting_up_a_hosted_managed_mode_for_Toaster#LayerSources">configure a layer source</a>
</p>
</div> </div>
{% endif %} {% endif %}

View File

@ -15,22 +15,22 @@ vim: expandtab tabstop=2
<script src="{% static "js/angular-sanitize.min.js" %}"></script> <script src="{% static "js/angular-sanitize.min.js" %}"></script>
<script src="{% static "js/ui-bootstrap-tpls-0.11.0.js" %}"></script> <script src="{% static "js/ui-bootstrap-tpls-0.11.0.js" %}"></script>
{% if lvs_nos == 0 %} {% if lvs_nos == 0 %}
<div class="alert alert-info">
<p> <div class="page-header">
Toaster has no layer information; without layer information, you cannot run builds.<br/> To generate layer information you can: <h1> {{ project.name }} </h1>
</p> </div>
<ul> <div class="alert alert-info lead">
<li> <a href="https://wiki.yoctoproject.org/wiki/Setting_up_a_hosted_managed_mode_for_Toaster#LayerSources">Configure a layer source</a> <p>Toaster has no layer information. Without layer information, you cannot run builds. To generate layer information you can:</p>
</li> <ul>
<li> <a href="{% url 'importlayer' %}">Import a layer</a> <li> <a href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html#layer-source">Configure a layer source</a></li>
</ul> <li> <a href="{% url 'importlayer' %}">Import a layer</a></li>
</ul>
</div> </div>
{%else%} {%else%}
<div id="main" role="main" ng-app="project" ng-controller="prjCtrl" class="top-padded">
<div id="main" role="main" ng-app="project" ng-controller="prjCtrl" class="top-padded">
<!-- project name --> <!-- project name -->
<div class="page-header"> <div class="page-header">

View File

@ -36,14 +36,12 @@
</div> </div>
</div> </div>
{% else %} {% else %}
<div class="alert alert-info"> <div class="alert alert-info lead">
<p class="lead"> <p>Toaster has no target information. To generate target information you can:</p>
Toaster has no target information. To generate target information you can:<br/> <ul>
<ul class="lead"> <li><a href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html#layer-source">Configure a layer source</a></li>
<li style="margin-top: 10px"> <a href="https://wiki.yoctoproject.org/wiki/Setting_up_a_hosted_managed_mode_for_Toaster#LayerSources">Configure a layer source</a></li> <li><a href="{% url 'importlayer' %}">Import a layer</a>, then run a build</li>
<li style="margin-top: 10px"> <a href="{% url 'importlayer' %}">Import a layer</a></li> </ul>
</ul>
</p>
</div> </div>
{% endif %} {% endif %}