[Toaster] [review-request][PATCH 2/6] toaster: Show mode-appropriate landing page
Elliot Smith
elliot.smith at intel.com
Fri Oct 16 07:32:53 PDT 2015
The same landing page is shown for both analysis and
build modes. This means that users in analysis mode can see
options which are not available or broken in that mode.
Modify the landing page template to show a simple "run a build"
message if the user is in analysis mode and has no builds yet.
Also clean up the landing page HTML, because the indentation was
a mess and the HTML was invalid.
[YOCTO #8514]
Signed-off-by: Elliot Smith <elliot.smith at intel.com>
---
.../lib/toaster/toastergui/templates/landing.html | 103 ++++++++++++---------
1 file changed, 58 insertions(+), 45 deletions(-)
diff --git a/bitbake/lib/toaster/toastergui/templates/landing.html b/bitbake/lib/toaster/toastergui/templates/landing.html
index 45e9532..65d8c3c 100644
--- a/bitbake/lib/toaster/toastergui/templates/landing.html
+++ b/bitbake/lib/toaster/toastergui/templates/landing.html
@@ -6,53 +6,66 @@
{% block pagecontent %}
- <div class="container-fluid">
- <div class="row-fluid">
- <!-- Empty - no data in database -->
- <div class="hero-unit span12 well-transparent">
- <div class="row-fluid">
- <div class="span6">
- <h1>
- This is Toaster
- </h1>
- <p>A web interface to <a href="http://www.openembedded.org">OpenEmbedded</a> and <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 lvs_nos %}
- <p class="hero-actions">
- <a class="btn btn-primary btn-large" href="{% url 'newproject' %}">
- To start building, create your first Toaster project
- </a>
- </p>
- {% else %}
- <div class="alert alert-info lead air">
- Toaster has no layer information. Without layer information, you cannot run builds. To generate layer information you can:
- <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 'newproject' %}">Create a project</a>, then import layers
- </li>
- </ul>
- </div>
- {% endif %}
-
- <ul class="unstyled">
- <li>
- <a href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html">Read the Toaster manual</a>
- </li>
- <li>
- <a href="https://wiki.yoctoproject.org/wiki/Contribute_to_Toaster">Contribute to Toaster</a>
- </li>
- </ul>
+ {% if BUILD_MODE %}
+ <!-- build mode -->
+ <div class="container-fluid">
+ <div class="row-fluid">
+ <div class="hero-unit span12 well-transparent">
+ <div class="row-fluid">
+ <div class="span6">
+ <h1>This is Toaster</h1>
+
+ <p>A web interface to <a href="http://www.openembedded.org">OpenEmbedded</a> and <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 lvs_nos %}
+ <p class="hero-actions">
+ <a class="btn btn-primary btn-large" href="{% url 'newproject' %}">
+ To start building, create your first Toaster project
+ </a>
+ </p>
+ {% else %}
+ <div class="alert alert-info lead air">
+ Toaster has no layer information. Without layer information, you cannot run builds. To generate layer information you can:
+ <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 'newproject' %}">Create a project</a>, then import layers
+ </li>
+ </ul>
+ </div>
+ {% endif %}
+
+ <ul class="unstyled">
+ <li>
+ <a href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html">
+ Read the Toaster manual
+ </a>
+ </li>
+
+ <li>
+ <a href="https://wiki.yoctoproject.org/wiki/Contribute_to_Toaster">
+ Contribute to Toaster
+ </a>
+ </li>
+ </ul>
+ </div>
+
+ <div class="span6">
+ <img alt="Yocto Project" class="thumbnail" src="{% static 'img/toaster_bw.png' %}"/>
+ </div>
+
+ </div>
+ </div>
</div>
- <div class="span6">
- <img alt="Yocto Project" class="thumbnail" src="{% static 'img/toaster_bw.png' %}"/>
- </div>
- </div>
</div>
- </div>
+ {% else %}
+ <!-- analysis mode -->
+ <div class="alert alert-info lead top-air">
+ Toaster has not recorded any builds yet. Run a build from the command line to see it here.
+ </div>
+ {% endif %}
{% endblock %}
--
Elliot Smith
Software Engineer
Intel OTC
---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
More information about the toaster
mailing list