summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@linux.intel.com>2016-09-05 15:29:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-08 00:33:46 +0100
commit23056fcc736d3cd58008df5da43fd17e03959f93 (patch)
tree855d4dfef2855def1cb161cf6de20fb7fd114b24 /bitbake
parentc4fcf41d7fde7d98466a3774159369ea57f1c638 (diff)
downloadpoky-23056fcc736d3cd58008df5da43fd17e03959f93.tar.gz
bitbake: toaster: import layer Layout fixes
The layout of the import layer form was looking a bit awkward. This commit tidies things up a bit. (Bitbake rev: e5e51ca1394bc392eba99742c59d86b8e5fd5623) Signed-off-by: Belen Barros Pena <belen.barros.pena@linux.intel.com> Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/toastergui/static/css/default.css1
-rw-r--r--bitbake/lib/toaster/toastergui/templates/importlayer.html12
2 files changed, 8 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css b/bitbake/lib/toaster/toastergui/static/css/default.css
index 22510e8687..88fe864e44 100644
--- a/bitbake/lib/toaster/toastergui/static/css/default.css
+++ b/bitbake/lib/toaster/toastergui/static/css/default.css
@@ -203,6 +203,7 @@ h2 { margin-bottom: 25px; }
203 203
204/* Style the import layer form controls*/ 204/* Style the import layer form controls*/
205legend { border: none; } 205legend { border: none; }
206fieldset.fields-apart-from-layer-name { margin-top: 20px; }
206.radioLegend { margin-bottom: 0; } 207.radioLegend { margin-bottom: 0; }
207#layer-name-ctrl { margin-top: 20px; } 208#layer-name-ctrl { margin-top: 20px; }
208#import-layer-name, 209#import-layer-name,
diff --git a/bitbake/lib/toaster/toastergui/templates/importlayer.html b/bitbake/lib/toaster/toastergui/templates/importlayer.html
index eb0244090b..1f426969af 100644
--- a/bitbake/lib/toaster/toastergui/templates/importlayer.html
+++ b/bitbake/lib/toaster/toastergui/templates/importlayer.html
@@ -113,16 +113,18 @@
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> 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> 114 </label>
115 <input type="text" class="form-control" id="layer-git-ref" required> 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> 116 <span class="help-inline" style="display:none;" id="invalid-layer-revision-hint"></span>
117 </div> 117 </div>
118 </fieldset> 118 </fieldset>
119 119
120 <fieldset class="fields-apart-from-layer-name" id="local-dir" style="display:none;"> 120 <fieldset class="fields-apart-from-layer-name" id="local-dir" style="display:none;">
121 <legend>Layer directory information</legend> 121 <legend>Layer directory information</legend>
122 <label for="local-dir-path" class="control-label">Enter the absolute path to the layer directory</label> 122 <div class="form-group">
123 <input type="text" class="form-control" id="local-dir-path" required/> 123 <label for="local-dir-path" class="control-label">Enter the absolute path to the layer directory</label>
124 <p class="help-block" id="hintError-dir-path-starts-with-slash" style="display:none;">The absolute path must start with "/".</p> 124 <input type="text" class="form-control" id="local-dir-path" required/>
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> 125 <p class="help-block" id="hintError-dir-path-starts-with-slash" style="display:none;">The absolute path must start with "/".</p>
126 <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>
127 </div>
126 </fieldset> 128 </fieldset>
127 129
128 <fieldset class="fields-apart-from-layer-name"> 130 <fieldset class="fields-apart-from-layer-name">