From 0f1ebe30e90897f6ec56c3219a37d03b8afa254c Mon Sep 17 00:00:00 2001 From: Sebastian Silva Date: Wed, 29 May 2013 06:22:57 +0000 Subject: Fix issues found for SN 0.9 release --- diff --git a/messages.pot b/messages.pot index fc42032..a655d24 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: 2013-05-22 01:40-0500\n" +"POT-Creation-Date: 2013-05-29 01:01-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -46,7 +46,7 @@ msgstr "" msgid "" "Success!\n" "\n" -"File %s has been copied to your Documents folder.\n" +"File %(filename)s has been copied to your Documents folder.\n" "You can access it from the Journal." msgstr "" @@ -59,7 +59,7 @@ msgstr "" msgid "page %(page)s of %(total)s" msgstr "" -#: sugar_network_webui/app.py:439 sugar_network_webui/app.py:741 +#: sugar_network_webui/app.py:439 sugar_network_webui/app.py:746 #: sugar_network_webui/templates/_browser-grid.html:5 #: sugar_network_webui/templates/context-view.html:5 #: sugar_network_webui/templates/context-view.html:25 @@ -67,7 +67,7 @@ msgstr "" msgid "questions" msgstr "" -#: sugar_network_webui/app.py:442 sugar_network_webui/app.py:744 +#: sugar_network_webui/app.py:442 sugar_network_webui/app.py:749 #: sugar_network_webui/templates/_browser-grid.html:11 #: sugar_network_webui/templates/context-view.html:11 #: sugar_network_webui/templates/context-view.html:31 @@ -75,7 +75,7 @@ msgstr "" msgid "problems" msgstr "" -#: sugar_network_webui/app.py:445 sugar_network_webui/app.py:747 +#: sugar_network_webui/app.py:445 sugar_network_webui/app.py:752 #: sugar_network_webui/templates/_browser-grid.html:8 #: sugar_network_webui/templates/context-view.html:8 #: sugar_network_webui/templates/context-view.html:28 @@ -83,7 +83,7 @@ msgstr "" msgid "ideas" msgstr "" -#: sugar_network_webui/app.py:448 sugar_network_webui/app.py:675 +#: sugar_network_webui/app.py:448 sugar_network_webui/app.py:680 #: sugar_network_webui/templates/_browser-grid.html:14 #: sugar_network_webui/templates/_review-list.html:16 #: sugar_network_webui/templates/context-view.html:14 @@ -92,15 +92,15 @@ msgstr "" msgid "reviews" msgstr "" -#: sugar_network_webui/app.py:451 sugar_network_webui/app.py:751 +#: sugar_network_webui/app.py:451 sugar_network_webui/app.py:756 msgid "artifacts" msgstr "" -#: sugar_network_webui/app.py:454 sugar_network_webui/app.py:754 +#: sugar_network_webui/app.py:454 sugar_network_webui/app.py:759 msgid "resources" msgstr "" -#: sugar_network_webui/app.py:468 sugar_network_webui/app.py:763 +#: sugar_network_webui/app.py:468 sugar_network_webui/app.py:768 #, python-format msgid "browsing %(total)s %(resource_label)s" msgstr "" @@ -222,25 +222,30 @@ msgstr "" msgid "favorite" msgstr "" -#: sugar_network_webui/templates/_context-artifact-list.html:52 +#: sugar_network_webui/templates/_context-artifact-list.html:45 +#: sugar_network_webui/templates/_context-comment-list.html:17 +msgid "delete" +msgstr "" + +#: sugar_network_webui/templates/_context-artifact-list.html:58 #: sugar_network_webui/templates/_context-resource-list.html:52 #: sugar_network_webui/templates/_review-list.html:53 msgid "followers" msgstr "" -#: sugar_network_webui/templates/_context-artifact-list.html:55 +#: sugar_network_webui/templates/_context-artifact-list.html:61 #: sugar_network_webui/templates/_context-resource-list.html:55 #: sugar_network_webui/templates/_review-list.html:56 msgid "comments" msgstr "" -#: sugar_network_webui/templates/_context-artifact-list.html:58 +#: sugar_network_webui/templates/_context-artifact-list.html:64 #: sugar_network_webui/templates/_context-resource-list.html:58 #: sugar_network_webui/templates/_review-list.html:59 msgid "solutions" msgstr "" -#: sugar_network_webui/templates/_context-artifact-list.html:66 +#: sugar_network_webui/templates/_context-artifact-list.html:72 #: sugar_network_webui/templates/_context-resource-list.html:66 #, python-format msgid "" @@ -248,10 +253,6 @@ msgid "" "first to contribute with the community!" msgstr "" -#: sugar_network_webui/templates/_context-comment-list.html:17 -msgid "delete" -msgstr "" - #: sugar_network_webui/templates/_context-comment-list.html:35 #: sugar_network_webui/templates/_context-comment-list.html:38 #: sugar_network_webui/templates/_context-review-list.html:55 @@ -330,29 +331,29 @@ msgstr "" #: sugar_network_webui/templates/base.html:74 #: sugar_network_webui/templates/dialog_resource.html:18 -#: sugar_network_webui/templates/upload-form.html:13 +#: sugar_network_webui/templates/upload-form.html:12 msgid "Sugar Network" msgstr "" #: sugar_network_webui/templates/base.html:85 #: sugar_network_webui/templates/base.html:139 #: sugar_network_webui/templates/base.html:199 -#: sugar_network_webui/templates/dialog_project.html:24 +#: sugar_network_webui/templates/dialog_project.html:21 #: sugar_network_webui/templates/dialog_resource.html:23 #: sugar_network_webui/templates/resource-form.html:21 msgid "Title" msgstr "" #: sugar_network_webui/templates/base.html:93 -#: sugar_network_webui/templates/context-view.html:83 -#: sugar_network_webui/templates/dialog_project.html:32 +#: sugar_network_webui/templates/context-view.html:87 +#: sugar_network_webui/templates/dialog_project.html:29 msgid "Summary" msgstr "" #: sugar_network_webui/templates/base.html:97 #: sugar_network_webui/templates/base.html:140 #: sugar_network_webui/templates/base.html:200 -#: sugar_network_webui/templates/dialog_project.html:36 +#: sugar_network_webui/templates/dialog_project.html:33 #: sugar_network_webui/templates/dialog_resource.html:33 #: sugar_network_webui/templates/resource-form.html:25 msgid "Details" @@ -381,7 +382,6 @@ msgid "Edit resource" msgstr "" #: sugar_network_webui/templates/base.html:387 -#: sugar_network_webui/templates/dialog_project.html:44 #: sugar_network_webui/templates/synchronize.html:34 msgid "You are in offline mode" msgstr "" @@ -392,7 +392,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:243 +#: sugar_network_webui/templates/context-view.html:258 #: sugar_network_webui/templates/resource-list.html:111 msgid "page '+new_page+' of" msgstr "" @@ -401,11 +401,11 @@ msgstr "" msgid "Author(s)" msgstr "" -#: sugar_network_webui/templates/context-view.html:86 +#: sugar_network_webui/templates/context-view.html:90 msgid "License" msgstr "" -#: sugar_network_webui/templates/context-view.html:87 +#: sugar_network_webui/templates/context-view.html:91 msgid "Work in progress." msgstr "" @@ -439,37 +439,26 @@ msgstr "" msgid "Editing project" msgstr "" -#: sugar_network_webui/templates/dialog_project.html:46 -msgid "" -"You need to be connected to the Internet or to a Sugar Network Node in " -"order to upload a project." -msgstr "" - -#: sugar_network_webui/templates/dialog_project.html:48 -#: sugar_network_webui/templates/synchronize.html:39 -msgid "Try to connect" -msgstr "" - -#: sugar_network_webui/templates/dialog_project.html:54 +#: sugar_network_webui/templates/dialog_project.html:38 msgid "Must fill all fields." msgstr "" -#: sugar_network_webui/templates/dialog_project.html:57 +#: sugar_network_webui/templates/dialog_project.html:41 #: sugar_network_webui/templates/dialog_resource.html:48 #: 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_project.html:42 #: sugar_network_webui/templates/dialog_resource.html:49 #: sugar_network_webui/templates/synchronize.html:25 msgid "Creative Commons Attribution Share-Alike License" msgstr "" -#: sugar_network_webui/templates/dialog_project.html:59 +#: sugar_network_webui/templates/dialog_project.html:43 #: sugar_network_webui/templates/dialog_resource.html:50 #: sugar_network_webui/templates/synchronize.html:26 -#: sugar_network_webui/templates/upload-form.html:27 +#: sugar_network_webui/templates/upload-form.html:26 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 " @@ -477,7 +466,7 @@ msgid "" "here." msgstr "" -#: sugar_network_webui/templates/dialog_project.html:61 +#: sugar_network_webui/templates/dialog_project.html:45 #: sugar_network_webui/templates/dialog_resource.html:52 #: sugar_network_webui/templates/synchronize.html:28 msgid "" @@ -495,7 +484,7 @@ msgstr "" #: sugar_network_webui/templates/dialog_resource.html:18 #: sugar_network_webui/templates/resource-form.html:13 -#: sugar_network_webui/templates/upload-form.html:13 +#: sugar_network_webui/templates/upload-form.html:12 msgid "Context" msgstr "" @@ -550,7 +539,7 @@ msgid "Reviews" msgstr "" #: sugar_network_webui/templates/synchronize.html:21 -#: sugar_network_webui/templates/upload-form.html:24 +#: sugar_network_webui/templates/upload-form.html:23 msgid "Upload and share" msgstr "" @@ -560,6 +549,10 @@ msgid "" "order to sync." msgstr "" +#: sugar_network_webui/templates/synchronize.html:39 +msgid "Try to connect" +msgstr "" + #: sugar_network_webui/templates/toolbar.html:8 #: sugar_network_webui/templates/toolbar.html:43 msgid "Activities" @@ -636,28 +629,18 @@ msgstr "" msgid "Upload an artifact: Share your work!" msgstr "" -#: sugar_network_webui/templates/upload-form.html:17 +#: sugar_network_webui/templates/upload-form.html:16 msgid "Please add a short description." msgstr "" -#: sugar_network_webui/templates/upload-form.html:29 +#: sugar_network_webui/templates/upload-form.html:28 msgid "cc-by-sa.png" msgstr "" -#: sugar_network_webui/templates/upload-form.html:31 +#: sugar_network_webui/templates/upload-form.html:30 msgid "" "You are also promising us that you wrote this yourself, or copied it from" " a public domain or similar free resource. Do not submit copyrighted " "work without permission!" msgstr "" -#: sugar_network_webui/templates/upload-form.html:40 -msgid "Alpha Version" -msgstr "" - -#: 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!" -msgstr "" - diff --git a/sugar_network_webui/app.py b/sugar_network_webui/app.py index 4ad8e02..e97f2bf 100644 --- a/sugar_network_webui/app.py +++ b/sugar_network_webui/app.py @@ -337,8 +337,8 @@ def artifact_copy(guid): f.write(blob.read()) title = _('Artifact has been downloaded.') body = _('Success!\n\n' - 'File %s has been copied to your Documents folder.\n' - 'You can access it from the Journal.' % filename) + 'File %(filename)s has been copied to your Documents folder.\n' + 'You can access it from the Journal.' , filename=filename) return render_template('dialog.html', title=title, body=body) diff --git a/sugar_network_webui/static/css/browser.css b/sugar_network_webui/static/css/browser.css index b0c6cc7..2845dd7 100644 --- a/sugar_network_webui/static/css/browser.css +++ b/sugar_network_webui/static/css/browser.css @@ -468,8 +468,8 @@ img.action-button:hover { background-color: #808080; cursor:pointer; } -span.delete-artifact-button { - float:right; +span.delete-artifact-button img{ + margin-top: 10px; } div.meta-column { diff --git a/sugar_network_webui/templates/_context-artifact-list.html b/sugar_network_webui/templates/_context-artifact-list.html index 332d26f..4538901 100644 --- a/sugar_network_webui/templates/_context-artifact-list.html +++ b/sugar_network_webui/templates/_context-artifact-list.html @@ -42,7 +42,7 @@ {{_('by %(author)s on %(date)s', author=sugar_nick, date=item['mtime']|timedelta)}} {% endif %} {%- if item.is_author -%} - + diff --git a/sugar_network_webui/templates/_context-review-list.html b/sugar_network_webui/templates/_context-review-list.html index 5cae03d..fec033a 100644 --- a/sugar_network_webui/templates/_context-review-list.html +++ b/sugar_network_webui/templates/_context-review-list.html @@ -41,7 +41,7 @@ {%- endfor %} {%- if item.is_author -%} - - + {%- endif -%}
+

{{_('Summary')}}

+
{{context['summary']}}
+

{{_('Author(s)')}}

-
+
{%- for author in context['author'] -%}
@@ -84,9 +87,6 @@ {%- endfor -%}
-

{{_('Summary')}}

-
{{context['summary']}}
-

{{_('License')}}

{{_('Work in progress.')}}
diff --git a/sugar_network_webui/templates/upload-form.html b/sugar_network_webui/templates/upload-form.html index 635523a..3284692 100644 --- a/sugar_network_webui/templates/upload-form.html +++ b/sugar_network_webui/templates/upload-form.html @@ -7,7 +7,6 @@
- {%- if (session['connected'] or False) -%}
{{_('Context')}} : {{session.get('last_context_title') or _('Sugar Network')}} @@ -33,15 +32,6 @@
- {%- else -%} -
-
-
- {{_('Alpha Version')}} -
- {{_('For the time being you need to be connected to the Internet in order to contribute!')}} -
- {%- endif -%}