summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/toastergui
diff options
context:
space:
mode:
authorSujith H <sujith.h@gmail.com>2016-07-19 07:51:50 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-11 00:09:28 +0100
commitc2c58a1879de1b76c380e098075eebf498b1d3f9 (patch)
treedaa0ece37b9a3e7814fe20aa678a1b03d9c5521a /bitbake/lib/toaster/toastergui
parent953ba7a221ff6a4f1472e686899d167e749126ef (diff)
downloadpoky-c2c58a1879de1b76c380e098075eebf498b1d3f9.tar.gz
bitbake: toaster: add import of local directory to UI
This patch will help to add local directory to UI. The modification is made in importlayer.html file. The radio buttons are created to separate selection of git based repo and local directory. Co-Author: Belen Barros Pena <belen.barros.pena@linux.intel.com> [YOCOT #9911] (Bitbake rev: 78e5edb8ed4bf6c8b0fb87fcf17a82485c145920) Signed-off-by: Sujith H <sujith.h@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui')
-rw-r--r--bitbake/lib/toaster/toastergui/templates/importlayer.html184
1 files changed, 106 insertions, 78 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/importlayer.html b/bitbake/lib/toaster/toastergui/templates/importlayer.html
index dd81f2f379..eb0244090b 100644
--- a/bitbake/lib/toaster/toastergui/templates/importlayer.html
+++ b/bitbake/lib/toaster/toastergui/templates/importlayer.html
@@ -26,16 +26,14 @@
26 </script> 26 </script>
27 27
28 <form class="col-md-11"> 28 <form class="col-md-11">
29 <span class="help-block">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>
30 <div class="alert alert-error" id="import-error" style="display:none">
31 <button type="button" class="close" data-dismiss="alert">&times;</button>
32 <h3>&nbsp;</h3>
33 <p></p>
34 <ul></ul>
35 </div>
29 <fieldset> 36 <fieldset>
30 <h2>Layer repository information</h2>
31 <span class="help-block">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>
32 <div class="alert alert-error" id="import-error" style="display:none">
33 <button type="button" class="close" data-dismiss="alert">&times;</button>
34 <h3>&nbsp;</h3>
35 <p></p>
36 <ul></ul>
37 </div>
38
39 <div class="form-group" id="layer-name-ctrl"> 37 <div class="form-group" id="layer-name-ctrl">
40 <label class="control-label" for="import-layer-name"> 38 <label class="control-label" for="import-layer-name">
41 Layer name 39 Layer name
@@ -45,82 +43,112 @@
45 <span class="help-block" style="display: none;" id="invalid-layer-name-hint">A valid layer name can only include letters, numbers and dashes</span> 43 <span class="help-block" style="display: none;" id="invalid-layer-name-hint">A valid layer name can only include letters, numbers and dashes</span>
46 <span class="help-inline" style="display: none;" id="duplicated-layer-name-hint"></span> 44 <span class="help-inline" style="display: none;" id="duplicated-layer-name-hint"></span>
47 </div> 45 </div>
48 46 </fieldset>
49 <div id="duplicate-layer-info" style="display:none"> 47 <div id="duplicate-layer-info" style="display:none">
50 <div class="alert alert-warning"> 48 <div class="alert alert-warning">
51 <h3>A layer called <a href="" class="dup-layer-link"><span class="dup-layer-name"></span></a> already exists</h3> 49 <h3>A layer called <a href="" class="dup-layer-link"><span class="dup-layer-name"></span></a> already exists</h3>
52 <p>Layer names must be unqiue. Please use a different layer name.</p> 50 <p>Layer names must be unqiue. Please use a different layer name.</p>
53 <dl> 51 <dl id="git-layer-dup" style="display:none;">
54 <dt> 52 <dt>
55 The <span class="dup-layer-name"></span> repository url is 53 The <span class="dup-layer-name"></span> repository url is
56 </dt> 54 </dt>
57 <dd> 55 <dd>
58 <span id="dup-layer-vcs-url"></span> 56 <span id="dup-layer-vcs-url"></span>
59 </dd> 57 </dd>
60 <dt> 58 <dt>
61 The <span class="dup-layer-name"></span> revision is 59 The <span class="dup-layer-name"></span> revision is
62 </dt> 60 </dt>
63 <dd> 61 <dd>
64 <span id="dup-layer-revision"></span> 62 <span id="dup-layer-revision"></span>
65 </dd> 63 </dd>
66 </dl> 64 </dl>
67 <p><a href="" class="dup-layer-link">View the <span class="dup-layer-name"></span> layer information</a></p> 65 <dl id="local-layer-dup" style="display:none;">
68 </div> 66 <dt>
67 The <span class="dup-layer-name"></span> directory is
68 </dt>
69 <dd>
70 <span id="dup-local-source-dir-name"></span>
71 </dd>
72 </dl>
73 <p><a href="" class="dup-layer-link">View the <span class="dup-layer-name"></span> layer information</a></p>
69 </div> 74 </div>
70 75 </div>
71 <div class="fields-apart-from-layer-name"> 76 <fieldset class="fields-apart-from-layer-name" id="repo-select">
72 <div class="form-group"> 77 <legend class="radioLegend">Where is the layer source code?</legend>
73 <label for="layer-git-repo-url"> 78 <div class="radio">
74 Git repository URL 79 <label>
75 <span class="glyphicon glyphicon-question-sign get-help" title="Fetch/clone URL of the repository. Currently, Toaster only supports Git repositories." ></span> 80 <input type="radio" id="git-repo-radio" name="repo" value="git" checked="checked">
76 </label> 81 In a <strong>Git repository</strong>
77 82 </label>
78 <input type="text" id="layer-git-repo-url" class="form-control" required> 83 <p class="help-block radio-help">To build the layer Toaster must be able to access the Git repository, otherwise builds will fail. Toaster will fetch and checkout your chosen Git revision every time you start a build.</p>
79 </div>
80 <div class="form-group">
81 <label for="layer-subdir">
82 Repository subdirectory
83 <span class="text-muted">(optional)</span>
84 <span class="glyphicon glyphicon-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>
85 </label>
86 <input type="text" class="form-control" id="layer-subdir">
87 </div>
88 <div class="form-group" id="layer-revision-ctrl">
89 <label for="layer-git-ref">Git revision
90 <span class="glyphicon glyphicon-question-sign get-help" title="You can provide a Git branch, a tag or a commit SHA as the revision"></span>
91 </label>
92 <input type="text" class="form-control" id="layer-git-ref" required>
93 <span class="help-inline" style="diaply:none;" id="invalid-layer-revision-hint"></span>
94 </div>
95 </div> 84 </div>
85 <div class="radio">
86 <label>
87 <input type="radio" id="local-dir-radio" name="repo" value="local">
88 In a <strong>directory</strong>
89 </label>
90 <p class="help-block radio-help">Use this option for quick layer development, by simply providing the path to the layer source code.</p>
91 </div>
92 </fieldset>
93 <fieldset class="fields-apart-from-layer-name" id="git-repo">
94 <legend>Git repository information</legend>
95 <div class="form-group">
96 <label for="layer-git-repo-url">
97 Git repository URL
98 <span class="glyphicon glyphicon-question-sign get-help" title="Fetch/clone URL of the repository. Currently, Toaster only supports Git repositories." ></span>
99 </label>
100 <input type="text" id="layer-git-repo-url" class="form-control" required>
101 </div>
102 <div class="form-group">
103 <label for="layer-subdir">
104 Repository subdirectory
105 <span class="text-muted">(optional)</span>
106 <span class="glyphicon glyphicon-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>
107 </label>
108 <input type="text" class="form-control" id="layer-subdir">
109 </div>
110 <div class="form-group" id="layer-revision-ctrl">
111 <label for="layer-git-ref">
112 Git revision
113 <span class="glyphicon glyphicon-question-sign get-help" title="You can provide a Git branch, a tag or a commit SHA as the revision"></span>
114 </label>
115 <input type="text" class="form-control" id="layer-git-ref" required>
116 <span class="help-inline" style="diaply:none;" id="invalid-layer-revision-hint"></span>
117 </div>
118 </fieldset>
96 119
120 <fieldset class="fields-apart-from-layer-name" id="local-dir" style="display:none;">
121 <legend>Layer directory information</legend>
122 <label for="local-dir-path" class="control-label">Enter the absolute path to the layer directory</label>
123 <input type="text" class="form-control" id="local-dir-path" required/>
124 <p class="help-block" id="hintError-dir-path-starts-with-slash" style="display:none;">The absolute path must start with "/".</p>
125 <p class="help-block" id="hintError-dir-path" style="display:none;">The directory path cannot include spaces or any of these characters: . \ ? % * : | " " &lt; &gt;</p>
97 </fieldset> 126 </fieldset>
98 127
99 <div class="fields-apart-from-layer-name"> 128 <fieldset class="fields-apart-from-layer-name">
100 <fieldset> 129 <legend>
101 <h2> 130 Layer dependencies
102 Layer dependencies 131 <small class="text-muted">(optional)</small>
103 <small class="text-muted">(optional)</small> 132 <span class="glyphicon glyphicon-question-sign get-help heading-help" title="Other layers this layer depends upon"></span>
104 <span class="glyphicon glyphicon-question-sign get-help heading-help" title="Other layers this layer depends upon"></span> 133 </legend>
105 </h2> 134 <ul class="list-unstyled lead" id="layer-deps-list">
106 <ul class="list-unstyled lead" id="layer-deps-list"> 135 </ul>
107 </ul> 136 <div class="form-inline">
108 <div class="form-inline"> 137 <div class="form-group">
109 <div class="form-group"> 138 <input type="text" autocomplete="off" data-minLength="1" data-autocomplete="off" data-provide="typeahead" placeholder="Type a layer name" id="layer-dependency" class="form-control">
110 <input type="text" autocomplete="off" data-minLength="1" data-autocomplete="off" data-provide="typeahead" placeholder="Type a layer name" id="layer-dependency" class="form-control">
111 </div>
112 <button class="btn btn-default" id="add-layer-dependency-btn">
113 Add layer
114 </button>
115 <span class="help-inline">You can only add layers Toaster knows about</span>
116 </div> 139 </div>
117 </fieldset> 140 <button class="btn btn-default" id="add-layer-dependency-btn">
118 <div class="top-air" id="form-actions"> 141 Add layer
119 <button class="btn btn-primary btn-lg" data-toggle="modal" id="import-and-add-btn" data-target="#dependencies-message" disabled>Import and add to project</button> 142 </button>
120 <span class="help-inline" id="import-and-add-hint" style="vertical-align: middle;">To import a layer you need to enter a layer name, a Git repository URL and a Git revision (branch, tag or commit)</span> 143 <span class="help-inline">You can only add layers Toaster knows about</span>
121 </div> 144 </fieldset>
145 <div class="top-air fields-apart-from-layer-name" id="form-actions">
146 <button class="btn btn-primary btn-lg" data-toggle="modal" id="import-and-add-btn" data-target="#dependencies-message" disabled>Import and add to project</button>
147 <span class="help-inline" id="import-git-layer-and-add-hint" style="vertical-align: middle;">To import a layer you need to enter a layer name, a Git repository URL and a Git revision (branch, tag or commit)</span>
148 <span class="help-inline" id="import-local-dir-and-add-hint" style="vertical-align: middle;display:none;">To import a layer you need to enter a layer name and the absolute path to the layer directory</span>
122 </div> 149 </div>
123 </form> 150 </div>
151</form>
124 152
125 {% else %} {#project and project release#} 153 {% else %} {#project and project release#}
126 <div class="page-header"> 154 <div class="page-header">