diff options
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates/importlayer.html')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/importlayer.html | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/importlayer.html b/bitbake/lib/toaster/toastergui/templates/importlayer.html index 6b2111a1f4..5ef8a5786c 100644 --- a/bitbake/lib/toaster/toastergui/templates/importlayer.html +++ b/bitbake/lib/toaster/toastergui/templates/importlayer.html | |||
@@ -51,26 +51,51 @@ | |||
51 | <div class="control-group" id="layer-name-ctrl"> | 51 | <div class="control-group" id="layer-name-ctrl"> |
52 | <label class="control-label" for="import-layer-name"> | 52 | <label class="control-label" for="import-layer-name"> |
53 | Layer name | 53 | Layer name |
54 | <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" /> | 54 | <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"></span> |
55 | </label> | 55 | </label> |
56 | <div class="controls"> | 56 | <div class="controls"> |
57 | <input id="import-layer-name" type="text" required autofocus> | 57 | <input id="import-layer-name" type="text" required autofocus data-autocomplete="off" data-provide="typeahead"> |
58 | <span class="help-inline" style="display: none;" id="invalid-layer-name-hint">A valid layer name can only include letters, numbers and dashes</span> | 58 | <span class="help-inline" style="display: none;" id="invalid-layer-name-hint">A valid layer name can only include letters, numbers and dashes</span> |
59 | <span class="help-inline" style="display: none;" id="duplicated-layer-name-hint"></span> | 59 | <span class="help-inline" style="display: none;" id="duplicated-layer-name-hint"></span> |
60 | </div> | 60 | </div> |
61 | 61 | ||
62 | </div> | 62 | </div> |
63 | <span id="duplicate-layer-info" style="display:none"> | ||
64 | <div class="alert warning"> | ||
65 | <h3>A layer called <a href="" class="dup-layer-link"><span class="dup-layer-name"></span></a> already exists</h3> | ||
66 | <p>Layer names must be unqiue. Please use a different layer name.</p> | ||
67 | </div> | ||
68 | <dl> | ||
69 | <dt> | ||
70 | The <span class="dup-layer-name"></span> repository url is | ||
71 | </dt> | ||
72 | <dd> | ||
73 | <span id="dup-layer-vcs-url"></span> | ||
74 | </dd> | ||
75 | |||
76 | <dt> | ||
77 | The <span class="dup-layer-name"></span> revision is | ||
78 | </dt> | ||
79 | <dd> | ||
80 | <span id="dup-layer-revision"></span> | ||
81 | </dd> | ||
82 | </dl> | ||
83 | |||
84 | <p><a href="" class="dup-layer-link">View the <span class="dup-layer-name"></span> layer information</a></p> | ||
63 | 85 | ||
86 | </span> | ||
87 | |||
88 | <span class="fields-apart-from-layer-name"> | ||
64 | <label for="layer-git-repo-url" class="project-form"> | 89 | <label for="layer-git-repo-url" class="project-form"> |
65 | Git repository URL | 90 | Git repository URL |
66 | <span class="icon-question-sign get-help" title="Fetch/clone URL of the repository. Currently, Toaster only supports Git repositories." /> | 91 | <span class="icon-question-sign get-help" title="Fetch/clone URL of the repository. Currently, Toaster only supports Git repositories." ></span> |
67 | </label> | 92 | </label> |
68 | 93 | ||
69 | <input type="text" id="layer-git-repo-url" class="input-xxlarge" required> | 94 | <input type="text" id="layer-git-repo-url" class="input-xxlarge" required> |
70 | <label class="project-form" for="layer-subdir"> | 95 | <label class="project-form" for="layer-subdir"> |
71 | Repository subdirectory | 96 | Repository subdirectory |
72 | <span class="muted">(optional)</span> | 97 | <span class="muted">(optional)</span> |
73 | <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)" /> | 98 | <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)"></span> |
74 | </label> | 99 | </label> |
75 | <input type="text" id="layer-subdir"> | 100 | <input type="text" id="layer-subdir"> |
76 | 101 | ||
@@ -83,13 +108,16 @@ | |||
83 | <span class="help-inline" style="diaply:none;" id="invalid-layer-revision-hint"></span> | 108 | <span class="help-inline" style="diaply:none;" id="invalid-layer-revision-hint"></span> |
84 | </div> | 109 | </div> |
85 | </div> | 110 | </div> |
111 | </span> | ||
86 | 112 | ||
87 | </fieldset> | 113 | </fieldset> |
114 | |||
115 | <span class="fields-apart-from-layer-name"> | ||
88 | <fieldset class="air"> | 116 | <fieldset class="air"> |
89 | <legend> | 117 | <legend> |
90 | Layer dependencies | 118 | Layer dependencies |
91 | <span class="muted">(optional)</span> | 119 | <span class="muted">(optional)</span> |
92 | <span class="icon-question-sign get-help heading-help" title="Other layers this layer depends upon" /> | 120 | <span class="icon-question-sign get-help heading-help" title="Other layers this layer depends upon"></span> |
93 | </legend> | 121 | </legend> |
94 | <ul class="unstyled configuration-list" id="layer-deps-list"> | 122 | <ul class="unstyled configuration-list" id="layer-deps-list"> |
95 | </ul> | 123 | </ul> |
@@ -105,6 +133,7 @@ | |||
105 | <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> | 133 | <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> |
106 | <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> | 134 | <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> |
107 | </div> | 135 | </div> |
136 | </span> | ||
108 | </form> | 137 | </form> |
109 | 138 | ||
110 | {% endblock %} | 139 | {% endblock %} |