Updated layout files.

Tássia Camões Araújo
1 parent 40247ad1
Showing 5 changed files with 80 additions and 25 deletions Show diff stats
src/web/templates/about.html
src/web/templates/apprec.html
src/web/templates/index.html
src/web/templates/layout.html
src/web/templates/survey_index.html
@@ -3,23 +3,23 @@ $var mod = &#39;about&#39;;
 $var cssfiles:
 $var jsfiles:
-
 <div id="maincontent">
 <div class="innertube">
 <img style="float: right;" alt="AppRecommender logo" src="/static/images/logo.png" width="150px" />
-<h1>What is this?</h1>
-
-<p>
-AppRecommender is a project in development that aims to provide solutions
-for application recommendation at the GNU/Linux world. It was initially thought
-as a Debian package recommender, but considering the multi-distro effort in
-providing platform independent solutions, it should also follow this
-principle.
-</p>
+<h1>About</h1>
+<p>This experiment aims to compare and validate automated application
+recommendations produced by various strategies and algorithms tunnings. Asking
+real users about the relevance of the recommendation is the closest we can get
+of the real accuracy of the recommender system.</p>
+<p>The engine that is being tested is a free software called <a
+href="http://github.com/tassia/AppRecommender">AppRecommender</a>. It was
+initially developed using the Debian Project infrasctructure, but the solution
+is essentially distro-independent and could even be adapted to non GNU/Linux
+systems given that there was available data for that.</p>
 </div><!-- id="innertube" -->
 </div><!-- id="maincontent" -->
@@ -41,7 +41,6 @@ $$(document).ready(function() {
 });
 </script>
-
 <div id="sidebar">
 <div class="innertube">
@@ -86,5 +85,3 @@ $for strategy, result in recommends.items():
 </div><!-- class="innertube" -->
 </div><!-- id="maincontent" -->
-
-
@@ -670,18 +670,17 @@ function showtags(tagid) {
 <h1>You might also like...</h1>
 <p>Provide a list of packages or upload a popcon submission file and you'll get
-a list of suggested packages automatically computed by AppRecommender. You can
-customize the recommender setup or let it randomly choose one.</p>
+a list of suggested packages automatically computed by AppRecommender.<!-- You can
+customize the recommender setup or let it randomly choose one.--></p> 
-<p>Please fill the form that follows the recommendation results. Your
+<p>Given the recommendation result, please evaluate each application and
+choose if you want to continue with another round of suggestions.
+<!--fill the form that follows the recommendation results.--> </p><p>Your
 feedback is very much appreciated!</p>
-
-<p>Enjoy it :)</p>
 </div>
 </div><!-- class="innertube" -->
 </div><!-- id="maincontent" -->
-
@@ -59,7 +59,7 @@ if (x==null || x==&quot;Write your list App here or send a file list this icon:&quot;)
       <fieldset>
 	<div id="submit-box">
 	<input type="submit" value="RECOMMENDER" id="submit-button"><br />
-        <a id="advanced-button">advanced query?</a>
+        <!--<a id="advanced-button">advanced query?</a>-->
 	</div>
 	<div id="input-box">
 	  <a href="#attachfile" rel="facebox" id="upfile"><span style="display: none;">Upload a file.</span></a>
@@ -165,16 +165,15 @@ $:content
  <div id="footer">
   <div id="navbar">
-     <ul> 
+     <ul>
 	<li><a href="$url_base">Home</a></li>
 	<li><a href="$url_base/about">About</a></li>
-	<li><a href="$url_base/support">Support</a></li>
 	<li><a href="http://github.com/tassia/AppRecommender">Development</a></li>
     </ul>
    </div><!-- id="navbar" -->
-  <p id="copyright">
-   Copyright © 2011 AppRecommender.  Debian is a registered trademark of Software in the Public Interest, Inc.
-  </p>
+<!--  <p id="copyright">
+   Copyright © 2011 AppRecommender team.
+  </p> -->
  </div><!-- id="footer" -->
@@ -0,0 +1,60 @@
+$var title: Survey
+$var mod = 'index';
+$var cssfiles: static/css/tabs.css static/css/debtags.css static/css/facebox.css 
+$var jsfiles: static/js/facebox.js
+
+
+<!-- Dynamic form -->
+<script type="application/x-javascript">
+window.onload = function() {
+    setupDependencies('weboptions'); //name of form(s). Seperate each with a comma (ie: 'weboptions', 'myotherform' )
+  };
+</script>
+
+<script type="application/x-javascript">
+$$(document).ready(function() {
+ $$('a[rel*=facebox]').facebox({
+ loadingImage : '/static/images/loading.gif',
+ closeImage   : '/static/images/closelabel.png'
+ });
+ $$("#tags-box").click(function () {
+ $$("#tags-box").hide(1000);
+ });
+
+});
+</script>
+
+
+<div id="sidebar">
+<div class="innertube">
+
+
+<br style="clear: both" />
+</div><!-- class="innertube" -->
+</div><!-- id="sidebar" -->
+
+<div id="maincontent">
+<div class="innertube">
+
+<div class="textbox">
+<h1>Help us learn your needs!</h1>
+
+<p>Participate in this survey and contribute for the development of
+AppRecommender, a recommender system for GNU/Linux applications.</p>
+<br />
+<p>Please provide the list of packages installed in a real running system,
+by uploading a popcon submission or the file generated with the command:
+"dpkg -l > packages_list".</p>
+
+<p>Evaluate at least 10 suggested applications and identify yourself if you
+wish to. Upon the completion of this survey there will be a thank you page
+listing all identified participant.</p>
+
+<p>Your help is very much appreciated!</p>
+
+</div>
+
+</div><!-- class="innertube" -->
+</div><!-- id="maincontent" -->
+
+
@@ -0,0 +1,60 @@		@@ -0,0 +1,60 @@
	1	+$var title: Survey
	2	+$var mod = 'index';
	3	+$var cssfiles: static/css/tabs.css static/css/debtags.css static/css/facebox.css
	4	+$var jsfiles: static/js/facebox.js
	5	+
	6	+
	7	+<!-- Dynamic form -->
	8	+<script type="application/x-javascript">
	9	+window.onload = function() {
	10	+ setupDependencies('weboptions'); //name of form(s). Seperate each with a comma (ie: 'weboptions', 'myotherform' )
	11	+ };
	12	+</script>
	13	+
	14	+<script type="application/x-javascript">
	15	+$$(document).ready(function() {
	16	+ $$('a[rel*=facebox]').facebox({
	17	+ loadingImage : '/static/images/loading.gif',
	18	+ closeImage : '/static/images/closelabel.png'
	19	+ });
	20	+ $$("#tags-box").click(function () {
	21	+ $$("#tags-box").hide(1000);
	22	+ });
	23	+
	24	+});
	25	+</script>
	26	+
	27	+
	28	+<div id="sidebar">
	29	+<div class="innertube">
	30	+
	31	+
	32	+<br style="clear: both" />
	33	+</div><!-- class="innertube" -->
	34	+</div><!-- id="sidebar" -->
	35	+
	36	+<div id="maincontent">
	37	+<div class="innertube">
	38	+
	39	+<div class="textbox">
	40	+<h1>Help us learn your needs!</h1>
	41	+
	42	+<p>Participate in this survey and contribute for the development of
	43	+AppRecommender, a recommender system for GNU/Linux applications.</p>
	44	+<br />
	45	+<p>Please provide the list of packages installed in a real running system,
	46	+by uploading a popcon submission or the file generated with the command:
	47	+"dpkg -l > packages_list".</p>
	48	+
	49	+<p>Evaluate at least 10 suggested applications and identify yourself if you
	50	+wish to. Upon the completion of this survey there will be a thank you page
	51	+listing all identified participant.</p>
	52	+
	53	+<p>Your help is very much appreciated!</p>
	54	+
	55	+</div>
	56	+
	57	+</div><!-- class="innertube" -->
	58	+</div><!-- id="maincontent" -->
	59	+
	60	+