Fixed bug with upload file format and layout issues.

Tássia Camões Araújo · root
1 parent 143f5a27
Showing 4 changed files with 27 additions and 20 deletions Show diff stats
src/web/survey.py
src/web/templates/layout.html
src/web/templates/survey.html
src/web/templates/thanks.html
@@ -97,7 +97,8 @@ class Request:
                     package_name_field = 0
                 for line in lines:
                     self.pkgs_list.append(line.split()[package_name_field])
-                    f.write(line)
+                for pkg in self.pkgs_list:
+                    f.write(pkg+'\n')
                 f.close()
     def __str__(self):
@@ -86,10 +86,10 @@ function validateForm()
 	<div id="tip-upload" class="tip important">
 	<p>
     Upload a popularity-contest submission file ('/var/log/popularity-contest')
-    or run the following command and upload generated 'packages.list' file.
+    or run the following command and upload the generated 'packages.list' file.
 	</p>
 	<p>
-	<code> # dpkg --get-selections > packages.list </code>
+	<code> # dpkg-query --show > packages.list </code>
 	</p>
 	</div><!-- id="tip-upload" -->
 	</fieldset>
@@ -170,7 +170,8 @@ $:content
 	<li><a href="http://github.com/tassia/AppRecommender">Development</a></li>
     </ul>
    </div><!-- id="navbar" -->
-   <div id="copyright"> <span> Copyright © 2011 AppRecommender team. </span>  
+   <!--<div id="copyright"> <span> Copyright © 2011 AppRecommender team.
+   </span>  -->
    </div><!-- id="copyright" -->
 <br style="clear: both;" />
  </div><!-- id="footer" -->
@@ -32,13 +32,6 @@ $var jsfiles: static/coda-slider-2.0/javascripts/jquery-1.3.2.min.js static/coda
 <input type="hidden" name="strategy" value=$request.strategy>
 <div id="controls-form" style="display: none;"><!-- display show in the end form -->
-<label for="restart_button" id="tip-restart">
-   <div class="tip note">
-    <p>Restart the survey with a new packages list.</p>
-   </div>
-   <input id="restart-button" name="restart_button" type="submit" value="Restart" class="glass" />
-</label>
-
 <label for="finish_button" id="tip-finish">
    <div class="tip important">
    <p>Conclude your participation in this survey</p>
@@ -48,9 +41,9 @@ $var jsfiles: static/coda-slider-2.0/javascripts/jquery-1.3.2.min.js static/coda
 <label for="strategy_button" id="tip-strategy">
    <div class="tip tip">
-   <p> New round of evaluations for the same list of packages and suggestions produced by a different recommendation strategy. </p>
+   <p>Evaluate more suggestions </p>
    </div>
-   <input id="strategy-button" name="strategy_button" type="submit" value="New Round" class="glass" />
+   <input id="strategy-button" name="strategy_button" type="submit" value="Continue" class="glass" />
 </label>
 </div><!-- id="controls-form" -->
@@ -64,7 +57,7 @@ $for pkg in pkg_details:
 			<label class="glass radioButton">
 			<img src="/static/images/smile-s.png" alt="Smile Surprising" style="float: right;">
 			<input class="radio" type="radio" name="evaluation-$pkg_details.index(pkg)" value="surprising" />
-			Surprising
+			Pleasantly surprising
 			</label>
        			<label class="glass radioButton">
 			<img src="/static/images/smile-g.png" alt="Smile Good" style="float: right;">
 $var title: Feedback
 $var mod = 'thanks';
 $var cssfiles: static/css/survey.css
-$var jsfiles: 
-
 <div id="maincontent">
 <div class="innertube">
@@ -10,12 +8,26 @@ $var jsfiles:
 <div class="index_include">
 <center>
-<p>Your personal identification is not mandatory, since it won't be processed
-along with the experiments results. It is collected by means of demographic
-characterization of the participants population.</p>
-
 <h1>Thanks!</h1>
 </center>
+<p>Thank you very much for participating in this survey.</p><br />
+<p>Your identification is not mandatory, though if you provide a valid e-mail
+address you'll be sent the survey results report as soon as it is released. If
+you have any further comments, please send it through the form below.</p><br />
+
+<div class=graybox>
+<h2>Identification</h2>
+<form>
+<label><input type="checkbox" name="public" value="checked">Can we publish your name
+in our thanks page?</label><br >
+<label>Name: <input type="text" name="name" value="" size="30"></label><br />
+<label>E-mail:<input type="text" name="email" value="" size="30"></label><br >
+<label>Country:<input type="text" name="country" value="" size="30"></label><br >
+<label>Comments:<textarea name="comments" value="" rows="2"
+cols="30"></textarea></label><br />
+<input type="submit" name="send_button" value="Submit" class="glass">
+</form>
+</div>
 </div>