Download as
Browse Code »

Commit 23fe5ddd4e1530be7f2f4d12ba73cd77e80648f7

Authored by Tássia Camões Araújo
1 parent c0d1836f
Exists in master and in 1 other branch add_vagrant

Layout updates.

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