diff --git a/src/web/static/css/apprec.css b/src/web/static/css/apprec.css index e9269af..2b9f783 100755 --- a/src/web/static/css/apprec.css +++ b/src/web/static/css/apprec.css @@ -1,7 +1,39 @@ +#upload-slide { +display: block; +position: absolute; +top: 0px; +left: 0px; +padding: 0px; +} -/* - * Result Recommendation - */ +#header, +#recommender-box { +height: 40px; +} + +#submit-button { +height: 42px; +} + +#tip-upload { +top: 40px; +width: 420px; +} + +#wrap { +max-width: 780px; +} + +body.apprec #wrap { +padding-top: 20px; +} + + +#recommender-box #upfile, +#advanced-button, +#pkgs_list { +display: none; +} #result-thumbnail .item { display: block; @@ -11,6 +43,7 @@ overflow: hidden; float: left; text-align: center; border-radius: 5px; +margin-left: 30px; } #result-thumbnail .item:hover { @@ -25,7 +58,6 @@ color: gray; a.link-thumb img { -height: 100px; margin: 5px; border-radius: 4px; box-shadow: 0 1px 2px gray; @@ -83,6 +115,7 @@ cursor: pointer; #debresources_box { float: left; margin-top: 20px; +padding: 10px; } #debresources_box li { diff --git a/src/web/static/css/facebox.css b/src/web/static/css/facebox.css index 3309bb9..e85cc13 100755 --- a/src/web/static/css/facebox.css +++ b/src/web/static/css/facebox.css @@ -20,8 +20,8 @@ #facebox .content { display:table; - width: 370px; - padding: 10px; + width: 650px; + padding: 20px; background: #fff; -webkit-border-radius:4px; -moz-border-radius:4px; diff --git a/src/web/static/css/style.css b/src/web/static/css/style.css index 4588272..fb951ed 100755 --- a/src/web/static/css/style.css +++ b/src/web/static/css/style.css @@ -151,7 +151,7 @@ float: right; } .innertube { -margin: 15px; +margin: 30px; } #footer { @@ -294,7 +294,8 @@ background-image: url('../images/admon-note.png'); /* Recommender BOX */ -#recommender-box { +#recommender-box { +height: 43px; position: relative; margin:0; vertical-align: top; @@ -325,8 +326,9 @@ z-index: 1; } #pkgs_list, #input-box { +padding:10px; position: relative; -width: 400px; +width: auto; } #pkgs_list { diff --git a/src/web/static/css/survey.css b/src/web/static/css/survey.css index 9709f1d..a654f2d 100755 --- a/src/web/static/css/survey.css +++ b/src/web/static/css/survey.css @@ -67,7 +67,7 @@ min-height: 200px; body.survey #wrap { padding-top: 0px; -min-height: 200px; +min-height: 400px; position: relative; } diff --git a/src/web/static/images/apprec.png b/src/web/static/images/apprec.png new file mode 100644 index 0000000..78182db Binary files /dev/null and b/src/web/static/images/apprec.png differ diff --git a/src/web/static/images/diaappr.png b/src/web/static/images/diaappr.png deleted file mode 100755 index eaa1388..0000000 Binary files a/src/web/static/images/diaappr.png and /dev/null differ diff --git a/src/web/templates/about.html b/src/web/templates/about.html index b84cfcd..e4d13a4 100755 --- a/src/web/templates/about.html +++ b/src/web/templates/about.html @@ -1,5 +1,7 @@ $var title: About +$var url_base: / $var mod = 'about'; +$var action: RECOMMENDATION $var cssfiles: static/css/facebox.css $var jsfiles: static/js/facebox.js @@ -15,29 +17,24 @@ $var jsfiles: static/js/facebox.js
-

AppRecommender Survey

+

AppRecommender

About

-

This experiment aims to compare and validate automated application -recommendations produced by different strategies and algorithms tuning. We -believe that real users evaluation regarding the relevance of recommendations is -the most accurate data source for computing recommender system effectiveness.

-
+

AppRecommender +is a free recommender system for GNU/Linux applications developed as part of a +Master's project. It was initially developed using the Debian Project +infrasctructure, but the solution is essentially distro-independent and can +be adapted to other environments given that there is available data sources for +computing recommendations.

-

The engine that is being tested is a free software called AppRecommender. It was -initially developed using the Debian Project infrasctructure, but the solution -is essentially distro-independent and can even be adapted to non GNU/Linux -systems given that there is available data for that.

- - + AppRecommender dataflow +src="static/images/apprec.png" width="230px" />

The picture on the right gives an idea of the data workflow -for AppRecommender. The user provides a set of applications installed in his -system and the recommender suggests a set of programs that he might also +for AppRecommender. The user provides a set of applications installed in her/his +system and the recommender suggests a set of programs that she/he might also be interested in, based on the profile deduced from the his previous choices and other similar users choices. The recommendations are composed using classification and information retrieval techniques using diff --git a/src/web/templates/about_survey.html b/src/web/templates/about_survey.html new file mode 100755 index 0000000..0637dea --- /dev/null +++ b/src/web/templates/about_survey.html @@ -0,0 +1,52 @@ +$var title: About +$var url_base: /survey/ +$var action: START +$var mod = 'about'; +$var cssfiles: static/css/facebox.css +$var jsfiles: static/js/facebox.js + + + +

+
+ +

AppRecommender Survey

+

About

+ +

This experiment aims to compare and validate automated application +recommendations produced by different strategies and algorithms tuning. We +believe that real users evaluation regarding the relevance of recommendations is +the most accurate data source for computing recommender system effectiveness.

+
+ +

The engine that is being tested is a free software called AppRecommender. It was +initially developed using the Debian Project infrasctructure, but the solution +is essentially distro-independent and can even be adapted to non GNU/Linux +systems given that there is available data for that.

+ + +AppRecommender dataflow +
+ +

The picture on the right gives an idea of the data workflow +for AppRecommender. The user provides a set of applications installed in his +system and the recommender suggests a set of programs that he might also +be interested in, based on the profile deduced from the his previous choices +and other similar users choices. The recommendations are composed using +classification and information retrieval techniques using +debtags, +apt-xapian-index, +Popcon and UDD as data sources.

+ +
+
diff --git a/src/web/templates/apprec.html b/src/web/templates/apprec.html index 44a3dcd..1a5bd33 100755 --- a/src/web/templates/apprec.html +++ b/src/web/templates/apprec.html @@ -1,7 +1,9 @@ -$def with (recommends, pkg_summaries, request) -$var title: Feedback -$var mod = 'feedback'; -$var cssfiles: static/css/apprec.css static/css/facebox.css static/css/voting.css +$def with (pkgs_details) +$var title: AppRecommender +$var url_base: / +$var action: RECOMMENDATION +$var mod = 'apprec'; +$var cssfiles: static/css/apprec.css static/css/facebox.css static/css/voting.css static/css/survey.css $var jsfiles: static/js/facebox.js - -
-

Recomendation

+
+

Recommended applications

+
-$for strategy, result in recommends.items(): - - $ count = 0 - $for pkg in result: - $ count = count + 1 +$for pkg in pkgs_details:
-

$pkg

- - Screenshot $pkg +

$pkg.name

+ + Screenshot $pkg.name -

$pkg_summaries[pkg]

+

$pkg.summary

- $if count == 5: - $ count = 0
diff --git a/src/web/templates/error.html b/src/web/templates/error.html index 74cb578..0637191 100755 --- a/src/web/templates/error.html +++ b/src/web/templates/error.html @@ -1,5 +1,7 @@ -$def with (error_msgs) +$def with (error_msgs,url_base,action) $var title: Error +$var url_base: $url_base +$var action: $action $var mod = 'error'; $var cssfiles: static/css/facebox.css static/css/facebox.css static/css/survey.css $var jsfiles: static/js/facebox.js @@ -10,21 +12,20 @@ $var jsfiles: static/js/facebox.js
-
-

Welcome to AppRecommender

-
+ +

AppRecommender

+

Unexpected error

Your request could not be proccessed due to the following error(s): -

    $for e in error_msgs:
  • $e
    •

-
-

Go back and try again. If you believe it is a bug, please report to tassia@gmail.com.

+
+

If you believe it is a bug, please report this error along with the uploaded file to tassia@ime.usp.br.

diff --git a/src/web/templates/error_survey.html b/src/web/templates/error_survey.html deleted file mode 100755 index 0fc508d..0000000 --- a/src/web/templates/error_survey.html +++ /dev/null @@ -1,20 +0,0 @@ -$var title: Error -$var mod = 'error'; -$var cssfiles: static/css/facebox.css static/css/facebox.css static/css/survey.css -$var jsfiles: static/js/facebox.js - - -
-
- -
-
-

AppRecommender Survey

-

Unfortunately your request could not be proccessed.

-

Please report this error along with the submitted
file to tassia@gmail.com.

-
- -
- -
-
diff --git a/src/web/templates/fake.html b/src/web/templates/fake.html new file mode 100644 index 0000000..e585138 --- /dev/null +++ b/src/web/templates/fake.html @@ -0,0 +1,3 @@ +$var title: Home +$var mod = 'index'; +

Fixing bugs...

diff --git a/src/web/templates/index.html b/src/web/templates/index.html index b061616..37e4914 100755 --- a/src/web/templates/index.html +++ b/src/web/templates/index.html @@ -1,6 +1,8 @@ $var title: Home +$var url_base: / +$var action: RECOMMENDATION $var mod = 'index'; -$var cssfiles: static/css/tabs.css static/css/debtags.css static/css/facebox.css +$var cssfiles: static/css/tabs.css static/css/debtags.css static/css/facebox.css static/css/apprec.css $var jsfiles: static/js/facebox.js @@ -604,9 +606,40 @@ function showtags(tagid) {
+
+ +

Most popular (all)

+ + +

Most voted (all)

+ + +

Most searched (all)

+ + +
+
-

Atualizados recentemente

+

Recently updated

- -
@@ -667,13 +666,19 @@ function showtags(tagid) {
-

You might also like...

- -

Provide a popcon submission's file and you'll get -a list of suggested packages automatically computed by AppRecommender. -

+

AppRecommender

+

You might also like...

-

This is a tentative web interface for the recommender, if you have any suggestion about it, please get in touch.

+

Provide the list of packages installed in your +system and a set of applications will be suggested for you. +


+

Upload a popularity-contest submission file +(usually located at '/var/log/popularity-contest') or run the +following command and upload the generated 'packages.list' file.
+ # dpkg-query --show > packages.list +


+

This is a tentative web interface for AppRecommender, if you have any +suggestion about it, please get in touch!

diff --git a/src/web/templates/index_survey.html b/src/web/templates/index_survey.html new file mode 100755 index 0000000..ef4be94 --- /dev/null +++ b/src/web/templates/index_survey.html @@ -0,0 +1,36 @@ +$var title: Survey +$var url_base: /survey/ +$var action: START +$var mod = 'index'; +$var cssfiles: static/css/survey.css +$var jsfiles: + + + + +
+
+ +
+

AppRecommender Survey

+

Help us learn your needs

+ +

Participate in this survey and contribute for the development of +AppRecommender, +a recommender system for GNU/Linux applications.


+

Given a list of packages installed in a real + running system and a set of applications will be suggested for it. + Upload a popularity-contest submission file (usually located at + '/var/log/popularity-contest') or run the following command and + upload the generated 'packages.list' file.


+

# dpkg-query --show > packages.list

+
+ +
+
+ + diff --git a/src/web/templates/layout.html b/src/web/templates/layout.html index d64f893..21c07bd 100755 --- a/src/web/templates/layout.html +++ b/src/web/templates/layout.html @@ -1,5 +1,5 @@ $def with (content) -$ url_base = "/" +$ url_base = "/survey/" @@ -8,16 +8,16 @@ $ url_base = "/" AppRecommender - $content.title - + - + $if content.has_key('cssfiles'): $for css in content.cssfiles.split(): - + - - + + $if content.has_key('jsfiles'): $for js in content.jsfiles.split(): @@ -61,12 +61,12 @@ function validateForm()
-

$pkg['package']
$pkg['description']

+

$pkg.name
$pkg.summary

Debtags

    -$for facet, tags in pkg['tag'].items(): +$for facet, tags in pkg.tags.items():
  • $facet
      $for tag in tags: @@ -35,32 +36,33 @@ $for facet, tags in pkg['tag'].items():

      Details

        -
      • Description:
        $:pkg['long_description']
        • - $if pkg['homepage']: -
      • Homepage:$pkg['homepage']
        • - $if pkg['task']: -
      • Tasks: $pkg['task']
        • -
      • Section: $pkg['section']
        • - $if pkg['recommends']: -
      • Recommends: $pkg['recommends']
        • - $if pkg['suggests']: -
      • Suggests: $pkg['suggests']
        • - $if pkg['origin']: -
      • Origin: $pkg['origin']
        • -
      • Maintainer: $pkg['maintainer']
        • + $if hasattr(pkg, 'description'): +
      • Description:
        $:pkg.description
        • + $if hasattr(pkg, 'maintainer'): +
      • Maintainer: $pkg.maintainer
        • + $if hasattr(pkg, 'homepage'): +
      • Homepage: $pkg.homepage
        • + $if hasattr(pkg,'section'): +
      • Section: $pkg.section
        • + $if hasattr(pkg,'recommends'): +
      • Recommends: $pkg.recommends
        • + $if hasattr(pkg,'suggests'): +
      • Suggests: $pkg.suggests
        • + $if hasattr(pkg,'origin'): +
      • Origin: $pkg.origin

      diff --git a/src/web/templates/survey.html b/src/web/templates/survey.html index 52344c9..ada4ec7 100755 --- a/src/web/templates/survey.html +++ b/src/web/templates/survey.html @@ -1,5 +1,7 @@ $def with (pkgs_details, request) $var title: Survey +$var url_base: /survey/ +$var action: START $var mod = 'survey'; $var cssfiles: static/coda-slider-2.0/stylesheets/coda-slider-2.0.css static/css/facebox.css static/css/survey.css $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 @@ -27,9 +29,7 @@ $var jsfiles: /static/coda-slider-2.0/javascripts/jquery-1.3.2.min.js /static/co @@ -38,24 +38,25 @@ button below. -
diff --git a/src/web/templates/survey_index.html b/src/web/templates/survey_index.html deleted file mode 100755 index fb50b77..0000000 --- a/src/web/templates/survey_index.html +++ /dev/null @@ -1,35 +0,0 @@ -$var title: Survey -$var mod = 'index'; -$var cssfiles: static/css/survey.css -$var jsfiles: - - - - -
-
- -
-

AppRecommender Survey

-

Help us learn your needs

- -

Participate in this survey and contribute for the development of -AppRecommender, -a recommender system for GNU/Linux applications.


-

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 (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.


-

# dpkg-query --show > packages.list

-
- -
-
- - diff --git a/src/web/templates/thanks.html b/src/web/templates/thanks.html index f2231d0..cf920bd 100755 --- a/src/web/templates/thanks.html +++ b/src/web/templates/thanks.html @@ -1,4 +1,6 @@ $def with (user_id) +$var url_base: /survey/ +$var action: START $var title: Thanks $var mod = 'thanks'; $var cssfiles: static/css/survey.css @@ -11,302 +13,31 @@ $var cssfiles: static/css/survey.css
-
-

Thanks!

-

Thank you very much for participating in this survey. Your help is very much -appreciated!


- -
-
-

Optional Info

-

- Provide your name or nick if you agree with that being published in our - thanks page and final report. If you also provide a valid e-mail address we'll - be able to send you the survey report as soon as it is ready. +

AppRecommender Survey

+

Thank you very much for participating in this survey, you help is very much +appreciated! Identify yourself if you want to be mentioned in our thanks page +and final report.


-
- -

-

-

-

-

- +

+
+
+

+

+

+

+

+

+

+

diff --git a/src/web/templates/thanks_id.html b/src/web/templates/thanks_id.html index 909f7fd..8e0802f 100755 --- a/src/web/templates/thanks_id.html +++ b/src/web/templates/thanks_id.html @@ -1,4 +1,6 @@ -$var title: Feedback +$var title: Thanks +$var url_base: /survey/ +$var action: START $var mod = 'thanks'; $var cssfiles: static/css/survey.css -- libgit2 0.21.2