diff options
author | Belen Barros Pena <belen.barros.pena@linux.intel.com> | 2016-06-02 14:26:16 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-15 08:35:05 +0100 |
commit | a7d498dfd3929eafb87274f27b487ef2fe1e7e68 (patch) | |
tree | 4a98b533e0269349ce534a93ef85c214510fff26 /bitbake/lib/toaster/toastergui/templates/basebuildpage.html | |
parent | 46271833bed74559ad006024c94036170cfc5b7d (diff) | |
download | poky-a7d498dfd3929eafb87274f27b487ef2fe1e7e68.tar.gz |
bitbake: toaster: port all build analysis pages to bootstrap 3
Port all the pages in the build analysis area to bootstrap version 3.
(Bitbake rev: f963b73f0bf32db2df39dd79d8d85184c280cda0)
Signed-off-by: Belen Barros Pena <belen.barros.pena@linux.intel.com>
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates/basebuildpage.html')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/basebuildpage.html | 71 |
1 files changed, 28 insertions, 43 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html index c002e42b7d..d9adcd77f8 100644 --- a/bitbake/lib/toaster/toastergui/templates/basebuildpage.html +++ b/bitbake/lib/toaster/toastergui/templates/basebuildpage.html | |||
@@ -7,7 +7,7 @@ | |||
7 | 7 | ||
8 | <div class="row"> | 8 | <div class="row"> |
9 | <!-- breadcrumbs --> | 9 | <!-- breadcrumbs --> |
10 | <div class="section"> | 10 | <div class="col-md-12"> |
11 | <ul class="breadcrumb" id="breadcrumb"> | 11 | <ul class="breadcrumb" id="breadcrumb"> |
12 | <li><a href="{% project_url build.project %}">{{build.project.name}}</a></li> | 12 | <li><a href="{% project_url build.project %}">{{build.project.name}}</a></li> |
13 | {% if not build.project.is_default %} | 13 | {% if not build.project.is_default %} |
@@ -44,12 +44,12 @@ | |||
44 | <div class="row"> | 44 | <div class="row"> |
45 | <!-- begin left sidebar container --> | 45 | <!-- begin left sidebar container --> |
46 | <div id="nav" class="col-md-2"> | 46 | <div id="nav" class="col-md-2"> |
47 | <ul class="nav nav-list well" id="build-menu"> | 47 | <ul class="nav nav-pills nav-stacked" id="build-menu"> |
48 | <li | 48 | <li |
49 | {% if request.resolver_match.url_name == 'builddashboard' %} | 49 | {% if request.resolver_match.url_name == 'builddashboard' %} |
50 | class="active" | 50 | class="active" |
51 | {% endif %} > | 51 | {% endif %} > |
52 | <a class="nav-parent" href="{% url 'builddashboard' build.pk %}">Build summary</a> | 52 | <a href="{% url 'builddashboard' build.pk %}">Build summary</a> |
53 | </li> | 53 | </li> |
54 | {% if build.target_set.all.0.is_image and build.outcome == 0 %} | 54 | {% if build.target_set.all.0.is_image and build.outcome == 0 %} |
55 | <li class="nav-header">Images</li> | 55 | <li class="nav-header">Images</li> |
@@ -72,56 +72,42 @@ | |||
72 | <li><a href="{% url 'cputime' build.pk %}">CPU usage</a></li> | 72 | <li><a href="{% url 'cputime' build.pk %}">CPU usage</a></li> |
73 | <li><a href="{% url 'diskio' build.pk %}">Disk I/O</a></li> | 73 | <li><a href="{% url 'diskio' build.pk %}">Disk I/O</a></li> |
74 | 74 | ||
75 | <li class="divider"></li> | 75 | <li class="nav-header">Actions</li> |
76 | 76 | <a class="btn btn-default btn-block navbar-btn" href="{% url 'build_artifact' build.id 'cookerlog' build.id %}">Download build log</a> | |
77 | <li> | ||
78 | <p class="navbar-btn"> | ||
79 | <a class="btn btn-block" href="{% url 'build_artifact' build.id 'cookerlog' build.id %}"> | ||
80 | Download build log | ||
81 | </a> | ||
82 | </p> | ||
83 | </li> | ||
84 | 77 | ||
85 | {% with build.get_custom_image_recipes as custom_image_recipes %} | 78 | {% with build.get_custom_image_recipes as custom_image_recipes %} |
86 | {% if custom_image_recipes.count > 0 %} | 79 | {% if custom_image_recipes.count > 0 %} |
87 | <!-- edit custom image built during this build --> | 80 | <!-- edit custom image built during this build --> |
88 | <li> | 81 | <button class="btn btn-default btn-block navbar-btn" data-role="edit-custom-image-trigger">Edit custom image</button> |
89 | <p class="navbar-btn" data-role="edit-custom-image-trigger"> | 82 | {% include 'editcustomimage_modal.html' %} |
90 | <button class="btn btn-block">Edit custom image</button> | 83 | <script> |
91 | {% include 'editcustomimage_modal.html' %} | 84 | var editableCustomImageRecipes = {{ custom_image_recipes | objects_to_dictionaries:"id,name" | json }}; |
92 | <script> | ||
93 | var editableCustomImageRecipes = {{ custom_image_recipes | objects_to_dictionaries:"id,name" | json }}; | ||
94 | 85 | ||
95 | $(document).ready(function () { | 86 | $(document).ready(function () { |
96 | var editCustomImageTrigger = $('[data-role="edit-custom-image-trigger"]'); | 87 | var editCustomImageTrigger = $('[data-role="edit-custom-image-trigger"]'); |
97 | var editCustomImageModal = $('#edit-custom-image-modal'); | 88 | var editCustomImageModal = $('#edit-custom-image-modal'); |
98 | 89 | ||
99 | // edit custom image which was built during this build | 90 | // edit custom image which was built during this build |
100 | editCustomImageTrigger.click(function () { | 91 | editCustomImageTrigger.click(function () { |
101 | // single editable custom image: redirect to the edit page | 92 | // single editable custom image: redirect to the edit page |
102 | // for that image | 93 | // for that image |
103 | if (editableCustomImageRecipes.length === 1) { | 94 | if (editableCustomImageRecipes.length === 1) { |
104 | var url = '{% url "customrecipe" build.project.id custom_image_recipes.first.id %}'; | 95 | var url = '{% url "customrecipe" build.project.id custom_image_recipes.first.id %}'; |
105 | document.location.href = url; | 96 | document.location.href = url; |
106 | } | 97 | } |
107 | // multiple editable custom images: show modal to select | 98 | // multiple editable custom images: show modal to select |
108 | // one of them for editing | 99 | // one of them for editing |
109 | else { | 100 | else { |
110 | editCustomImageModal.modal('show'); | 101 | editCustomImageModal.modal('show'); |
111 | } | 102 | } |
112 | }); | ||
113 | }); | 103 | }); |
114 | </script> | 104 | }); |
115 | </p> | 105 | </script> |
116 | </li> | ||
117 | {% endif %} | 106 | {% endif %} |
118 | {% endwith %} | 107 | {% endwith %} |
119 | 108 | ||
120 | <li> | ||
121 | <!-- new custom image from image recipe in this build --> | 109 | <!-- new custom image from image recipe in this build --> |
122 | <p class="navbar-btn" data-role="new-custom-image-trigger"> | 110 | <button class="btn btn-default btn-block navbar-btn" data-role="new-custom-image-trigger">New custom image</button> |
123 | <button class="btn btn-block">New custom image</button> | ||
124 | </p> | ||
125 | {% include 'newcustomimage_modal.html' %} | 111 | {% include 'newcustomimage_modal.html' %} |
126 | <script> | 112 | <script> |
127 | // imageRecipes includes both custom image recipes and built-in | 113 | // imageRecipes includes both custom image recipes and built-in |
@@ -145,7 +131,6 @@ | |||
145 | }); | 131 | }); |
146 | }); | 132 | }); |
147 | </script> | 133 | </script> |
148 | </li> | ||
149 | </ul> | 134 | </ul> |
150 | 135 | ||
151 | </div> | 136 | </div> |