Commit 9acf4d5bd7284ec8f5d4e37788b1532dee1d949b

Authored by Tássia Camões Araújo
2 parents b0897954 d6f82a87
Exists in master and in 1 other branch add_vagrant

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

src/web/static/css/style.css
... ... @@ -43,7 +43,7 @@ abbr, acronym {
43 43 /*-----------------------------------------*/
44 44 body {
45 45 font-family: sans-serif;
46   - font-size: 11pt;
  46 + font-size: 10.5pt;
47 47 background-color: #ebedef;
48 48 margin: 0;
49 49 padding: 0;
... ... @@ -464,11 +464,11 @@ div.jGrowl div.jGrowl-closer {
464 464 }
465 465  
466 466 .imgcaption .smaller {
467   - font-size: 80%;
  467 + font-size: 90%;
468 468 }
469 469  
470 470 .smaller {
471   - font-size: 80%;
  471 + font-size: 90%;
472 472 }
473 473  
474 474 #debtags-area {
... ...
src/web/templates/index.html
1 1 $var title: Home
2 2 $var mod = 'index';
3 3  
4   -<div class="graybox">
5   -<h1>You might also like these packages...</h1>
  4 +<table><tr><td class="noborder">
  5 +<div class="textbox">
  6 +<h1>You might also like...</h1>
6 7  
7 8 <p>Provide a list of packages or upload a popcon submission file and you'll get
8 9 a list of suggested packages automatically computed by AppRecommender. You can
9   -customize the recommender setup or let it randomly choose a setup for you.</p>
  10 +customize the recommender setup or let it randomly choose one.</p>
  11 +
  12 +<p>Please fill the form that follows the recommendation results. Your
  13 +feedback is very much appreciated!</p>
10 14  
11 15 <p>Enjoy it :)</p>
12 16 </div>
  17 +</td>
  18 +<td class="noborder">
13 19  
14 20 <!--<div class="align-right"><img alt="AppRecommender logo"
15 21 src="/static/images/AppRecommender-logo.jpg" width="320" /></div>-->
... ... @@ -29,9 +35,6 @@ function toggle() {
29 35 }
30 36 </script>
31 37  
32   -<p>Please fill in the form that follows the recommendation results. Your
33   -feedback is very much appreciated!</p> Or want to try a <a id="displayText"
34   -href="javascript:toggle();">custom</a> query setup...?
35 38  
36 39 <form action="apprec" enctype="multipart/form-data" method="post" name="weboptions">
37 40 <fieldset>
... ... @@ -42,43 +45,52 @@ href=&quot;javascript:toggle();&quot;&gt;custom&lt;/a&gt; query setup...?
42 45 <div>
43 46 <label>Packages list</label><textarea rows="2" cols="33" name="pkgs_list" id="pkgs_list"></textarea>
44 47 </div>
45   - <div>
46   - <label>Profile size</label><input type="text" name="profile_size" value="10" size="4">
47   - </div>
48   - <div>
49   - <label>Recommendations</label><input type="text" name="limit" value="10" size="4">
50   - </div>
51 48 </fieldset>
52 49  
53 50 <div id="toggleText" style="display: none">
54 51 <fieldset>
55   - <legend>Weighting scheme</legend>
  52 + <legend>General</legend>
  53 + <div>
  54 + <label><input type="hidden">Profile size:</label>
  55 + </div>
56 56 <div>
57   - <input type="radio" name="weight" value="BM25" checked ><label> BM25</label>
  57 + <label class="special"><input type="text" name="profile_size" value="10" size="4"></label>
58 58 </div>
  59 + <div>
  60 + <label><input type="hidden">Recommendations:</label>
  61 + </div>
59 62 <div>
60   - <input type="radio" name="weight" value="trad"><label> Traditional</label>
  63 + <label class="special"><input type="text" name="limit" value="10" size="4"></label>
  64 + </div>
  65 + <div>
  66 + <label><input type="hidden">Weighting:</label>
  67 + </div>
  68 + <div>
  69 + <label class="special"><input type="radio" name="weight" value="BM25" checked > BM25</label>
61 70 </div>
62   - </fieldset>
63   - <fieldset>
64   - <legend>Strategy</legend>
65 71 <div>
66   - <input type="radio" name="strategy" value="content" checked><label> Content-based</label>
  72 + <label class="special"><input type="radio" name="weight" value="trad"> Traditional</label>
67 73 </div>
  74 + <div>
  75 + <label><input type="hidden">Strategy:</label>
  76 + </div>
68 77 <div>
69   - <input type="radio" name="strategy" value="collab"><label> Collaborative</label>
  78 + <label class="special"><input type="radio" name="strategy" value="content" checked> Content-based</label>
70 79 </div>
71 80 <div>
72   - <input type="radio" name="strategy" value="hybrid"><label> Hybrid</label>
  81 + <label class="special"><input type="radio" name="strategy" value="collab"> Collaborative</label>
  82 + </div>
  83 + <div>
  84 + <label class="special"><input type="radio" name="strategy" value="hybrid"> Hybrid</label>
73 85 </div>
74 86 </fieldset>
75 87 <fieldset>
76 88 <legend>Tuning up</legend>
77 89 <div>
78   - <label><input type="hidden" class="DEPENDS ON strategy BEING content OR strategy BEING hybrid"><b>Content representation:</b></label>
  90 + <label><input type="hidden" class="DEPENDS ON strategy BEING content OR strategy BEING hybrid">Content representation:</label>
79 91 </div>
80 92 <div>
81   - <label class="special"><input type="radio" name="content" value="tag" class="DEPENDS ON strategy BEING content OR strategy BEING hybrid"> tag</label>
  93 + <label class="special"><input type="radio" name="content" value="tag" checked class="DEPENDS ON strategy BEING content OR strategy BEING hybrid"> tag</label>
82 94 </div>
83 95 <div>
84 96 <label class="special"><input type="radio" name="content" value="desc" class="DEPENDS ON strategy BEING content OR strategy BEING hybrid"> description</label>
... ... @@ -87,39 +99,44 @@ href=&quot;javascript:toggle();&quot;&gt;custom&lt;/a&gt; query setup...?
87 99 <label class="special"><input type="radio" name="content" value="full" class="DEPENDS ON strategy BEING content OR strategy BEING hybrid"> both</label>
88 100 </div>
89 101 <div>
90   - <label><input type="hidden" class="DEPENDS ON strategy BEING collab OR strategy BEING hybrid"><b>Clustering:</b></label>
  102 + <label><input type="hidden" class="DEPENDS ON strategy BEING collab OR strategy BEING hybrid">Clustering:</label>
91 103 </div>
92 104 <div>
93   - <label class="special"><input type="radio" name="cluster" value="True" class="DEPENDS ON strategy BEING collab OR strategy BEING hybrid"> yes</label>
  105 + <label class="special"><input type="radio" name="cluster" checked value="True" class="DEPENDS ON strategy BEING collab OR strategy BEING hybrid"> yes</label>
94 106 </div>
95 107 <div>
96 108 <label class="special"><input type="radio" name="cluster" value="False" class="DEPENDS ON strategy BEING collab OR strategy BEING hybrid"> no</label>
97 109 </div>
98 110 <div>
99   - <label><input type="hidden" class="DEPENDS ON strategy BEING hybrid"><b>Neighborhood:</b></label>
  111 + <label><input type="hidden" class="DEPENDS ON strategy BEING hybrid">Neighborhood:</label>
100 112 </div>
101 113 <div>
102   - <label class="special"><input type="text" name="neighbours" class="DEPENDS ON strategy BEING collab OR strategy BEING hybrid" value="50" size="4"></label>
  114 + <label class="special"><input type="text" name="neighbours" class="DEPENDS ON strategy BEING hybrid" value="50" size="4"></label>
103 115 </div>
104 116 <div>
105   - <label><input type="hidden" class="DEPENDS ON strategy BEING hybrid"><b>Personal profile:</b></label>
  117 + <label><input type="hidden" class="DEPENDS ON strategy BEING hybrid">Personal profile:</label>
106 118 </div>
107 119 <div>
108   - <label class=special><input type="checkbox" name="profile_desktop" class="DEPENDS ON strategy BEING hybrid"> Desktop</label>
  120 + <label class=special><input type="checkbox" name="profile_desktop" class="DEPENDS ON strategy BEING hybrid" checked> Desktop</label>
109 121 </div>
110 122 <div>
111   - <label class=special><input type="checkbox" name="profile_admin" class="DEPENDS ON strategy BEING hybrid"> Admin</label>
  123 + <label class=special><input type="checkbox" name="profile_admin" class="DEPENDS ON strategy BEING hybrid" checked> Admin</label>
112 124 </div>
113 125 <div>
114   - <label class=special><input type="checkbox" name="profile_devel" class="DEPENDS ON strategy BEING hybrid"> Devel</label>
  126 + <label class=special><input type="checkbox" name="profile_devel" class="DEPENDS ON strategy BEING hybrid" checked> Devel</label>
115 127 </div>
116 128 <div>
117   - <label class=special><input type="checkbox" name="profile_science" class="DEPENDS ON strategy BEING hybrid"> Science</label>
  129 + <label class=special><input type="checkbox" name="profile_science" class="DEPENDS ON strategy BEING hybrid" checked> Science</label>
118 130 </div>
119 131 <div>
120   - <label class=special><input type="checkbox" name="profile_arts" class="DEPENDS ON strategy BEING hybrid"> Arts</label>
  132 + <label class=special><input type="checkbox" name="profile_arts" class="DEPENDS ON strategy BEING hybrid" checked> Arts</label>
121 133 </div>
122 134 </fieldset>
123 135 </div>
  136 +Want to try a <a id="displayText"
  137 +href="javascript:toggle();">custom</a> query setup?
124 138 <div class="align-right"><input type="submit"></div>
125 139 </form>
  140 +
  141 +</td></tr>
  142 +</table>
... ...