mirror of
https://git.yoctoproject.org/poky
synced 2026-05-02 00:32:12 +02:00
Some URLs, although invalid on their own, are used in JS to build valid page pointers. Previous patch removed two of these URLs, breaking the display of several patches. This patch re-adds these URLs with different names, and returns 400 Bad Request empty pages on them, which is consistent with the intended usage of these URLs. (Bitbake rev: 73afee5ddb2e89dcec65854639b19b8860232d89) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
111 lines
6.1 KiB
HTML
111 lines
6.1 KiB
HTML
{% extends "baseprojectpage.html" %}
|
|
{% load projecttags %}
|
|
{% load humanize %}
|
|
{% load static %}
|
|
|
|
{% block localbreadcrumb %}
|
|
<li>Import layer</li>
|
|
{% endblock %}
|
|
|
|
{% block projectinfomain %}
|
|
|
|
<script src="{% static 'js/importlayer.js' %}"></script>
|
|
<script>
|
|
$(document).ready(function (){
|
|
var ctx = {
|
|
xhrDataTypeaheadUrl : "{% url 'xhr_datatypeahead' %}",
|
|
layerDetailsUrl : "{% url 'base_layerdetails' %}",
|
|
xhrImportLayerUrl : "{% url 'xhr_importlayer' %}",
|
|
xhrEditProjectUrl : "{% url 'xhr_projectedit' project.id %}",
|
|
projectPageUrl : "{% url 'project' project.id %}",
|
|
projectId : {{project.id}}
|
|
};
|
|
|
|
try {
|
|
importLayerPageInit(ctx);
|
|
} catch (e) {
|
|
document.write("Sorry, An error has occurred loading this page");
|
|
console.warn(e);
|
|
}
|
|
});
|
|
</script>
|
|
|
|
<div class="page-header">
|
|
<h1>Import layer</h1>
|
|
</div>
|
|
|
|
{% include "layers_dep_modal.html" %}
|
|
<form>
|
|
{% if project %}
|
|
<span class="help-block" style="padding-left:19px;">The layer you are importing must be compatible with <strong>{{project.release.description}}</strong>, which is the release you are using in this project.</span>
|
|
{% endif %}
|
|
<fieldset class="air">
|
|
<legend>Layer repository information</legend>
|
|
<div class="alert alert-error" id="import-error" style="display:none">
|
|
<button type="button" class="close" data-dismiss="alert">×</button>
|
|
<h3></h3>
|
|
<p></p>
|
|
<ul></ul>
|
|
</div>
|
|
|
|
<div class="control-group" id="layer-name-ctrl">
|
|
<label class="control-label" for="import-layer-name">
|
|
Layer name
|
|
<span class="icon-question-sign get-help" title="Something like 'meta-mylayer'. Your layer name must be unique and can only include letters, numbers and dashes" />
|
|
</label>
|
|
<div class="controls">
|
|
<input id="import-layer-name" type="text" required autofocus>
|
|
<span class="help-inline" style="display: none;" id="invalid-layer-name-hint">A valid layer name can only include letters, numbers and dashes</span>
|
|
<span class="help-inline" style="display: none;" id="duplicated-layer-name-hint"></span>
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<label for="layer-git-repo-url" class="project-form">
|
|
Git repository URL
|
|
<span class="icon-question-sign get-help" title="Fetch/clone URL of the repository. Currently, Toaster only supports Git repositories." />
|
|
</label>
|
|
|
|
<input type="text" id="layer-git-repo-url" class="input-xxlarge" required>
|
|
<label class="project-form" for="layer-subdir">
|
|
Repository subdirectory
|
|
<span class="muted">(optional)</span>
|
|
<span class="icon-question-sign get-help" title="Subdirectory within the repository where the layer is located, if not in the root (usually only used if the repository contains more than one layer)" />
|
|
</label>
|
|
<input type="text" id="layer-subdir">
|
|
|
|
<div class="control-group" id="layer-revision-ctrl">
|
|
<label class="control-label project-form" for="layer-git-ref">Revision
|
|
<span class="icon-question-sign get-help" title="You can provide a Git branch, a tag or a commit SHA as the revision"></span>
|
|
</label>
|
|
<div class="controls">
|
|
<input type="text" class="span3" id="layer-git-ref" required>
|
|
<span class="help-inline" style="diaply:none;" id="invalid-layer-revision-hint"></span>
|
|
</div>
|
|
</div>
|
|
|
|
</fieldset>
|
|
<fieldset class="air">
|
|
<legend>
|
|
Layer dependencies
|
|
<span class="muted">(optional)</span>
|
|
<span class="icon-question-sign get-help heading-help" title="Other layers this layer depends upon" />
|
|
</legend>
|
|
<ul class="unstyled configuration-list" id="layer-deps-list">
|
|
</ul>
|
|
<div class="input-append">
|
|
<input type="text" autocomplete="off" data-minLength="1" data-autocomplete="off" data-provide="typeahead" placeholder="Type a layer name" id="layer-dependency" class="input-xlarge">
|
|
<a class="btn" type="button" id="add-layer-dependency-btn" disabled>
|
|
Add layer
|
|
</a>
|
|
</div>
|
|
<span class="help-inline">You can only add layers Toaster knows about</span>
|
|
</fieldset>
|
|
<div class="form-actions" id="form-actions">
|
|
<button class="btn btn-primary btn-large" data-toggle="modal" id="import-and-add-btn" data-target="#dependencies-message" disabled>Import and add to project</button>
|
|
<span class="help-inline" id="import-and-add-hint" style="vertical-align: middle;">To import a layer, you need to enter a repository URL, a branch, tag or commit and a layer name</span>
|
|
</div>
|
|
</form>
|
|
|
|
{% endblock %}
|