diff options
author | Elliot Smith <elliot.smith@intel.com> | 2015-11-13 15:28:07 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-16 11:55:07 +0000 |
commit | 9d8e36a6c9663a1665ecefca59d172ad53f90ffe (patch) | |
tree | 264b8cec39b31534c64634b9a5112a0a6f56b0a4 /bitbake/lib/toaster/toastergui/templates | |
parent | 4677d8b4fb9ab00970ccc6c07d4e75a103dce3f5 (diff) | |
download | poky-9d8e36a6c9663a1665ecefca59d172ad53f90ffe.tar.gz |
bitbake: toaster: localhostbectrl Pass DATABASE_URL in via the process environment
Instead of putting the DATABASE_URL as part of the command for launching
the bitbake observer process set it as part of environment.
This fixes two issues 1. Where the value isn't quoted and therefore will be
interpreted in the shell and 2. Anyone being able to see the value of
DATABASE_URL in the process tree.
[YOCTO #8669]
(Bitbake rev: 832a8523067606b180c02f0d1544e8a23219bb08)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Elliot Smith <elliot.smith@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/base.html | 133 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/projecttopbar.html | 18 |
2 files changed, 51 insertions, 100 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/base.html b/bitbake/lib/toaster/toastergui/templates/base.html index 11ac2a0355..e0b15cef12 100644 --- a/bitbake/lib/toaster/toastergui/templates/base.html +++ b/bitbake/lib/toaster/toastergui/templates/base.html | |||
@@ -3,15 +3,15 @@ | |||
3 | {% load projecttags %} | 3 | {% load projecttags %} |
4 | {% load project_url_tag %} | 4 | {% load project_url_tag %} |
5 | <html lang="en"> | 5 | <html lang="en"> |
6 | <head> | 6 | <head> |
7 | <title> | 7 | <title> |
8 | {% block title %} Toaster {% endblock %} | 8 | {% block title %} Toaster {% endblock %} |
9 | </title> | 9 | </title> |
10 | <link rel="stylesheet" href="{% static 'css/bootstrap.min.css' %}" type="text/css"/> | 10 | <link rel="stylesheet" href="{% static 'css/bootstrap.min.css' %}" type="text/css"/> |
11 | <link rel="stylesheet" href="{% static 'css/bootstrap-responsive.min.css' %}" type='text/css'/> | 11 | <link rel="stylesheet" href="{% static 'css/bootstrap-responsive.min.css' %}" type='text/css'/> |
12 | <link rel="stylesheet" href="{% static 'css/font-awesome.min.css' %}" type='text/css'/> | 12 | <link rel="stylesheet" href="{% static 'css/font-awesome.min.css' %}" type='text/css'/> |
13 | <link rel="stylesheet" href="{% static 'css/prettify.css' %}" type='text/css'/> | 13 | <link rel="stylesheet" href="{% static 'css/prettify.css' %}" type='text/css'/> |
14 | <link rel="stylesheet" href="{% static 'css/default.css' %}" type='text/css'/> | 14 | <link rel="stylesheet" href="{% static 'css/default.css' %}" type='text/css'/> |
15 | 15 | ||
16 | <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | 16 | <meta name="viewport" content="width=device-width, initial-scale=1.0" /> |
17 | <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" /> | 17 | <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" /> |
@@ -40,7 +40,6 @@ | |||
40 | projectId : {{project.id}}, | 40 | projectId : {{project.id}}, |
41 | projectPageUrl : {% url 'project' project.id as purl %}{{purl|json}}, | 41 | projectPageUrl : {% url 'project' project.id as purl %}{{purl|json}}, |
42 | projectName : {{project.name|json}}, | 42 | projectName : {{project.name|json}}, |
43 | projectIsDefault: {% if project.is_default %}true{% else %}false{% endif %}, | ||
44 | recipesTypeAheadUrl: {% url 'xhr_recipestypeahead' project.id as paturl%}{{paturl|json}}, | 43 | recipesTypeAheadUrl: {% url 'xhr_recipestypeahead' project.id as paturl%}{{paturl|json}}, |
45 | layersTypeAheadUrl: {% url 'xhr_layerstypeahead' project.id as paturl%}{{paturl|json}}, | 44 | layersTypeAheadUrl: {% url 'xhr_layerstypeahead' project.id as paturl%}{{paturl|json}}, |
46 | machinesTypeAheadUrl: {% url 'xhr_machinestypeahead' project.id as paturl%}{{paturl|json}}, | 45 | machinesTypeAheadUrl: {% url 'xhr_machinestypeahead' project.id as paturl%}{{paturl|json}}, |
@@ -51,37 +50,24 @@ | |||
51 | projectId : undefined, | 50 | projectId : undefined, |
52 | projectPageUrl : undefined, | 51 | projectPageUrl : undefined, |
53 | projectName : undefined, | 52 | projectName : undefined, |
54 | projectIsDefault: false, | ||
55 | {% endif %} | 53 | {% endif %} |
56 | }; | 54 | }; |
57 | </script> | 55 | </script> |
58 | <script src="{% static 'js/base.js' %}"></script> | 56 | {% block extraheadcontent %} |
59 | <script> | 57 | {% endblock %} |
60 | $(document).ready(function () { | 58 | </head> |
61 | /* Vars needed for base.js */ | ||
62 | var ctx = {}; | ||
63 | ctx.numProjects = {{projects|length}}; | ||
64 | ctx.currentUrl = "{{request.path|escapejs}}"; | ||
65 | |||
66 | basePageInit(ctx); | ||
67 | }); | ||
68 | </script> | ||
69 | 59 | ||
70 | {% block extraheadcontent %} | 60 | <body style="height: 100%"> |
71 | {% endblock %} | ||
72 | </head> | ||
73 | 61 | ||
74 | <body style="height: 100%"> | 62 | {% csrf_token %} |
75 | 63 | <div id="loading-notification" class="alert lead text-center" style="display:none"> | |
76 | {% csrf_token %} | 64 | Loading <i class="fa-pulse icon-spinner"></i> |
77 | <div id="loading-notification" class="alert lead text-center" style="display:none"> | 65 | </div> |
78 | Loading <i class="fa-pulse icon-spinner"></i> | ||
79 | </div> | ||
80 | 66 | ||
81 | <div id="change-notification" class="alert lead alert-info" style="display:none"> | 67 | <div id="change-notification" class="alert lead alert-info" style="display:none"> |
82 | <button type="button" class="close" id="hide-alert">×</button> | 68 | <button type="button" class="close" id="hide-alert">×</button> |
83 | <span id="change-notification-msg"></span> | 69 | <span id="change-notification-msg"></span> |
84 | </div> | 70 | </div> |
85 | 71 | ||
86 | <div class="navbar navbar-fixed-top"> | 72 | <div class="navbar navbar-fixed-top"> |
87 | <div class="navbar-inner"> | 73 | <div class="navbar-inner"> |
@@ -125,72 +111,19 @@ | |||
125 | 111 | ||
126 | <!-- new project button; only show in build mode --> | 112 | <!-- new project button; only show in build mode --> |
127 | {% if BUILD_MODE %} | 113 | {% if BUILD_MODE %} |
128 | <div class="btn-group pull-right"> | 114 | <div class="btn-group pull-right"> |
129 | <a class="btn" id="new-project-button" href="{% url 'newproject' %}">New project</a> | 115 | <a class="btn" id="new-project-button" href="{% url 'newproject' %}">New project</a> |
130 | </div> | 116 | </div> |
131 | {% endif %} | ||
132 | |||
133 | <!-- | ||
134 | New build popover; only shown if there is at least one user-created project | ||
135 | and we're in build mode | ||
136 | --> | ||
137 | {% if BUILD_MODE and non_cli_projects.count > 0 %} | ||
138 | <div class="btn-group pull-right" id="new-build-button" style="display:none"> | ||
139 | <button class="btn dropdown-toggle" data-toggle="dropdown"> | ||
140 | New build | ||
141 | <i class="icon-caret-down"></i> | ||
142 | </button> | ||
143 | <ul class="dropdown-menu new-build multi-select"> | ||
144 | <li> | ||
145 | <h3>New build</h3> | ||
146 | <h6> | ||
147 | Project: | ||
148 | <span id="project"> | ||
149 | {% if project.id and not project.is_default %} | ||
150 | <a class="lead" href="{% project_url project %}">{{project.name}}</a> | ||
151 | {% else %} | ||
152 | <a class="lead" href="#"></a> | ||
153 | {% endif %} | ||
154 | <i class="icon-pencil"></i> | ||
155 | </span> | ||
156 | </h6> | ||
157 | <form id="change-project-form" style="display:none;"> | ||
158 | <div class="input-append"> | ||
159 | <input type="text" class="input-medium" id="project-name-input" placeholder="Type a project name" autocomplete="off" data-minLength="1" data-autocomplete="off" data-provide="typeahead"/> | ||
160 | <button id="save-project-button" class="btn" type="button">Save</button> | ||
161 | <a href="#" id="cancel-change-project" class="btn btn-link" style="display: none">Cancel</a> | ||
162 | </div> | ||
163 | <p><a id="view-all-projects" href="{% url 'all-projects' %}">View all projects</a></p> | ||
164 | </form> | ||
165 | </li> | ||
166 | <li> | ||
167 | <div class="alert" style="display:none;"> | ||
168 | <p>This project configuration is incomplete, so you cannot run builds.</p> | ||
169 | <p><a href="{% if project.id %}{% url 'project' project.id %}{% endif %}">View project configuration</a></p> | ||
170 | </div> | ||
171 | </li> | ||
172 | <li id="targets-form"> | ||
173 | <h6>Recipe(s):</h6> | ||
174 | <form> | ||
175 | <input type="text" class="input-xlarge build-target-input" placeholder="Type a recipe name" autocomplete="off" data-minLength="1" data-autocomplete="off" data-provide="typeahead" disabled/> | ||
176 | <div class="row-fluid"> | ||
177 | <button class="btn btn-primary build-button" disabled>Build</button> | ||
178 | </div> | ||
179 | </form> | ||
180 | </li> | ||
181 | </ul> | ||
182 | </div> | ||
183 | {% endif %} | 117 | {% endif %} |
118 | </div> | ||
119 | </div> | ||
184 | </div> | 120 | </div> |
185 | </div> | ||
186 | </div> | ||
187 | 121 | ||
188 | <div class="container-fluid top-padded"> | 122 | <div class="container-fluid top-padded"> |
189 | <div class="row-fluid"> | 123 | <div class="row-fluid"> |
190 | {% block pagecontent %} | 124 | {% block pagecontent %} |
191 | {% endblock %} | 125 | {% endblock %} |
192 | </div> | 126 | </div> |
193 | </div> | 127 | </div> |
194 | </body> | 128 | </body> |
195 | </html> | 129 | </html> |
196 | |||
diff --git a/bitbake/lib/toaster/toastergui/templates/projecttopbar.html b/bitbake/lib/toaster/toastergui/templates/projecttopbar.html index d8f7cbdbe8..8b44acccfd 100644 --- a/bitbake/lib/toaster/toastergui/templates/projecttopbar.html +++ b/bitbake/lib/toaster/toastergui/templates/projecttopbar.html | |||
@@ -1,3 +1,21 @@ | |||
1 | {% load static %} | ||
2 | <script src="{% static 'js/projecttopbar.js' %}"></script> | ||
3 | <script> | ||
4 | $(document).ready(function () { | ||
5 | var ctx = { | ||
6 | numProjectLayers : {{project.get_project_layer_versions.count}}, | ||
7 | machine : "{{project.get_current_machine_name|default_if_none:""}}", | ||
8 | } | ||
9 | |||
10 | try { | ||
11 | projectTopBarInit(ctx); | ||
12 | } catch (e) { | ||
13 | document.write("Sorry, An error has occurred loading this page"); | ||
14 | console.warn(e); | ||
15 | } | ||
16 | }); | ||
17 | </script> | ||
18 | |||
1 | <div class="alert alert-success lead" id="project-created-notification" style="margin-top:15px; display:none"> | 19 | <div class="alert alert-success lead" id="project-created-notification" style="margin-top:15px; display:none"> |
2 | <button type="button" class="close" data-dismiss="alert">×</button> | 20 | <button type="button" class="close" data-dismiss="alert">×</button> |
3 | Your project <strong>{{project.name}}</strong> has been created. You can now <a href="{% url 'projectmachines' project.id %}">select your target machine</a> and <a href="{% url 'projectsoftwarerecipes' project.id %}">choose image recipes</a> to build. | 21 | Your project <strong>{{project.name}}</strong> has been created. You can now <a href="{% url 'projectmachines' project.id %}">select your target machine</a> and <a href="{% url 'projectsoftwarerecipes' project.id %}">choose image recipes</a> to build. |