summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@linux.intel.com>2015-03-23 17:15:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-25 12:39:57 +0000
commit3190ab644199ea8e7d765783d71ed1cb39ac8e1b (patch)
tree111a6c4262340f57d250ea339bebc5a93b730534
parent38c3f2ec5ee30a6ff12e7f0794452bd3379a0fb7 (diff)
downloadpoky-3190ab644199ea8e7d765783d71ed1cb39ac8e1b.tar.gz
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>
-rw-r--r--bitbake/lib/toaster/toastergui/static/css/default.css11
-rw-r--r--bitbake/lib/toaster/toastergui/templates/landing.html100
-rw-r--r--bitbake/lib/toaster/toastergui/templates/layers.html16
-rw-r--r--bitbake/lib/toaster/toastergui/templates/machines.html6
-rw-r--r--bitbake/lib/toaster/toastergui/templates/project.html22
-rw-r--r--bitbake/lib/toaster/toastergui/templates/targets.html14
6 files changed, 84 insertions, 85 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css b/bitbake/lib/toaster/toastergui/static/css/default.css
index 0e5c0f9773..7ee1251529 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; }
130.task-name { margin-left: 7px; } 130.task-name { margin-left: 7px; }
131.icon-hand-right {color: #CCCCCC; } 131.icon-hand-right {color: #CCCCCC; }
132.help-inline { margin: 5px; } 132.help-inline { margin: 5px; }
133.dashboard-section { background-color: transparent; }
134
135/* styles for landing page - analysis mode */
133.hero-unit { margin: 20px 0 30px; } 136.hero-unit { margin: 20px 0 30px; }
134.hero-unit > .close { font-size:40px; } 137.hero-unit > .close { font-size:40px; }
135.hero-actions { margin-top: 30px; } 138.hero-actions { margin-top: 30px; }
136.dashboard-section { background-color: transparent; } 139
140/* styles for landing page - build mode */
141.hero-unit p { line-height: 25px; }
142.hero-unit p, .hero-unit .btn-large { margin-top: 15px; }
143.hero-unit ul { margin-top: 20px; }
144.hero-unit li { line-height: 30px; }
145.hero-unit img { background-color: #eee; margin-top: 15px; }
137 146
138/* make tables Chrome-happy (me, not so much) */ 147/* make tables Chrome-happy (me, not so much) */
139#otable { table-layout: fixed; word-wrap: break-word; } 148#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 d5ae9f5e20..5bbe694f89 100644
--- a/bitbake/lib/toaster/toastergui/templates/landing.html
+++ b/bitbake/lib/toaster/toastergui/templates/landing.html
@@ -9,80 +9,64 @@
9 <div class="container-fluid"> 9 <div class="container-fluid">
10 <div class="row-fluid"> 10 <div class="row-fluid">
11 <!-- Empty - no data in database --> 11 <!-- Empty - no data in database -->
12 <div class="hero-unit span12" {%if MANAGED%}style="background-color: white"{%endif%}> 12 <div class="hero-unit span12 {%if MANAGED%}well-transparent{%endif%}">
13 {% if not MANAGED %}
14 <button class="close" data-dismiss="alert" type="button">
15 ×
16 </button>
17 {% endif %}
18 <div class="row-fluid"> 13 <div class="row-fluid">
19 <div class="span6"> 14 <div class="span6">
20 <h1> 15 <h1>
21 This is Toaster 16 This is Toaster
22 </h1> 17 </h1>
23 <p> 18 <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>
24 A web interface to
25 <a href="http://www.yoctoproject.org/tools-resources/projects/bitbake">
26 BitBake
27 </a>
28 , the
29 <a href="http://www.yoctoproject.org">
30 Yocto Project
31 </a>
32 build system.
33 </p>
34 19
35 {% if MANAGED %} 20 {% if MANAGED %}
36 21
37 {% if lvs_nos %} 22 {% if lvs_nos %}
38 <p class="hero-actions"> 23 <p class="hero-actions">
39 <a class="btn btn-primary btn-large" href="{% url 'newproject' %}"> 24 <a class="btn btn-primary btn-large" href="{% url 'newproject' %}">
40 To start building, create your first Toaster project 25 To start building, create your first Toaster project
41 </a> 26 </a>
42 </p> 27 </p>
43 {% else %} 28 {% else %}
44 <div class="alert alert-info"> 29 <div class="alert alert-info lead air">
45 <p> 30 Toaster has no layer information. Without layer information, you cannot run builds. To generate layer information you can:
46 Toaster has no layer information; without layer information, you cannot run builds. To generate layer information you can: 31 <ul>
47 </p> 32 <li>
48 <ul> 33 <a href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html#layer-source">Configure a layer source</a>
49 <li> <a href="https://wiki.yoctoproject.org/wiki/Setting_up_a_hosted_managed_mode_for_Toaster#LayerSources">Configure a layer source</a> 34 </li>
50 </li> 35 <li>
51 <li> <a href="{% url 'newproject' %}">Create a project</a>, then import layers 36 <a href="{% url 'newproject' %}">Create a project</a>, then import layers
52 </ul> 37 </li>
53 </div> 38 </ul>
54 {% endif %} 39 </div>
40 {% endif %}
55 41
56 <p style="margin-top: 2em"> 42 <ul class="unstyled">
57 <a href="https://www.yoctoproject.org/documentation/toaster-manual"> 43 <li>
58 Read the Toaster manual 44 <a href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html">Read the Toaster manual</a>
59 </a> <br/> 45 </li>
60 <a href="https://wiki.yoctoproject.org/wiki/Contribute_to_Toaster"> 46 <li>
61 Contribute to Toaster 47 <a href="https://wiki.yoctoproject.org/wiki/Contribute_to_Toaster">Contribute to Toaster</a>
62 </a> 48 </li>
63 </p> 49 </ul>
64 50
65 {% else %} 51 {% else %}
66 52
67 <p class="hero-actions"> 53 <p class="hero-actions">
68 <a class="btn btn-primary btn-large" href="https://www.yoctoproject.org/documentation/toaster-manual"> 54 <a class="btn btn-primary btn-large" href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html">
69 Show me the manual 55 Show me the manual
70 </a> 56 </a>
71 <a class="btn btn-large" href="https://wiki.yoctoproject.org/wiki/Contribute_to_Toaster"> 57 <a class="btn btn-large" href="https://wiki.yoctoproject.org/wiki/Contribute_to_Toaster">
72 I want to contribute 58 I want to contribute
73 </a> 59 </a>
74 </p> 60 </p>
75 61
76 {% endif %} 62 {% endif %}
77 </div> 63 </div>
78 <div class="span5"> 64 <div class="span6">
79 <a href="http://www.yoctoproject.org">
80 {% if MANAGED %} 65 {% if MANAGED %}
81 <img alt="Yocto Project" class="thumbnail" src="{% static 'img/toaster_1.7.png' %}"/> 66 <img alt="Yocto Project" class="thumbnail" src="{% static 'img/toaster_1.7.png' %}"/>
82 {% else %} 67 {% else %}
83 <img alt="Yocto Project" class="thumbnail" src="{% static 'img/toaster.png' %}"/> 68 <img alt="Yocto Project" class="thumbnail" src="{% static 'img/toaster.png' %}"/>
84 {% endif %} 69 {% endif %}
85 </a>
86 </div> 70 </div>
87 </div> 71 </div>
88 </div> 72 </div>
diff --git a/bitbake/lib/toaster/toastergui/templates/layers.html b/bitbake/lib/toaster/toastergui/templates/layers.html
index c35a299333..24d31c770e 100644
--- a/bitbake/lib/toaster/toastergui/templates/layers.html
+++ b/bitbake/lib/toaster/toastergui/templates/layers.html
@@ -9,9 +9,9 @@
9{% block projectinfomain %} 9{% block projectinfomain %}
10 <div class="page-header"> 10 <div class="page-header">
11 <h1> 11 <h1>
12 {% if request.GET.filter and total_count > 0 or request.GET.search and total_count > 0 %} 12 {% if request.GET.filter and objects.paginator.count > 0 or request.GET.search and objects.paginator.count > 0 %}
13 {{total_count}} layer{{total_count|pluralize}} found 13 {{objects.paginator.count}} layer{{objects.paginator.count|pluralize}} found
14 {% elif request.GET.filter and total_count == 0 or request.GET.search and total_count == 0 %} 14 {% elif request.GET.filter and objects.paginator.count == 0 or request.GET.search and objects.paginator.count == 0 %}
15 No layers found 15 No layers found
16 {%else%} 16 {%else%}
17 All compatible layers 17 All compatible layers
@@ -24,6 +24,7 @@
24 </div> 24 </div>
25 25
26{% if objects.paginator.count == 0 %} 26{% if objects.paginator.count == 0 %}
27 {% if request.GET.filter or request.GET.search %}
27 <div class="row-fluid"> 28 <div class="row-fluid">
28 <div class="alert"> 29 <div class="alert">
29 <form class="no-results input-append" id="searchform"> 30 <form class="no-results input-append" id="searchform">
@@ -33,6 +34,15 @@
33 </form> 34 </form>
34 </div> 35 </div>
35 </div> 36 </div>
37 {% else %}
38 <div class="alert alert-info lead">
39 <p>Toaster has no layer information. To generate layer information you can:</p>
40 <ul>
41 <li><a href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html#layer-source">Configure a layer source</a></li>
42 <li><a href="{% url 'importlayer' %}">Import a layer</a></li>
43 </ul>
44 </div>
45 {% endif %}
36 46
37{% else %} 47{% else %}
38 48
diff --git a/bitbake/lib/toaster/toastergui/templates/machines.html b/bitbake/lib/toaster/toastergui/templates/machines.html
index 1057bdda3f..2ac35378e0 100644
--- a/bitbake/lib/toaster/toastergui/templates/machines.html
+++ b/bitbake/lib/toaster/toastergui/templates/machines.html
@@ -59,10 +59,8 @@
59 </form> 59 </form>
60 </div> 60 </div>
61 {% else %} 61 {% else %}
62 <div class="alert alert-info"> 62 <div class="alert alert-info lead">
63 <p class="lead"> 63 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>
64 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>
65 </p>
66 </div> 64 </div>
67 {% endif %} 65 {% endif %}
68 66
diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html
index ae9ee9b44d..40048c2f2c 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
15<script src="{% static "js/angular-sanitize.min.js" %}"></script> 15<script src="{% static "js/angular-sanitize.min.js" %}"></script>
16<script src="{% static "js/ui-bootstrap-tpls-0.11.0.js" %}"></script> 16<script src="{% static "js/ui-bootstrap-tpls-0.11.0.js" %}"></script>
17 17
18
19{% if lvs_nos == 0 %} 18{% if lvs_nos == 0 %}
20<div class="alert alert-info"> 19
21 <p> 20 <div class="page-header">
22 Toaster has no layer information; without layer information, you cannot run builds.<br/> To generate layer information you can: 21 <h1> {{ project.name }} </h1>
23 </p> 22 </div>
24 <ul> 23 <div class="alert alert-info lead">
25 <li> <a href="https://wiki.yoctoproject.org/wiki/Setting_up_a_hosted_managed_mode_for_Toaster#LayerSources">Configure a layer source</a> 24 <p>Toaster has no layer information. Without layer information, you cannot run builds. To generate layer information you can:</p>
26 </li> 25 <ul>
27 <li> <a href="{% url 'importlayer' %}">Import a layer</a> 26 <li> <a href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html#layer-source">Configure a layer source</a></li>
28 </ul> 27 <li> <a href="{% url 'importlayer' %}">Import a layer</a></li>
28 </ul>
29</div> 29</div>
30 30
31{%else%} 31{%else%}
32<div id="main" role="main" ng-app="project" ng-controller="prjCtrl" class="top-padded">
33 32
33<div id="main" role="main" ng-app="project" ng-controller="prjCtrl" class="top-padded">
34 34
35 <!-- project name --> 35 <!-- project name -->
36 <div class="page-header"> 36 <div class="page-header">
diff --git a/bitbake/lib/toaster/toastergui/templates/targets.html b/bitbake/lib/toaster/toastergui/templates/targets.html
index 27ff2be928..6f59a6cdab 100644
--- a/bitbake/lib/toaster/toastergui/templates/targets.html
+++ b/bitbake/lib/toaster/toastergui/templates/targets.html
@@ -36,14 +36,12 @@
36 </div> 36 </div>
37 </div> 37 </div>
38 {% else %} 38 {% else %}
39 <div class="alert alert-info"> 39 <div class="alert alert-info lead">
40 <p class="lead"> 40 <p>Toaster has no target information. To generate target information you can:</p>
41 Toaster has no target information. To generate target information you can:<br/> 41 <ul>
42 <ul class="lead"> 42 <li><a href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html#layer-source">Configure a layer source</a></li>
43 <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> 43 <li><a href="{% url 'importlayer' %}">Import a layer</a>, then run a build</li>
44 <li style="margin-top: 10px"> <a href="{% url 'importlayer' %}">Import a layer</a></li> 44 </ul>
45 </ul>
46 </p>
47 </div> 45 </div>
48 {% endif %} 46 {% endif %}
49 47