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

Tássia Camões Araújo
2 parents e74e28c2 d3b38af6
Showing 3 changed files with 26 additions and 28 deletions Show diff stats
src/web/templates/layout.html
src/web/templates/survey.html
src/web/templates/thanks.html
@@ -81,16 +81,12 @@ function validateForm()
     <div id="upload-slide">
 	 <fieldset>
 	<p>
-	   <label title="Upload file">Upload file: <input type="file" name="pkgs_file" size="20" /></label>
+	   <label title="Upload file">Installed packages file: <input type="file" name="pkgs_file" size="20" /></label>
 	</p>
 	<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 the generated 'packages.list' file.
-	</p>
-	<p>
-	<code> # dpkg-query --show > packages.list </code>
-	</p>
+    Format: popularity-contest submission file or any file having each package
+    as the first field of lines.
 	</div><!-- id="tip-upload" -->
 	</fieldset>
    </div><!-- id="upload-slide" -->
@@ -44,15 +44,15 @@ button below.
 <input type="hidden" name="strategy" value=$request.strategy>
 <div id="controls-form" style="display: none;" class="show-end"><!-- display show in the end form -->
 <label for="finish_button" id="tip-finish">
-   <div class="tip important">
+   <!--<div class="tip important">
    <p>Conclude your participation in this survey</p>
-   </div>
+   </div>-->
    <input id="finish-button" name="finish_button" type="submit" value="Finish" class="glass" />
 </label>
 <label for="strategy_button" id="tip-continue">
-   <div class="tip tip">
+   <!--<div class="tip tip">
    <p>Evaluate more suggestions </p>
-   </div>
+   </div>-->
    <input id="continue-button" name="strategy_button" type="submit" value="Continue" class="glass" />
 </label>
 </div><!-- id="controls-form" -->
@@ -70,25 +70,25 @@ $for pkg in pkg_details:
 			<label class="glass radioButton">
 			<input class="radio" type="radio" name="evaluation-$pkg_details.index(pkg)" value="surprising" />
 			Pleasantly surprising 
-			<div class="tip tip">
+			<!--<div class="tip tip">
 			<p>Pleasantly $pkg['package'] FIXME </p>
-			</div>
+			</div>-->
 			</label><br />
        			<label class="glass radioButton">
 			<img src="/static/images/yes-enb.JPG" alt="Yes, Good" style="float: right;">
 			<input class="radio" type="radio" name="evaluation-$pkg_details.index(pkg)" value="good" />
-			Good
-			<div class="tip tip">
+			Yes
+			<!--<div class="tip tip">
 			<p>Good $pkg['package'] FIXME </p>
-			</div>
+			</div>-->
 			</label><br />
 			<label class="glass radioButton">
 			<img src="/static/images/no-dis.JPG" alt="Poor" style="float: right;">
 			<input class="radio" type="radio" name="evaluation-$pkg_details.index(pkg)" value="poor" />
-			Poor
-			<div class="tip tip">
+			No
+			<!--<div class="tip tip">
 			<p>Poor $pkg['package'] FIXME </p>
-			</div>
+			</div>-->
 			</label>
 			<br style="clear: both;" />
 		     	</div><!-- #panel-controls -->
@@ -7,7 +7,15 @@ $var cssfiles: static/css/survey.css
 <div id="sidebar">
 <div class="innertube">
-<h2>Identification</h2>
+<center>
+<h1>Thanks!</h1>
+</center>
+<p>Thank you very much for participating in this survey.</p><br />
+
+<h2>Optional Info</h2>
+<p>Provide at least a valid e-mail address if you want to be sent the survey
+results report when it is released.</p>
+<br />
 	<form action="/thanks" method="post" enctype="multipart/form-data" name="identification_form">
 	<p>
 	<label>
@@ -298,20 +306,14 @@ $var cssfiles: static/css/survey.css
 	</p>
 	</form>
+<!--
 <br style="clear: both" />
 </div><!-- class="innertube" -->
 </div><!-- id="sidebar" -->
 <div id="maincontent">
 <div class="innertube">
-
-<center>
-<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 />
+-->
 <br style="clear: both" />
 </div><!-- class="innertube" -->