Download as
Browse Code »

Commit 3c551b8895bb5284f228c04d7d0a1cf6f8b844e7

Authored by Tássia Camões Araújo
2 parents 96b1b9b8 265c3da0
Exists in master and in 1 other branch add_vagrant

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

Showing 7 changed files with 354 additions and 51 deletions   Show diff stats
src/web/static/coda-slider-2.0/stylesheets/coda-slider-2.0.css
  Diff comments   View file @3c551b8
... ... @@ -19,10 +19,10 @@
19 19 .coda-slider-no-js .coda-slider { height: 300px; overflow: auto !important; padding-right: 20px }
20 20  
21 21 /* Change the width of the entire slider (without dynamic arrows) */
22   - .coda-slider, .coda-slider .panel { width: 700px }
  22 + .coda-slider, .coda-slider .panel { width: 780px }
23 23  
24 24 /* Change margin and width of the slider (with dynamic arrows) */
25   - .coda-slider-wrapper.arrows .coda-slider, .coda-slider-wrapper.arrows .coda-slider .panel { width: 600px }
  25 + .coda-slider-wrapper.arrows .coda-slider, .coda-slider-wrapper.arrows .coda-slider .panel { width: 700px }
26 26 .coda-slider-wrapper.arrows .coda-slider { margin: 0 10px }
27 27  
28 28 /* Arrow styling
... ...
src/web/static/css/style.css
  Diff comments   View file @3c551b8
... ... @@ -44,7 +44,7 @@ html { background-color: transparent; }
44 44 :focus { outline: 0; }
45 45 caption, th, td { text-align: left; font-weight: normal; }
46 46 blockquote:before, blockquote:after, q:before, q:after { content: ""; }
47   -
  47 +p { margin-bottom: 5px; }
48 48  
49 49 /*
50 50 * Layout, font, size.. colors..
... ... @@ -66,7 +66,6 @@ margin-top: 40px;
66 66 margin-bottom: 40px;
67 67 margin-right: auto;
68 68 margin-left: auto;
69   -background-color: white;
70 69 border-radius: 10px;
71 70 box-shadow: 0 2px 20px #545454;
72 71 }
... ... @@ -407,7 +406,6 @@ font-weight: bold;
407 406  
408 407 #upload-slide,
409 408 #advanced-slide fieldset {
410   -boder: 1px solid gray;
411 409 font-size: 0.9em;
412 410 padding: 5px;
413 411 margin: 10px;
... ...
src/web/static/css/survey.css
  Diff comments   View file @3c551b8
... ... @@ -112,8 +112,15 @@ background: white;
112 112 .radioButton {
113 113 text-align: left;
114 114 vertical-align: middle;
115   -float: right;
116 115 cursor: normal;
  116 +width: 150px;
  117 +margin-bottom: 10px;
  118 +float: left;
  119 +}
  120 +
  121 +#panel-controls {
  122 +width: 180px;
  123 +float: right;
117 124 }
118 125  
119 126 #controls-form,
... ...
src/web/survey.py
  Diff comments   View file @3c551b8
... ... @@ -27,7 +27,13 @@ class About:
27 27  
28 28 class Thanks:
29 29 def POST(self):
30   - return render.thanks()
  30 + web_input = web.input()
  31 + user_id = web_input['user_id'].encode('utf8')
  32 + with open("./submissions/%s/ident" % user_id,'w') as ident:
  33 + for key in ["name","email","country","public","comments"]:
  34 + if web_input.has_key(key):
  35 + ident.write("%s: %s\n" % (key,web_input[key]))
  36 + return render.thanks_id()
31 37  
32 38 class Package:
33 39 def GET(self, pkg):
... ... @@ -97,7 +103,8 @@ class Request:
97 103 package_name_field = 0
98 104 for line in lines:
99 105 self.pkgs_list.append(line.split()[package_name_field])
100   - f.write(line)
  106 + for pkg in self.pkgs_list:
  107 + f.write(pkg+'\n')
101 108 f.close()
102 109  
103 110 def __str__(self):
... ... @@ -142,7 +149,7 @@ class Save:
142 149 if web_input.has_key('strategy_button'):
143 150 return Survey().POST()
144 151 elif web_input.has_key('finish_button'):
145   - return render.thanks()
  152 + return render.thanks(user_id)
146 153 else:
147 154 return render.survey_index()
148 155  
... ... @@ -209,6 +216,7 @@ urls = ('/', 'Index',
209 216 '/apprec', 'Survey',
210 217 '/thanks', 'Thanks',
211 218 '/save', 'Save',
  219 + '/thanks', 'Thanks',
212 220 '/about', 'About',
213 221 '/package/(.*)', 'Package'
214 222 )
... ...
src/web/templates/layout.html
  Diff comments   View file @3c551b8
... ... @@ -59,14 +59,14 @@ function validateForm()
59 59  
60 60 <body class="$content.mod">
61 61  
62   -<div id="wrap" class="glass">
  62 +<div id="wrap" class="vert-grad">
63 63 <div id="header" class="glass">
64 64 <a href="$url_base" title="AppRecommender"><h1 id="logo"><span>AppRecommender</span></h1></a>
65 65 <div id="recommender-box">
66 66 <form action="apprec" enctype="multipart/form-data" method="post" name="weboptions" onsubmit="return validateForm()">
67 67 <fieldset>
68 68 <div id="submit-box">
69   - <input type="submit" value="RECOMMENDER" id="submit-button" class="glass"><br />
  69 + <input type="submit" value="START" id="submit-button" class="glass"><br />
70 70 <a id="advanced-button">advanced query?</a>
71 71 </div>
72 72 <div id="input-box">
... ... @@ -86,10 +86,10 @@ function validateForm()
86 86 <div id="tip-upload" class="tip important">
87 87 <p>
88 88 Upload a popularity-contest submission file ('/var/log/popularity-contest')
89   - or run the following command and upload generated 'packages.list' file.
  89 + or run the following command and upload the generated 'packages.list' file.
90 90 </p>
91 91 <p>
92   - <code> # dpkg --get-selections > packages.list </code>
  92 + <code> # dpkg-query --show > packages.list </code>
93 93 </p>
94 94 </div><!-- id="tip-upload" -->
95 95 </fieldset>
... ... @@ -170,7 +170,8 @@ $:content
170 170 <li><a href="http://github.com/tassia/AppRecommender">Development</a></li>
171 171 </ul>
172 172 </div><!-- id="navbar" -->
173   - <div id="copyright"> <span> Copyright © 2011 AppRecommender team. </span>
  173 + <!--<div id="copyright"> <span> Copyright © 2011 AppRecommender team.
  174 + </span> -->
174 175 </div><!-- id="copyright" -->
175 176 <br style="clear: both;" />
176 177 </div><!-- id="footer" -->
... ...
src/web/templates/survey.html
  Diff comments   View file @3c551b8
... ... @@ -4,7 +4,6 @@ $var mod = &#39;survey&#39;;
4 4 $var cssfiles: static/coda-slider-2.0/stylesheets/coda-slider-2.0.css static/css/facebox.css static/css/survey.css
5 5 $var jsfiles: static/coda-slider-2.0/javascripts/jquery-1.3.2.min.js static/coda-slider-2.0/javascripts/jquery.coda-slider-2.0.js static/coda-slider-2.0/javascripts/jquery.easing.1.3.js static/js/facebox.js
6 6  
7   -
8 7 <script type="text/javascript">
9 8 $$(document).ready(function() {
10 9 $$("input[type=radio]").click(function () {
... ... @@ -32,25 +31,18 @@ $var jsfiles: static/coda-slider-2.0/javascripts/jquery-1.3.2.min.js static/coda
32 31 <input type="hidden" name="strategy" value=$request.strategy>
33 32 <div id="controls-form" style="display: none;"><!-- display show in the end form -->
34 33  
35   -<label for="restart_button" id="tip-restart">
36   - <div class="tip note">
37   - <p>Restart the survey with a new packages list.</p>
38   - </div>
39   - <input id="restart-button" name="restart_button" type="submit" value="Restart" class="glass" />
40   -</label>
41   -
42 34 <label for="finish_button" id="tip-finish">
43 35 <div class="tip important">
44 36 <p>Conclude your participation in this survey</p>
45 37 </div>
46   - <input id="finish-button" name="finish_button" type="submit" value="Finish" class="glass" rel="facebox" />
  38 + <input id="finish-button" name="finish_button" type="submit" value="Finish" class="glass" />
47 39 </label>
48 40  
49 41 <label for="strategy_button" id="tip-strategy">
50 42 <div class="tip tip">
51   - <p> New round of evaluations for the same list of packages and suggestions produced by a different recommendation strategy. </p>
  43 + <p>Evaluate more suggestions </p>
52 44 </div>
53   - <input id="strategy-button" name="strategy_button" type="submit" value="New Round" class="glass" />
  45 + <input id="strategy-button" name="strategy_button" type="submit" value="Continue" class="glass" />
54 46 </label>
55 47  
56 48 </div><!-- id="controls-form" -->
... ... @@ -60,33 +52,35 @@ $var jsfiles: static/coda-slider-2.0/javascripts/jquery-1.3.2.min.js static/coda
60 52 $for pkg in pkg_details:
61 53 <div class="panel">
62 54 <div class="panel-wrapper">
63   - <div id="panel-controls">
  55 + <p>
  56 + <h1 id="title_pkg">$pkg['package'] <br />
  57 + <span>$pkg['description']</span></h1>
  58 + </p>
  59 + <div id="panel-controls">
64 60 <label class="glass radioButton">
65   - <img src="/static/images/smile-s.png" alt="Smile Surprising" style="float: right;">
66 61 <input class="radio" type="radio" name="evaluation-$pkg_details.index(pkg)" value="surprising" />
67   - Surprising
68   - </label>
  62 + Pleasantly surprising
  63 + </label><br />
69 64 <label class="glass radioButton">
70   - <img src="/static/images/smile-g.png" alt="Smile Good" style="float: right;">
  65 + <img src="/static/images/yes-enb.JPG" alt="Yes, Good" style="float: right;">
71 66 <input class="radio" type="radio" name="evaluation-$pkg_details.index(pkg)" value="good" />
72 67 Good
73   - </label>
  68 + </label><br />
74 69 <label class="glass radioButton">
75   - <img src="/static/images/smile-p.png" alt="Smile Poor" style="float: right;">
  70 + <img src="/static/images/no-dis.JPG" alt="Poor" style="float: right;">
76 71 <input class="radio" type="radio" name="evaluation-$pkg_details.index(pkg)" value="poor" />
77 72 Poor
78 73 </label>
79 74 <br style="clear: both;" />
80   - </div><!-- #panel-controls -->
81   - <p>
82   - <h1 id="title_pkg">$pkg['package'] <br />
83   - <span>$pkg['description']</span></h1>
84   - </p>
  75 + <div class="screenshot">
  76 + <a class="link-thumb" rel="facebox"
  77 + href="http://screenshots.debian.net/screenshot/$pkg['package']?.jpg"
  78 + title="Screenshot of package $pkg['package']">
  79 + <img src="http://screenshots.debian.net/thumbnail/$pkg['package']"
  80 + alt="Screenshot $pkg['package']" /></a>
  81 + </div><!-- screenshot -->
  82 + </div><!-- #panel-controls -->
85 83 <div class="content-pkg">
86   - <div class="screenshot">
87   - <a class="link-thumb" rel="facebox" href="http://screenshots.debian.net/screenshot/$pkg['package']?.jpg" title="Screenshot of package $pkg['package']">
88   - <img src="http://screenshots.debian.net/thumbnail/$pkg['package']" alt="Screenshot $pkg['package']" /></a>
89   - </div><!-- .item -->
90 84 <li><b>Description</b>: <br />$:pkg['long_description']</li>
91 85 $if pkg['homepage']:
92 86 <li><b>Homepage</b>: $pkg['homepage']</li>
... ...
src/web/templates/thanks.html
  Diff comments   View file @3c551b8
1   -$var title: Feedback
  1 +$def with (user_id)
  2 +$var title: Thanks
2 3 $var mod = 'thanks';
3 4 $var cssfiles: static/css/survey.css
4   -$var jsfiles:
5 5  
6 6  
7   -<div id="maincontent">
  7 +<div id="sidebar">
8 8 <div class="innertube">
9 9  
10   -<div class="index_include">
  10 +<h2>Identification</h2>
  11 + <form action="/thanks" method="post" enctype="multipart/form-data" name="identification_form">
  12 + <p>
  13 + <label>
  14 + <input type="hidden" name="user_id" value=$user_id>
  15 + Name: <input type="text" name="name" value="" size="30">
  16 + </label></p>
  17 + <p>
  18 + <label>
  19 + E-mail:<input type="text" name="email" value="" size="30">
  20 + </label></p>
  21 + <p>
  22 + <label>
  23 + Country:
  24 + <select name="Country">
  25 + <option value="" selected="selected">Select</option>
  26 + <option value="United States">United States</option>
  27 + <option value="United Kingdom">United Kingdom</option>
  28 + <option value="Afghanistan">Afghanistan</option>
  29 + <option value="Albania">Albania</option>
  30 + <option value="Algeria">Algeria</option>
  31 + <option value="American Samoa">American Samoa</option>
  32 + <option value="Andorra">Andorra</option>
  33 + <option value="Angola">Angola</option>
  34 + <option value="Anguilla">Anguilla</option>
  35 + <option value="Antarctica">Antarctica</option>
  36 + <option value="Antigua and Barbuda">Antigua and Barbuda</option>
  37 + <option value="Argentina">Argentina</option>
  38 + <option value="Armenia">Armenia</option>
  39 + <option value="Aruba">Aruba</option>
  40 + <option value="Australia">Australia</option>
  41 + <option value="Austria">Austria</option>
  42 + <option value="Azerbaijan">Azerbaijan</option>
  43 + <option value="Bahamas">Bahamas</option>
  44 + <option value="Bahrain">Bahrain</option>
  45 + <option value="Bangladesh">Bangladesh</option>
  46 + <option value="Barbados">Barbados</option>
  47 + <option value="Belarus">Belarus</option>
  48 + <option value="Belgium">Belgium</option>
  49 + <option value="Belize">Belize</option>
  50 + <option value="Benin">Benin</option>
  51 + <option value="Bermuda">Bermuda</option>
  52 + <option value="Bhutan">Bhutan</option>
  53 + <option value="Bolivia">Bolivia</option>
  54 + <option value="Bosnia and Herzegovina">Bosnia and Herzegovina</option>
  55 + <option value="Botswana">Botswana</option>
  56 + <option value="Bouvet Island">Bouvet Island</option>
  57 + <option value="Brazil">Brazil</option>
  58 + <option value="British Indian Ocean Territory">British Indian Ocean
  59 + Territory</option>
  60 + <option value="Brunei Darussalam">Brunei Darussalam</option>
  61 + <option value="Bulgaria">Bulgaria</option>
  62 + <option value="Burkina Faso">Burkina Faso</option>
  63 + <option value="Burundi">Burundi</option>
  64 + <option value="Cambodia">Cambodia</option>
  65 + <option value="Cameroon">Cameroon</option>
  66 + <option value="Canada">Canada</option>
  67 + <option value="Cape Verde">Cape Verde</option>
  68 + <option value="Cayman Islands">Cayman Islands</option>
  69 + <option value="Central African Republic">Central African Republic</option>
  70 + <option value="Chad">Chad</option>
  71 + <option value="Chile">Chile</option>
  72 + <option value="China">China</option>
  73 + <option value="Christmas Island">Christmas Island</option>
  74 + <option value="Cocos (Keeling) Islands">Cocos (Keeling) Islands</option>
  75 + <option value="Colombia">Colombia</option>
  76 + <option value="Comoros">Comoros</option>
  77 + <option value="Congo">Congo</option>
  78 + <option value="Congo, The Democratic Republic of The">Congo, The Democratic
  79 + Republic of The</option>
  80 + <option value="Cook Islands">Cook Islands</option>
  81 + <option value="Costa Rica">Costa Rica</option>
  82 + <option value="Cote D'ivoire">Cote D'ivoire</option>
  83 + <option value="Croatia">Croatia</option>
  84 + <option value="Cuba">Cuba</option>
  85 + <option value="Cyprus">Cyprus</option>
  86 + <option value="Czech Republic">Czech Republic</option>
  87 + <option value="Denmark">Denmark</option>
  88 + <option value="Djibouti">Djibouti</option>
  89 + <option value="Dominica">Dominica</option>
  90 + <option value="Dominican Republic">Dominican Republic</option>
  91 + <option value="Ecuador">Ecuador</option>
  92 + <option value="Egypt">Egypt</option>
  93 + <option value="El Salvador">El Salvador</option>
  94 + <option value="Equatorial Guinea">Equatorial Guinea</option>
  95 + <option value="Eritrea">Eritrea</option>
  96 + <option value="Estonia">Estonia</option>
  97 + <option value="Ethiopia">Ethiopia</option>
  98 + <option value="Falkland Islands (Malvinas)">Falkland Islands
  99 + (Malvinas)</option>
  100 + <option value="Faroe Islands">Faroe Islands</option>
  101 + <option value="Fiji">Fiji</option>
  102 + <option value="Finland">Finland</option>
  103 + <option value="France">France</option>
  104 + <option value="French Guiana">French Guiana</option>
  105 + <option value="French Polynesia">French Polynesia</option>
  106 + <option value="French Southern Territories">French Southern
  107 + Territories</option>
  108 + <option value="Gabon">Gabon</option>
  109 + <option value="Gambia">Gambia</option>
  110 + <option value="Georgia">Georgia</option>
  111 + <option value="Germany">Germany</option>
  112 + <option value="Ghana">Ghana</option>
  113 + <option value="Gibraltar">Gibraltar</option>
  114 + <option value="Greece">Greece</option>
  115 + <option value="Greenland">Greenland</option>
  116 + <option value="Grenada">Grenada</option>
  117 + <option value="Guadeloupe">Guadeloupe</option>
  118 + <option value="Guam">Guam</option>
  119 + <option value="Guatemala">Guatemala</option>
  120 + <option value="Guinea">Guinea</option>
  121 + <option value="Guinea-bissau">Guinea-bissau</option>
  122 + <option value="Guyana">Guyana</option>
  123 + <option value="Haiti">Haiti</option>
  124 + <option value="Heard Island and Mcdonald Islands">Heard Island and Mcdonald
  125 + Islands</option>
  126 + <option value="Holy See (Vatican City State)">Holy See (Vatican City
  127 + State)</option>
  128 + <option value="Honduras">Honduras</option>
  129 + <option value="Hong Kong">Hong Kong</option>
  130 + <option value="Hungary">Hungary</option>
  131 + <option value="Iceland">Iceland</option>
  132 + <option value="India">India</option>
  133 + <option value="Indonesia">Indonesia</option>
  134 + <option value="Iran, Islamic Republic of">Iran, Islamic Republic
  135 + of</option>
  136 + <option value="Iraq">Iraq</option>
  137 + <option value="Ireland">Ireland</option>
  138 + <option value="Israel">Israel</option>
  139 + <option value="Italy">Italy</option>
  140 + <option value="Jamaica">Jamaica</option>
  141 + <option value="Japan">Japan</option>
  142 + <option value="Jordan">Jordan</option>
  143 + <option value="Kazakhstan">Kazakhstan</option>
  144 + <option value="Kenya">Kenya</option>
  145 + <option value="Kiribati">Kiribati</option>
  146 + <option value="Korea, Democratic People's Republic of">Korea, Democratic
  147 + People's Republic of</option>
  148 + <option value="Korea, Republic of">Korea, Republic of</option>
  149 + <option value="Kuwait">Kuwait</option>
  150 + <option value="Kyrgyzstan">Kyrgyzstan</option>
  151 + <option value="Lao People's Democratic Republic">Lao People's Democratic
  152 + Republic</option>
  153 + <option value="Latvia">Latvia</option>
  154 + <option value="Lebanon">Lebanon</option>
  155 + <option value="Lesotho">Lesotho</option>
  156 + <option value="Liberia">Liberia</option>
  157 + <option value="Libyan Arab Jamahiriya">Libyan Arab Jamahiriya</option>
  158 + <option value="Liechtenstein">Liechtenstein</option>
  159 + <option value="Lithuania">Lithuania</option>
  160 + <option value="Luxembourg">Luxembourg</option>
  161 + <option value="Macao">Macao</option>
  162 + <option value="Macedonia, The Former Yugoslav Republic of">Macedonia, The
  163 + Former Yugoslav Republic of</option>
  164 + <option value="Madagascar">Madagascar</option>
  165 + <option value="Malawi">Malawi</option>
  166 + <option value="Malaysia">Malaysia</option>
  167 + <option value="Maldives">Maldives</option>
  168 + <option value="Mali">Mali</option>
  169 + <option value="Malta">Malta</option>
  170 + <option value="Marshall Islands">Marshall Islands</option>
  171 + <option value="Martinique">Martinique</option>
  172 + <option value="Mauritania">Mauritania</option>
  173 + <option value="Mauritius">Mauritius</option>
  174 + <option value="Mayotte">Mayotte</option>
  175 + <option value="Mexico">Mexico</option>
  176 + <option value="Micronesia, Federated States of">Micronesia, Federated
  177 + States of</option>
  178 + <option value="Moldova, Republic of">Moldova, Republic of</option>
  179 + <option value="Monaco">Monaco</option>
  180 + <option value="Mongolia">Mongolia</option>
  181 + <option value="Montserrat">Montserrat</option>
  182 + <option value="Morocco">Morocco</option>
  183 + <option value="Mozambique">Mozambique</option>
  184 + <option value="Myanmar">Myanmar</option>
  185 + <option value="Namibia">Namibia</option>
  186 + <option value="Nauru">Nauru</option>
  187 + <option value="Nepal">Nepal</option>
  188 + <option value="Netherlands">Netherlands</option>
  189 + <option value="Netherlands Antilles">Netherlands Antilles</option>
  190 + <option value="New Caledonia">New Caledonia</option>
  191 + <option value="New Zealand">New Zealand</option>
  192 + <option value="Nicaragua">Nicaragua</option>
  193 + <option value="Niger">Niger</option>
  194 + <option value="Nigeria">Nigeria</option>
  195 + <option value="Niue">Niue</option>
  196 + <option value="Norfolk Island">Norfolk Island</option>
  197 + <option value="Northern Mariana Islands">Northern Mariana Islands</option>
  198 + <option value="Norway">Norway</option>
  199 + <option value="Oman">Oman</option>
  200 + <option value="Pakistan">Pakistan</option>
  201 + <option value="Palau">Palau</option>
  202 + <option value="Palestinian Territory, Occupied">Palestinian Territory,
  203 + Occupied</option>
  204 + <option value="Panama">Panama</option>
  205 + <option value="Papua New Guinea">Papua New Guinea</option>
  206 + <option value="Paraguay">Paraguay</option>
  207 + <option value="Peru">Peru</option>
  208 + <option value="Philippines">Philippines</option>
  209 + <option value="Pitcairn">Pitcairn</option>
  210 + <option value="Poland">Poland</option>
  211 + <option value="Portugal">Portugal</option>
  212 + <option value="Puerto Rico">Puerto Rico</option>
  213 + <option value="Qatar">Qatar</option>
  214 + <option value="Reunion">Reunion</option>
  215 + <option value="Romania">Romania</option>
  216 + <option value="Russian Federation">Russian Federation</option>
  217 + <option value="Rwanda">Rwanda</option>
  218 + <option value="Saint Helena">Saint Helena</option>
  219 + <option value="Saint Kitts and Nevis">Saint Kitts and Nevis</option>
  220 + <option value="Saint Lucia">Saint Lucia</option>
  221 + <option value="Saint Pierre and Miquelon">Saint Pierre and
  222 + Miquelon</option>
  223 + <option value="Saint Vincent and The Grenadines">Saint Vincent and The
  224 + Grenadines</option>
  225 + <option value="Samoa">Samoa</option>
  226 + <option value="San Marino">San Marino</option>
  227 + <option value="Sao Tome and Principe">Sao Tome and Principe</option>
  228 + <option value="Saudi Arabia">Saudi Arabia</option>
  229 + <option value="Senegal">Senegal</option>
  230 + <option value="Serbia and Montenegro">Serbia and Montenegro</option>
  231 + <option value="Seychelles">Seychelles</option>
  232 + <option value="Sierra Leone">Sierra Leone</option>
  233 + <option value="Singapore">Singapore</option>
  234 + <option value="Slovakia">Slovakia</option>
  235 + <option value="Slovenia">Slovenia</option>
  236 + <option value="Solomon Islands">Solomon Islands</option>
  237 + <option value="Somalia">Somalia</option>
  238 + <option value="South Africa">South Africa</option>
  239 + <option value="South Georgia and The South Sandwich Islands">South Georgia
  240 + and The South Sandwich Islands</option>
  241 + <option value="Spain">Spain</option>
  242 + <option value="Sri Lanka">Sri Lanka</option>
  243 + <option value="Sudan">Sudan</option>
  244 + <option value="Suriname">Suriname</option>
  245 + <option value="Svalbard and Jan Mayen">Svalbard and Jan Mayen</option>
  246 + <option value="Swaziland">Swaziland</option>
  247 + <option value="Sweden">Sweden</option>
  248 + <option value="Switzerland">Switzerland</option>
  249 + <option value="Syrian Arab Republic">Syrian Arab Republic</option>
  250 + <option value="Taiwan, Province of China">Taiwan, Province of
  251 + China</option>
  252 + <option value="Tajikistan">Tajikistan</option>
  253 + <option value="Tanzania, United Republic of">Tanzania, United Republic
  254 + of</option>
  255 + <option value="Thailand">Thailand</option>
  256 + <option value="Timor-leste">Timor-leste</option>
  257 + <option value="Togo">Togo</option>
  258 + <option value="Tokelau">Tokelau</option>
  259 + <option value="Tonga">Tonga</option>
  260 + <option value="Trinidad and Tobago">Trinidad and Tobago</option>
  261 + <option value="Tunisia">Tunisia</option>
  262 + <option value="Turkey">Turkey</option>
  263 + <option value="Turkmenistan">Turkmenistan</option>
  264 + <option value="Turks and Caicos Islands">Turks and Caicos Islands</option>
  265 + <option value="Tuvalu">Tuvalu</option>
  266 + <option value="Uganda">Uganda</option>
  267 + <option value="Ukraine">Ukraine</option>
  268 + <option value="United Arab Emirates">United Arab Emirates</option>
  269 + <option value="United Kingdom">United Kingdom</option>
  270 + <option value="United States">United States</option>
  271 + <option value="United States Minor Outlying Islands">United States Minor
  272 + Outlying Islands</option>
  273 + <option value="Uruguay">Uruguay</option>
  274 + <option value="Uzbekistan">Uzbekistan</option>
  275 + <option value="Vanuatu">Vanuatu</option>
  276 + <option value="Venezuela">Venezuela</option>
  277 + <option value="Viet Nam">Viet Nam</option>
  278 + <option value="Virgin Islands, British">Virgin Islands, British</option>
  279 + <option value="Virgin Islands, U.S.">Virgin Islands, U.S.</option>
  280 + <option value="Wallis and Futuna">Wallis and Futuna</option>
  281 + <option value="Western Sahara">Western Sahara</option>
  282 + <option value="Yemen">Yemen</option>
  283 + <option value="Zambia">Zambia</option>
  284 + <option value="Zimbabwe">Zimbabwe</option>
  285 + </select>
  286 + </label></p>
  287 + <p>
  288 + <label>
  289 + Comments:<br />
  290 + <textarea name="comments" value="" rows="2" cols="35"></textarea>
  291 + </label></p>
  292 + <p><label>
  293 + <input type="checkbox" name="public" value="checked">
  294 + Name can be published in the 'thanks' page
  295 + </label></p>
  296 + <p align="right">
  297 + <input type="submit" name="send_button" value="Submit" class="glass" id="finish-button">
  298 + </p>
  299 + </form>
11 300  
12   -<center>
13   -<p>Your personal identification is not mandatory, since it won't be processed
14   -along with the experiments results. It is collected by means of demographic
15   -characterization of the participants population.</p>
  301 +<br style="clear: both" />
  302 +</div><!-- class="innertube" -->
  303 +</div><!-- id="sidebar" -->
  304 +
  305 +<div id="maincontent">
  306 +<div class="innertube">
16 307  
  308 +<center>
17 309 <h1>Thanks!</h1>
18 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 />
19 315  
20   -</div>
21   -
  316 +<br style="clear: both" />
22 317 </div><!-- class="innertube" -->
23 318 </div><!-- id="maincontent" -->
24 319  
... ...