Layout updates.

Tássia Camões Araújo
1 parent c0d1836f
Showing 4 changed files with 21 additions and 29 deletions Show diff stats
src/web/templates/error.html
src/web/templates/layout.html
src/web/templates/survey_index.html
src/web/templates/thanks.html
@@ -14,9 +14,7 @@ $var jsfiles: static/js/facebox.js
     <h1>Welcome to AppRecommender</h1>
 </center>
-<div class="align-right"><img alt="AppRecommender logo" src="/static/Pics/AppRecommender-logo.jpg" /></div>
-
-Your request could not be proccessed due to the following error(s): 
+Your request could not be proccessed due to the following error(s):
 <div class="warning">
 <p><ul>
@@ -25,8 +23,7 @@ $for e in error_msgs:
 </ul></p>
 </div>
-<p><a href="/">Go back</a> and try again. </p>
-<p>If you believe it is a bug, please report to <a
+<p><a href="/">Go back</a> and try again. If you believe it is a bug, please report to <a
 href="mailto:tassia@gamil.com">tassia@gmail.com</a>.</p>
 </div>
@@ -35,7 +35,7 @@ function validateForm()
   var i = $$("input[name=pkgs_file]");
   if (!i.val() && ( !t.val() || t.val() == "Write your list App here or send a file list this icon:")) {
     alert("Choose your list app or create a list!");
-    return false;
+    return true;
   } else {
     if (i.val()) t.val("");
   	return true;
@@ -22,14 +22,14 @@ AppRecommender, a recommender system for GNU/Linux applications.&lt;/p&gt;
 <br />
 <p>Please provide a list of packages installed in a real running system and a
 set of applications will be suggested for it. You can upload a
-popularity-contest submission file (which is usually located at
+popularity-contest submission file (usually located at
 '/var/log/popularity-contest') or any other file with packages name as first
 field of each line. For instance, you can run the following command and upload the
 generated 'packages.list' file.</p>
 <p><code> # dpkg-query --show > packages.list </code></p>
+<br />
 <p>Given the produced recommendations you will be asked to evaluate the list of
-applications suggested. You need to analyse at least 10 sugestions to be
-considered in the survey, though we appreciate if you do as many as you can.</p>
+applications suggested.</p>
 <br />
 <p>Your help is very much appreciated!</p>
 </div>
@@ -4,33 +4,32 @@ $var mod = &#39;thanks&#39;;
 $var cssfiles: static/css/survey.css
-<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 />
 <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>
+<p>Tell us your name if you want it to be published in our <br / > thanks page.
+If you also provide a valid e-mail address <br / > you will be sent the survey
+report as soon as it is ready.</p>
 <br />
 	<form action="/thanks" method="post" enctype="multipart/form-data" name="identification_form">
 	<p>
 	<label>
     <input type="hidden" name="user_id" value=$user_id>
-	Name: <input type="text" name="name" value="" size="30">
+	Name: <input type="text" name="name" value="" size="35">
 	</label></p>
 	<p>
 	<label>
-	E-mail:<input type="text" name="email" value="" size="30">
+	E-mail: <input type="text" name="email" value="" size="35">
 	</label></p>
 	<p>
 	<label>
-	Country:
-    <select name="Country">
-    <option value="" selected="selected">Select</option>
+	Country: <select name="Country">
+    <option value="" selected="selected">--- Select ---</option>
     <option value="United States">United States</option>
     <option value="United Kingdom">United Kingdom</option>
     <option value="Afghanistan">Afghanistan</option>
@@ -294,22 +293,18 @@ results report when it is released.&lt;/p&gt;
 	</label></p>
 	<p>
 	<label>
-	Comments:<br />
-	<textarea name="comments" value="" rows="2" cols="35"></textarea>
-	</label></p>
-	<p><label>
-	<input type="checkbox" name="public" value="checked">
-	Name can be published in the 'thanks' page
+	Comments:
+	<textarea name="comments" value="" rows="2" cols="32"></textarea>
 	</label></p>
-	<p align="right">
-	<input type="submit" name="send_button" value="Submit" class="glass" id="finish-button">
-	</p>
+	<p><input type="submit" name="send_button" value="Submit" class="glass"
+    id="finish-button"><p>
 	</form>
+</center>
 <!--
 <br style="clear: both" />
-</div><!-- class="innertube" -->
-</div><!-- id="sidebar" -->
+</div>
+</div> 
 <div id="maincontent">
 <div class="innertube">
	@@ -35,7 +35,7 @@ function validateForm()		@@ -35,7 +35,7 @@ function validateForm()
35	var i = $$("input[name=pkgs_file]");	35	var i = $$("input[name=pkgs_file]");
36	if (!i.val() && ( !t.val() \|\| t.val() == "Write your list App here or send a file list this icon:")) {	36	if (!i.val() && ( !t.val() \|\| t.val() == "Write your list App here or send a file list this icon:")) {
37	alert("Choose your list app or create a list!");	37	alert("Choose your list app or create a list!");
38	- return false;	38	+ return true;
39	} else {	39	} else {
40	if (i.val()) t.val("");	40	if (i.val()) t.val("");
41	return true;	41	return true;