diff options
author | Michael Wood <michael.g.wood@intel.com> | 2016-05-26 16:12:23 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-15 08:35:04 +0100 |
commit | caae3b6206dc31690f0c6638daaa7bb072c69042 (patch) | |
tree | 780fc9c4e430f93e1b1ae8d522ee921e82515876 /bitbake/lib/toaster/toastergui/templates | |
parent | b2a68f55110b39aaf0b0d47bf533251a59a40a41 (diff) | |
download | poky-caae3b6206dc31690f0c6638daaa7bb072c69042.tar.gz |
bitbake: toaster: port Installed packages table to ToasterTable
(Bitbake rev: 2418c092abd9a503becf5e786125f8cdddd8652c)
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')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/builddashboard.html | 4 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/target.html | 118 |
2 files changed, 8 insertions, 114 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/builddashboard.html b/bitbake/lib/toaster/toastergui/templates/builddashboard.html index 5425dfe610..f33757eaca 100644 --- a/bitbake/lib/toaster/toastergui/templates/builddashboard.html +++ b/bitbake/lib/toaster/toastergui/templates/builddashboard.html | |||
@@ -102,7 +102,7 @@ | |||
102 | files from a previous build already exist in your | 102 | files from a previous build already exist in your |
103 | <code>.../poky/build/tmp/deploy</code> | 103 | <code>.../poky/build/tmp/deploy</code> |
104 | directory. You can | 104 | directory. You can |
105 | also <a href="{% url 'targetpkg' build.pk target.target.pk %}">view the | 105 | also <a href="{% url 'target' build.pk target.target.pk %}">view the |
106 | license manifest information</a> in Toaster. | 106 | license manifest information</a> in Toaster. |
107 | </p> | 107 | </p> |
108 | </div> | 108 | </div> |
@@ -115,7 +115,7 @@ | |||
115 | License manifest | 115 | License manifest |
116 | </dt> | 116 | </dt> |
117 | <dd> | 117 | <dd> |
118 | <a href="{% url 'targetpkg' build.pk target.target.pk %}">View in Toaster</a> | | 118 | <a href="{% url 'target' build.pk target.target.pk %}">View in Toaster</a> | |
119 | <a href="{% url 'build_artifact' build.pk 'licensemanifest' target.target.pk %}">Download</a></dd> | 119 | <a href="{% url 'build_artifact' build.pk 'licensemanifest' target.target.pk %}">Download</a></dd> |
120 | <dt> | 120 | <dt> |
121 | <i class="icon-question-sign get-help" title="Image files are stored in <code>/build/tmp/deploy/images/</code>"></i> | 121 | <i class="icon-question-sign get-help" title="Image files are stored in <code>/build/tmp/deploy/images/</code>"></i> |
diff --git a/bitbake/lib/toaster/toastergui/templates/target.html b/bitbake/lib/toaster/toastergui/templates/target.html index 9f31239d8e..0b2fe99577 100644 --- a/bitbake/lib/toaster/toastergui/templates/target.html +++ b/bitbake/lib/toaster/toastergui/templates/target.html | |||
@@ -17,9 +17,7 @@ | |||
17 | {% endblock %} | 17 | {% endblock %} |
18 | 18 | ||
19 | {% block buildinfomain %} | 19 | {% block buildinfomain %} |
20 | |||
21 | <div class="col-md-10"> | 20 | <div class="col-md-10"> |
22 | |||
23 | <div class="page-header"> | 21 | <div class="page-header"> |
24 | <h1> | 22 | <h1> |
25 | {% if request.GET.search and objects.paginator.count > 0 %} | 23 | {% if request.GET.search and objects.paginator.count > 0 %} |
@@ -31,8 +29,6 @@ | |||
31 | {% endif %} | 29 | {% endif %} |
32 | </h1> | 30 | </h1> |
33 | </div> | 31 | </div> |
34 | |||
35 | |||
36 | <div id="navTab"> | 32 | <div id="navTab"> |
37 | <ul class="nav nav-pills"> | 33 | <ul class="nav nav-pills"> |
38 | <li class="active"> | 34 | <li class="active"> |
@@ -50,113 +46,11 @@ | |||
50 | </ul> | 46 | </ul> |
51 | 47 | ||
52 | <div id="image-packages" class="tab-pane"> | 48 | <div id="image-packages" class="tab-pane"> |
53 | 49 | {# xhr_table_url is just the current url so leave it blank #} | |
54 | {% if objects.paginator.count == 0 %} | 50 | {% with xhr_table_url='' %} |
55 | <div class="alert"> | 51 | {% include "toastertable.html" %} |
56 | <form class="no-results input-append" id="searchform"> | 52 | {% endwith %} |
57 | <input id="search" name="search" class="input-xxlarge" type="text" value="{% if request.GET.search %}{{request.GET.search}}{% endif %}"/>{% if request.GET.search %}<a href="javascript:$('#search').val('');searchform.submit()" class="input-append-addon btn" tabindex="-1"><i class="glyphicon glyphicon-remove"></i></a>{% endif %} | ||
58 | <button class="btn" type="submit" value="Search">Search</button> | ||
59 | <button class="btn btn-link" onclick="javascript:$('#search').val('');searchform.submit()">Show all packages</button> | ||
60 | </form> | ||
61 | </div> | ||
62 | |||
63 | |||
64 | {% else %} | ||
65 | {% include "basetable_top.html" %} | ||
66 | {% for package in objects %} | ||
67 | <tr> | ||
68 | {# order of the table data must match the columns defined in template's context tablecols #} | ||
69 | <td class="package_name"> | ||
70 | <a href="{% url 'package_included_detail' build.id target.id package.id %}"> | ||
71 | {{package.name}} | ||
72 | </a> | ||
73 | {% if package.installed_name and package.name != package.installed_name %} | ||
74 | <span class="muted"> as {{package.installed_name}}</span> | ||
75 | <i class="icon-question-sign get-help hover-help" title='{{package.name|add:" was renamed at packaging time and was installed in your image as "|add:package.installed_name}}'></i> | ||
76 | {% endif %} | ||
77 | </td> | ||
78 | <td class="package_version"> | ||
79 | <a href="{% url 'package_included_detail' build.id target.id package.id %}"> | ||
80 | {{package.version|filtered_packageversion:package.revision}} | ||
81 | </a> | ||
82 | </td> | ||
83 | <td class="license"> | ||
84 | {{package.license}} | ||
85 | </td> | ||
86 | <td class="size sizecol"> | ||
87 | {{package.size|filtered_installedsize:package.installed_size|filtered_filesizeformat}} | ||
88 | </td> | ||
89 | |||
90 | <td class="size_over_total sizecol"> | ||
91 | {{package|filter_sizeovertotal:packages_sum}} | ||
92 | </td> | ||
93 | <td class="depends"> | ||
94 | {% with deps=package.runtime_dependencies %} | ||
95 | {% with deps_count=deps|length %} | ||
96 | {% if deps_count > 0 %} | ||
97 | <a class="btn" | ||
98 | title="<a href='{% url "package_included_dependencies" build.id target.id package.id %}'>{{package.name}}</a> dependencies" | ||
99 | data-content="<ul class='list-unstyled'> | ||
100 | {% for i in deps|dictsort:'depends_on.name' %} | ||
101 | <li><a href='{% url "package_included_detail" build.pk target.id i.depends_on.pk %}'>{{i.depends_on.name}}</a></li> | ||
102 | {% endfor %} | ||
103 | </ul>"> | ||
104 | {{deps_count}} | ||
105 | </a> | ||
106 | {% endif %} | ||
107 | {% endwith %} | ||
108 | {% endwith %} | ||
109 | </td> | ||
110 | <td class="brought_in_by"> | ||
111 | {% with rdeps=package.reverse_runtime_dependencies %} | ||
112 | {% with rdeps_count=rdeps|length %} | ||
113 | {% if rdeps_count > 0 %} | ||
114 | <a class="btn" | ||
115 | title="<a href='{% url "package_included_reverse_dependencies" build.id target.id package.id %}'>{{package.name}}</a> reverse dependencies" | ||
116 | data-content="<ul class='list-unstyled'> | ||
117 | {% for i in rdeps|dictsort:'package.name' %} | ||
118 | <li><a href='{% url "package_included_detail" build.id target.id i.package.id %}'>{{i.package.name}}</a></li> | ||
119 | {% endfor %} | ||
120 | </ul>"> | ||
121 | {{rdeps_count}} | ||
122 | </a> | ||
123 | {% endif %} | ||
124 | {% endwith %} | ||
125 | {% endwith %} | ||
126 | </td> | ||
127 | <td class="recipe_name"> | ||
128 | {% if package.recipe.version %} | ||
129 | <a href="{% url 'recipe' build.id package.recipe_id %}"> | ||
130 | {{ package.recipe.name }} | ||
131 | </a> | ||
132 | {% endif %} | ||
133 | </td> | ||
134 | <td class="recipe_version"> | ||
135 | {% if package.recipe.version %} | ||
136 | <a href="{% url 'recipe' build.id package.recipe_id %}"> | ||
137 | {{ package.recipe.version }} | ||
138 | </a> | ||
139 | {% endif %} | ||
140 | </td> | ||
141 | <td class="layer_name"> | ||
142 | {{ package.recipe.layer_version.layer.name }} | ||
143 | </td> | ||
144 | <td class="layer_branch"> | ||
145 | {{ package.recipe.layer_version.branch}} | ||
146 | </td> | ||
147 | <td class="layer_commit"> | ||
148 | <a class="btn" | ||
149 | data-content="<ul class='list-unstyled'> | ||
150 | <li>{{package.recipe.layer_version.commit}}</li> | ||
151 | </ul>"> | ||
152 | {{package.recipe.layer_version.commit|truncatechars:13}} | ||
153 | </a> | ||
154 | </td> | ||
155 | </tr> | ||
156 | {% endfor %} | ||
157 | |||
158 | {% include "basetable_bottom.html" %} | ||
159 | {% endif %} | ||
160 | </div> <!-- tabpane --> | 53 | </div> <!-- tabpane --> |
161 | </div> <!--span 10--> | 54 | </div> <!--navTab -->> |
55 | <!-- col-md-10 --> | ||
162 | {% endblock buildinfomain %} | 56 | {% endblock buildinfomain %} |