diff options
| author | Alexandru DAMIAN <alexandru.damian@intel.com> | 2015-05-11 18:58:25 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-14 18:04:09 +0100 |
| commit | c5a16235b8b56102703bc264768ba386ebe90611 (patch) | |
| tree | 1a3822b4225ac5de88cc812e14ec0080ffec0a4b /bitbake/lib/toaster/toastergui/templates/project.html | |
| parent | 35d75c83522a050f0e35a33f73317461e2adf554 (diff) | |
| download | poky-c5a16235b8b56102703bc264768ba386ebe90611.tar.gz | |
bitbake: toaster: fix html5 compliance
This patch brings needed changes in all views so that
each view passes the HTML5 compliance test by the
W3C Markup Service.
(Bitbake rev: 6e60ed8ab71e4300ab571f42b7af5011086df697)
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates/project.html')
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/project.html | 184 |
1 files changed, 92 insertions, 92 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/project.html b/bitbake/lib/toaster/toastergui/templates/project.html index 85a1b164dd..933da4f7da 100644 --- a/bitbake/lib/toaster/toastergui/templates/project.html +++ b/bitbake/lib/toaster/toastergui/templates/project.html | |||
| @@ -30,7 +30,7 @@ vim: expandtab tabstop=2 | |||
| 30 | 30 | ||
| 31 | {%else%} | 31 | {%else%} |
| 32 | 32 | ||
| 33 | <div id="main" role="main" ng-app="project" ng-controller="prjCtrl" class="top-padded"> | 33 | <div id="main" role="main" data-ng-app="project" data-ng-controller="prjCtrl" class="top-padded"> |
| 34 | 34 | ||
| 35 | <!-- project name --> | 35 | <!-- project name --> |
| 36 | <div class="page-header"> | 36 | <div class="page-header"> |
| @@ -38,9 +38,9 @@ vim: expandtab tabstop=2 | |||
| 38 | </div> | 38 | </div> |
| 39 | 39 | ||
| 40 | <!-- alerts section 1--> | 40 | <!-- alerts section 1--> |
| 41 | <div ng-repeat="a in zone1alerts"> | 41 | <div data-ng-repeat="a in zone1alerts"> |
| 42 | <div class="alert alert-dismissible lead" role="alert" ng-class="a.type"><button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">×</span></button> | 42 | <div class="alert alert-dismissible lead" role="alert" data-ng-class="a.type"><button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">×</span></button> |
| 43 | <span ng-bind-html="a.text"></span> | 43 | <span data-ng-bind-html="a.text"></span> |
| 44 | </div> | 44 | </div> |
| 45 | </div> | 45 | </div> |
| 46 | 46 | ||
| @@ -54,21 +54,21 @@ vim: expandtab tabstop=2 | |||
| 54 | <script type="text/ng-template" id="dependencies_modal"> | 54 | <script type="text/ng-template" id="dependencies_modal"> |
| 55 | <div class="modal-header"> | 55 | <div class="modal-header"> |
| 56 | <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button> | 56 | <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button> |
| 57 | <h3><span ng-bind="layerAddName"></span> dependencies</h3> | 57 | <h3><span data-ng-bind="layerAddName"></span> dependencies</h3> |
| 58 | </div> | 58 | </div> |
| 59 | <div class="modal-body"> | 59 | <div class="modal-body"> |
| 60 | <p><strong>{[layerAddName]}</strong> depends on some layers that are not added to your project. Select the ones you want to add:</p> | 60 | <p><strong>{[layerAddName]}</strong> depends on some layers that are not added to your project. Select the ones you want to add:</p> |
| 61 | <ul class="unstyled"> | 61 | <ul class="unstyled"> |
| 62 | <li ng-repeat="ld in items"> | 62 | <li data-ng-repeat="ld in items"> |
| 63 | <label class="checkbox"> | 63 | <label class="checkbox"> |
| 64 | <input type="checkbox" ng-model="selectedItems[ld.id]"> {[ld.name]} | 64 | <input type="checkbox" data-ng-model="selectedItems[ld.id]"> {[ld.name]} |
| 65 | </label> | 65 | </label> |
| 66 | </li> | 66 | </li> |
| 67 | </ul> | 67 | </ul> |
| 68 | </div> | 68 | </div> |
| 69 | <div class="modal-footer"> | 69 | <div class="modal-footer"> |
| 70 | <button class="btn btn-primary" ng-click="ok()">Add layers</button> | 70 | <button class="btn btn-primary" data-ng-click="ok()">Add layers</button> |
| 71 | <button class="btn" ng-click="cancel()">Cancel</button> | 71 | <button class="btn" data-ng-click="cancel()">Cancel</button> |
| 72 | </div> | 72 | </div> |
| 73 | </form> | 73 | </form> |
| 74 | </script> | 74 | </script> |
| @@ -82,30 +82,30 @@ vim: expandtab tabstop=2 | |||
| 82 | <div class="modal-body"> | 82 | <div class="modal-body"> |
| 83 | <p>The following project layers do not exist for the {[releaseDescription]} release:</p> | 83 | <p>The following project layers do not exist for the {[releaseDescription]} release:</p> |
| 84 | <ul> | 84 | <ul> |
| 85 | <li ng-repeat="i in items"><span class="layer-info" data-toggle="tooltip" tooltip="{[i.detail]}">{[i.name]}</span></li> | 85 | <li data-ng-repeat="i in items"><span class="layer-info" data-toggle="tooltip" tooltip="{[i.detail]}">{[i.name]}</span></li> |
| 86 | </ul> | 86 | </ul> |
| 87 | <p>If you change the release to {[releaseDescription]}, the above layers will be deleted from your project.</p> | 87 | <p>If you change the release to {[releaseDescription]}, the above layers will be deleted from your project.</p> |
| 88 | </div> | 88 | </div> |
| 89 | <div class="modal-footer"> | 89 | <div class="modal-footer"> |
| 90 | <button class="btn btn-primary" ng-click="ok()">Change release and delete layers</button> | 90 | <button class="btn btn-primary" data-ng-click="ok()">Change release and delete layers</button> |
| 91 | <button class="btn" ng-click="cancel()">Cancel</button> | 91 | <button class="btn" data-ng-click="cancel()">Cancel</button> |
| 92 | </div> | 92 | </div> |
| 93 | </script> | 93 | </script> |
| 94 | 94 | ||
| 95 | <script type="text/ng-template" id="target_display"> | 95 | <script type="text/ng-template" id="target_display"> |
| 96 | <div ng-switch on="t.task.length"> | 96 | <div data-ng-switch on="t.task.length"> |
| 97 | <div ng-switch-when="0">{[t.target]}</div> | 97 | <div data-ng-switch-when="0">{[t.target]}</div> |
| 98 | <div ng-switch-default>{[t.target]}:{[t.task]}</div> | 98 | <div data-ng-switch-default>{[t.target]}:{[t.task]}</div> |
| 99 | </div> | 99 | </div> |
| 100 | </script> | 100 | </script> |
| 101 | 101 | ||
| 102 | 102 | ||
| 103 | <!-- build form --> | 103 | <!-- build form --> |
| 104 | <div class="well"> | 104 | <div class="well"> |
| 105 | <form class="build-form" ng-submit="buildNamedTarget()"> | 105 | <form class="build-form" data-ng-submit="buildNamedTarget()"> |
| 106 | <div class="input-append controls"> | 106 | <div class="input-append controls"> |
| 107 | <input type="text" class="huge input-xxlarge" placeholder="Type the recipe(s) you want to build" autocomplete="off" ng-model="targetName" typeahead="e.name for e in getAutocompleteSuggestions('targets', $viewValue)|filter:$viewValue" typeahead-template-url="suggestion_details" ng-disabled="!layers.length"/> | 107 | <input type="text" class="huge input-xxlarge" placeholder="Type the recipe(s) you want to build" autocomplete="off" data-ng-model="targetName" data-typeahead="e.name for e in getAutocompleteSuggestions('targets', $viewValue)|filter:$viewValue" data-typeahead-template-url="suggestion_details" data-ng-disabled="!layers.length"/> |
| 108 | <button type="submit" class="btn btn-large btn-primary" ng-disabled="!targetName.length"> | 108 | <button type="submit" class="btn btn-large btn-primary" data-ng-disabled="!targetName.length"> |
| 109 | Build | 109 | Build |
| 110 | </button> | 110 | </button> |
| 111 | </div> | 111 | </div> |
| @@ -124,27 +124,27 @@ vim: expandtab tabstop=2 | |||
| 124 | <!-- latest builds list --> | 124 | <!-- latest builds list --> |
| 125 | 125 | ||
| 126 | <a id="buildslist"></a> | 126 | <a id="buildslist"></a> |
| 127 | <h2 class="air" ng-if="builds.length">Latest builds</h2> | 127 | <h2 class="air" data-ng-if="builds.length">Latest builds</h2> |
| 128 | <div class="animate-repeat alert" ng-repeat="b in builds track by b.id" ng-class="{'queued':'alert-info', 'deleted':'alert-info', 'in progress': 'alert-info', 'failed':'alert-error', 'completed':{'In Progress':'alert-info', 'Succeeded':'alert-success', 'Failed':'alert-error'}[b.build[0].status]}[b.status]"> | 128 | <div class="animate-repeat alert" data-ng-repeat="b in builds track by b.id" data-ng-class="{'queued':'alert-info', 'deleted':'alert-info', 'in progress': 'alert-info', 'failed':'alert-error', 'completed':{'In Progress':'alert-info', 'Succeeded':'alert-success', 'Failed':'alert-error'}[b.build[0].status]}[b.status]"> |
| 129 | <div class="row-fluid"> | 129 | <div class="row-fluid"> |
| 130 | <switch ng-switch="b.status"> | 130 | <switch data-ng-switch="b.status"> |
| 131 | 131 | ||
| 132 | <case ng-switch-when="failed"> | 132 | <case data-ng-switch-when="failed"> |
| 133 | <div class="lead span3"> | 133 | <div class="lead span3"> |
| 134 | <a ng-class="{'succeeded': 'success', 'failed': 'error'}[b.status]" href="{[b.br_page_url]}"> | 134 | <a data-ng-class="{'succeeded': 'success', 'failed': 'error'}[b.status]" href="{[b.br_page_url]}"> |
| 135 | <span ng-repeat="t in b.targets" ng-include src="'target_display'"></span> | 135 | <span data-ng-repeat="t in b.targets" data-ng-include src="'target_display'"></span> |
| 136 | </a> | 136 | </a> |
| 137 | </div> | 137 | </div> |
| 138 | <div class="span2 lead"> | 138 | <div class="span2 lead"> |
| 139 | <ngif ng-if="b.updated - todaydate > 0"> | 139 | <ngif data-ng-if="b.updated - todaydate > 0"> |
| 140 | {[b.updated|date:'HH:mm']} | 140 | {[b.updated|date:'HH:mm']} |
| 141 | </ngif> | 141 | </ngif> |
| 142 | <ngif ng-if="b.updated - todaydate < 0"> | 142 | <ngif data-ng-if="b.updated - todaydate < 0"> |
| 143 | {[b.updated|date:'dd/MM/yy HH:mm']} | 143 | {[b.updated|date:'dd/MM/yy HH:mm']} |
| 144 | </ngif> | 144 | </ngif> |
| 145 | </div> | 145 | </div> |
| 146 | <div class="span2"> | 146 | <div class="span2"> |
| 147 | <ngif ng-if="b.errors.length"> | 147 | <ngif data-ng-if="b.errors.length"> |
| 148 | <span> | 148 | <span> |
| 149 | <i class="icon-minus-sign red lead"></i> | 149 | <i class="icon-minus-sign red lead"></i> |
| 150 | <a href="{[b.br_page_url]}#errors" class="lead error">{[b.errors.length]} | 150 | <a href="{[b.br_page_url]}#errors" class="lead error">{[b.errors.length]} |
| @@ -156,47 +156,47 @@ vim: expandtab tabstop=2 | |||
| 156 | <!-- we don't have warnings in this case --> | 156 | <!-- we don't have warnings in this case --> |
| 157 | </div> | 157 | </div> |
| 158 | <div> <span class="lead">Build time: {[b.command_time|timediff]}</span> | 158 | <div> <span class="lead">Build time: {[b.command_time|timediff]}</span> |
| 159 | <button class="btn pull-right" ng-class="{'succeeded': 'btn-success', 'failed': 'btn-danger'}[b.status]" | 159 | <button class="btn pull-right" data-ng-class="{'succeeded': 'btn-success', 'failed': 'btn-danger'}[b.status]" |
| 160 | ng-click="buildExistingTarget(b.targets)">Run again</button> | 160 | data-ng-click="buildExistingTarget(b.targets)">Run again</button> |
| 161 | 161 | ||
| 162 | </div> | 162 | </div> |
| 163 | </case> | 163 | </case> |
| 164 | 164 | ||
| 165 | <case ng-switch-when="queued"> | 165 | <case data-ng-switch-when="queued"> |
| 166 | <div class="lead span5"> <span ng-repeat="t in b.targets" ng-include src="'target_display'"></span> </div> | 166 | <div class="lead span5"> <span data-ng-repeat="t in b.targets" data-ng-include src="'target_display'"></span> </div> |
| 167 | <div class="span4 lead" >Build queued | 167 | <div class="span4 lead" >Build queued |
| 168 | <i title="This build will start as soon as a build server is available" class="icon-question-sign get-help get-help-blue heading-help" data-toggle="tooltip"></i> | 168 | <i title="This build will start as soon as a build server is available" class="icon-question-sign get-help get-help-blue heading-help" data-toggle="tooltip"></i> |
| 169 | </div> | 169 | </div> |
| 170 | <button class="btn pull-right btn-info" ng-click="buildCancel(b)">Cancel</button> | 170 | <button class="btn pull-right btn-info" data-ng-click="buildCancel(b)">Cancel</button> |
| 171 | </case> | 171 | </case> |
| 172 | 172 | ||
| 173 | <case ng-switch-when="created"> | 173 | <case data-ng-switch-when="created"> |
| 174 | <div class="lead span5"> <span ng-repeat="t in b.targets" ng-include src="'target_display'"></span> </div> | 174 | <div class="lead span5"> <span data-ng-repeat="t in b.targets" data-ng-include src="'target_display'"></span> </div> |
| 175 | <div class="span4"> | 175 | <div class="span4"> |
| 176 | <span class="lead">Creating build</span> | 176 | <span class="lead">Creating build</span> |
| 177 | </div> | 177 | </div> |
| 178 | <button class="btn pull-right btn-info" ng-click="buildCancel(b)">Cancel</button> | 178 | <button class="btn pull-right btn-info" data-ng-click="buildCancel(b)">Cancel</button> |
| 179 | </case> | 179 | </case> |
| 180 | 180 | ||
| 181 | <case ng-switch-when="deleted"> | 181 | <case data-ng-switch-when="deleted"> |
| 182 | <div class="lead span5"> <span ng-repeat="t in b.targets" ng-include src="'target_display'"></span> </div> | 182 | <div class="lead span5"> <span data-ng-repeat="t in b.targets" data-ng-include src="'target_display'"></span> </div> |
| 183 | <div class="span4" id="{[b.id]}-deleted" > | 183 | <div class="span4" id="{[b.id]}-deleted" > |
| 184 | <span class="lead">Build cancelled</span> | 184 | <span class="lead">Build cancelled</span> |
| 185 | </div> | 185 | </div> |
| 186 | <button class="btn pull-right btn-info" ng-click="buildDelete(b)">Close</button> | 186 | <button class="btn pull-right btn-info" data-ng-click="buildDelete(b)">Close</button> |
| 187 | </case> | 187 | </case> |
| 188 | 188 | ||
| 189 | 189 | ||
| 190 | <case ng-switch-when="in progress"> | 190 | <case data-ng-switch-when="in progress"> |
| 191 | <switch ng-switch="b.build.length"> | 191 | <switch data-ng-switch="b.build.length"> |
| 192 | <case ng-switch-when="0"> | 192 | <case data-ng-switch-when="0"> |
| 193 | <div class="lead span5"> <span ng-repeat="t in b.targets" ng-include src="'target_display'"></span> </div> | 193 | <div class="lead span5"> <span data-ng-repeat="t in b.targets" data-ng-include src="'target_display'"></span> </div> |
| 194 | <div class="span4 lead"> | 194 | <div class="span4 lead"> |
| 195 | Checking out layers | 195 | Checking out layers |
| 196 | </div> | 196 | </div> |
| 197 | </case> | 197 | </case> |
| 198 | <case ng-switch-default=""> | 198 | <case data-ng-switch-default=""> |
| 199 | <div class="lead span3"> <span ng-repeat="t in b.targets" ng-include src="'target_display'"></span> </div> | 199 | <div class="lead span3"> <span data-ng-repeat="t in b.targets" data-ng-include src="'target_display'"></span> </div> |
| 200 | <div class="span4 offset1" > | 200 | <div class="span4 offset1" > |
| 201 | <div class="progress" style="margin-top:5px;" data-toggle="tooltip" tooltip="{[b.build[0].completeper]}% of tasks complete"> | 201 | <div class="progress" style="margin-top:5px;" data-toggle="tooltip" tooltip="{[b.build[0].completeper]}% of tasks complete"> |
| 202 | <div style="width: {[b.build[0].completeper]}%;" class="bar"></div> | 202 | <div style="width: {[b.build[0].completeper]}%;" class="bar"></div> |
| @@ -207,22 +207,22 @@ vim: expandtab tabstop=2 | |||
| 207 | </case> | 207 | </case> |
| 208 | 208 | ||
| 209 | 209 | ||
| 210 | <case ng-switch-when="completed"> | 210 | <case data-ng-switch-when="completed"> |
| 211 | <div class="lead span3"> | 211 | <div class="lead span3"> |
| 212 | <a ng-class="{'Succeeded': 'success', 'Failed': 'error'}[b.build[0].status]" href="{[b.build[0].build_page_url]}"> | 212 | <a data-ng-class="{'Succeeded': 'success', 'Failed': 'error'}[b.build[0].status]" href="{[b.build[0].build_page_url]}"> |
| 213 | <span ng-repeat="t in b.targets" ng-include src="'target_display'"></span> | 213 | <span data-ng-repeat="t in b.targets" data-ng-include src="'target_display'"></span> |
| 214 | </a> | 214 | </a> |
| 215 | </div> | 215 | </div> |
| 216 | <div class="span2 lead"> | 216 | <div class="span2 lead"> |
| 217 | <ngif ng-if="b.build[0].completed_on - todaydate > 0"> | 217 | <ngif data-ng-if="b.build[0].completed_on - todaydate > 0"> |
| 218 | {[b.build[0].completed_on|date:'HH:mm']} | 218 | {[b.build[0].completed_on|date:'HH:mm']} |
| 219 | </ngif> | 219 | </ngif> |
| 220 | <ngif ng-if="b.build[0].completed_on - todaydate < 0"> | 220 | <ngif data-ng-if="b.build[0].completed_on - todaydate < 0"> |
| 221 | {[b.build[0].completed_on|date:'dd/MM/yy HH:mm']} | 221 | {[b.build[0].completed_on|date:'dd/MM/yy HH:mm']} |
| 222 | </ngif> | 222 | </ngif> |
| 223 | </div> | 223 | </div> |
| 224 | <div class="span2"> | 224 | <div class="span2"> |
| 225 | <ngif ng-if="b.build[0].errors"> | 225 | <ngif data-ng-if="b.build[0].errors"> |
| 226 | <span> | 226 | <span> |
| 227 | <i class="icon-minus-sign red lead"></i> | 227 | <i class="icon-minus-sign red lead"></i> |
| 228 | <a href="{[b.build[0].build_page_url]}#errors" class="lead error">{[b.build[0].errors]} | 228 | <a href="{[b.build[0].build_page_url]}#errors" class="lead error">{[b.build[0].errors]} |
| @@ -231,7 +231,7 @@ vim: expandtab tabstop=2 | |||
| 231 | </ngif> | 231 | </ngif> |
| 232 | </div> | 232 | </div> |
| 233 | <div class="span2"> | 233 | <div class="span2"> |
| 234 | <ngif ng-if="b.build[0].warnings"> | 234 | <ngif data-ng-if="b.build[0].warnings"> |
| 235 | <span> | 235 | <span> |
| 236 | <i class="icon-warning-sign yellow lead"></i> | 236 | <i class="icon-warning-sign yellow lead"></i> |
| 237 | <a href="{[b.build[0].build_page_url]}#warnings" class="lead warning">{[b.build[0].warnings]} | 237 | <a href="{[b.build[0].build_page_url]}#warnings" class="lead warning">{[b.build[0].warnings]} |
| @@ -240,14 +240,14 @@ vim: expandtab tabstop=2 | |||
| 240 | </ngif> | 240 | </ngif> |
| 241 | </div> | 241 | </div> |
| 242 | <div> <span class="lead">Build time: <a href="{[b.build[0].build_time_page_url]}">{[b.build[0].build_time|timediff]}</a></span> | 242 | <div> <span class="lead">Build time: <a href="{[b.build[0].build_time_page_url]}">{[b.build[0].build_time|timediff]}</a></span> |
| 243 | <button class="btn pull-right" ng-class="{'Succeeded': 'btn-success', 'Failed': 'btn-danger'}[b.build[0].status]" | 243 | <button class="btn pull-right" data-ng-class="{'Succeeded': 'btn-success', 'Failed': 'btn-danger'}[b.build[0].status]" |
| 244 | ng-click="buildExistingTarget(b.targets)">Run again</button> | 244 | data-ng-click="buildExistingTarget(b.targets)">Run again</button> |
| 245 | 245 | ||
| 246 | </div> | 246 | </div> |
| 247 | </case> | 247 | </case> |
| 248 | 248 | ||
| 249 | 249 | ||
| 250 | <case ng-switch-default=""> | 250 | <case data-ng-switch-default=""> |
| 251 | <div>FIXME!</div> | 251 | <div>FIXME!</div> |
| 252 | </case> | 252 | </case> |
| 253 | </switch> | 253 | </switch> |
| @@ -259,9 +259,9 @@ vim: expandtab tabstop=2 | |||
| 259 | <h2 class="air">Project configuration</h2> | 259 | <h2 class="air">Project configuration</h2> |
| 260 | 260 | ||
| 261 | <!-- alerts section 2 --> | 261 | <!-- alerts section 2 --> |
| 262 | <div ng-repeat="a in zone2alerts"> | 262 | <div data-ng-repeat="a in zone2alerts"> |
| 263 | <div class="alert alert-dismissible lead" role="alert" ng-class="a.type"><button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">×</span></button> | 263 | <div class="alert alert-dismissible lead" role="alert" data-ng-class="a.type"><button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">×</span></button> |
| 264 | <span ng-bind-html="a.text"></span> | 264 | <span data-ng-bind-html="a.text"></span> |
| 265 | </div> | 265 | </div> |
| 266 | </div> | 266 | </div> |
| 267 | 267 | ||
| @@ -273,7 +273,7 @@ vim: expandtab tabstop=2 | |||
| 273 | Layers <span class="muted counter">({[layers.length]})</span> | 273 | Layers <span class="muted counter">({[layers.length]})</span> |
| 274 | <i class="icon-question-sign get-help heading-help" title="Bitbake reads metadata files from modules called 'layers'. Layers allow you to isolate different types of customizations from each other. <a href='http://www.yoctoproject.org/docs/current/dev-manual/dev-manual.html#understanding-and-creating-layers' target='_blank'>More on layers</a>"></i> | 274 | <i class="icon-question-sign get-help heading-help" title="Bitbake reads metadata files from modules called 'layers'. Layers allow you to isolate different types of customizations from each other. <a href='http://www.yoctoproject.org/docs/current/dev-manual/dev-manual.html#understanding-and-creating-layers' target='_blank'>More on layers</a>"></i> |
| 275 | </h3> | 275 | </h3> |
| 276 | <div class="alert" ng-if="!layers.length"> | 276 | <div class="alert" data-ng-if="!layers.length"> |
| 277 | <b>You need to add some layers </b> | 277 | <b>You need to add some layers </b> |
| 278 | <p> | 278 | <p> |
| 279 | You can: | 279 | You can: |
| @@ -285,10 +285,10 @@ vim: expandtab tabstop=2 | |||
| 285 | Or type a layer name below. | 285 | Or type a layer name below. |
| 286 | </p> | 286 | </p> |
| 287 | </div> | 287 | </div> |
| 288 | <form ng-submit="layerAdd()"> | 288 | <form data-ng-submit="layerAdd()"> |
| 289 | <div class="input-append"> | 289 | <div class="input-append"> |
| 290 | <input type="text" class="input-xlarge" id="layer" autocomplete="off" placeholder="Type a layer name" data-minLength="1" ng-model="layerAddName" typeahead="e.name for e in getAutocompleteSuggestions('layers', $viewValue)|filter:$viewValue" typeahead-template-url="suggestion_details" typeahead-on-select="onLayerSelect($item, $model, $label)" typeahead-editable="false" ng-class="{ 'has-error': layerAddName.$invalid }" /> | 290 | <input type="text" class="input-xlarge" id="layer" autocomplete="off" placeholder="Type a layer name" data-minLength="1" data-ng-model="layerAddName" data-typeahead="e.name for e in getAutocompleteSuggestions('layers', $viewValue)|filter:$viewValue" data-typeahead-template-url="suggestion_details" data-typeahead-on-select="onLayerSelect($item, $model, $label)" data-typeahead-editable="false" data-ng-class="{ 'has-error': layerAddName.$invalid }" /> |
| 291 | <input type="submit" id="add-layer" class="btn" value="Add" ng-disabled="!layerAddName.length"/> | 291 | <input type="submit" id="add-layer" class="btn" value="Add" data-ng-disabled="!layerAddName.length"/> |
| 292 | </div> | 292 | </div> |
| 293 | {% csrf_token %} | 293 | {% csrf_token %} |
| 294 | </form> | 294 | </form> |
| @@ -298,9 +298,9 @@ vim: expandtab tabstop=2 | |||
| 298 | | | 298 | | |
| 299 | <a href="{% url 'importlayer' project.id %}">Import layer</a></p> | 299 | <a href="{% url 'importlayer' project.id %}">Import layer</a></p> |
| 300 | <ul class="unstyled configuration-list"> | 300 | <ul class="unstyled configuration-list"> |
| 301 | <li ng-repeat="l in layers track by l.id" class="animate-repeat"> | 301 | <li data-ng-repeat="l in layers track by l.id" class="animate-repeat"> |
| 302 | <a href="{[l.layerdetailurl]}" class="layer-info" data-toggle="tooltip" tooltip-placement="right" tooltip="{[l.giturl]} | {[l.branch.name]}">{[l.name]}</a> | 302 | <a href="{[l.layerdetailurl]}" class="layer-info" data-toggle="tooltip" tooltip-placement="right" tooltip="{[l.giturl]} | {[l.branch.name]}">{[l.name]}</a> |
| 303 | <i class="icon-trash" ng-click="layerDel(l.id)" tooltip="Delete"></i> | 303 | <i class="icon-trash" data-ng-click="layerDel(l.id)" tooltip="Delete"></i> |
| 304 | </li> | 304 | </li> |
| 305 | </ul> | 305 | </ul> |
| 306 | </div> | 306 | </div> |
| @@ -312,10 +312,10 @@ vim: expandtab tabstop=2 | |||
| 312 | Recipes | 312 | Recipes |
| 313 | <i class="icon-question-sign get-help heading-help" title="What you build, often an image recipe that produces a root file system file. Something like <code>core-image-minimal</code> or <code>core-image-sato</code>"></i> | 313 | <i class="icon-question-sign get-help heading-help" title="What you build, often an image recipe that produces a root file system file. Something like <code>core-image-minimal</code> or <code>core-image-sato</code>"></i> |
| 314 | </h3> | 314 | </h3> |
| 315 | <form ng-submit="buildNamedTarget()"> | 315 | <form data-ng-submit="buildNamedTarget()"> |
| 316 | <div class="input-append"> | 316 | <div class="input-append"> |
| 317 | <input type="text" class="input-xlarge" placeholder="Type the recipe(s) you want to build" autocomplete="off" data-minLength="1" ng-model="targetName1" typeahead="e.name for e in getAutocompleteSuggestions('targets', $viewValue)|filter:$viewValue" typeahead-template-url="suggestion_details" ng-disabled="!layers.length"> | 317 | <input type="text" class="input-xlarge" placeholder="Type the recipe(s) you want to build" autocomplete="off" data-minLength="1" data-ng-model="targetName1" data-typeahead="e.name for e in getAutocompleteSuggestions('targets', $viewValue)|filter:$viewValue" data-typeahead-template-url="suggestion_details" data-ng-disabled="!layers.length"> |
| 318 | <button type="submit" class="btn btn-primary" ng-disabled="!targetName1.length"> | 318 | <button type="submit" class="btn btn-primary" data-ng-disabled="!targetName1.length"> |
| 319 | Build </button> | 319 | Build </button> |
| 320 | </div> | 320 | </div> |
| 321 | {% csrf_token %} | 321 | {% csrf_token %} |
| @@ -324,18 +324,18 @@ vim: expandtab tabstop=2 | |||
| 324 | <a href="{% url 'all-targets' project.id %}">View all compatible recipes</a> | 324 | <a href="{% url 'all-targets' project.id %}">View all compatible recipes</a> |
| 325 | <i class="icon-question-sign get-help" title="View all the recipes you can build with the release selected for this project, which is {[project.release.desc]}"></i> | 325 | <i class="icon-question-sign get-help" title="View all the recipes you can build with the release selected for this project, which is {[project.release.desc]}"></i> |
| 326 | </p> | 326 | </p> |
| 327 | <div ng-if="frequenttargets.length"> | 327 | <div data-ng-if="frequenttargets.length"> |
| 328 | <h4 class="air"> | 328 | <h4 class="air"> |
| 329 | Most built recipes | 329 | Most built recipes |
| 330 | </h4> | 330 | </h4> |
| 331 | <ul class="unstyled configuration-list {[mutedtargets]}"> | 331 | <ul class="unstyled configuration-list {[mutedtargets]}"> |
| 332 | <li ng-repeat="t in frequenttargets"> | 332 | <li data-ng-repeat="t in frequenttargets"> |
| 333 | <label class="checkbox"> | 333 | <label class="checkbox"> |
| 334 | <input type="checkbox" ng-model="mostBuiltTargets[t]" ng-disabled="disableBuildCheckbox(t)" ng-checked="mostBuiltTargets[t] && !disableBuildCheckbox(t)">{[t]} | 334 | <input type="checkbox" data-ng-model="mostBuiltTargets[t]" data-ng-disabled="disableBuildCheckbox(t)" data-ng-checked="mostBuiltTargets[t] && !disableBuildCheckbox(t)">{[t]} |
| 335 | </label> | 335 | </label> |
| 336 | </li> | 336 | </li> |
| 337 | </ul> | 337 | </ul> |
| 338 | <button class="btn btn-large btn-primary" ng-disabled="enableBuildSelectedTargets()" ng-click="buildSelectedTargets()">Build selected recipes</button> | 338 | <button class="btn btn-large btn-primary" data-ng-disabled="enableBuildSelectedTargets()" data-ng-click="buildSelectedTargets()">Build selected recipes</button> |
| 339 | </div> | 339 | </div> |
| 340 | </div> | 340 | </div> |
| 341 | 341 | ||
| @@ -347,17 +347,17 @@ vim: expandtab tabstop=2 | |||
| 347 | </h3> | 347 | </h3> |
| 348 | <p class="lead" id="select-machine-opposite"> | 348 | <p class="lead" id="select-machine-opposite"> |
| 349 | <span>{[machine.name]}</span> | 349 | <span>{[machine.name]}</span> |
| 350 | <i id="change-machine" class="icon-pencil" ng-click="toggle('#select-machine')"></i> | 350 | <i id="change-machine" class="icon-pencil" data-ng-click="toggle('#select-machine')"></i> |
| 351 | </p> | 351 | </p> |
| 352 | <div id="select-machine" style="display: none"> | 352 | <div id="select-machine" style="display: none"> |
| 353 | <div class="alert alert-info"> | 353 | <div class="alert alert-info"> |
| 354 | <strong>Machine changes have a big impact on build outcome.</strong> | 354 | <strong>Machine changes have a big impact on build outcome.</strong> |
| 355 | You cannot really compare the builds for the new machine with the previous ones. | 355 | You cannot really compare the builds for the new machine with the previous ones. |
| 356 | </div> | 356 | </div> |
| 357 | <form ng-submit="editProjectSettings('#select-machine')" class="input-append"> | 357 | <form data-ng-submit="editProjectSettings('#select-machine')" class="input-append"> |
| 358 | <input type="text" id="machine" autocomplete="off" ng-model="machineName" value="{[machine.name]}" typeahead="m.name for m in getAutocompleteSuggestions('machines', $viewValue)" typeahead-template-url="suggestion_details" /> | 358 | <input type="text" id="machine" autocomplete="off" data-ng-model="machineName" value="{[machine.name]}" data-typeahead="m.name for m in getAutocompleteSuggestions('machines', $viewValue)" data-typeahead-template-url="suggestion_details" /> |
| 359 | <input type="submit" id="apply-change-machine" class="btn" type="button" ng-disabled="machineName == machine.name || machineName.length == 0" value="Save"></input> | 359 | <input type="submit" id="apply-change-machine" class="btn" data-ng-disabled="machineName == machine.name || machineName.length == 0" value="Save"/> |
| 360 | <input type="reset" id="cancel-machine" class="btn btn-link" ng-click="toggle('#select-machine')" value="Cancel"></input> | 360 | <input type="reset" id="cancel-machine" class="btn btn-link" data-ng-click="toggle('#select-machine')" value="Cancel"/> |
| 361 | {% csrf_token %} | 361 | {% csrf_token %} |
| 362 | </form> | 362 | </form> |
| 363 | <p> | 363 | <p> |
| @@ -376,9 +376,9 @@ vim: expandtab tabstop=2 | |||
| 376 | <h2>Project details</h2> | 376 | <h2>Project details</h2> |
| 377 | 377 | ||
| 378 | <!-- alerts section 3 --> | 378 | <!-- alerts section 3 --> |
| 379 | <div ng-repeat="a in zone3alerts"> | 379 | <div data-ng-repeat="a in zone3alerts"> |
| 380 | <div class="alert alert-dismissible lead" role="alert" ng-class="a.type"><button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">×</span></button> | 380 | <div class="alert alert-dismissible lead" role="alert" data-ng-class="a.type"><button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">×</span></button> |
| 381 | <span ng-bind-html="a.text"></span> | 381 | <span data-ng-bind-html="a.text"></span> |
| 382 | </div> | 382 | </div> |
| 383 | </div> | 383 | </div> |
| 384 | 384 | ||
| @@ -387,31 +387,31 @@ vim: expandtab tabstop=2 | |||
| 387 | <h3>Project name</h3> | 387 | <h3>Project name</h3> |
| 388 | <p class="lead" id="change-project-name-opposite"> | 388 | <p class="lead" id="change-project-name-opposite"> |
| 389 | <span >{[project.name]}</span> | 389 | <span >{[project.name]}</span> |
| 390 | <i class="icon-pencil" ng-click="toggle('#change-project-name')" ></i> | 390 | <i class="icon-pencil" data-ng-click="toggle('#change-project-name')" ></i> |
| 391 | </p> | 391 | </p> |
| 392 | <div id="change-project-name" style="display:none;"> | 392 | <div id="change-project-name" style="display:none;"> |
| 393 | <form ng-submit="editProjectSettings('#change-project-name')" class="input-append"> | 393 | <form data-ng-submit="editProjectSettings('#change-project-name')" class="input-append"> |
| 394 | <input type="text" class="input-xlarge" id="type-project-name" ng-model="projectName" value="{[project.name]}"> | 394 | <input type="text" class="input-xlarge" id="type-project-name" data-ng-model="projectName" value="{[project.name]}"> |
| 395 | <input type="submit" class="btn" value="Save" ng-disabled="project.name == projectName"/> | 395 | <input type="submit" class="btn" value="Save" data-ng-disabled="project.name == projectName"/> |
| 396 | <input type="reset" class="btn btn-link" value="Cancel" ng-click="toggle('#change-project-name')"> | 396 | <input type="reset" class="btn btn-link" value="Cancel" data-ng-click="toggle('#change-project-name')"> |
| 397 | </form> | 397 | </form> |
| 398 | </div> | 398 | </div> |
| 399 | 399 | ||
| 400 | <h3 ng-if="releases.length > 1"> | 400 | <h3 data-ng-if="releases.length > 1"> |
| 401 | Release | 401 | Release |
| 402 | <i class="icon-question-sign get-help heading-help" title="The version of the build system you want to use"></i> | 402 | <i class="icon-question-sign get-help heading-help" title="The version of the build system you want to use"></i> |
| 403 | </h3> | 403 | </h3> |
| 404 | <p ng-if="releases.length > 1" class="lead" id="change-project-version-opposite"> | 404 | <p data-ng-if="releases.length > 1" class="lead" id="change-project-version-opposite"> |
| 405 | <span id="project-version">{[project.release.desc]}</span> | 405 | <span id="project-version">{[project.release.desc]}</span> |
| 406 | <i id="change-version" class="icon-pencil" ng-click="toggle('#change-project-version')" ></i> | 406 | <i id="change-version" class="icon-pencil" data-ng-click="toggle('#change-project-version')" ></i> |
| 407 | </p> | 407 | </p> |
| 408 | <div class="div-inline" id="change-project-version" style="display:none;"> | 408 | <div class="div-inline" id="change-project-version" style="display:none;"> |
| 409 | <form ng-submit="testProjectSettingsChange('#change-project-version')" class="input-append"> | 409 | <form data-ng-submit="testProjectSettingsChange('#change-project-version')" class="input-append"> |
| 410 | <select id="select-version" ng-model="projectVersion"> | 410 | <select id="select-version" data-ng-model="projectVersion"> |
| 411 | <option ng-repeat="r in releases" value="{[r.id]}" ng-selected="r.id == project.release.id">{[r.description]}</option> | 411 | <option data-ng-repeat="r in releases" value="{[r.id]}" data-ng-selected="r.id == project.release.id">{[r.description]}</option> |
| 412 | </select> | 412 | </select> |
| 413 | <input type="submit" class="btn" style="margin-left:5px;" value="Save" ng-disabled="project.release.id == projectVersion"/> | 413 | <input type="submit" class="btn" style="margin-left:5px;" value="Save" data-ng-disabled="project.release.id == projectVersion"/> |
| 414 | <input type="reset" class="btn btn-link" value="Cancel" ng-click="toggle('#change-project-version')"/> | 414 | <input type="reset" class="btn btn-link" value="Cancel" data-ng-click="toggle('#change-project-version')"/> |
| 415 | 415 | ||
| 416 | </form> | 416 | </form> |
| 417 | </div> | 417 | </div> |
| @@ -431,7 +431,7 @@ angular.element(document).ready(function() { | |||
| 431 | scope.urls = {}; | 431 | scope.urls = {}; |
| 432 | scope.urls.xhr_build = "{% url 'xhr_projectbuild' project.id %}"; | 432 | scope.urls.xhr_build = "{% url 'xhr_projectbuild' project.id %}"; |
| 433 | scope.urls.xhr_edit = "{% url 'xhr_projectedit' project.id %}"; | 433 | scope.urls.xhr_edit = "{% url 'xhr_projectedit' project.id %}"; |
| 434 | scope.urls.xhr_datatypeahead = "{% url 'xhr_datatypeahead' %}"; | 434 | scope.urls.xhr_datatypeahead = "{% url 'xhr_datatypeahead' project.id %}"; |
| 435 | scope.urls.layers = "{% url 'all-layers' project.id %}"; | 435 | scope.urls.layers = "{% url 'all-layers' project.id %}"; |
| 436 | scope.urls.targets = "{% url 'all-targets' project.id %}"; | 436 | scope.urls.targets = "{% url 'all-targets' project.id %}"; |
| 437 | scope.urls.importlayer = "{% url 'importlayer' project.id %}"; | 437 | scope.urls.importlayer = "{% url 'importlayer' project.id %}"; |
