diff options
author | Michael Wood <michael.g.wood@intel.com> | 2016-09-26 13:59:31 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-30 16:52:22 +0100 |
commit | 0d70606022cad010f586ec29b558ee902be765ef (patch) | |
tree | dfcfb5b5ca63c6c1047807fd64ec482d73a2b1a5 /bitbake/lib/toaster/toastergui/templates | |
parent | 7ca44f53bccf48d289c5f53c00ca7026aacef6dd (diff) | |
download | poky-0d70606022cad010f586ec29b558ee902be765ef.tar.gz |
bitbake: toaster: project page Implement front end feature to delete project
Add confirm modal and api calls to delete a project from the project
dashboard.
[YOCTO #6238]
(Bitbake rev: e1cca28826dfa66d905dd4daf9964564c355207e)
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')
3 files changed, 28 insertions, 15 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html b/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html index b3b6f1caf8..8427d25210 100644 --- a/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html +++ b/bitbake/lib/toaster/toastergui/templates/baseprojectpage.html | |||
@@ -34,6 +34,12 @@ $(document).ready(function(){ | |||
34 | <li><a href="{% url 'projectlayers' project.id %}">Layers</a></li> | 34 | <li><a href="{% url 'projectlayers' project.id %}">Layers</a></li> |
35 | <li class="nav-header">Extra configuration</li> | 35 | <li class="nav-header">Extra configuration</li> |
36 | <li><a href="{% url 'projectconf' project.id %}">BitBake variables</a></li> | 36 | <li><a href="{% url 'projectconf' project.id %}">BitBake variables</a></li> |
37 | |||
38 | <li class="nav-header">Actions</li> | ||
39 | <li> | ||
40 | <a href="#delete-project-modal" role="button" class="text-danger" data-toggle="modal" data-target="#delete-project-modal"> | ||
41 | <i class="icon-trash text-danger"></i> Delete project</a> | ||
42 | </li> | ||
37 | </ul> | 43 | </ul> |
38 | </div> | 44 | </div> |
39 | <div class="col-md-10"> | 45 | <div class="col-md-10"> |
diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html index 30ee93a76f..7644dad2f3 100644 --- a/bitbake/lib/toaster/toastergui/templates/project.html +++ b/bitbake/lib/toaster/toastergui/templates/project.html | |||
@@ -24,30 +24,37 @@ | |||
24 | }); | 24 | }); |
25 | </script> | 25 | </script> |
26 | 26 | ||
27 | {% comment %} | 27 | <div id="delete-project-modal" class="modal fade" tabindex="-1" role="dialog" data-backdrop="static" data-keyboard="false"> |
28 | <!-- Comment out the ability to change the project release, until we decide what to do this functionality --> | ||
29 | <div id="change-release-modal" class="modal hide fade in" tabindex="-1" role="dialog" aria-labelledby="change-release-modal" aria-hidden="false"> | ||
30 | <div class="modal-dialog"> | 28 | <div class="modal-dialog"> |
31 | <div class="modal-content"> | 29 | <div class="modal-content"> |
32 | |||
33 | <div class="modal-header"> | 30 | <div class="modal-header"> |
34 | <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button> | 31 | <h4>Are you sure you want to delete this project?</h4> |
35 | <h3>Changing Yocto Project release to <span class="proposed-release-change-name"></span></h3> | ||
36 | </div> | 32 | </div> |
37 | <div class="modal-body"> | 33 | <div class="modal-body"> |
38 | <p>The following added layers do not exist for <span class="proposed-release-change-name"></span>: </p> | 34 | <p>Deleting the <strong class="project-name"></strong> project will remove forever:</p> |
39 | <ul id="layers-to-remove-list"> | 35 | <ul> |
40 | </ul> | 36 | <li>Its configuration information</li> |
41 | <p>If you change the Yocto Project release to <span class="proposed-release-change-name"></span>, the above layers will be deleted from your added layers.</p> | 37 | <li>Its imported layers</li> |
38 | <li>Its custom images</li> | ||
39 | <li>All its build information</li> | ||
40 | </ul> | ||
42 | </div> | 41 | </div> |
43 | <div class="modal-footer"> | 42 | <div class="modal-footer"> |
44 | <button id="change-release-and-rm-layers" data-dismiss="modal" type="submit" class="btn btn-primary">Change release and delete layers</button> | 43 | <button type="button" class="btn btn-primary" id="delete-project-confirmed"> |
45 | <button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button> | 44 | <span data-role="submit-state">Delete project</span> |
45 | <span data-role="loading-state" style="display:none"> | ||
46 | <span class="fa-pulse"> | ||
47 | <i class="fa-pulse icon-spinner"></i> | ||
48 | </span> | ||
49 | Deleting project... | ||
50 | </span> | ||
51 | </button> | ||
52 | <button type="button" class="btn btn-link" data-dismiss="modal">Cancel</button> | ||
46 | </div> | 53 | </div> |
47 | </div><!-- /.modal-content --> | 54 | </div><!-- /.modal-content --> |
48 | </div><!-- /.modal-dialog --> | 55 | </div><!-- /.modal-dialog --> |
49 | </div><!-- /.modal --> | 56 | </div> |
50 | {% endcomment %} | 57 | |
51 | 58 | ||
52 | <div class="row" id="project-page" style="display:none"> | 59 | <div class="row" id="project-page" style="display:none"> |
53 | <div class="col-md-6"> | 60 | <div class="col-md-6"> |
diff --git a/bitbake/lib/toaster/toastergui/templates/projecttopbar.html b/bitbake/lib/toaster/toastergui/templates/projecttopbar.html index 2734af0c95..768ca94554 100644 --- a/bitbake/lib/toaster/toastergui/templates/projecttopbar.html +++ b/bitbake/lib/toaster/toastergui/templates/projecttopbar.html | |||
@@ -24,7 +24,7 @@ | |||
24 | <!-- project name --> | 24 | <!-- project name --> |
25 | <div class="page-header"> | 25 | <div class="page-header"> |
26 | <h1 id="project-name-container"> | 26 | <h1 id="project-name-container"> |
27 | <span id="project-name">{{project.name}}</span> | 27 | <span class="project-name">{{project.name}}</span> |
28 | 28 | ||
29 | <span class="glyphicon glyphicon-edit" id="project-change-form-toggle"></i> | 29 | <span class="glyphicon glyphicon-edit" id="project-change-form-toggle"></i> |
30 | 30 | ||