diff options
Diffstat (limited to 'lib/toaster/toastergui/templates')
18 files changed, 266 insertions, 84 deletions
diff --git a/lib/toaster/toastergui/templates/base.html b/lib/toaster/toastergui/templates/base.html index 4f7206489..e90be6962 100644 --- a/lib/toaster/toastergui/templates/base.html +++ b/lib/toaster/toastergui/templates/base.html @@ -14,11 +14,11 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" /> - <script src="{% static 'js/jquery-2.0.3.min.js' %}"> + <script src="{% static 'js/jquery-3.7.1.min.js' %}"> </script> <script src="{% static 'js/jquery.cookie.js' %}"> </script> - <script src="{% static 'js/bootstrap.min.js' %}"> + <script src="{% static 'js/bootstrap-3.4.1.min.js' %}"> </script> <script src="{% static 'js/typeahead.jquery.js' %}"> </script> @@ -94,7 +94,7 @@ </a> <a class="brand" href="/">Toaster</a> {% if DEBUG %} - <span class="glyphicon glyphicon-info-sign" title="<strong>Toaster version information</strong>" data-content="<dl><dt>Git branch</dt><dd>{{TOASTER_BRANCH}}</dd><dt>Git revision</dt><dd>{{TOASTER_REVISION}}</dd></dl>"></i> + <span id="toaster-version-info-sign" class="glyphicon glyphicon-info-sign" title="<strong>Toaster version information</strong>" data-content="<dl><dt>Git branch</dt><dd>{{TOASTER_BRANCH}}</dd><dt>Git revision</dt><dd>{{TOASTER_REVISION}}</dd></dl>"></i> {% endif %} </div> </div> @@ -123,7 +123,7 @@ {% endif %} {% endif %} <li id="navbar-docs"> - <a target="_blank" href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html"> + <a target="_blank" href="http://docs.yoctoproject.org/toaster-manual/index.html#toaster-user-manual"> <i class="glyphicon glyphicon-book"></i> Documentation </a> @@ -132,7 +132,8 @@ {% if project_enable %} <a class="btn btn-default navbar-btn navbar-right" id="new-project-button" href="{% url 'newproject' %}">New project</a> {% endif %} - </div> + <a class="btn btn-default navbar-btn navbar-right" id="import_page" style="margin-right: 5px !important" id="import-cmdline-button" href="{% url 'cmdlines' %}">Import command line builds</a> + </div> </div> </nav> diff --git a/lib/toaster/toastergui/templates/base_specific.html b/lib/toaster/toastergui/templates/base_specific.html index e377cadd7..425f7ed73 100644 --- a/lib/toaster/toastergui/templates/base_specific.html +++ b/lib/toaster/toastergui/templates/base_specific.html @@ -14,11 +14,11 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" /> - <script src="{% static 'js/jquery-2.0.3.min.js' %}"> + <script src="{% static 'js/jquery-3.7.1.min.js' %}"> </script> <script src="{% static 'js/jquery.cookie.js' %}"> </script> - <script src="{% static 'js/bootstrap.min.js' %}"> + <script src="{% static 'js/bootstrap-3.4.1.min.js' %}"> </script> <script src="{% static 'js/typeahead.jquery.js' %}"> </script> diff --git a/lib/toaster/toastergui/templates/command_line_builds.html b/lib/toaster/toastergui/templates/command_line_builds.html new file mode 100644 index 000000000..05db6727e --- /dev/null +++ b/lib/toaster/toastergui/templates/command_line_builds.html @@ -0,0 +1,209 @@ +{% extends "base.html" %} +{% load projecttags %} +{% load humanize %} +{% load static %} + +{% block title %} Import Builds from eventlogs - Toaster {% endblock %} + +{% block pagecontent %} + +<div class="container-fluid"> + <div id="overlay" class="hide"> + <div class="spinner"> + <div class="fa-spin"> + </div> + </div> + </div> + <div class="row"> + <div class="col-md-12"> + <div class="page-header"> + <div class="row"> + <div class="col-md-6"> + <h1>Import command line builds</h1> + </div> + {% if import_all %} + <div class="col-md-6"> + <button id="import_all" type="button" class="btn btn-primary navbar-btn navbar-right"> + <span class="glyphicon glyphicon-upload" style="vertical-align: top;"></span> Import All + </button> + </div> + {% endif %} + </div> + </div> + {% if messages %} + <div class="row-fluid" id="empty-state-{{table_name}}"> + {% for message in messages %} + <div class="alert alert-danger">{{message}}</div> + {%endfor%} + </div> + {% endif %} + <div class="row"> + <h4 style="margin-left: 15px;"><strong>Import eventlog file</strong></h4> + <form method="POST" enctype="multipart/form-data" action="{% url 'cmdlines' %}" id="form_file"> + {% csrf_token %} + <div class="col-md-6" style="padding-left: 20px;"> + <div class="row"> + <input type="hidden" value="{{dir}}" name="dir"> + <div class="col-md-3"> {{ form.eventlog_file}} </div> + </div> + <div class="row" style="padding-top: 10px;"> + <div class="col-md-6"> + <button id="file_import" type="submit" disabled="disabled" class="btn btn-default navbar-btn" > + <span class="glyphicon glyphicon-upload" style="vertical-align: top;"></span> Import + </button> + </div> + </div> + </div> + </form> + </div> + + <div class="row" style="padding-top: 20px;"> + <div class="col-md-8 "> + <h4><strong>Eventlogs from existing build directory: </strong> + <a href="#" data-toggle="tooltip" title="{{dir}}"> + <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-info-circle" viewBox="0 0 16 16" data-toggle="tooltip"> + <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14m0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16"/> + <path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533zM9 4.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0"/> + </svg> + </a> + </h4> + {% if files %} + <div class="table-responsive"> + <table class="table col-md-6 table-bordered table-hover" id="eventlog-table" style="border-collapse: collapse;"> + <thead> + <tr class="row"> + <th scope="col">Name</th> + <th scope="col">Size</th> + <th scope="col">Action</th> + </tr> + </thead> + <tbody> + {% for file in files %} + <tr class="row" style="height: 48px;"> + <th scope="row" class="col-md-4" style="vertical-align: middle;"> + <input type="hidden" value="{{file.name}}" name="{{file.name}}">{{file.name}} + </th> + <td class="col-md-4 align-middle" style="vertical-align: middle;">{{file.size|filesizeformat}}</td> + <td class="col-md-4 align-middle" style="vertical-align: middle;"> + {% if file.imported == True and file.build_id is not None %} + <a href="{% url 'builddashboard' file.build_id %}">Build Details</a> + {% elif request.session.file == file.name or request.session.all_builds %} + <a data-toggle="tooltip" title="Build in progress"> + <span class="glyphicon glyphicon-upload" style="font-size: 18px; color:grey"></span> + </a> + {%else%} + <a onclick="_ajax_update('{{file.name}}', false, '{{dir}}')" data-toggle="tooltip" title="Import File"> + <span class="glyphicon glyphicon-upload" style="font-size: 18px;"></span> + </a> + {%endif%} + </td> + </tr> + {% endfor%} + </tbody> + </table> + </div> + {% else %} + <div class="row-fluid" id="empty-state-{{table_name}}"> + <div class="alert alert-info">Sorry - no files found</div> + </div> + {%endif%} + </div> + </div> + </div> + </div> +</div> + +<link rel="stylesheet" href="{% static 'css/jquery.dataTables-1.13.8.min.css' %}" type='text/css'/> +<script src="{% static 'js/jquery.dataTables-1.13.8.min.js' %}"> </script> +<script> + +function _ajax_update(file, all, dir){ + function getCookie(name) { + var cookieValue = null; + if (document.cookie && document.cookie !== '') { + var cookies = document.cookie.split(';'); + for (var i = 0; i < cookies.length; i++) { + var cookie = jQuery.trim(cookies[i]); + // Does this cookie string begin with the name we want? + if (cookie.substring(0, name.length + 1) === (name + '=')) { + cookieValue = decodeURIComponent(cookie.substring(name.length + 1)); + break; + } + } + } + return cookieValue; + } + var csrftoken = getCookie('csrftoken'); + + function csrfSafeMethod(method) { + // these HTTP methods do not require CSRF protection + return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method)); + } + $.ajaxSetup({ + beforeSend: function (xhr, settings) { + if (!csrfSafeMethod(settings.type) && !this.crossDomain) { + xhr.setRequestHeader("X-CSRFToken", csrftoken); + } + } + }); + + $.ajax({ + url:'/toastergui/cmdline/', + type: "POST", + data: {file: file, all: all, dir: dir}, + success:function(data){ + if (data['response']=='building'){ + location.reload() + } else { + window.location = '/toastergui/builds/' + } + }, + complete:function(data){ + }, + error:function (xhr, textStatus, thrownError){ + console.log('fail'); + } + }); +} + +$('#import_all').on('click', function(){ + _ajax_update("{{files | safe}}", true, "{{dir | safe}}"); +}); + + +$('#import_page').hide(); + +$(function () { + $('[data-toggle="tooltip"]').tooltip() +}) + + +$("#id_eventlog_file").change(function(){ + $('#file_import').prop("disabled", false); + $('#file_import').addClass('btn-primary') + $('#file_import').removeClass('btn-default') +}) + +$(document).ajaxStart(function(){ + $('#overlay').removeClass('hide'); + window.setTimeout( + function() { + window.location = '/toastergui/builds/' + }, 10000) +}); + +$( "#form_file").on( "submit", function( event ) { + $('#overlay').removeClass('hide'); + window.setTimeout( + function() { + window.location = '/toastergui/builds/' + }, 10000) +}); + +$(document).ready( function () { + $('#eventlog-table').DataTable({order: [[0, 'desc']], "pageLength": 50}); +}); + +</script> + +{% endblock %} diff --git a/lib/toaster/toastergui/templates/configvars.html b/lib/toaster/toastergui/templates/configvars.html index ca2e1eab3..691dace3a 100644 --- a/lib/toaster/toastergui/templates/configvars.html +++ b/lib/toaster/toastergui/templates/configvars.html @@ -66,7 +66,7 @@ <td class="description"> {% if variable.description %} {{variable.description}} - <a href="http://www.yoctoproject.org/docs/current/ref-manual/ref-manual.html#var-{{variable.variable_name|variable_parent_name}}" target="_blank"> + <a href="http://docs.yoctoproject.org/ref-manual/variables.html#term-{{variable.variable_name|variable_parent_name}}" target="_blank"> <span class="glyphicon glyphicon-new-window get-info"></span></a> {% endif %} </td> diff --git a/lib/toaster/toastergui/templates/js-unit-tests.html b/lib/toaster/toastergui/templates/js-unit-tests.html index ca248962f..41553c4f9 100644 --- a/lib/toaster/toastergui/templates/js-unit-tests.html +++ b/lib/toaster/toastergui/templates/js-unit-tests.html @@ -11,7 +11,7 @@ <script src="{% static 'js/layerDepsModal.js' %}"></script> <script src="{% static 'js/projectpage.js' %}"></script> -<script src="{% static 'js/bootstrap.min.js' %}"></script> +<script src="{% static 'js/bootstrap-3.4.1.min.js' %}"></script> <script src="{% static 'js/filtersnippet.js' %}"></script> <script src="{% static 'js/importlayer.js' %}"></script> <script src="{% static 'js/highlight.pack.js' %}"></script> diff --git a/lib/toaster/toastergui/templates/landing.html b/lib/toaster/toastergui/templates/landing.html index 70c7359fa..589ee2263 100644 --- a/lib/toaster/toastergui/templates/landing.html +++ b/lib/toaster/toastergui/templates/landing.html @@ -12,10 +12,10 @@ <div class="col-md-6"> <h1>This is Toaster</h1> - <p>A web interface to <a href="http://www.openembedded.org">OpenEmbedded</a> and <a href="http://www.yoctoproject.org/tools-resources/projects/bitbake">BitBake</a>, the <a href="http://www.yoctoproject.org">Yocto Project</a> build system.</p> + <p>A web interface to <a href="https://www.openembedded.org">OpenEmbedded</a> and <a href="https://docs.yoctoproject.org/bitbake.html">BitBake</a>, the <a href="https://www.yoctoproject.org">Yocto Project</a> build system.</p> <p class="top-air"> - <a class="btn btn-info btn-lg" href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html#toaster-manual-setup-and-use"> + <a class="btn btn-info btn-lg" href="http://docs.yoctoproject.org/toaster-manual/setup-and-use.html#setting-up-and-using-toaster" style="min-width: 460px;"> Toaster is ready to capture your command line builds </a> </p> @@ -23,7 +23,7 @@ {% if lvs_nos %} {% if project_enable %} <p class="top-air"> - <a class="btn btn-primary btn-lg" href="{% url 'newproject' %}"> + <a class="btn btn-primary btn-lg" href="{% url 'newproject' %}" style="min-width: 460px;"> Create your first Toaster project to run manage builds </a> </p> @@ -33,7 +33,7 @@ Toaster has no layer information. Without layer information, you cannot run builds. To generate layer information you can: <ul> <li> - <a href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html#layer-source">Configure a layer source</a> + <a href="http://docs.yoctoproject.org/toaster-manual/reference.html#layer-source">Configure a layer source</a> </li> <li> <a href="{% url 'newproject' %}">Create a project</a>, then import layers @@ -42,9 +42,15 @@ </div> {% endif %} + <p class="top-air"> + <a class="btn btn-info btn-lg" href="{% url 'cmdlines' %}" style="min-width: 460px;"> + Import command line event logs from build directory + </a> + </p> + <ul class="list-unstyled lead"> <li> - <a href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html"> + <a href="http://docs.yoctoproject.org/toaster-manual/index.html#toaster-user-manual"> Read the Toaster manual </a> </li> diff --git a/lib/toaster/toastergui/templates/landing_not_managed.html b/lib/toaster/toastergui/templates/landing_not_managed.html deleted file mode 100644 index baa4b72c1..000000000 --- a/lib/toaster/toastergui/templates/landing_not_managed.html +++ /dev/null @@ -1,34 +0,0 @@ -{% extends "base.html" %} - -{% load static %} -{% load projecttags %} -{% load humanize %} - -{% block title %} Welcome to Toaster {% endblock %} - -{% block pagecontent %} - - <div class="container"> - <div class="row"> - <!-- Empty - no build module --> - <div class="page-header top-air"> - <h1> - This page only works with Toaster in 'Build' mode - </h1> - </div> - <div class="alert alert-info lead"> - <p"> - The 'Build' mode allows you to configure and run your Yocto Project builds from Toaster. - <ul> - <li><a href="http://www.yoctoproject.org/docs/latest/toaster-manual/toaster-manual.html#intro-modes"> - Read about the 'Build' mode - </a></li> - <li><a href="/"> - View your builds - </a></li> - </ul> - </p> - </div> - </div> - -{% endblock %} diff --git a/lib/toaster/toastergui/templates/layerdetails.html b/lib/toaster/toastergui/templates/layerdetails.html index 1e26e31c8..923ca3bfe 100644 --- a/lib/toaster/toastergui/templates/layerdetails.html +++ b/lib/toaster/toastergui/templates/layerdetails.html @@ -355,7 +355,7 @@ {% if layerversion.layer_source == layer_source.TYPE_LAYERINDEX %} <dt>Layer index</dt> <dd> - <a href="http://layers.openembedded.org/layerindex/branch/{{layerversion.release.name}}/layer/{{layerversion.layer.name}}">Layer index {{layerversion.layer.name}}</a> + <a href="https://layers.openembedded.org/layerindex/branch/{{layerversion.release.name}}/layer/{{layerversion.layer.name}}">Layer index {{layerversion.layer.name}}</a> </dd> {% endif %} </dl> diff --git a/lib/toaster/toastergui/templates/mrb_section.html b/lib/toaster/toastergui/templates/mrb_section.html index 98d9fac82..9fc7dfaee 100644 --- a/lib/toaster/toastergui/templates/mrb_section.html +++ b/lib/toaster/toastergui/templates/mrb_section.html @@ -63,7 +63,7 @@ <%/if%> </div> - <div data-build-state="<%:state%>"> + <div class="build-state" data-build-state="<%:state%>"> <%if state == 'Cloning'%> <%include tmpl='#cloning-repos-build-template'/%> <%else state == 'Parsing'%> diff --git a/lib/toaster/toastergui/templates/package_built_dependencies.html b/lib/toaster/toastergui/templates/package_built_dependencies.html index a5d589357..2493954de 100644 --- a/lib/toaster/toastergui/templates/package_built_dependencies.html +++ b/lib/toaster/toastergui/templates/package_built_dependencies.html @@ -18,7 +18,7 @@ </ul> <div class="tab-content"> <div class="tab-pane active" id="dependencies"> - {% ifequal runtime_deps|length 0 %} + {% if runtime_deps|length == 0 %} <div class="alert alert-info"> <strong>{{package.fullpackagespec}}</strong> has no runtime dependencies. </div> @@ -54,8 +54,8 @@ {% endfor %} </tbody> </table> - {% endifequal %} - {% ifnotequal other_deps|length 0 %} + {% endif %} + {% if other_deps|length != 0 %} <h3>Other runtime relationships</h3> <table class="table table-bordered table-hover"> <thead> @@ -93,7 +93,7 @@ {% endfor %} </tbody> </table> - {% endifnotequal %} + {% endif %} </div> <!-- tab-pane --> </div> <!-- tab-content --> {% endblock tabcontent %} diff --git a/lib/toaster/toastergui/templates/package_detail_base.html b/lib/toaster/toastergui/templates/package_detail_base.html index 66f8e7f06..a4fcd2aa4 100644 --- a/lib/toaster/toastergui/templates/package_detail_base.html +++ b/lib/toaster/toastergui/templates/package_detail_base.html @@ -127,7 +127,7 @@ {% comment %} # Removed per team meeting of 1/29/2014 until # decision on index search algorithm - <a href="http://layers.openembedded.org" target="_blank"> + <a href="https://layers.openembedded.org" target="_blank"> <i class="glyphicon glyphicon-share get-info"></i> </a> {% endcomment %} diff --git a/lib/toaster/toastergui/templates/package_included_dependencies.html b/lib/toaster/toastergui/templates/package_included_dependencies.html index 95e56ded2..1f5ed6d91 100644 --- a/lib/toaster/toastergui/templates/package_included_dependencies.html +++ b/lib/toaster/toastergui/templates/package_included_dependencies.html @@ -14,7 +14,7 @@ {% include "package_included_tabs.html" with active_tab="dependencies" %} <div class="tab-content"> <div class="tab-pane active" id="dependencies"> - {% ifnotequal runtime_deps|length 0 %} + {% if runtime_deps|length != 0 %} <table class="table table-bordered table-hover"> <thead> <tr> @@ -48,9 +48,9 @@ <div class="alert alert-info"> <strong>{{package.fullpackagespec}}</strong> has no runtime dependencies. </div> - {% endifnotequal %} + {% endif %} - {% ifnotequal other_deps|length 0 %} + {% if other_deps|length != 0 %} <h3>Other runtime relationships</h3> <table class="table table-bordered table-hover"> <thead> @@ -103,7 +103,7 @@ {% endfor %} </tbody> </table> - {% endifnotequal %} + {% endif %} </div> <!-- end tab-pane --> </div> <!-- end tab content --> {% endwith %} diff --git a/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html b/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html index fb310c7fc..dae4549e2 100644 --- a/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html +++ b/lib/toaster/toastergui/templates/package_included_reverse_dependencies.html @@ -15,7 +15,7 @@ <div class="tab-content"> <div class="tab-pane active" id="brought-in-by"> - {% ifequal reverse_count 0 %} + {% if reverse_count == 0 %} <div class="alert alert-info"> <strong>{{package.fullpackagespec}}</strong> has no reverse runtime dependencies. </div> @@ -43,7 +43,7 @@ {% endfor %} </tbody> </table> - {% endifequal %} + {% endif %} </div> <!-- end tab-pane --> </div> <!-- end tab content --> {% endwith %} diff --git a/lib/toaster/toastergui/templates/project.html b/lib/toaster/toastergui/templates/project.html index fa41e3c90..22239a82f 100644 --- a/lib/toaster/toastergui/templates/project.html +++ b/lib/toaster/toastergui/templates/project.html @@ -139,7 +139,7 @@ <ul> <li><a href="{% url 'projectlayers' project.id %}">Choose from the layers compatible with this project</a></li> <li><a href="{% url 'importlayer' project.id %}">Import a layer</a></li> - <li><a href="http://www.yoctoproject.org/docs/current/dev-manual/dev-manual.html#understanding-and-creating-layers" target="_blank">Read about layers in the documentation</a></li> + <li><a href="http://docs.yoctoproject.org/dev-manual/common-tasks.html#understanding-and-creating-layers" target="_blank">Read about layers in the documentation</a></li> <li>Or type a layer name below</li> </ul> </div> diff --git a/lib/toaster/toastergui/templates/project_specific.html b/lib/toaster/toastergui/templates/project_specific.html index f625d18ba..76d45b1b3 100644 --- a/lib/toaster/toastergui/templates/project_specific.html +++ b/lib/toaster/toastergui/templates/project_specific.html @@ -137,7 +137,7 @@ <ul> <li><a href="{% url 'projectlayers' project.id %}">Choose from the layers compatible with this project</a></li> <li><a href="{% url 'importlayer' project.id %}">Import a layer</a></li> - <li><a href="http://www.yoctoproject.org/docs/current/dev-manual/dev-manual.html#understanding-and-creating-layers" target="_blank">Read about layers in the documentation</a></li> + <li><a href="http://docs.yoctoproject.org/dev-manual/common-tasks.html#understanding-and-creating-layers" target="_blank">Read about layers in the documentation</a></li> <li>Or type a layer name below</li> </ul> </div> diff --git a/lib/toaster/toastergui/templates/projectconf.html b/lib/toaster/toastergui/templates/projectconf.html index fb20b26f2..c30683583 100644 --- a/lib/toaster/toastergui/templates/projectconf.html +++ b/lib/toaster/toastergui/templates/projectconf.html @@ -73,7 +73,7 @@ {% if image_install_append_defined %} <dt> - <span class="js-config-var-name js-config-var-managed-name">IMAGE_INSTALL_append</span> + <span class="js-config-var-name js-config-var-managed-name">IMAGE_INSTALL:append</span> <span class="glyphicon glyphicon-question-sign get-help" title="Specifies additional packages to install into an image. If your build creates more than one image, the packages will be installed in all of them"></span> </dt> <dd class="variable-list"> @@ -83,7 +83,7 @@ <form id="change-image_install-form" class="form-inline" style="display:none;"> <div class="row"> <div class="col-md-4"> - <span class="help-block">To set IMAGE_INSTALL_append to more than one package, type the package names separated by a space.</span> + <span class="help-block">To set IMAGE_INSTALL:append to more than one package, type the package names separated by a space.</span> </div> </div> <div class="form-group"> @@ -167,8 +167,8 @@ {% for fstype in vars_fstypes %} <input type="hidden" class="js-checkbox-fstypes-list" value="{{fstype}}"> {% endfor %} - {% for b in vars_blacklist %} - <input type="hidden" class="js-config-blacklist-name" value="{{b}}"> + {% for b in vars_disallowed %} + <input type="hidden" class="js-config-disallowed-name" value="{{b}}"> {% endfor %} {% for b in vars_managed %} <input type="hidden" class="js-config-managed-name" value="{{b}}"> @@ -201,12 +201,12 @@ <p>Toaster cannot set any variables that impact 1) the configuration of the build servers, or 2) where artifacts produced by the build are stored. Such variables include: </p> <p> - <code><a href="http://www.yoctoproject.org/docs/1.6.1/ref-manual/ref-manual.html#var-BB_DISKMON_DIRS" target="_blank">BB_DISKMON_DIRS</a></code> - <code><a href="http://www.yoctoproject.org/docs/1.6.1/ref-manual/ref-manual.html#var-BB_NUMBER_THREADS" target="_blank">BB_NUMBER_THREADS</a></code> + <code><a href="http://docs.yoctoproject.org/ref-manual/variables.html#term-BB_DISKMON_DIRS" target="_blank">BB_DISKMON_DIRS</a></code> + <code><a href="http://docs.yoctoproject.org/ref-manual/variables.html#term-BB_NUMBER_THREADS" target="_blank">BB_NUMBER_THREADS</a></code> <code>CVS_PROXY_HOST</code> <code>CVS_PROXY_PORT</code> - <code><a href="http://www.yoctoproject.org/docs/1.6.1/ref-manual/ref-manual.html#var-PARALLEL_MAKE" target="_blank">PARALLEL_MAKE</a></code> - <code><a href="http://www.yoctoproject.org/docs/1.6.1/ref-manual/ref-manual.html#var-TMPDIR" target="_blank">TMPDIR</a></code></p> + <code><a href="http://docs.yoctoproject.org/ref-manual/variables.html#term-PARALLEL_MAKE" target="_blank">PARALLEL_MAKE</a></code> + <code><a href="http://docs.yoctoproject.org/ref-manual/variables.html#term-TMPDIR" target="_blank">TMPDIR</a></code></p> <p>Plus the following standard shell environment variables:</p> <p><code>http_proxy</code> <code>ftp_proxy</code> <code>https_proxy</code> <code>all_proxy</code></p> </div> @@ -238,9 +238,9 @@ function validate_new_variable() { } } - var blacklist_configvars = document.getElementsByClassName('js-config-blacklist-name'); - for (var i = 0, length = blacklist_configvars.length; i < length; i++) { - if (blacklist_configvars[i].value.toUpperCase() == variable.toUpperCase()) { + var disallowed_configvars = document.getElementsByClassName('js-config-disallowed-name'); + for (var i = 0, length = disallowed_configvars.length; i < length; i++) { + if (disallowed_configvars[i].value.toUpperCase() == variable.toUpperCase()) { error_msg = "You cannot edit this variable in Toaster because it is set by the build servers"; } } @@ -771,10 +771,10 @@ $(document).ready(function() { {% if image_install_append_defined %} - // init IMAGE_INSTALL_append trash icon + // init IMAGE_INSTALL:append trash icon setDeleteTooltip($('#delete-image_install-icon')); - // change IMAGE_INSTALL_append variable + // change IMAGE_INSTALL:append variable $('#change-image_install-icon').click(function() { // preset the edit value var current_val = $("span#image_install").text().trim(); @@ -814,7 +814,7 @@ $(document).ready(function() { $('#apply-change-image_install').click(function(){ // insure these non-empty values have single space prefix var value = " " + $('#new-image_install').val().trim(); - postEditAjaxRequest({"configvarChange" : 'IMAGE_INSTALL_append:'+value}); + postEditAjaxRequest({"configvarChange" : 'IMAGE_INSTALL:append:'+value}); $('#image_install').text(value); $('#image_install').removeClass('text-muted'); $("#change-image_install-form").slideUp(function () { @@ -826,10 +826,10 @@ $(document).ready(function() { }); }); - // delete IMAGE_INSTALL_append variable value + // delete IMAGE_INSTALL:append variable value $('#delete-image_install-icon').click(function(){ $(this).tooltip('hide'); - postEditAjaxRequest({"configvarChange" : 'IMAGE_INSTALL_append:'+''}); + postEditAjaxRequest({"configvarChange" : 'IMAGE_INSTALL:append:'+''}); $('#image_install').parent().fadeOut(1000, function(){ $('#image_install').addClass('text-muted'); $('#image_install').text('Not set'); @@ -1011,7 +1011,7 @@ $(document).ready(function() { $(".save").attr("disabled","disabled"); // Reload page if admin-removed core managed value is manually added back in - if (0 <= " DISTRO DL_DIR IMAGE_FSTYPES IMAGE_INSTALL_append PACKAGE_CLASSES SSTATE_DIR ".indexOf( " "+variable+" " )) { + if (0 <= " DISTRO DL_DIR IMAGE_FSTYPES IMAGE_INSTALL:append PACKAGE_CLASSES SSTATE_DIR ".indexOf( " "+variable+" " )) { // delayed reload to avoid race condition with postEditAjaxRequest do_reload=true; } diff --git a/lib/toaster/toastergui/templates/recipe.html b/lib/toaster/toastergui/templates/recipe.html index 3f76e656f..4b5301b54 100644 --- a/lib/toaster/toastergui/templates/recipe.html +++ b/lib/toaster/toastergui/templates/recipe.html @@ -186,9 +186,9 @@ <i class="icon-question-sign get-help hover-help" title="{{task.get_outcome_help}}"></i> </td> <td> - {% ifnotequal task.sstate_result task.SSTATE_NA %} + {% if task.sstate_result != task.SSTATE_NA %} {{task.get_sstate_result_display}} - {% endifnotequal %} + {% endif %} </td> </tr> diff --git a/lib/toaster/toastergui/templates/target.html b/lib/toaster/toastergui/templates/target.html index 1924a0dad..d5f60e77a 100644 --- a/lib/toaster/toastergui/templates/target.html +++ b/lib/toaster/toastergui/templates/target.html @@ -8,11 +8,11 @@ {% block nav-target %} {% for t in build.get_sorted_target_list %} - {% ifequal target.pk t.pk %} + {% if target.pk == t.pk %} <li class="active"><a href="{% url 'target' build.pk t.pk %}">{{t.target}}</a><li> {% else %} <li><a href="{% url 'target' build.pk t.pk %}">{{t.target}}</a><li> - {% endifequal %} + {% endif %} {% endfor %} {% endblock %} |