fix final bugs for v0.8 for testing

15 files changed, 445 insertions, 214 deletions

diff --git a/messages.pot b/messages.pot
index fe99325..4b024a1 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-11-13 11:38-0500\n"
+"POT-Creation-Date: 2012-12-12 22:59-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: sugar_network_webui/app.py:91
+#: sugar_network_webui/app.py:92
 msgid "MMMM d, yyyy"
 msgstr ""
 
-#: sugar_network_webui/app.py:368
+#: sugar_network_webui/app.py:320
 msgid "Artifact has been downloaded."
 msgstr ""
 
-#: sugar_network_webui/app.py:369
+#: sugar_network_webui/app.py:321
 #, python-format
 msgid ""
 "Success!\n"
@@ -34,16 +34,16 @@ msgid ""
 "You can access it from the Journal."
 msgstr ""
 
-#: sugar_network_webui/app.py:511
+#: sugar_network_webui/app.py:436
 msgid "zero results"
 msgstr ""
 
-#: sugar_network_webui/app.py:513
+#: sugar_network_webui/app.py:438
 #, python-format
 msgid "page %(page)s of %(total)s"
 msgstr ""
 
-#: sugar_network_webui/app.py:552 sugar_network_webui/app.py:844
+#: sugar_network_webui/app.py:477 sugar_network_webui/app.py:773
 #: sugar_network_webui/templates/_browser-grid.html:5
 #: sugar_network_webui/templates/context-view.html:5
 #: sugar_network_webui/templates/context-view.html:25
@@ -51,7 +51,7 @@ msgstr ""
 msgid "questions"
 msgstr ""
 
-#: sugar_network_webui/app.py:555 sugar_network_webui/app.py:847
+#: sugar_network_webui/app.py:480 sugar_network_webui/app.py:776
 #: sugar_network_webui/templates/_browser-grid.html:11
 #: sugar_network_webui/templates/context-view.html:11
 #: sugar_network_webui/templates/context-view.html:31
@@ -59,7 +59,7 @@ msgstr ""
 msgid "problems"
 msgstr ""
 
-#: sugar_network_webui/app.py:558 sugar_network_webui/app.py:850
+#: sugar_network_webui/app.py:483 sugar_network_webui/app.py:779
 #: sugar_network_webui/templates/_browser-grid.html:8
 #: sugar_network_webui/templates/context-view.html:8
 #: sugar_network_webui/templates/context-view.html:28
@@ -67,57 +67,58 @@ msgstr ""
 msgid "ideas"
 msgstr ""
 
-#: sugar_network_webui/app.py:561 sugar_network_webui/app.py:779
+#: sugar_network_webui/app.py:486 sugar_network_webui/app.py:708
 #: sugar_network_webui/templates/_browser-grid.html:14
+#: sugar_network_webui/templates/_review-list.html:16
 #: sugar_network_webui/templates/context-view.html:14
 #: sugar_network_webui/templates/context-view.html:34
 #: sugar_network_webui/templates/resource-list.html:15
 msgid "reviews"
 msgstr ""
 
-#: sugar_network_webui/app.py:564 sugar_network_webui/app.py:854
+#: sugar_network_webui/app.py:489 sugar_network_webui/app.py:783
 msgid "artifacts"
 msgstr ""
 
-#: sugar_network_webui/app.py:567 sugar_network_webui/app.py:857
+#: sugar_network_webui/app.py:492 sugar_network_webui/app.py:786
 msgid "resources"
 msgstr ""
 
-#: sugar_network_webui/app.py:581 sugar_network_webui/app.py:866
+#: sugar_network_webui/app.py:506 sugar_network_webui/app.py:795
 #, python-format
 msgid "browsing %(total)s %(resource_label)s"
 msgstr ""
 
-#: sugar_network_webui/app.py:606 sugar_network_webui/app.py:615
+#: sugar_network_webui/app.py:535 sugar_network_webui/app.py:544
 msgid "Error"
 msgstr ""
 
-#: sugar_network_webui/app.py:609
+#: sugar_network_webui/app.py:538
 msgid "Object not found."
 msgstr ""
 
-#: sugar_network_webui/app.py:618
+#: sugar_network_webui/app.py:547
 msgid "Server error."
 msgstr ""
 
-#: sugar_network_webui/app.py:651
+#: sugar_network_webui/app.py:580
 msgid "activities"
 msgstr ""
 
-#: sugar_network_webui/app.py:654
+#: sugar_network_webui/app.py:583
 msgid "projects"
 msgstr ""
 
-#: sugar_network_webui/app.py:658
+#: sugar_network_webui/app.py:587
 msgid "contexts"
 msgstr ""
 
-#: sugar_network_webui/app.py:673
+#: sugar_network_webui/app.py:602
 #, python-format
 msgid "browsing %(total)s %(label)s"
 msgstr ""
 
-#: sugar_network_webui/dialogs.py:68
+#: sugar_network_webui/dialogs.py:95
 msgid "Synchronization in progress..."
 msgstr ""
 
@@ -135,6 +136,7 @@ msgstr ""
 
 #: sugar_network_webui/templates/_artifact-list.html:6
 #: sugar_network_webui/templates/_resource-list.html:6
+#: sugar_network_webui/templates/_review-list.html:6
 msgid "context resources"
 msgstr ""
 
@@ -146,6 +148,8 @@ msgstr ""
 #: sugar_network_webui/templates/_artifact-list.html:27
 #: sugar_network_webui/templates/_resource-list.html:22
 #: sugar_network_webui/templates/_resource-list.html:27
+#: sugar_network_webui/templates/_review-list.html:22
+#: sugar_network_webui/templates/_review-list.html:27
 msgid "see more"
 msgstr ""
 
@@ -155,8 +159,9 @@ msgstr ""
 #: sugar_network_webui/templates/_context-resource-list.html:39
 #: sugar_network_webui/templates/_context-review-list.html:34
 #: sugar_network_webui/templates/_context-solution-list.html:14
-#: sugar_network_webui/templates/_context-solution-list.html:63
+#: sugar_network_webui/templates/_context-solution-list.html:64
 #: sugar_network_webui/templates/_resource-list.html:31
+#: sugar_network_webui/templates/_review-list.html:31
 #, python-format
 msgid "by %(author)s on %(date)s"
 msgstr ""
@@ -165,6 +170,7 @@ msgstr ""
 #: sugar_network_webui/templates/_context-artifact-list.html:48
 #: sugar_network_webui/templates/_context-resource-list.html:48
 #: sugar_network_webui/templates/_resource-list.html:49
+#: sugar_network_webui/templates/_review-list.html:49
 msgid "followers"
 msgstr ""
 
@@ -172,6 +178,7 @@ msgstr ""
 #: sugar_network_webui/templates/_context-artifact-list.html:51
 #: sugar_network_webui/templates/_context-resource-list.html:51
 #: sugar_network_webui/templates/_resource-list.html:52
+#: sugar_network_webui/templates/_review-list.html:52
 msgid "comments"
 msgstr ""
 
@@ -179,6 +186,7 @@ msgstr ""
 #: sugar_network_webui/templates/_context-artifact-list.html:54
 #: sugar_network_webui/templates/_context-resource-list.html:54
 #: sugar_network_webui/templates/_resource-list.html:55
+#: sugar_network_webui/templates/_review-list.html:55
 msgid "solutions"
 msgstr ""
 
@@ -228,24 +236,19 @@ msgid "delete"
 msgstr ""
 
 #: sugar_network_webui/templates/_context-comment-list.html:29
-#: sugar_network_webui/templates/_context-comment-list.html:32
 #: sugar_network_webui/templates/_context-review-list.html:53
 #: sugar_network_webui/templates/_context-solution-list.html:40
-#: sugar_network_webui/templates/_context-solution-list.html:82
+#: sugar_network_webui/templates/_context-solution-list.html:83
 msgid "comment"
 msgstr ""
 
-#: sugar_network_webui/templates/_context-comment-list.html:32
-msgid "can't comment in offline mode yet"
-msgstr ""
-
 #: sugar_network_webui/templates/_context-comment-list.html:36
 msgid "collapse"
 msgstr ""
 
 #: sugar_network_webui/templates/_context-resource-list.html:79
 #: sugar_network_webui/templates/_context-review-list.html:18
-#: sugar_network_webui/templates/_context-solution-list.html:112
+#: sugar_network_webui/templates/_context-solution-list.html:114
 msgid "New question, idea or problem"
 msgstr ""
 
@@ -262,7 +265,7 @@ msgid "contribute a review offline"
 msgstr ""
 
 #: sugar_network_webui/templates/_context-review-list.html:23
-#: sugar_network_webui/templates/_context-solution-list.html:52
+#: sugar_network_webui/templates/_context-solution-list.html:53
 #, python-format
 msgid ""
 "No %(resource)s have been shared yet for this context.<br><br>Be the "
@@ -270,19 +273,20 @@ msgid ""
 msgstr ""
 
 #: sugar_network_webui/templates/_context-review-list.html:43
-#: sugar_network_webui/templates/_context-solution-list.html:72
+#: sugar_network_webui/templates/_context-solution-list.html:73
 msgid "edit"
 msgstr ""
 
-#: sugar_network_webui/templates/_context-solution-list.html:103
+#: sugar_network_webui/templates/_context-solution-list.html:105
 msgid "contribute a solution"
 msgstr ""
 
-#: sugar_network_webui/templates/_context-solution-list.html:107
+#: sugar_network_webui/templates/_context-solution-list.html:109
 msgid "contribute a solution in offline mode"
 msgstr ""
 
 #: sugar_network_webui/templates/_resource-list.html:16
+#: sugar_network_webui/templates/_review-list.html:16
 #, python-format
 msgid "context %(resource)s"
 msgstr ""
@@ -364,7 +368,7 @@ msgstr ""
 
 #: sugar_network_webui/templates/browser-view.html:72
 #: sugar_network_webui/templates/browser-view.html:80
-#: sugar_network_webui/templates/context-view.html:237
+#: sugar_network_webui/templates/context-view.html:243
 #: sugar_network_webui/templates/resource-list.html:111
 msgid "page '+new_page+' of"
 msgstr ""
@@ -382,10 +386,14 @@ msgid "Work in progress."
 msgstr ""
 
 #: sugar_network_webui/templates/dialog_about.html:5
-msgid "About"
+msgid "Terms of Use"
+msgstr ""
+
+#: sugar_network_webui/templates/dialog_about.html:11
+msgid "terms_of_use.html"
 msgstr ""
 
-#: sugar_network_webui/templates/dialog_about.html:13
+#: sugar_network_webui/templates/dialog_about.html:16
 msgid ""
 "Except where otherwise noted, content on this service is licensed under "
 "the\n"
@@ -393,7 +401,7 @@ msgid ""
 "version</b>."
 msgstr ""
 
-#: sugar_network_webui/templates/dialog_about.html:16
+#: sugar_network_webui/templates/dialog_about.html:19
 msgid ""
 "Likewise, Sugar Network software modules are licensed under the\n"
 "<b>General Public License v3.0 or any later version</b>."
@@ -408,7 +416,7 @@ msgid "Editing project"
 msgstr ""
 
 #: sugar_network_webui/templates/dialog_project.html:44
-#: sugar_network_webui/templates/synchronize.html:32
+#: sugar_network_webui/templates/synchronize.html:34
 msgid "You are in offline mode"
 msgstr ""
 
@@ -419,7 +427,7 @@ msgid ""
 msgstr ""
 
 #: sugar_network_webui/templates/dialog_project.html:48
-#: sugar_network_webui/templates/synchronize.html:37
+#: sugar_network_webui/templates/synchronize.html:39
 msgid "Try to connect"
 msgstr ""
 
@@ -429,19 +437,19 @@ msgstr ""
 
 #: sugar_network_webui/templates/dialog_project.html:57
 #: sugar_network_webui/templates/dialog_resource.html:48
-#: sugar_network_webui/templates/synchronize.html:22
+#: sugar_network_webui/templates/synchronize.html:24
 msgid "cc-by-sa-full.png"
 msgstr ""
 
 #: sugar_network_webui/templates/dialog_project.html:58
 #: sugar_network_webui/templates/dialog_resource.html:49
-#: sugar_network_webui/templates/synchronize.html:23
+#: sugar_network_webui/templates/synchronize.html:25
 msgid "<b>Creative Commons Attribution Share-Alike License</b>"
 msgstr ""
 
 #: sugar_network_webui/templates/dialog_project.html:59
 #: sugar_network_webui/templates/dialog_resource.html:50
-#: sugar_network_webui/templates/synchronize.html:24
+#: sugar_network_webui/templates/synchronize.html:26
 #: sugar_network_webui/templates/upload-form.html:27
 msgid ""
 "Please note that all contributions to Sugar Labs are considered to be "
@@ -452,7 +460,7 @@ msgstr ""
 
 #: sugar_network_webui/templates/dialog_project.html:61
 #: sugar_network_webui/templates/dialog_resource.html:52
-#: sugar_network_webui/templates/synchronize.html:26
+#: sugar_network_webui/templates/synchronize.html:28
 msgid ""
 "You are also promising us that you wrote this yourself, or copied it from"
 " a public domain or similar free resource."
@@ -488,11 +496,11 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: sugar_network_webui/templates/report-form.html:24
-msgid "Offline mode"
+#: sugar_network_webui/templates/report-form.html:25
+msgid "Sugar Network is in offline mode"
 msgstr ""
 
-#: sugar_network_webui/templates/report-form.html:26
+#: sugar_network_webui/templates/report-form.html:27
 msgid "Your report will be queued for upload."
 msgstr ""
 
@@ -516,12 +524,18 @@ msgstr ""
 msgid "Solutions"
 msgstr ""
 
-#: sugar_network_webui/templates/synchronize.html:19
+#: sugar_network_webui/templates/synchronize.html:17
+#: sugar_network_webui/templates/toolbar.html:60
+#: sugar_network_webui/templates/toolbar.html:73
+msgid "Reviews"
+msgstr ""
+
+#: sugar_network_webui/templates/synchronize.html:21
 #: sugar_network_webui/templates/upload-form.html:24
 msgid "Upload and share"
 msgstr ""
 
-#: sugar_network_webui/templates/synchronize.html:34
+#: sugar_network_webui/templates/synchronize.html:36
 msgid ""
 "You need to be connected to the Internet or to a Sugar Network Node in "
 "order to sync."
@@ -571,11 +585,6 @@ msgstr ""
 msgid "Problems"
 msgstr ""
 
-#: sugar_network_webui/templates/toolbar.html:60
-#: sugar_network_webui/templates/toolbar.html:73
-msgid "Reviews"
-msgstr ""
-
 #: sugar_network_webui/templates/toolbar.html:66
 msgid "artifacts list"
 msgstr ""
diff --git a/sugar_network_webui/app.py b/sugar_network_webui/app.py
index de4f956..89caa13 100644
--- a/sugar_network_webui/app.py
+++ b/sugar_network_webui/app.py
@@ -509,6 +509,8 @@ def resource_list(query=None):
     if '_pjax' in request.args:
         if resource == 'artifacts':
             template = '_artifact-list.html'
+        elif resource == 'reviews':
+            template = '_review-list.html'
         else:
             template = '_resource-list.html'
     else:
@@ -517,6 +519,8 @@ def resource_list(query=None):
     if resource == 'artifacts':
         kwargs['inner_template'] = '_artifact-list.html'
         kwargs['artifacts_view'] = 'true'
+    elif resource == 'reviews':
+        kwargs['inner_template'] = '_review-list.html'
     else:
         kwargs['resource_view'] = 'true'
     return render_template(template, query=query, resource=resource,
@@ -656,7 +660,7 @@ def project_browser(context_guid=None):
         session.modified = True
 
     return render_template(template, context=context,
-        inner_template=inner_template)
+        inner_template=inner_template, article_view=True)
 
 
 #@app.route('/reload/<path:href>')
@@ -898,6 +902,7 @@ def new_context():
     context = g.client.Context()
     context['type'] = ['project']
     context['title'] = request.form['title']
+    context['layer'] = ['public', 'peruvian-pilot']
     context['summary'] = request.form['summary']
     context['description'] = request.form['content']
     if context['title'] and context['description'] and context['summary']:
diff --git a/sugar_network_webui/cursors.py b/sugar_network_webui/cursors.py
index c05aff6..039ec61 100644
--- a/sugar_network_webui/cursors.py
+++ b/sugar_network_webui/cursors.py
@@ -73,7 +73,7 @@ class Mount:
                     'mtime'], order_by='-mtime')
         self.Comments = self.client.Comment.cursor(
             reply=['guid', 'message', 'tags', 'author',
-                    'mtime'])
+                    'feedback', 'review', 'solution', 'mtime'])
         self.Reviews = self.client.Review.cursor(
             reply=['guid', 'content', 'context', 'author',
                     'tags', 'mtime'], order_by='-mtime')
diff --git a/sugar_network_webui/dialogs.py b/sugar_network_webui/dialogs.py
index 8cb9023..ee4a3a8 100644
--- a/sugar_network_webui/dialogs.py
+++ b/sugar_network_webui/dialogs.py
@@ -1,22 +1,26 @@
 import flask
 from flask_classy import FlaskView
 from flaskext.babel import gettext as _
-#import logging
+import logging
 
 
 class SyncView(FlaskView):
     def index(self):
-        self.total_comments = flask.g.home_mount.Comments.total
+        #flask.g.home_mount.Comments._reset()
+        flask.g.home_mount.Resources._reset()
+        flask.g.home_mount.Solutions._reset()
+        flask.g.home_mount.Reviews._reset()
+        #self.total_comments = flask.g.home_mount.Comments.total
         self.total_resources = flask.g.home_mount.Resources.total
         self.total_solutions = flask.g.home_mount.Solutions.total
-        self.report_cursor = flask.g.home_mount.client.Report.cursor()
-        self.total_reports = self.report_cursor.total
+        self.total_reviews = flask.g.home_mount.Reviews.total
+
         if flask.request.args.get('returnto'):
             flask.session['returnto'] = flask.request.args.get('returnto')
         return flask.render_template('synchronize.html',
-                    comments_total=self.total_comments,
+                    #comments_total=self.total_comments,
                     resources_total=self.total_resources,
-                    reports_total=self.total_reports,
+                    reviews_total=self.total_reviews,
                     solutions_total=self.total_solutions)
 
     def process(self):
@@ -38,18 +42,19 @@ class SyncView(FlaskView):
         flask.g.network_mount.Ideas._reset()
         flask.g.network_mount.Reviews._reset()
 
-        self.report_cursor = flask.g.home_mount.client.Report.cursor(
-                reply=['guid', 'context', 'implementation',
-                        'description', 'version'])
-        for local_report in self.report_cursor:
-            report = flask.g.client.Report()
-            report['context'] = local_report['context']
-            report['implementation'] = local_report['implementation']
-            report['description'] = local_report['description']
-            report.post()
+        flask.g.home_mount.Reviews.filter()
+        
+        for local_review in flask.g.home_mount.Reviews:
+            review = flask.g.client.Review()
+            review['context'] = local_review['context']
+            review['content'] = local_review['content']
+            review['title'] = '' 
+            review['rating'] = 0 
+            review['tags'] = local_review['tags']
+            review.post()
 
-            flask.g.home_mount.client.Report.delete(local_report['guid'])
-        self.report_cursor._reset()
+            flask.g.home_mount.client.review.delete(local_review['guid'])
+        flask.g.home_mount.Reviews._reset()
 
         flask.g.home_mount.Solutions.filter()
         for local_solution in flask.g.home_mount.Solutions:
@@ -61,12 +66,20 @@ class SyncView(FlaskView):
         flask.g.network_mount.Solutions._reset()
         flask.g.home_mount.Solutions._reset()
 
-# ONLY FEEDBACK CAN BE SHARED OFFLINE
+# COMMENTS SYNC POSTPONED
+#        flask.g.home_mount.Comments.filter()
 #        for local_comment in flask.g.home_mount.Comments:
 #            comment = flask.g.network_mount.client.Comment()
 #            comment['message'] = local_comment['message']
-#            comment['parent'] = new_guids[local_comment['parent']]
-#            comment['parent_resource'] = local_comment['parent_resource']
+#            if local_comment['review']:
+#                comment['review'] = new_guids.get(local_comment['review'])
+#            elif comment['solution']:
+#                comment['solution'] = new_guids.get(local_comment['solution'])
+#            elif comment['feedback']:
+#                comment['feedback'] = new_guids.get(local_comment['feedback'])
+#            else:
+#                # Orphaned comment?
+#                logging.debug('loosing orphan comment: 
 #            comment.post()
 #            flask.g.network_mount.Comments._reset()
 #            flask.g.home_mount.client.Comment.delete(local_comment['guid'])
@@ -154,4 +167,4 @@ class ReportView(FlaskView):
                     title='Success',
                     body='''
 Your report has been recorded for review by developers.
-Thank you!''')
\ No newline at end of file
+Thank you!''')
diff --git a/sugar_network_webui/static/docs/terminos_de_uso.html b/sugar_network_webui/static/docs/terminos_de_uso.html
new file mode 100644
index 0000000..79f6465
--- /dev/null
+++ b/sugar_network_webui/static/docs/terminos_de_uso.html
@@ -0,0 +1,69 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
+	<TITLE></TITLE>
+	<META NAME="GENERATOR" CONTENT="LibreOffice 3.3  (Linux)">
+	<META NAME="CREATED" CONTENT="20121211;21583800">
+	<META NAME="CHANGED" CONTENT="20121211;23353700">
+	<STYLE TYPE="text/css">
+	<!--
+		@page { margin: 0cm }
+		P { margin-bottom: 0.21cm }
+		A:link { so-language: zxx }
+        li p { margin-top: 0px }
+        ol { -webkit-padding-start: 25px; }
+        body { margin: 0px }
+	-->
+	</STYLE>
+</HEAD>
+<BODY LANG="es-PE" DIR="LTR">
+<OL>
+	<LI><P STYLE="margin-bottom: 0cm; border: none; padding: 0cm; font-style: normal; font-weight: normal; line-height: 0.6cm; widows: 2; orphans: 2">
+	<FONT COLOR="#000000"><FONT FACE="DejaVu Sans, sans-serif"><FONT SIZE=3 STYLE="font-size: 11pt">Para
+	tener identidad en la Red Azúcar debes ser usuario de la plataforma
+	de aprendizaje Sugar, en caso contrario desde Internet todos tienen
+	acceso al usuario &quot;Demo&quot;.</FONT></FONT></FONT></P>
+	<LI><P STYLE="margin-bottom: 0cm; border: none; padding: 0cm; font-style: normal; font-weight: normal; line-height: 0.6cm; widows: 2; orphans: 2">
+	<FONT COLOR="#000000"><FONT FACE="DejaVu Sans, sans-serif"><FONT SIZE=3 STYLE="font-size: 11pt">Cuando
+	estés dentro del sistema, procura hacer el mejor uso de los
+	recursos que tienes a tu disposición.</FONT></FONT></FONT></P>
+	<LI><P STYLE="margin-bottom: 0cm; border: none; padding: 0cm; font-style: normal; font-weight: normal; line-height: 0.6cm; widows: 2; orphans: 2">
+	<FONT COLOR="#000000"><FONT FACE="DejaVu Sans, sans-serif"><FONT SIZE=3 STYLE="font-size: 11pt">Considera
+	que la Red Azúcar y sus componentes son Bienes Comunes por lo tanto
+	nos pertenecen a todos.</FONT></FONT></FONT></P>
+	<LI><P STYLE="margin-bottom: 0cm; border: none; padding: 0cm; font-style: normal; font-weight: normal; line-height: 0.6cm; widows: 2; orphans: 2">
+	<FONT COLOR="#000000"><FONT FACE="DejaVu Sans, sans-serif"><FONT SIZE=3 STYLE="font-size: 11pt">Debes
+	usar licencias libres sobre todo el contenido que publiques (de
+	conformidad con la Política de Licencias de Sugar Labs).</FONT></FONT></FONT></P>
+	<LI><P STYLE="margin-bottom: 0cm; border: none; padding: 0cm; font-style: normal; font-weight: normal; line-height: 0.6cm; widows: 2; orphans: 2">
+	<FONT COLOR="#000000"><FONT FACE="DejaVu Sans, sans-serif"><FONT SIZE=3 STYLE="font-size: 11pt">Hay
+	contenidos que NO están permitidos:</FONT></FONT></FONT></P>
+	<UL>
+		<LI><P STYLE="margin-bottom: 0cm; border: none; padding: 0cm; font-style: normal; font-weight: normal; line-height: 0.6cm; widows: 2; orphans: 2">
+		<FONT COLOR="#000000"><FONT FACE="DejaVu Sans, sans-serif"><FONT SIZE=3 STYLE="font-size: 11pt">Contenido
+		Inapropiado (violento, sexual, subversivo, comercial,
+		discriminatorio)</FONT></FONT></FONT></P>
+		<LI><P STYLE="margin-bottom: 0cm; border: none; padding: 0cm; font-style: normal; font-weight: normal; line-height: 0.6cm; widows: 2; orphans: 2">
+		<FONT COLOR="#000000"><FONT FACE="DejaVu Sans, sans-serif"><FONT SIZE=3 STYLE="font-size: 11pt">Contenido
+		con Licencias Inapropiadas</FONT></FONT></FONT></P>
+		<LI><P STYLE="margin-bottom: 0cm; border: none; padding: 0cm; line-height: 0.6cm; widows: 2; orphans: 2">
+		<FONT FACE="DejaVu Sans, sans-serif"><FONT SIZE=3 STYLE="font-size: 11pt"><SPAN STYLE="font-weight: normal"><SPAN STYLE="font-style: normal"><FONT COLOR="#000000">El
+		software contribuido no debe contener binarios, en cambio, debe
+		contener las fuentes y las reglas para transformar las fuentes en
+		binarios.</FONT></SPAN></SPAN></FONT></FONT></P>
+	</UL>
+	<LI><P STYLE="margin-bottom: 0cm; border: none; padding: 0cm; font-style: normal; font-weight: normal; line-height: 0.6cm; widows: 2; orphans: 2">
+	<FONT COLOR="#000000"><FONT FACE="DejaVu Sans, sans-serif"><FONT SIZE=3 STYLE="font-size: 11pt">Al
+	participar en la Red, estás aportando estadísticas de uso de
+	acuerdo con la filosofía y práctica de los Datos Abiertos.</FONT></FONT></FONT></P>
+	<LI><P STYLE="margin-bottom: 0cm; border: none; padding: 0cm; font-style: normal; font-weight: normal; line-height: 0.6cm; widows: 2; orphans: 2">
+	<FONT COLOR="#000000"><FONT FACE="DejaVu Sans, sans-serif"><FONT SIZE=3 STYLE="font-size: 11pt">El
+	incumplimiento de los términos de uso podrá significar la
+	suspención del acceso a la Red y/o la eliminación del contendio
+	publicado.</FONT></FONT></FONT></P>
+</OL>
+<P STYLE="margin-bottom: 0cm"><BR>
+</P>
+</BODY>
+</HTML>
diff --git a/sugar_network_webui/static/docs/terms_of_use.html b/sugar_network_webui/static/docs/terms_of_use.html
new file mode 100644
index 0000000..86db482
--- /dev/null
+++ b/sugar_network_webui/static/docs/terms_of_use.html
@@ -0,0 +1,68 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
+	<TITLE></TITLE>
+	<META NAME="GENERATOR" CONTENT="LibreOffice 3.3  (Linux)">
+	<META NAME="CREATED" CONTENT="20121211;21583800">
+	<META NAME="CHANGED" CONTENT="20121211;23540000">
+	<STYLE TYPE="text/css">
+	<!--
+		@page { margin: 0cm }
+		P { margin-bottom: 0.21cm }
+		A:link { so-language: zxx }
+        li p { margin-top: 0px }
+        ol { -webkit-padding-start: 25px; }
+        body { margin: 0px }
+	-->
+	</STYLE>
+</HEAD>
+<BODY LANG="es-PE" DIR="LTR">
+<OL>
+	<LI><P STYLE="margin-bottom: 0cm; border: none; padding: 0cm; font-style: normal; font-weight: normal; line-height: 0.6cm; widows: 2; orphans: 2">
+	<FONT COLOR="#000000"><FONT FACE="DejaVu Sans, sans-serif"><FONT SIZE=3 STYLE="font-size: 11pt">In
+	order to have identity on the Sugar Network you must be a user of
+	the Sugar learning platform, otherwhise from the Internet everyone
+	has access to the user &quot;Demo&quot;.</FONT></FONT></FONT></P>
+	<LI><P STYLE="margin-bottom: 0cm; border: none; padding: 0cm; font-style: normal; font-weight: normal; line-height: 0.6cm; widows: 2; orphans: 2">
+	<FONT COLOR="#000000"><FONT FACE="DejaVu Sans, sans-serif"><FONT SIZE=3 STYLE="font-size: 11pt">When
+	you're in the system, try to make the best use of the resources at
+	your disposal.</FONT></FONT></FONT></P>
+	<LI><P STYLE="margin-bottom: 0cm; border: none; padding: 0cm; font-style: normal; font-weight: normal; line-height: 0.6cm; widows: 2; orphans: 2">
+	<FONT COLOR="#000000"><FONT FACE="DejaVu Sans, sans-serif"><FONT SIZE=3 STYLE="font-size: 11pt">Consider
+	that the Sugar Network and its components are Commons therefore
+	belong to all of us.</FONT></FONT></FONT></P>
+	<LI><P STYLE="margin-bottom: 0cm; border: none; padding: 0cm; font-style: normal; font-weight: normal; line-height: 0.6cm; widows: 2; orphans: 2">
+	<FONT COLOR="#000000"><FONT FACE="DejaVu Sans, sans-serif"><FONT SIZE=3 STYLE="font-size: 11pt">You
+	must use free licenses for all content that you post (in accordance
+	with the Sugar Labs Licensing Policy).</FONT></FONT></FONT></P>
+	<LI><P STYLE="margin-bottom: 0cm; border: none; padding: 0cm; font-style: normal; font-weight: normal; line-height: 0.6cm; widows: 2; orphans: 2">
+	<FONT COLOR="#000000"><FONT FACE="DejaVu Sans, sans-serif"><FONT SIZE=3 STYLE="font-size: 11pt">The
+	following type of content is not allowed:</FONT></FONT></FONT></P>
+	<UL>
+		<LI><P STYLE="margin-bottom: 0cm; border: none; padding: 0cm; font-style: normal; font-weight: normal; line-height: 0.6cm; widows: 2; orphans: 2">
+		<FONT COLOR="#000000"><FONT FACE="DejaVu Sans, sans-serif"><FONT SIZE=3 STYLE="font-size: 11pt">Inappropriate
+		Content (violent, sexual, subversive, commercial, discriminatory)</FONT></FONT></FONT></P>
+	</UL>
+	<UL>
+		<LI><P STYLE="margin-bottom: 0cm; border: none; padding: 0cm; font-style: normal; font-weight: normal; line-height: 0.6cm; widows: 2; orphans: 2">
+		<FONT COLOR="#000000"><FONT FACE="DejaVu Sans, sans-serif"><FONT SIZE=3 STYLE="font-size: 11pt">Content
+		with inappropriate licenses</FONT></FONT></FONT></P>
+	</UL>
+	<UL>
+		<LI><P STYLE="margin-bottom: 0cm; border: none; padding: 0cm; line-height: 0.6cm; widows: 2; orphans: 2">
+		<FONT FACE="DejaVu Sans, sans-serif"><FONT COLOR="#000000"><FONT SIZE=3 STYLE="font-size: 11pt"><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: normal">Contributed
+		software must not contain compiled binaries but it must contain the
+		sources and the rules for compiling new binaries.</SPAN></SPAN></FONT></FONT></FONT></P>
+	</UL>
+	<LI><P STYLE="margin-bottom: 0cm; border: none; padding: 0cm; font-style: normal; font-weight: normal; line-height: 0.6cm; widows: 2; orphans: 2">
+	<FONT COLOR="#000000"><FONT FACE="DejaVu Sans, sans-serif"><FONT SIZE=3 STYLE="font-size: 11pt">By
+	participating in the Network, you are providing usage statistics
+	according to the philosophy and practice of Open Data.</FONT></FONT></FONT></P>
+	<LI><P STYLE="margin-bottom: 0cm; border: none; padding: 0cm; line-height: 0.6cm; widows: 2; orphans: 2">
+	<FONT FACE="DejaVu Sans, sans-serif"><FONT COLOR="#000000"><FONT SIZE=3 STYLE="font-size: 11pt"><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: normal">The
+	breach of the terms of use may mean the suspension of access to the
+	network and / or the elimination of published content.</SPAN></SPAN></FONT></FONT></FONT></P>
+</OL>
+</BODY>
+</HTML>
diff --git a/sugar_network_webui/templates/_context-article-view.html b/sugar_network_webui/templates/_context-article-view.html
index 2cee695..565193a 100644
--- a/sugar_network_webui/templates/_context-article-view.html
+++ b/sugar_network_webui/templates/_context-article-view.html
@@ -11,6 +11,7 @@
                     }
                 </style>
                 <br/>
+                <article>
                 <div class="resource-title">
                     {{context['title']|safe}}
                 </div>
@@ -21,6 +22,7 @@
                     <pre>{{context['description']|safe}}</pre>
                 </div>
                 <div>
+                </article>
                 {%- if context.is_author -%}
                 <a href="{{url_for('ProjectView:edit',
                             context=context['guid'],
diff --git a/sugar_network_webui/templates/_context-comment-list.html b/sugar_network_webui/templates/_context-comment-list.html
index 36175ce..94fdc98 100644
--- a/sugar_network_webui/templates/_context-comment-list.html
+++ b/sugar_network_webui/templates/_context-comment-list.html
@@ -24,13 +24,13 @@
                 <form id="comment_form_{{resource_guid}}" class="comment-form" data-document="{{document}}" data-guid="{{resource_guid}}" method="POST" action="/submit_comment">
                     <input type="hidden" name="resource_guid" value="{{resource_guid}}" /> 
                     <input type="hidden" name="resource_type" value="solution" /> 
-        {%- if (session['connected'] or False) -%}
+        {#%- if (session['connected'] or False) -%#}
                         <textarea id="textarea-comment" name="comment"></textarea>
                         <input id="comment_button_{{resource_guid}}" class="comment-button sugar-button" data-guid="{{resource_guid}}" type="submit" value="{{_('comment')}}" />
-        {%- else -%}
+        {#%- else -%}
                         <textarea id="textarea-comment" name="comment" disabled></textarea>
                         <input id="comment_button_{{resource_guid}}" class="comment-button sugar-button has_tooltip" title="{{_('comment')}}" data-guid="{{resource_guid}}" type="submit" value="{{_('can\'t comment in offline mode yet')}}" disabled />
-        {%- endif -%}
+        {%- endif -%#}
                 </form>
                 <span class="collapse-button has_tooltip"
                         title="{{_('collapse')}}"
diff --git a/sugar_network_webui/templates/_review-list.html b/sugar_network_webui/templates/_review-list.html
new file mode 100644
index 0000000..bfd6315
--- /dev/null
+++ b/sugar_network_webui/templates/_review-list.html
@@ -0,0 +1,62 @@
+    <ul class="resource-list" id="resource-page-{{page}}">
+        {%- for item in result %}
+        <li class="resource-list">
+            <div class="icon-column">
+                <a href="/context/all/{{item['context']}}">
+                <img class="has_tooltip" src="/context/icon/{{item['context']}}" title="{{_('context resources')}}" />
+                </a>
+            </div>
+            <div class="icon-column">
+                {%- if item['author'] %}
+                <img src="/static/icons/sugar-xo.png"/>
+                {%- endif %}
+            </div>
+            <div class="icon-column res_type_col">
+                <a href="/context/reviews/{{item['context']}}">
+                <img class="tab-button has_tooltip" src="/static/icons/button-review.png" title="{{_('context %(resource)s', resource=_('reviews'))}}"/>
+                </a>
+            </div>
+            <div class="summary-column">
+                {%- if resource_type!='review' %}
+                <div class="resource-title">
+                <a class="has_tooltip" title="{{_('see more')}}" href="/{{item['type']|special_str}}/{{item['guid']}}">
+                {{item['title']}}</a>
+                </div>
+                {%- endif %}
+                <div class="resource-content-row">
+                <a class="has_tooltip" title="{{_('see more')}}" href="/review/{{item['guid']}}">
+                {{item['content']}}</a>
+                </div>
+                <div class="resource-meta">
+                {{_('by %(author)s on %(date)s', author=item['author'][0]['name'], date=item['mtime']|timedelta)}}
+                {%- for tag in item['tags'] %}
+                    <span class="tag">{{tag}}</span>
+                {%- endfor %}
+                </div>
+            </div>
+            <!--
+            <div class="icon-column">
+                %- if item['favorite'] %
+                <img class="star" src="/static/icons/emblem-favorite.png"/>
+                %- else %
+                <img class="star" src="/static/icons/add-link.png"/>
+                %- endif %
+            </div>
+            -->
+            {%- if resource_type!='review' %}
+            <div class="meta-column">
+                <div>
+                {{_('followers')}}
+                </div>
+                <div>
+                {{_('comments')}}
+                </div>
+                <div>
+                {{_('solutions')}}
+                </div>
+            </div>    
+            {%- endif %}
+        </li>
+
+        {%- endfor %}
+    </ul>
diff --git a/sugar_network_webui/templates/context-view.html b/sugar_network_webui/templates/context-view.html
index 4d90479..d81bf7a 100644
--- a/sugar_network_webui/templates/context-view.html
+++ b/sugar_network_webui/templates/context-view.html
@@ -181,11 +181,16 @@
             if ($(".resource-header-column").length) {
                 $('#bottom-palette').slideUp();
                 };
+            // When viewing articles 
+            if ($("article").length) {
+                $('#bottom-palette').slideUp();
+                };
 
             // When displaying notice
             if ($(".notice").length) {
                     $("#mejorar-sistema").css( "left", "49%");
                     $("#mejorar-sistema").css( "top", "40%");
+                    $('#bottom-palette').slideUp();
                     };
 
             // When viewing resources
diff --git a/sugar_network_webui/templates/dialog_about.html b/sugar_network_webui/templates/dialog_about.html
index 26cc8ba..43d6d3b 100644
--- a/sugar_network_webui/templates/dialog_about.html
+++ b/sugar_network_webui/templates/dialog_about.html
@@ -2,11 +2,14 @@
 {% block view %}
 <div class="resource-form">
     <div id="resource-form-title">
-    {{_('About')}}
+    {{_('Terms of Use')}}
         <div class="window-buttons">
             <img id="cancel-button" class="button window-button" src="/static/icons/dialog-ok.png" />
         </div>
     </div>
+    <div class="resource-form-field dialog-content">
+    <iframe id="dialog-iframe" style="border: 0px; width:100%" src="/static/docs/{{_('terms_of_use.html')}}"></iframe>
+    </div>
     <div class="resource-form-field license-notice">
         <img class="license-big" src="/static/images/cc-by-sa-full.png" />
         <img class="license-big" style="float:right" src="/static/images/gplv3.png" />
@@ -20,6 +23,8 @@
 </div>
 <script type="text/javascript">
     $(function() {
+       var dialog_height = $(".resource-form").height();
+       $("#dialog-iframe").height(dialog_height - 140 + "px");
        $("#query").attr('disabled', true);
        $("#cancel-button").click( function() {
            {%- if returnto|special_str or session['returnto']-%}
diff --git a/sugar_network_webui/templates/synchronize.html b/sugar_network_webui/templates/synchronize.html
index 4d0a7ec..5101b15 100644
--- a/sugar_network_webui/templates/synchronize.html
+++ b/sugar_network_webui/templates/synchronize.html
@@ -14,7 +14,7 @@
     <br/><br/>
     {{_('Solutions')}}: {{solutions_total}}
     <br/><br/>
-    {{_('Failure reports')}}: {{reports_total}}
+    {{_('Reviews')}}: {{reviews_total}}
     </div>
     {%- if (session['connected'] or False) -%}
     <div class="resource-form-field">
diff --git a/sugar_network_webui/translations/es/LC_MESSAGES/messages.mo b/sugar_network_webui/translations/es/LC_MESSAGES/messages.mo
index 724bf27..0bf9a8e 100644
--- a/sugar_network_webui/translations/es/LC_MESSAGES/messages.mo
+++ b/sugar_network_webui/translations/es/LC_MESSAGES/messages.mo
diff --git a/sugar_network_webui/translations/es/LC_MESSAGES/messages.po b/sugar_network_webui/translations/es/LC_MESSAGES/messages.po
index 54e811b..7ad99e4 100644
--- a/sugar_network_webui/translations/es/LC_MESSAGES/messages.po
+++ b/sugar_network_webui/translations/es/LC_MESSAGES/messages.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-11-13 11:38-0500\n"
-"PO-Revision-Date: 2012-04-21 20:49-0500\n"
-"Last-Translator: Sebastian Silva <sebastian@sugarlabs.org>\n"
+"POT-Creation-Date: 2012-12-12 22:59-0500\n"
+"PO-Revision-Date: 2012-12-12 23:05-0500\n"
+"Last-Translator: Sebastian Silva <sebastian@somosazucar.org>\n"
 "Language-Team: es <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: sugar_network_webui/app.py:91
+#: sugar_network_webui/app.py:92
 msgid "MMMM d, yyyy"
 msgstr "d 'de' MMMM 'de' 2012"
 
-#: sugar_network_webui/app.py:368
+#: sugar_network_webui/app.py:320
 msgid "Artifact has been downloaded."
 msgstr "Se ha descargado un artefacto."
 
-#: sugar_network_webui/app.py:369
+#: sugar_network_webui/app.py:321
 #, python-format
 msgid ""
 "Success!\n"
@@ -38,16 +38,17 @@ msgstr ""
 "El archivo %s ha sido copiado a tu carpeta de Documentos.\n"
 "Puedes acceder a él desde el Diario."
 
-#: sugar_network_webui/app.py:511
+#: sugar_network_webui/app.py:436
 msgid "zero results"
 msgstr "cero resultados"
 
-#: sugar_network_webui/app.py:513
+#: sugar_network_webui/app.py:438
 #, python-format
 msgid "page %(page)s of %(total)s"
 msgstr "página %(page)s de %(total)s"
 
-#: sugar_network_webui/app.py:552 sugar_network_webui/app.py:844
+#: sugar_network_webui/app.py:477
+#: sugar_network_webui/app.py:773
 #: sugar_network_webui/templates/_browser-grid.html:5
 #: sugar_network_webui/templates/context-view.html:5
 #: sugar_network_webui/templates/context-view.html:25
@@ -55,7 +56,8 @@ msgstr "página %(page)s de %(total)s"
 msgid "questions"
 msgstr "preguntas"
 
-#: sugar_network_webui/app.py:555 sugar_network_webui/app.py:847
+#: sugar_network_webui/app.py:480
+#: sugar_network_webui/app.py:776
 #: sugar_network_webui/templates/_browser-grid.html:11
 #: sugar_network_webui/templates/context-view.html:11
 #: sugar_network_webui/templates/context-view.html:31
@@ -63,7 +65,8 @@ msgstr "preguntas"
 msgid "problems"
 msgstr "problemas"
 
-#: sugar_network_webui/app.py:558 sugar_network_webui/app.py:850
+#: sugar_network_webui/app.py:483
+#: sugar_network_webui/app.py:779
 #: sugar_network_webui/templates/_browser-grid.html:8
 #: sugar_network_webui/templates/context-view.html:8
 #: sugar_network_webui/templates/context-view.html:28
@@ -71,59 +74,65 @@ msgstr "problemas"
 msgid "ideas"
 msgstr "ideas"
 
-#: sugar_network_webui/app.py:561 sugar_network_webui/app.py:779
+#: sugar_network_webui/app.py:486
+#: sugar_network_webui/app.py:708
 #: sugar_network_webui/templates/_browser-grid.html:14
+#: sugar_network_webui/templates/_review-list.html:16
 #: sugar_network_webui/templates/context-view.html:14
 #: sugar_network_webui/templates/context-view.html:34
 #: sugar_network_webui/templates/resource-list.html:15
 msgid "reviews"
 msgstr "reseñas"
 
-#: sugar_network_webui/app.py:564 sugar_network_webui/app.py:854
+#: sugar_network_webui/app.py:489
+#: sugar_network_webui/app.py:783
 msgid "artifacts"
 msgstr "artefactos"
 
-#: sugar_network_webui/app.py:567 sugar_network_webui/app.py:857
+#: sugar_network_webui/app.py:492
+#: sugar_network_webui/app.py:786
 msgid "resources"
 msgstr "recursos"
 
-#: sugar_network_webui/app.py:581 sugar_network_webui/app.py:866
+#: sugar_network_webui/app.py:506
+#: sugar_network_webui/app.py:795
 #, python-format
 msgid "browsing %(total)s %(resource_label)s"
 msgstr "navegando por %(total)s %(resource_label)s"
 
-#: sugar_network_webui/app.py:606 sugar_network_webui/app.py:615
+#: sugar_network_webui/app.py:535
+#: sugar_network_webui/app.py:544
 msgid "Error"
 msgstr "Error"
 
-#: sugar_network_webui/app.py:609
+#: sugar_network_webui/app.py:538
 msgid "Object not found."
 msgstr "Objeto no encontrado."
 
-#: sugar_network_webui/app.py:618
+#: sugar_network_webui/app.py:547
 msgid "Server error."
 msgstr "Error de servidor."
 
-#: sugar_network_webui/app.py:651
+#: sugar_network_webui/app.py:580
 msgid "activities"
 msgstr "actividades"
 
-#: sugar_network_webui/app.py:654
+#: sugar_network_webui/app.py:583
 msgid "projects"
 msgstr "proyectos"
 
-#: sugar_network_webui/app.py:658
+#: sugar_network_webui/app.py:587
 msgid "contexts"
 msgstr "contextos"
 
-#: sugar_network_webui/app.py:673
+#: sugar_network_webui/app.py:602
 #, python-format
 msgid "browsing %(total)s %(label)s"
 msgstr "navegando por %(total)s %(label)s"
 
-#: sugar_network_webui/dialogs.py:68
+#: sugar_network_webui/dialogs.py:95
 msgid "Synchronization in progress..."
-msgstr ""
+msgstr "Sincronizando..."
 
 #: sugar_network_webui/env.py:22
 msgid "start web application to serve Sugar Network content"
@@ -139,6 +148,7 @@ msgstr "dirección para escuchar a los clientes Web"
 
 #: sugar_network_webui/templates/_artifact-list.html:6
 #: sugar_network_webui/templates/_resource-list.html:6
+#: sugar_network_webui/templates/_review-list.html:6
 msgid "context resources"
 msgstr "recursos del contexto"
 
@@ -150,6 +160,8 @@ msgstr "descargar artefacto"
 #: sugar_network_webui/templates/_artifact-list.html:27
 #: sugar_network_webui/templates/_resource-list.html:22
 #: sugar_network_webui/templates/_resource-list.html:27
+#: sugar_network_webui/templates/_review-list.html:22
+#: sugar_network_webui/templates/_review-list.html:27
 msgid "see more"
 msgstr "ver más"
 
@@ -159,8 +171,9 @@ msgstr "ver más"
 #: sugar_network_webui/templates/_context-resource-list.html:39
 #: sugar_network_webui/templates/_context-review-list.html:34
 #: sugar_network_webui/templates/_context-solution-list.html:14
-#: sugar_network_webui/templates/_context-solution-list.html:63
+#: sugar_network_webui/templates/_context-solution-list.html:64
 #: sugar_network_webui/templates/_resource-list.html:31
+#: sugar_network_webui/templates/_review-list.html:31
 #, python-format
 msgid "by %(author)s on %(date)s"
 msgstr "por %(author)s el %(date)s"
@@ -169,6 +182,7 @@ msgstr "por %(author)s el %(date)s"
 #: sugar_network_webui/templates/_context-artifact-list.html:48
 #: sugar_network_webui/templates/_context-resource-list.html:48
 #: sugar_network_webui/templates/_resource-list.html:49
+#: sugar_network_webui/templates/_review-list.html:49
 msgid "followers"
 msgstr "seguidores"
 
@@ -176,6 +190,7 @@ msgstr "seguidores"
 #: sugar_network_webui/templates/_context-artifact-list.html:51
 #: sugar_network_webui/templates/_context-resource-list.html:51
 #: sugar_network_webui/templates/_resource-list.html:52
+#: sugar_network_webui/templates/_review-list.html:52
 msgid "comments"
 msgstr "comentarios"
 
@@ -183,6 +198,7 @@ msgstr "comentarios"
 #: sugar_network_webui/templates/_context-artifact-list.html:54
 #: sugar_network_webui/templates/_context-resource-list.html:54
 #: sugar_network_webui/templates/_resource-list.html:55
+#: sugar_network_webui/templates/_review-list.html:55
 msgid "solutions"
 msgstr "soluciones"
 
@@ -222,38 +238,29 @@ msgstr "favorito"
 #: sugar_network_webui/templates/_context-artifact-list.html:62
 #: sugar_network_webui/templates/_context-resource-list.html:62
 #, python-format
-msgid ""
-"No %(resource)s have been shared yet for this context.<br><br>Be the "
-"first to contribute with the community!"
-msgstr ""
-"Aún no se han compartido %(resource)s en este contexto.<br><br>¡Se el "
-"primero en aportar a la comunidad!"
+msgid "No %(resource)s have been shared yet for this context.<br><br>Be the first to contribute with the community!"
+msgstr "Aún no se han compartido %(resource)s en este contexto.<br><br>¡Se el primero en aportar a la comunidad!"
 
 #: sugar_network_webui/templates/_context-comment-list.html:11
 msgid "delete"
 msgstr "borrar"
 
 #: sugar_network_webui/templates/_context-comment-list.html:29
-#: sugar_network_webui/templates/_context-comment-list.html:32
 #: sugar_network_webui/templates/_context-review-list.html:53
 #: sugar_network_webui/templates/_context-solution-list.html:40
-#: sugar_network_webui/templates/_context-solution-list.html:82
+#: sugar_network_webui/templates/_context-solution-list.html:83
 msgid "comment"
 msgstr "comentar"
 
-#: sugar_network_webui/templates/_context-comment-list.html:32
-msgid "can't comment in offline mode yet"
-msgstr "aún no se puede comentar sin conexión"
-
 #: sugar_network_webui/templates/_context-comment-list.html:36
 msgid "collapse"
 msgstr "colapsar"
 
 #: sugar_network_webui/templates/_context-resource-list.html:79
 #: sugar_network_webui/templates/_context-review-list.html:18
-#: sugar_network_webui/templates/_context-solution-list.html:112
+#: sugar_network_webui/templates/_context-solution-list.html:114
 msgid "New question, idea or problem"
-msgstr ""
+msgstr "Nueva pregunta, idea o problema"
 
 #: sugar_network_webui/templates/_context-review-list.html:6
 msgid "contribute a review"
@@ -261,38 +268,33 @@ msgstr "aportar una reseña"
 
 #: sugar_network_webui/templates/_context-review-list.html:9
 msgid "Offline contribution will be saved until synchronized."
-msgstr ""
+msgstr "Contribuciones \"offline\" serán guardadas hasta próxima sincronización."
 
 #: sugar_network_webui/templates/_context-review-list.html:12
-#, fuzzy
 msgid "contribute a review offline"
-msgstr "aportar una reseña"
+msgstr "aportar una reseña \"offline\""
 
 #: sugar_network_webui/templates/_context-review-list.html:23
-#: sugar_network_webui/templates/_context-solution-list.html:52
+#: sugar_network_webui/templates/_context-solution-list.html:53
 #, python-format
-msgid ""
-"No %(resource)s have been shared yet for this context.<br><br>Be the "
-"first to share with the community!"
-msgstr ""
-"Aún no se han compartido %(resource)s en este contexto.<br><br>¡Se el "
-"primero en compartir con la comunidad!"
+msgid "No %(resource)s have been shared yet for this context.<br><br>Be the first to share with the community!"
+msgstr "Aún no se han compartido %(resource)s en este contexto.<br><br>¡Se el primero en compartir con la comunidad!"
 
 #: sugar_network_webui/templates/_context-review-list.html:43
-#: sugar_network_webui/templates/_context-solution-list.html:72
+#: sugar_network_webui/templates/_context-solution-list.html:73
 msgid "edit"
 msgstr "editar"
 
-#: sugar_network_webui/templates/_context-solution-list.html:103
+#: sugar_network_webui/templates/_context-solution-list.html:105
 msgid "contribute a solution"
 msgstr "aportar una solución"
 
-#: sugar_network_webui/templates/_context-solution-list.html:107
-#, fuzzy
+#: sugar_network_webui/templates/_context-solution-list.html:109
 msgid "contribute a solution in offline mode"
-msgstr "aportar una solución"
+msgstr "aportar una solución \"offline\""
 
 #: sugar_network_webui/templates/_resource-list.html:16
+#: sugar_network_webui/templates/_review-list.html:16
 #, python-format
 msgid "context %(resource)s"
 msgstr "%(resource)s del contexto"
@@ -337,20 +339,18 @@ msgstr "Detalles"
 
 #: sugar_network_webui/templates/base.html:98
 #: sugar_network_webui/templates/dialog_resource.html:37
-#, fuzzy
 msgid "submit question"
-msgstr "preguntas"
+msgstr "enviar pregunta"
 
 #: sugar_network_webui/templates/base.html:100
 #: sugar_network_webui/templates/dialog_resource.html:39
 msgid "submit idea"
-msgstr ""
+msgstr "enviar idea"
 
 #: sugar_network_webui/templates/base.html:102
 #: sugar_network_webui/templates/dialog_resource.html:41
-#, fuzzy
 msgid "submit problem"
-msgstr "problemas"
+msgstr "enviar problema"
 
 #: sugar_network_webui/templates/base.html:140
 msgid "Edit project"
@@ -376,7 +376,7 @@ msgstr "Editar recurso"
 
 #: sugar_network_webui/templates/browser-view.html:72
 #: sugar_network_webui/templates/browser-view.html:80
-#: sugar_network_webui/templates/context-view.html:237
+#: sugar_network_webui/templates/context-view.html:243
 #: sugar_network_webui/templates/resource-list.html:111
 msgid "page '+new_page+' of"
 msgstr "página '+new_page+' de"
@@ -394,94 +394,87 @@ msgid "Work in progress."
 msgstr "En construcción."
 
 #: sugar_network_webui/templates/dialog_about.html:5
-msgid "About"
-msgstr ""
+msgid "Terms of Use"
+msgstr "Términos de Uso"
+
+#: sugar_network_webui/templates/dialog_about.html:11
+msgid "terms_of_use.html"
+msgstr "terminos_de_uso.html"
 
-#: sugar_network_webui/templates/dialog_about.html:13
+#: sugar_network_webui/templates/dialog_about.html:16
 msgid ""
-"Except where otherwise noted, content on this service is licensed under "
-"the\n"
-"<b>Creative Commons Attribution Share-Alike License v3.0 or any later "
-"version</b>."
+"Except where otherwise noted, content on this service is licensed under the\n"
+"<b>Creative Commons Attribution Share-Alike License v3.0 or any later version</b>."
 msgstr ""
+"Salvo que se especifique de otra manera, el contenido en este servicio está licenciado bajo la\n"
+" <b> Licencia Creative Commons Reconocimiento Compartir-Igual v3.0 o cualquier versión posterior</b>. "
 
-#: sugar_network_webui/templates/dialog_about.html:16
+#: sugar_network_webui/templates/dialog_about.html:19
 msgid ""
 "Likewise, Sugar Network software modules are licensed under the\n"
 "<b>General Public License v3.0 or any later version</b>."
 msgstr ""
+"De la misma manera, el software de los módulos de la Red Azúcar están licenciados bajo la\n"
+"<b>Licencia Pública General  GPL v3.0 o cualquier versión posterior."
 
 #: sugar_network_webui/templates/dialog_project.html:6
-#, fuzzy
 msgid "Creating new project"
-msgstr "Crear nuevo proyecto"
+msgstr "Creando nuevo proyecto"
 
 #: sugar_network_webui/templates/dialog_project.html:8
-#, fuzzy
 msgid "Editing project"
-msgstr "Editar proyecto"
+msgstr "Editando proyecto"
 
 #: sugar_network_webui/templates/dialog_project.html:44
-#: sugar_network_webui/templates/synchronize.html:32
-#, fuzzy
+#: sugar_network_webui/templates/synchronize.html:34
 msgid "You are in offline mode"
-msgstr "aún no se puede aportar sin conexión"
+msgstr "Estas en modo \"offline\""
 
 #: sugar_network_webui/templates/dialog_project.html:46
-#, fuzzy
-msgid ""
-"You need to be connected to the Internet or to a Sugar Network Node in "
-"order to upload a project."
-msgstr "¡Por ahora es necesario tener conexión para aportar!"
+msgid "You need to be connected to the Internet or to a Sugar Network Node in order to upload a project."
+msgstr "Necesitas tener conección a Internet o a un nodo de la red Azúcar para enviar un proyecto."
 
 #: sugar_network_webui/templates/dialog_project.html:48
-#: sugar_network_webui/templates/synchronize.html:37
+#: sugar_network_webui/templates/synchronize.html:39
 msgid "Try to connect"
-msgstr ""
+msgstr "Intentar conectar"
 
 #: sugar_network_webui/templates/dialog_project.html:54
 msgid "Must fill all fields."
-msgstr ""
+msgstr "Es necesario llenar todos los campos."
 
 #: sugar_network_webui/templates/dialog_project.html:57
 #: sugar_network_webui/templates/dialog_resource.html:48
-#: sugar_network_webui/templates/synchronize.html:22
+#: sugar_network_webui/templates/synchronize.html:24
 msgid "cc-by-sa-full.png"
-msgstr ""
+msgstr "cc-by-sa-full.png"
 
 #: sugar_network_webui/templates/dialog_project.html:58
 #: sugar_network_webui/templates/dialog_resource.html:49
-#: sugar_network_webui/templates/synchronize.html:23
+#: sugar_network_webui/templates/synchronize.html:25
 msgid "<b>Creative Commons Attribution Share-Alike License</b>"
-msgstr ""
+msgstr "<b>Licencia Creative Commons Reconocimiento Compartir Igual</b>"
 
 #: sugar_network_webui/templates/dialog_project.html:59
 #: sugar_network_webui/templates/dialog_resource.html:50
-#: sugar_network_webui/templates/synchronize.html:24
+#: sugar_network_webui/templates/synchronize.html:26
 #: sugar_network_webui/templates/upload-form.html:27
-msgid ""
-"Please note that all contributions to Sugar Labs are considered to be "
-"released under the Attribution 3.0 Unported. If you do not want your "
-"writing to be edited and redistributed at will, then do not submit it "
-"here."
-msgstr ""
+msgid "Please note that all contributions to Sugar Labs are considered to be released under the Attribution 3.0 Unported. If you do not want your writing to be edited and redistributed at will, then do not submit it here."
+msgstr "Por favor note que todas las contribuciones a Laboratorios Azúcar se consideran publicadas bajo la Licencia CC Reconocimiento y Compartir Igual  3.0 Internacional. Si no es tu intención permitir que tu obra pueda ser modificada y distribuida libremente, por favor no las publiques aquí. "
 
 #: sugar_network_webui/templates/dialog_project.html:61
 #: sugar_network_webui/templates/dialog_resource.html:52
-#: sugar_network_webui/templates/synchronize.html:26
-msgid ""
-"You are also promising us that you wrote this yourself, or copied it from"
-" a public domain or similar free resource."
-msgstr ""
+#: sugar_network_webui/templates/synchronize.html:28
+msgid "You are also promising us that you wrote this yourself, or copied it from a public domain or similar free resource."
+msgstr "Tambien nos aseguras que tu escribiste esto, o lo copiaste de un dominio público u otro recurso libre similar."
 
 #: sugar_network_webui/templates/dialog_resource.html:6
 msgid "Creating new resource: Question, Idea or Problem"
-msgstr ""
+msgstr "Creando nuevo recurso: Pregunta, Idea or Problema"
 
 #: sugar_network_webui/templates/dialog_resource.html:8
-#, fuzzy
 msgid "Editing "
-msgstr "editar"
+msgstr "Editando"
 
 #: sugar_network_webui/templates/dialog_resource.html:18
 #: sugar_network_webui/templates/resource-form.html:13
@@ -491,7 +484,7 @@ msgstr "Contexto"
 
 #: sugar_network_webui/templates/please_wait.html:5
 msgid "Please wait"
-msgstr ""
+msgstr "Por favor espera"
 
 #: sugar_network_webui/templates/report-form.html:5
 msgid "Report to developers: Activity failed to start!"
@@ -505,14 +498,13 @@ msgstr "Si lo deseas, deja un comentario sobre las condiciones del fallo."
 msgid "Report"
 msgstr "Reportar"
 
-#: sugar_network_webui/templates/report-form.html:24
-#, fuzzy
-msgid "Offline mode"
-msgstr "aún no se puede aportar sin conexión"
+#: sugar_network_webui/templates/report-form.html:25
+msgid "Sugar Network is in offline mode"
+msgstr "Estás en modo \"offline\""
 
-#: sugar_network_webui/templates/report-form.html:26
+#: sugar_network_webui/templates/report-form.html:27
 msgid "Your report will be queued for upload."
-msgstr ""
+msgstr "Tu reporte de fallo será enviando con próxima sincronización"
 
 #: sugar_network_webui/templates/resource-form.html:5
 msgid "Improve the system"
@@ -534,17 +526,20 @@ msgstr "Retroalimentación"
 msgid "Solutions"
 msgstr "Soluciones"
 
-#: sugar_network_webui/templates/synchronize.html:19
+#: sugar_network_webui/templates/synchronize.html:17
+#: sugar_network_webui/templates/toolbar.html:60
+#: sugar_network_webui/templates/toolbar.html:73
+msgid "Reviews"
+msgstr "Reseñas"
+
+#: sugar_network_webui/templates/synchronize.html:21
 #: sugar_network_webui/templates/upload-form.html:24
 msgid "Upload and share"
 msgstr "Cargar y compartir"
 
-#: sugar_network_webui/templates/synchronize.html:34
-#, fuzzy
-msgid ""
-"You need to be connected to the Internet or to a Sugar Network Node in "
-"order to sync."
-msgstr "¡Por ahora es necesario tener conexión para aportar!"
+#: sugar_network_webui/templates/synchronize.html:36
+msgid "You need to be connected to the Internet or to a Sugar Network Node in order to sync."
+msgstr "Necesitas estar conectado a Internet o a un nodo de la Red Azúcar para poder sincronizar."
 
 #: sugar_network_webui/templates/toolbar.html:8
 #: sugar_network_webui/templates/toolbar.html:46
@@ -590,18 +585,13 @@ msgstr "Ideas"
 msgid "Problems"
 msgstr "Problemas"
 
-#: sugar_network_webui/templates/toolbar.html:60
-#: sugar_network_webui/templates/toolbar.html:73
-msgid "Reviews"
-msgstr "Reseñas"
-
 #: sugar_network_webui/templates/toolbar.html:66
 msgid "artifacts list"
 msgstr "galería de artefactos"
 
 #: sugar_network_webui/templates/toolbar.html:79
 msgid "synchronize"
-msgstr ""
+msgstr "sincronizar"
 
 #: sugar_network_webui/templates/toolbar.html:86
 msgid "type to search contexts"
@@ -617,7 +607,7 @@ msgstr "crear nuevo proyecto"
 
 #: sugar_network_webui/templates/toolbar.html:101
 msgid "about"
-msgstr ""
+msgstr "Acerca de"
 
 #: sugar_network_webui/templates/toolbar.html:107
 msgid "reload"
@@ -633,22 +623,25 @@ msgstr "Porfavor incluye una breve descripción."
 
 #: sugar_network_webui/templates/upload-form.html:29
 msgid "cc-by-sa.png"
-msgstr ""
+msgstr "cc-by-sa.png"
 
 #: sugar_network_webui/templates/upload-form.html:31
-msgid ""
-"You are also promising us that you wrote this yourself, or copied it from"
-" a public domain or similar free resource. <b>Do not submit copyrighted "
-"work without permission!</b>"
-msgstr ""
+msgid "You are also promising us that you wrote this yourself, or copied it from a public domain or similar free resource. <b>Do not submit copyrighted work without permission!</b>"
+msgstr "Tambien nos aseguras que tu escribiste esto, o lo copiaste de un dominio público u otro recurso libre similar.<b> Por favor envies material con licencias no libres sin permiso!</b>"
 
 #: sugar_network_webui/templates/upload-form.html:40
 msgid "Alpha Version"
 msgstr "Versión Alfa"
 
 #: sugar_network_webui/templates/upload-form.html:42
-msgid ""
-"For the time being you need to be connected to the Internet in order to "
-"contribute!"
+msgid "For the time being you need to be connected to the Internet in order to contribute!"
 msgstr "¡Por ahora es necesario tener conexión para aportar!"
 
+#~ msgid "can't comment in offline mode yet"
+#~ msgstr "aún no se puede comentar sin conexión"
+
+#~ msgid "About"
+#~ msgstr "Acerca de"
+
+#~ msgid "Offline mode"
+#~ msgstr "modo \"offline\""
diff --git a/sweets.recipe b/sweets.recipe
index e70a98e..c4fb1b0 100644
--- a/sweets.recipe
+++ b/sweets.recipe
@@ -8,7 +8,7 @@ summary   = Web UI client for Sugar Network server
 license   = GPLv3+
 homepage  = http://wiki.sugarlabs.org/go/Platform_Team/Sugar_Network/Browser
 
-version   = 0.7
+version   = 0.8
 stability = developer
 
 requires  = flask; flask-babel