From 3190ab644199ea8e7d765783d71ed1cb39ac8e1b Mon Sep 17 00:00:00 2001 From: Belen Barros Pena Date: Mon, 23 Mar 2015 17:15:01 +0000 Subject: 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 Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- .../lib/toaster/toastergui/static/css/default.css | 11 ++- .../lib/toaster/toastergui/templates/landing.html | 100 +++++++++------------ .../lib/toaster/toastergui/templates/layers.html | 16 +++- .../lib/toaster/toastergui/templates/machines.html | 6 +- .../lib/toaster/toastergui/templates/project.html | 22 ++--- .../lib/toaster/toastergui/templates/targets.html | 14 ++- 6 files changed, 84 insertions(+), 85 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css b/bitbake/lib/toaster/toastergui/static/css/default.css index 0e5c0f9..7ee1251 100644 --- a/bitbake/lib/toaster/toastergui/static/css/default.css +++ b/bitbake/lib/toaster/toastergui/static/css/default.css @@ -130,10 +130,19 @@ select { width: auto; } .task-name { margin-left: 7px; } .icon-hand-right {color: #CCCCCC; } .help-inline { margin: 5px; } +.dashboard-section { background-color: transparent; } + +/* styles for landing page - analysis mode */ .hero-unit { margin: 20px 0 30px; } .hero-unit > .close { font-size:40px; } .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) */ #otable { table-layout: fixed; word-wrap: break-word; } diff --git a/bitbake/lib/toaster/toastergui/templates/landing.html b/bitbake/lib/toaster/toastergui/templates/landing.html index d5ae9f5..5bbe694 100644 --- a/bitbake/lib/toaster/toastergui/templates/landing.html +++ b/bitbake/lib/toaster/toastergui/templates/landing.html @@ -9,80 +9,64 @@
-
- {% if not MANAGED %} - - {% endif %} +

This is Toaster

-

- A web interface to - - BitBake - - , the - - Yocto Project - - build system. -

+

A web interface to BitBake, the Yocto Project build system.

{% if MANAGED %} {% if lvs_nos %} -

- - To start building, create your first Toaster project - -

+

+ + To start building, create your first Toaster project + +

{% else %} -
-

- Toaster has no layer information; without layer information, you cannot run builds. To generate layer information you can: -

- -
- {% endif %} +
+ Toaster has no layer information. Without layer information, you cannot run builds. To generate layer information you can: + +
+ {% endif %} -

- - Read the Toaster manual -
- - Contribute to Toaster - -

+ - {% else %} + {% else %} -

- - Show me the manual - - - I want to contribute - -

+

+ + Show me the manual + + + I want to contribute + +

- {% endif %} + {% endif %}
-
- +
{% if MANAGED %} - Yocto Project - {% else %} - Yocto Project - {% endif %} - + Yocto Project + {% else %} + Yocto Project + {% endif %}
diff --git a/bitbake/lib/toaster/toastergui/templates/layers.html b/bitbake/lib/toaster/toastergui/templates/layers.html index c35a299..24d31c7 100644 --- a/bitbake/lib/toaster/toastergui/templates/layers.html +++ b/bitbake/lib/toaster/toastergui/templates/layers.html @@ -9,9 +9,9 @@ {% block projectinfomain %}

- {% if request.GET.filter and total_count > 0 or request.GET.search and total_count > 0 %} - {{total_count}} layer{{total_count|pluralize}} found - {% elif 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 %} + {{objects.paginator.count}} layer{{objects.paginator.count|pluralize}} found + {% elif request.GET.filter and objects.paginator.count == 0 or request.GET.search and objects.paginator.count == 0 %} No layers found {%else%} All compatible layers @@ -24,6 +24,7 @@

{% if objects.paginator.count == 0 %} + {% if request.GET.filter or request.GET.search %}
@@ -33,6 +34,15 @@
+ {% else %} +
+

Toaster has no layer information. To generate layer information you can:

+ +
+ {% endif %} {% else %} diff --git a/bitbake/lib/toaster/toastergui/templates/machines.html b/bitbake/lib/toaster/toastergui/templates/machines.html index 1057bdd..2ac3537 100644 --- a/bitbake/lib/toaster/toastergui/templates/machines.html +++ b/bitbake/lib/toaster/toastergui/templates/machines.html @@ -59,10 +59,8 @@
{% else %} -
-

- Toaster has no machine information. To fetch machine information you should configure a layer source -

+
+ Toaster has no machine information. To generate machine information you should configure a layer source
{% endif %} diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html index ae9ee9b..40048c2 100644 --- a/bitbake/lib/toaster/toastergui/templates/project.html +++ b/bitbake/lib/toaster/toastergui/templates/project.html @@ -15,22 +15,22 @@ vim: expandtab tabstop=2 - {% if lvs_nos == 0 %} -
-

- Toaster has no layer information; without layer information, you cannot run builds.
To generate layer information you can: -

- + +
+

{{ project.name }}

+
+
+

Toaster has no layer information. Without layer information, you cannot run builds. To generate layer information you can:

+
{%else%} -
+
diff --git a/bitbake/lib/toaster/toastergui/templates/targets.html b/bitbake/lib/toaster/toastergui/templates/targets.html index 27ff2be..6f59a6c 100644 --- a/bitbake/lib/toaster/toastergui/templates/targets.html +++ b/bitbake/lib/toaster/toastergui/templates/targets.html @@ -36,14 +36,12 @@
{% else %} -
-

- Toaster has no target information. To generate target information you can:
-

-

+
+

Toaster has no target information. To generate target information you can:

+
{% endif %} -- cgit v1.1