diff options
author | Michael Wood <michael.g.wood@intel.com> | 2015-07-31 15:09:12 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-01 11:26:12 +0100 |
commit | 80c1586bbb7f661f37754de5ba637c8d6e2185de (patch) | |
tree | 56011e83e1f192a68f4e9014ca266dd6cd76c719 /bitbake/lib/toaster/toastergui/templates/importlayer.html | |
parent | 258c929973e233f212938ea69eec8f83f3285854 (diff) | |
download | poky-80c1586bbb7f661f37754de5ba637c8d6e2185de.tar.gz |
bitbake: toastergui: Add new project page and navigation
This brings in the new project page design and improved navigation. As
this also removes the dependency on Angular it also required that the
entry points to the project page such as machine-change notifications
are also updated.
[YOCTO #7329]
(Bitbake rev: 6489e6eb5c3b0d59063b6d60521fc33fe563e707)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates/importlayer.html')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/importlayer.html | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/importlayer.html b/bitbake/lib/toaster/toastergui/templates/importlayer.html index d6984bcc9f..bec5f1aa74 100644 --- a/bitbake/lib/toaster/toastergui/templates/importlayer.html +++ b/bitbake/lib/toaster/toastergui/templates/importlayer.html | |||
@@ -1,10 +1,11 @@ | |||
1 | {% extends "baseprojectpage.html" %} | 1 | {% extends "base.html" %} |
2 | {% load projecttags %} | 2 | {% load projecttags %} |
3 | {% load humanize %} | 3 | {% load humanize %} |
4 | {% load static %} | 4 | {% load static %} |
5 | {% block pagecontent %} | ||
5 | 6 | ||
7 | {% include "projecttopbar.html" %} | ||
6 | 8 | ||
7 | {% block projectinfomain %} | ||
8 | 9 | ||
9 | {% if project and project.release %} | 10 | {% if project and project.release %} |
10 | <script src="{% static 'js/layerDepsModal.js' %}"></script> | 11 | <script src="{% static 'js/layerDepsModal.js' %}"></script> |
@@ -24,12 +25,10 @@ | |||
24 | }); | 25 | }); |
25 | </script> | 26 | </script> |
26 | 27 | ||
27 | <h2>Import layer</h2> | 28 | <form class="span11"> |
28 | |||
29 | <form> | ||
30 | <span class="help-block">The layer you are importing must be compatible with <strong>{{project.release.description}}</strong>, which is the release you are using in this project.</span> | ||
31 | <fieldset class="air"> | 29 | <fieldset class="air"> |
32 | <legend>Layer repository information</legend> | 30 | <legend>Layer repository information</legend> |
31 | <span class="help-block">The layer you are importing must be compatible with <strong>{{project.release.description}}</strong>, which is the release you are using in this project.</span> | ||
33 | <div class="alert alert-error" id="import-error" style="display:none"> | 32 | <div class="alert alert-error" id="import-error" style="display:none"> |
34 | <button type="button" class="close" data-dismiss="alert">×</button> | 33 | <button type="button" class="close" data-dismiss="alert">×</button> |
35 | <h3> </h3> | 34 | <h3> </h3> |
@@ -136,5 +135,4 @@ | |||
136 | </div> | 135 | </div> |
137 | 136 | ||
138 | {% endif %} | 137 | {% endif %} |
139 | |||
140 | {% endblock %} | 138 | {% endblock %} |