Commit 1e970ec52ffce2999aa736c85d1a70dd28728808

Authored by Tássia Camões Araújo
2 parents e74e28c2 d3b38af6
Exists in master and in 1 other branch add_vagrant

Merge branch 'master' of https://github.com/tassia/AppRecommender

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
... ... @@ -44,15 +44,15 @@ button below.
44 44 <input type="hidden" name="strategy" value=$request.strategy>
45 45 <div id="controls-form" style="display: none;" class="show-end"><!-- display show in the end form -->
46 46 <label for="finish_button" id="tip-finish">
47   - <div class="tip important">
  47 + <!--<div class="tip important">
48 48 <p>Conclude your participation in this survey</p>
49   - </div>
  49 + </div>-->
50 50 <input id="finish-button" name="finish_button" type="submit" value="Finish" class="glass" />
51 51 </label>
52 52 <label for="strategy_button" id="tip-continue">
53   - <div class="tip tip">
  53 + <!--<div class="tip tip">
54 54 <p>Evaluate more suggestions </p>
55   - </div>
  55 + </div>-->
56 56 <input id="continue-button" name="strategy_button" type="submit" value="Continue" class="glass" />
57 57 </label>
58 58 </div><!-- id="controls-form" -->
... ... @@ -70,25 +70,25 @@ $for pkg in pkg_details:
70 70 <label class="glass radioButton">
71 71 <input class="radio" type="radio" name="evaluation-$pkg_details.index(pkg)" value="surprising" />
72 72 Pleasantly surprising
73   - <div class="tip tip">
  73 + <!--<div class="tip tip">
74 74 <p>Pleasantly $pkg['package'] FIXME </p>
75   - </div>
  75 + </div>-->
76 76 </label><br />
77 77 <label class="glass radioButton">
78 78 <img src="/static/images/yes-enb.JPG" alt="Yes, Good" style="float: right;">
79 79 <input class="radio" type="radio" name="evaluation-$pkg_details.index(pkg)" value="good" />
80   - Good
81   - <div class="tip tip">
  80 + Yes
  81 + <!--<div class="tip tip">
82 82 <p>Good $pkg['package'] FIXME </p>
83   - </div>
  83 + </div>-->
84 84 </label><br />
85 85 <label class="glass radioButton">
86 86 <img src="/static/images/no-dis.JPG" alt="Poor" style="float: right;">
87 87 <input class="radio" type="radio" name="evaluation-$pkg_details.index(pkg)" value="poor" />
88   - Poor
89   - <div class="tip tip">
  88 + No
  89 + <!--<div class="tip tip">
90 90 <p>Poor $pkg['package'] FIXME </p>
91   - </div>
  91 + </div>-->
92 92 </label>
93 93 <br style="clear: both;" />
94 94 </div><!-- #panel-controls -->
... ...
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" -->
... ...