Commit 28fbf48b51ff79a2ba2525569dda6f5121978da8
1 parent
165d3a03
Exists in
master
and in
1 other branch
Layout fix.
Showing
3 changed files
with
26 additions
and
28 deletions
Show diff stats
src/web/templates/layout.html
| ... | ... | @@ -81,16 +81,12 @@ function validateForm() |
| 81 | 81 | <div id="upload-slide"> |
| 82 | 82 | <fieldset> |
| 83 | 83 | <p> |
| 84 | - <label title="Upload file">Upload file: <input type="file" name="pkgs_file" size="20" /></label> | |
| 84 | + <label title="Upload file">Installed packages file: <input type="file" name="pkgs_file" size="20" /></label> | |
| 85 | 85 | </p> |
| 86 | 86 | <div id="tip-upload" class="tip important"> |
| 87 | 87 | <p> |
| 88 | - Upload a popularity-contest submission file ('/var/log/popularity-contest') | |
| 89 | - or run the following command and upload the generated 'packages.list' file. | |
| 90 | - </p> | |
| 91 | - <p> | |
| 92 | - <code> # dpkg-query --show > packages.list </code> | |
| 93 | - </p> | |
| 88 | + Format: popularity-contest submission file or any file having each package | |
| 89 | + as the first field of lines. | |
| 94 | 90 | </div><!-- id="tip-upload" --> |
| 95 | 91 | </fieldset> |
| 96 | 92 | </div><!-- id="upload-slide" --> | ... | ... |
src/web/templates/survey.html
| ... | ... | @@ -31,16 +31,16 @@ $var jsfiles: static/coda-slider-2.0/javascripts/jquery-1.3.2.min.js static/coda |
| 31 | 31 | <input type="hidden" name="strategy" value=$request.strategy> |
| 32 | 32 | <div id="controls-form" style="display: none;"><!-- display show in the end form --> |
| 33 | 33 | <label for="finish_button" id="tip-finish"> |
| 34 | - <div class="tip important"> | |
| 34 | + <!--<div class="tip important"> | |
| 35 | 35 | <p>Conclude your participation in this survey</p> |
| 36 | - </div> | |
| 36 | + </div>--> | |
| 37 | 37 | <input id="finish-button" name="finish_button" type="submit" value="Finish" class="glass" /> |
| 38 | 38 | </label> |
| 39 | 39 | <br /> |
| 40 | 40 | <label for="strategy_button" id="tip-continue"> |
| 41 | - <div class="tip tip"> | |
| 41 | + <!--<div class="tip tip"> | |
| 42 | 42 | <p>Evaluate more suggestions </p> |
| 43 | - </div> | |
| 43 | + </div>--> | |
| 44 | 44 | <input id="continue-button" name="strategy_button" type="submit" value="Continue" class="glass" /> |
| 45 | 45 | </label> |
| 46 | 46 | </div><!-- id="controls-form" --> |
| ... | ... | @@ -58,25 +58,25 @@ $for pkg in pkg_details: |
| 58 | 58 | <label class="glass radioButton"> |
| 59 | 59 | <input class="radio" type="radio" name="evaluation-$pkg_details.index(pkg)" value="surprising" /> |
| 60 | 60 | Pleasantly surprising |
| 61 | - <div class="tip tip"> | |
| 61 | + <!--<div class="tip tip"> | |
| 62 | 62 | <p>Pleasantly $pkg['package'] FIXME </p> |
| 63 | - </div> | |
| 63 | + </div>--> | |
| 64 | 64 | </label><br /> |
| 65 | 65 | <label class="glass radioButton"> |
| 66 | 66 | <img src="/static/images/yes-enb.JPG" alt="Yes, Good" style="float: right;"> |
| 67 | 67 | <input class="radio" type="radio" name="evaluation-$pkg_details.index(pkg)" value="good" /> |
| 68 | - Good | |
| 69 | - <div class="tip tip"> | |
| 68 | + Yes | |
| 69 | + <!--<div class="tip tip"> | |
| 70 | 70 | <p>Good $pkg['package'] FIXME </p> |
| 71 | - </div> | |
| 71 | + </div>--> | |
| 72 | 72 | </label><br /> |
| 73 | 73 | <label class="glass radioButton"> |
| 74 | 74 | <img src="/static/images/no-dis.JPG" alt="Poor" style="float: right;"> |
| 75 | 75 | <input class="radio" type="radio" name="evaluation-$pkg_details.index(pkg)" value="poor" /> |
| 76 | - Poor | |
| 77 | - <div class="tip tip"> | |
| 76 | + No | |
| 77 | + <!--<div class="tip tip"> | |
| 78 | 78 | <p>Poor $pkg['package'] FIXME </p> |
| 79 | - </div> | |
| 79 | + </div>--> | |
| 80 | 80 | </label> |
| 81 | 81 | <br style="clear: both;" /> |
| 82 | 82 | <div class="screenshot"> | ... | ... |
src/web/templates/thanks.html
| ... | ... | @@ -7,7 +7,15 @@ $var cssfiles: static/css/survey.css |
| 7 | 7 | <div id="sidebar"> |
| 8 | 8 | <div class="innertube"> |
| 9 | 9 | |
| 10 | -<h2>Identification</h2> | |
| 10 | +<center> | |
| 11 | +<h1>Thanks!</h1> | |
| 12 | +</center> | |
| 13 | +<p>Thank you very much for participating in this survey.</p><br /> | |
| 14 | + | |
| 15 | +<h2>Optional Info</h2> | |
| 16 | +<p>Provide at least a valid e-mail address if you want to be sent the survey | |
| 17 | +results report when it is released.</p> | |
| 18 | +<br /> | |
| 11 | 19 | <form action="/thanks" method="post" enctype="multipart/form-data" name="identification_form"> |
| 12 | 20 | <p> |
| 13 | 21 | <label> |
| ... | ... | @@ -298,20 +306,14 @@ $var cssfiles: static/css/survey.css |
| 298 | 306 | </p> |
| 299 | 307 | </form> |
| 300 | 308 | |
| 309 | +<!-- | |
| 301 | 310 | <br style="clear: both" /> |
| 302 | 311 | </div><!-- class="innertube" --> |
| 303 | 312 | </div><!-- id="sidebar" --> |
| 304 | 313 | |
| 305 | 314 | <div id="maincontent"> |
| 306 | 315 | <div class="innertube"> |
| 307 | - | |
| 308 | -<center> | |
| 309 | -<h1>Thanks!</h1> | |
| 310 | -</center> | |
| 311 | -<p>Thank you very much for participating in this survey.</p><br /> | |
| 312 | -<p>Your identification is not mandatory, though if you provide a valid e-mail | |
| 313 | -address you'll be sent the survey results report as soon as it is released. If | |
| 314 | -you have any further comments, please send it through the form below.</p><br /> | |
| 316 | +--> | |
| 315 | 317 | |
| 316 | 318 | <br style="clear: both" /> |
| 317 | 319 | </div><!-- class="innertube" --> | ... | ... |