Improvement of tooltips and UI.

15 files changed, 237 insertions, 182 deletions

diff --git a/app/app.py b/app/app.py
index 8381171..e786480 100644
--- a/app/app.py
+++ b/app/app.py
@@ -54,6 +54,9 @@ def get_locale():
     if not lang:
         # otherwise we're probably embedded, get from env
         lang = locale.getdefaultlocale()[0].split('_')[0]
+        logging.info('Locale from env: %s' % lang)
+    else:
+        logging.info('Locale from headers: %s' % lang)
     return lang
 
 @app.template_filter('special_str')
diff --git a/app/static/css/browser.css b/app/static/css/browser.css
index aee2294..3ff15a5 100644
--- a/app/static/css/browser.css
+++ b/app/static/css/browser.css
@@ -79,10 +79,14 @@ hr {
     display: none;
     z-index: 110;
     line-height: 2em;
-    padding: 5px 10px;
+    padding: 9px 10px;
+    padding-left: 55px;
     border-radius: 15px; 
     -moz-border-radius: 15px;
     -webkit-border-radius: 15px;
+    background-image: url(/static/images/tuki.png);
+    background-repeat: no-repeat;
+    background-position: left center;
 }
 #infobar {
     position: fixed;
@@ -114,7 +118,7 @@ hr.menu-separator {
 
 #query {
     height: 28px;
-    width: 350px;
+    width: 250px;
     border-radius: 15px;
     -moz-border-radius: 15px;
     -webkit-border-radius: 15px;
@@ -1324,7 +1328,7 @@ a.disabled {
         width: 750px; 
         }
     .slider {
-        width: 500px;
+        width: 450px;
         }
     div.context-grid-box {
         width: 750px; 
diff --git a/app/templates/_browser-grid.html b/app/templates/_browser-grid.html
index efac9e4..baefa87 100644
--- a/app/templates/_browser-grid.html
+++ b/app/templates/_browser-grid.html
@@ -2,25 +2,25 @@
                 {%- for context in result[:6] %}
                 <div class="grid-item">
                     <a href="/context/questions/{{context['guid']}}?cursor_offset={{context.offset}}">
-                    <img class="box-button question-icon has_tooltip" src="/static/icons/button-question.png" title="{{_('Questions')}}"/>
+                    <img class="box-button question-icon has_tooltip" src="/static/icons/button-question.png" title="{{_('questions')}}"/>
                     </a>
                     <a href="/context/ideas/{{context['guid']}}?cursor_offset={{context.offset}}">
-                    <img class="box-button idea-icon has_tooltip" src="/static/icons/button-idea.png" title="{{_('Ideas')}}"/>
+                    <img class="box-button idea-icon has_tooltip" src="/static/icons/button-idea.png" title="{{_('ideas')}}"/>
                     </a>
                     <a href="/context/problems/{{context['guid']}}?cursor_offset={{context.offset}}">
-                    <img class="box-button problem-icon has_tooltip" src="/static/icons/button-problem.png"  title="{{_('Problems')}}"/>
+                    <img class="box-button problem-icon has_tooltip" src="/static/icons/button-problem.png"  title="{{_('problems')}}"/>
                     </a>
                     <a href="/context/reviews/{{context['guid']}}">
-                    <img class="box-button review-icon has_tooltip" src="/static/icons/button-review.png"  title="{{_('Reviews')}}"/>
+                    <img class="box-button review-icon has_tooltip" src="/static/icons/button-review.png"  title="{{_('reviews')}}"/>
                     </a>
                     <a href="/context/gallery/{{context['guid']}}">
-                    <img class="box-button gallery-icon has_tooltip" src="/static/icons/button-blank.png" title="{{_('Artifact gallery')}}" />
+                    <img class="box-button gallery-icon has_tooltip" src="/static/icons/button-blank.png" title="{{_('artifact gallery')}}" />
                     </a>
                     <a href="/context/all/{{context['guid']}}">
-                    <img class="box-button wiki-icon has_tooltip" src="/static/icons/button-list.png" title="{{_('All resources')}}" />
+                    <img class="box-button wiki-icon has_tooltip" src="/static/icons/button-list.png" title="{{_('all resources')}}" />
                     </a>
 
-                    <div class="iconbox has_tooltip" title="{{_('Launch')}}">
+                    <div class="iconbox has_tooltip" title="{{_('launch')}}">
                         {%- if 'activity' in context['type'] -%}
                         <a href="/launch/{{context['guid']}}">
                         {%- else -%}
@@ -31,14 +31,14 @@
                     </div>
                     <div class="context-label">    
                         <span class="context-controls">
-                        <img title="{{_('Make available when offline')}}" id="moon-{{context['guid']}}" 
+                        <img title="{{_('available offline')}}" id="moon-{{context['guid']}}" 
                         {% if context['keep_impl'] %}
                         style="background-color:{{fill}}; border: 1px solid {{stroke}};"
                         data-keep_impl="true"
                         {% endif %} 
                         class="moon-emblem has_tooltip" src="/static/icons/moon.png"/>
                         
-                        <img title="{{_('Make favourite')}}" id="star-{{context['guid']}}" 
+                        <img title="{{_('favorite')}}" id="star-{{context['guid']}}" 
                         {% if context['keep'] %}
                         style="background-color:{{fill}}; border: 1px solid {{stroke}};"
                         data-keep="true"
diff --git a/app/templates/_context-comment-list.html b/app/templates/_context-comment-list.html
index 81a2136..18f485d 100644
--- a/app/templates/_context-comment-list.html
+++ b/app/templates/_context-comment-list.html
@@ -8,7 +8,7 @@
                         </div>
                         <div class='mtime mtime-comment'>{{_('by %(author)s on %(date)s', author=item['author'][0], date=item['mtime']|timedelta)}}
                         {%- if userid in item['user'] -%}
-                            <span class="delete-comment-button" data-guid="{{item['guid']}}"><img class="action-button" src="/static/icons/edit-delete.png"></img></span>
+                            <span class="delete-comment-button has_tooltip" title="{{_('delete')}}" data-guid="{{item['guid']}}"><img class="action-button" src="/static/icons/edit-delete.png"></img></span>
                         {%- endif -%}
                         </div>
                         <div class="resource-meta">
@@ -29,10 +29,11 @@
                         <input id="comment_button_{{resource_guid}}" class="comment-button sugar-button" data-guid="{{resource_guid}}" type="submit" value="{{_('comment')}}" />
         {%- else -%}
                         <textarea id="textarea-comment" name="comment" disabled></textarea>
-                        <input id="comment_button_{{resource_guid}}" class="comment-button sugar-button" data-guid="{{resource_guid}}" type="submit" value="{{_('can\'t comment in offline mode yet')}}" disabled />
+                        <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 -%}
                 </form>
-                <span class="collapse-button" 
+                <span class="collapse-button has_tooltip"
+                        title="{{_('collapse')}}"
                         id="collapse_button_{{resource_guid}}" 
                         data-guid="{{resource_guid}}">
                     <img class="collapse-icon" src="/static/icons/collapse.png" />
diff --git a/app/templates/_context-review-list.html b/app/templates/_context-review-list.html
index 475cf99..197d7a5 100644
--- a/app/templates/_context-review-list.html
+++ b/app/templates/_context-review-list.html
@@ -32,7 +32,8 @@
                         {%- endfor %}
                         </div>
                         {%- if userid in item['user'] -%}
-                        <span class="comments-button" 
+                        <span class="comments-button has_tooltip" 
+                            title="{{_('edit')}}"
                             onclick='edit_resource("review",
                                             "{{item["guid"]}}",
                                             "{{item["content"]}}",
@@ -41,7 +42,8 @@
                             </img>
                             </span>
                         {%- endif -%}
-                        <span class="comments-button" 
+                        <span class="comments-button has_tooltip" 
+                            title="{{_('comment')}}"
                             id="comments-button-{{item['guid']}}" 
                             data-guid="{{item['guid']}}">
                             <img src="/static/icons/comments.png" />
@@ -57,3 +59,8 @@
                 </li>
                 {%- endfor %}
                 </ul>
+                <script type="text/javascript">
+                $(document).ready( function() {
+                    $('#bottom-palette').slideUp();
+                });
+                </script>
diff --git a/app/templates/_context-solution-list.html b/app/templates/_context-solution-list.html
index 9d1584b..bd4675c 100644
--- a/app/templates/_context-solution-list.html
+++ b/app/templates/_context-solution-list.html
@@ -27,7 +27,8 @@
                             <img src="/static/icons/toolbar-edit.png" />
                         </span>
                         {%- endif -%}
-                        <span class="comments-button" 
+                        <span class="comments-button has_tooltip" 
+                            title="{{_('comment')}}"
                             id="comments-button-{{resource['guid']}}" 
                             data-guid="{{resource['guid']}}">
                             <img src="/static/icons/comments.png" />
@@ -58,7 +59,8 @@
                         {%- endfor %}
                         </div>
                         {%- if userid in item['user'] -%}
-                        <span class="comments-button" 
+                        <span class="comments-button has_tooltip" 
+                            title="{{_('edit')}}"
                             onclick="edit_resource('solution',
                                             {{item["guid"]|tojson}},
                                             {{item["content"]|tojson}},
@@ -67,7 +69,8 @@
                             </img>
                             </span>
                         {%- endif -%}
-                        <span class="comments-button" 
+                        <span class="comments-button has_tooltip" 
+                            title="{{_('comment')}}"
                             id="comments-button-{{item['guid']}}" 
                             data-guid="{{item['guid']}}">
                             <img src="/static/icons/comments.png" />
@@ -95,4 +98,8 @@
                     <input id="contribute-button" class="sugar-button" type="submit" value="{{_('can\'t contribute in offline mode yet')}}" disabled />
         {%- endif -%}
                 </form>
-
+                <script type="text/javascript">
+                    $(document).ready( function() {
+                        $('#bottom-palette').slideUp();
+                    });
+                </script>
diff --git a/app/templates/_resource-list.html b/app/templates/_resource-list.html
index 0434af5..c963a6a 100644
--- a/app/templates/_resource-list.html
+++ b/app/templates/_resource-list.html
@@ -3,7 +3,7 @@
         <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')}}" />
+                <img class="has_tooltip" src="/context/icon/{{item['context']}}" title="{{_('context resources')}}" />
                 </a>
             </div>
             <div class="icon-column">
@@ -13,18 +13,18 @@
             </div>
             <div class="icon-column res_type_col">
                 <a href="/context/{{item['type']|special_str}}s/{{item['context']}}">
-                <img class="tab-button has_tooltip" src="/static/icons/button-{{item['type']|special_str}}.png" title="{{_('Context %(resource)ss', resource=item['type']|special_str)}}"/>
+                <img class="tab-button has_tooltip" src="/static/icons/button-{{item['type']|special_str}}.png" title="{{_('context %(resource)s', resource=_('%ss' % item['type']|special_str))}}"/>
                 </a>
             </div>
             <div class="summary-column">
                 {%- if resource_type!='review' %}
                 <div class="resource-title">
-                <a class="has_tooltip" title="{{_('Participate')}}" href="/{{item['type']|special_str}}/{{item['guid']}}">
+                <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="{{_('Participate')}}" href="/{{item['type']|special_str}}/{{item['guid']}}">
+                <a class="has_tooltip" title="{{_('see more')}}" href="/{{item['type']|special_str}}/{{item['guid']}}">
                 {{item['content']}}</a>
                 </div>
                 <div class="resource-meta">
diff --git a/app/templates/base.html b/app/templates/base.html
index aa74276..526924e 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -479,9 +479,9 @@
             $( this ).tooltip({position:"bottom right", offset:[-3,-60], tipClass:"generic_tooltip", 
                 onShow: function(event, position) {
                     var tip = this.getTip();
-                    var new_pos = $(window).width() - (parseInt( tip.css( 'width' ), 10) + 60);
+                    var new_pos = $(window).width() - (parseInt( tip.css( 'width' ), 10) + 110);
                     tip.css( 'position', "fixed" );
-                    tip.css( 'top', "7px" );
+                    tip.css( 'top', "4px" );
                     tip.css( 'left', new_pos + "px" );
                 }
             })
diff --git a/app/templates/context-view.html b/app/templates/context-view.html
index bd17767..e99a7d7 100644
--- a/app/templates/context-view.html
+++ b/app/templates/context-view.html
@@ -2,44 +2,44 @@
     {%- block view %}
     <div id="resource-tabs" class="resource-list-tabs">
         <a href="/context/questions/{{context['guid']}}">
-        <img class="palette-tab-button has_tooltip {{questions}}" src="/static/icons/button-question.png" title="{{_('Questions')}}"/>
+        <img class="palette-tab-button has_tooltip {{questions}}" src="/static/icons/button-question.png" title="{{_('questions')}}"/>
         </a>
         <a href="/context/ideas/{{context['guid']}}">
-        <img class="palette-tab-button has_tooltip {{ideas}}" src="/static/icons/button-idea.png" title="{{_('Ideas')}}" />
+        <img class="palette-tab-button has_tooltip {{ideas}}" src="/static/icons/button-idea.png" title="{{_('ideas')}}" />
         </a>
         <a href="/context/problems/{{context['guid']}}">
-        <img class="palette-tab-button has_tooltip {{problems}}" src="/static/icons/button-problem.png" title="{{_('Problems')}}" />
+        <img class="palette-tab-button has_tooltip {{problems}}" src="/static/icons/button-problem.png" title="{{_('problems')}}" />
         </a>
         <a href="/context/reviews/{{context['guid']}}">
-        <img class="palette-tab-button has_tooltip {{reviews}}" src="/static/icons/button-review.png" title="{{_('Reviews')}}" />
+        <img class="palette-tab-button has_tooltip {{reviews}}" src="/static/icons/button-review.png" title="{{_('reviews')}}" />
         </a>
         <a href="/context/gallery/{{context['guid']}}">
-        <img class="palette-tab-button has_tooltip {{gallery}}" src="/static/icons/button-blank.png" title="{{_('Artifact gallery')}}" />
+        <img class="palette-tab-button has_tooltip {{gallery}}" src="/static/icons/button-blank.png" title="{{_('artifact gallery')}}" />
         </a>
         <a href="/context/all/{{context['guid']}}">
-        <img class="palette-tab-button has_tooltip {{all}}" src="/static/icons/button-list.png" title="{{_('All resources')}}" />
+        <img class="palette-tab-button has_tooltip {{all}}" src="/static/icons/button-list.png" title="{{_('all resources')}}" />
         </a>
     </div>
     <div class="grid-item context-info">
         <a href="/context/questions/{{context['guid']}}">
-        <img class="question-icon has_tooltip {{questions}}" src="/static/icons/button-question.png" title="{{_('Questions')}}" />
+        <img class="question-icon has_tooltip {{questions}}" src="/static/icons/button-question.png" title="{{_('questions')}}" />
         </a>
         <a href="/context/ideas/{{context['guid']}}">
-        <img class="idea-icon has_tooltip {{ideas}}" src="/static/icons/button-idea.png" title="{{_('Ideas')}}" />
+        <img class="idea-icon has_tooltip {{ideas}}" src="/static/icons/button-idea.png" title="{{_('ideas')}}" />
         </a>
         <a href="/context/problems/{{context['guid']}}">
-        <img class="problem-icon has_tooltip {{problems}}" src="/static/icons/button-problem.png" title="{{_('Problems')}}" />
+        <img class="problem-icon has_tooltip {{problems}}" src="/static/icons/button-problem.png" title="{{_('problems')}}" />
         </a>
         <a href="/context/reviews/{{context['guid']}}">
-        <img class="review-icon has_tooltip {{reviews}}" src="/static/icons/button-review.png" title="{{_('Reviews')}}" />
+        <img class="review-icon has_tooltip {{reviews}}" src="/static/icons/button-review.png" title="{{_('reviews')}}" />
         </a>
         <a href="/context/gallery/{{context['guid']}}">
-        <img class="gallery-icon has_tooltip {{gallery}}" src="/static/icons/button-blank.png" title="{{_('Artifact gallery')}}" />
+        <img class="gallery-icon has_tooltip {{gallery}}" src="/static/icons/button-blank.png" title="{{_('artifact gallery')}}" />
         </a>
         <a href="/context/all/{{context['guid']}}">
-        <img class="wiki-icon has_tooltip {{all}}" src="/static/icons/button-list.png" title="{{_('All resources')}}" />
+        <img class="wiki-icon has_tooltip {{all}}" src="/static/icons/button-list.png" title="{{_('all resources')}}" />
         </a> 
-        <div class="iconbox has_tooltip" title="{{_('Launch')}}">
+        <div class="iconbox has_tooltip" title="{{_('launch')}}">
             {%- if 'activity' in context['type'] -%}
             <a href="/launch/{{context['guid']}}">
             {%- else -%}
@@ -51,14 +51,14 @@
         <div class="context-label">    
             <span class="context-controls">
             <img id="moon-{{context['guid']}}" 
-            title="{{_('Make available when offline')}}" 
+            title="{{_('available offline')}}" 
             {% if context['keep_impl'] %}
             style="background-color:{{fill}}; border: 1px solid {{stroke}};"
             data-keep_impl="true"
             {% endif %} 
             class="moon-emblem has_tooltip" src="/static/icons/moon.png"/>
             <img id="star-{{context['guid']}}" 
-            title="{{_('Make favourite')}}" 
+            title="{{_('favorite')}}" 
             {% if context['keep'] %}
             style="background-color:{{fill}}; border: 1px solid {{stroke}};"
             data-keep="true"
diff --git a/app/templates/resource-list.html b/app/templates/resource-list.html
index c927a66..9c68c62 100644
--- a/app/templates/resource-list.html
+++ b/app/templates/resource-list.html
@@ -2,22 +2,22 @@
     {% block view %}
     <div id="resource-tabs" class="resource-list-tabs">
         <a href="/resource/questions">
-        <img class="palette-tab-button has_tooltip {{questions}}" src="/static/icons/button-question.png" title="{{_('Questions')}}" />
+        <img class="palette-tab-button has_tooltip {{questions}}" src="/static/icons/button-question.png" title="{{_('questions')}}" />
         </a>
         <a href="/resource/ideas">
-        <img class="palette-tab-button has_tooltip {{ideas}}" src="/static/icons/button-idea.png" title="{{_('Ideas')}}" />
+        <img class="palette-tab-button has_tooltip {{ideas}}" src="/static/icons/button-idea.png" title="{{_('ideas')}}" />
         </a>
         <a href="/resource/problems">
-        <img class="palette-tab-button has_tooltip {{problems}}" src="/static/icons/button-problem.png" title="{{_('Problems')}}" />
+        <img class="palette-tab-button has_tooltip {{problems}}" src="/static/icons/button-problem.png" title="{{_('problems')}}" />
         </a>
         <a href="/resource/reviews">
-        <img class="palette-tab-button has_tooltip {{reviews}}" src="/static/icons/button-review.png" title="{{_('Reviews')}}" />
+        <img class="palette-tab-button has_tooltip {{reviews}}" src="/static/icons/button-review.png" title="{{_('reviews')}}" />
         </a>
         <a href="/resource/gallery" has_tooltip onclick='alert("{% trans %}Work in progress.{% endtrans %}"); return false;'>
-        <img class="palette-tab-button has_tooltip {{gallery}}" src="/static/icons/button-blank.png"  title="{{_('Artifact gallery')}}" />
+        <img class="palette-tab-button has_tooltip {{gallery}}" src="/static/icons/button-blank.png"  title="{{_('artifact gallery')}}" />
         </a>
         <a href="/resource">
-        <img class="palette-tab-button has_tooltip {{all_}} {{all}}" src="/static/icons/button-list.png" title="{{_('All resources')}}" />
+        <img class="palette-tab-button has_tooltip {{all_}} {{all}}" src="/static/icons/button-list.png" title="{{_('all resources')}}" />
         </a>
     </div>
     {#<div id="resource-buttons">
@@ -62,7 +62,7 @@
     <script type="text/javascript">
         $(function() {
             // initialize scrollable
-            $(".resource-list-scrollable").scrollable( {vertical:true} );
+            $(".resource-list-scrollable").scrollable( {vertical:true } );
             var api = $("#resource-list-scrollable").data("scrollable");
             var last_page = {{page}};
             
diff --git a/app/templates/toolbar.html b/app/templates/toolbar.html
index 2ae95da..57f66a9 100644
--- a/app/templates/toolbar.html
+++ b/app/templates/toolbar.html
@@ -15,7 +15,7 @@
         <ul class="toolbar-bar">
         <li class="toolbar-items">
             <div id="sn-button" onclick="location='/_toggle_connect'">
-                <span class="has_tooltip" title="{{_('Connect to')}}">
+                <span class="has_tooltip" title="{{_('connect with')}}">
                 {% if (session['connected'] or False) %}
                 <img class="toolbar-icon sugar-network-online" src="/static/icons/sugar-network.png" /> 
                 {% else %}
@@ -38,7 +38,7 @@
         <!--li class="toolbar-items" onclick="location='/new/resource'"-->
         <li class="toolbar-items">
             <div id="browser-button" class="toolbar-button" onclick="location='/context?type=all'">
-                <span class="has_tooltip" title="{{_('Context grid')}}">
+                <span class="has_tooltip" title="{{_('context grid')}}">
                 <img class="{{'toolbar-selected' if browser_view}} toolbar-icon" src="/static/icons/insert-table.png" /> 
                 </span>
             </div>
@@ -50,7 +50,7 @@
             </div>
         </li>
         <li class="toolbar-items">
-            <div id="list-button" class="toolbar-button has_tooltip" onclick="location='/resource'" title="{{_('Resources list')}}">
+            <div id="list-button" class="toolbar-button has_tooltip" onclick="location='/resource'" title="{{_('resources list')}}">
                 <img class="{{'toolbar-selected' if resource_view}} toolbar-icon" src="/static/icons/view-list.png" /> 
             </div>
             <!--div id="browser-tooltip" class="tooltip">
@@ -65,31 +65,24 @@
         <li class="toolbar-items">
             <!-- input id="search" type="text" name="terms" value="{{query or ''}}"
                 onkeyup="onKeyPressed(event)" /-->
-            <div class="ui-widget has_tooltip" title="{{_('Type to search contexts')}}">
+            <div class="ui-widget has_tooltip" title="{{_('type to search contexts')}}">
                 <input id="query" name="terms" value="{{query or ''}}">
             </div>
         </li>
         <li class="toolbar-items" onclick="improve_the_system('{{session.get('last_context')}}')">
-            <div class="toolbar-button has_tooltip" title="{{_('New resource')}}">
+            <div class="toolbar-button has_tooltip" title="{{_('create new resource')}}">
                 <img class="toolbar-icon" src="/static/icons/list-add.png" /> 
             </div>
         </li>
         <li class="toolbar-items" onclick="new_context('{{session.get('last_context')}}')">
-            <div class="toolbar-button has_tooltip" title="{{_('New context')}}">
+            <div class="toolbar-button has_tooltip" title="{{_('create new context')}}">
                 <img class="toolbar-icon" src="/static/icons/go-up.png" /> 
             </div>
         </li>
         <li class="toolbar-items" onclick="location.href='/reload'+location.pathname;">
-            <div class="toolbar-button has_tooltip" title="{{_('Reload')}}">
+            <div class="toolbar-button has_tooltip" title="{{_('reload')}}">
                 <img class="toolbar-icon" src="/static/icons/reload.png" /> 
             </div>
         </li>
         </ul>
-        <ul class="toolbar-bar toolbar-right">
-        <!--li class="toolbar-items" onclick='alert("{% trans %}Work in progress.{% endtrans %}")'>
-            <div class="toolbar-button">
-                <img class="toolbar-icon" src="/static/icons/sugar-xo.png" /> 
-            </div>
-        </li-->
-        </ul>
     </div>
diff --git a/app/translations/es/LC_MESSAGES/messages.mo b/app/translations/es/LC_MESSAGES/messages.mo
index 215d3f0..d51dee9 100644
--- a/app/translations/es/LC_MESSAGES/messages.mo
+++ b/app/translations/es/LC_MESSAGES/messages.mo
diff --git a/app/translations/es/LC_MESSAGES/messages.po b/app/translations/es/LC_MESSAGES/messages.po
index c564a33..b27d7b2 100644
--- a/app/translations/es/LC_MESSAGES/messages.po
+++ b/app/translations/es/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-08-28 03:44-0500\n"
+"POT-Creation-Date: 2012-08-28 22:24-0500\n"
 "PO-Revision-Date: 2012-04-21 20:49-0500\n"
 "Last-Translator: Sebastian Silva <sebastian@sugarlabs.org>\n"
 "Language-Team: es <LL@li.org>\n"
@@ -30,19 +30,27 @@ msgstr "cero resultados"
 msgid "page %(page)s of %(total)s"
 msgstr "página %(page)s de %(total)s"
 
-#: app/app.py:368 app/app.py:629
+#: app/app.py:368 app/app.py:629 app/templates/_browser-grid.html:5
+#: app/templates/context-view.html:5 app/templates/context-view.html:25
+#: app/templates/resource-list.html:5
 msgid "questions"
 msgstr "preguntas"
 
-#: app/app.py:371 app/app.py:632
+#: app/app.py:371 app/app.py:632 app/templates/_browser-grid.html:11
+#: app/templates/context-view.html:11 app/templates/context-view.html:31
+#: app/templates/resource-list.html:11
 msgid "problems"
 msgstr "problemas"
 
-#: app/app.py:374 app/app.py:635
+#: app/app.py:374 app/app.py:635 app/templates/_browser-grid.html:8
+#: app/templates/context-view.html:8 app/templates/context-view.html:28
+#: app/templates/resource-list.html:8
 msgid "ideas"
 msgstr "ideas"
 
-#: app/app.py:377 app/app.py:569
+#: app/app.py:377 app/app.py:569 app/templates/_browser-grid.html:14
+#: app/templates/context-view.html:14 app/templates/context-view.html:34
+#: app/templates/resource-list.html:14
 msgid "reviews"
 msgstr "reseñas"
 
@@ -96,63 +104,47 @@ msgstr "nombre de host"
 msgid "address to listen for Web clients"
 msgstr "dirección para escuchar a los clientes Web"
 
-#: app/templates/_browser-grid.html:5 app/templates/context-view.html:5
-#: app/templates/context-view.html:25 app/templates/resource-list.html:5
-#: app/templates/toolbar.html:57
-msgid "Questions"
-msgstr "Preguntas"
-
-#: app/templates/_browser-grid.html:8 app/templates/context-view.html:8
-#: app/templates/context-view.html:28 app/templates/resource-list.html:8
-#: app/templates/toolbar.html:58
-msgid "Ideas"
-msgstr "Ideas"
-
-#: app/templates/_browser-grid.html:11 app/templates/context-view.html:11
-#: app/templates/context-view.html:31 app/templates/resource-list.html:11
-#: app/templates/toolbar.html:59
-msgid "Problems"
-msgstr "Problemas"
-
-#: app/templates/_browser-grid.html:14 app/templates/context-view.html:14
-#: app/templates/context-view.html:34 app/templates/resource-list.html:14
-#: app/templates/toolbar.html:60
-msgid "Reviews"
-msgstr "Reseñas"
-
 #: app/templates/_browser-grid.html:17 app/templates/context-view.html:17
 #: app/templates/context-view.html:37 app/templates/resource-list.html:17
-msgid "Artifact gallery"
-msgstr "Galería de artefactos"
+msgid "artifact gallery"
+msgstr "galería de artefactos"
 
 #: app/templates/_browser-grid.html:20 app/templates/context-view.html:20
 #: app/templates/context-view.html:40 app/templates/resource-list.html:20
-msgid "All resources"
-msgstr "Todos los recursos"
+msgid "all resources"
+msgstr "todos los recursos"
 
 #: app/templates/_browser-grid.html:23 app/templates/context-view.html:42
-msgid "Launch"
-msgstr "Iniciar"
+msgid "launch"
+msgstr "iniciar"
 
 #: app/templates/_browser-grid.html:34 app/templates/context-view.html:54
-msgid "Make available when offline"
-msgstr "Habilitar sin conexión"
+msgid "available offline"
+msgstr "disponible sin conexión"
 
 #: app/templates/_browser-grid.html:41 app/templates/context-view.html:61
-msgid "Make favourite"
-msgstr "Hacer favorito"
+msgid "favorite"
+msgstr "favorito"
 
 #: app/templates/_context-comment-list.html:9
 #: app/templates/_context-resource-list.html:39
 #: app/templates/_context-review-list.html:27
 #: app/templates/_context-solution-list.html:14
-#: app/templates/_context-solution-list.html:53
+#: app/templates/_context-solution-list.html:54
 #: app/templates/_resource-list.html:31
 #, python-format
 msgid "by %(author)s on %(date)s"
 msgstr "por %(author)s el %(date)s"
 
+#: app/templates/_context-comment-list.html:11
+msgid "delete"
+msgstr "borrar"
+
 #: app/templates/_context-comment-list.html:29
+#: app/templates/_context-comment-list.html:32
+#: app/templates/_context-review-list.html:46
+#: app/templates/_context-solution-list.html:31
+#: app/templates/_context-solution-list.html:73
 msgid "comment"
 msgstr "comentar"
 
@@ -160,6 +152,10 @@ msgstr "comentar"
 msgid "can't comment in offline mode yet"
 msgstr "aún no se puede comentar sin conexión"
 
+#: app/templates/_context-comment-list.html:36
+msgid "collapse"
+msgstr "colapsar"
+
 #: app/templates/_context-resource-list.html:48
 #: app/templates/_resource-list.html:49
 msgid "followers"
@@ -182,19 +178,19 @@ msgid ""
 "first to contribute with the community!"
 msgstr ""
 "Aún no se han compartido %(resource)s en este contexto.<br><br>¡Se el "
-"primero en contribuír con la comunidad!"
+"primero en aportar a la comunidad!"
 
 #: app/templates/_context-review-list.html:6
 msgid "contribute a review"
-msgstr "contribuir una reseña"
+msgstr "aportar una reseña"
 
 #: app/templates/_context-review-list.html:10
-#: app/templates/_context-solution-list.html:95
+#: app/templates/_context-solution-list.html:98
 msgid "can't contribute in offline mode yet"
-msgstr "aún no se puede contribuir sin conexión"
+msgstr "aún no se puede aportar sin conexión"
 
 #: app/templates/_context-review-list.html:16
-#: app/templates/_context-solution-list.html:42
+#: app/templates/_context-solution-list.html:43
 #, python-format
 msgid ""
 "No %(resource)s have been shared yet for this context.<br><br>Be the "
@@ -203,28 +199,33 @@ msgstr ""
 "Aún no se han compartido %(resource)s en este contexto.<br><br>¡Se el "
 "primero en compartir con la comunidad!"
 
-#: app/templates/_context-solution-list.html:91
+#: app/templates/_context-review-list.html:36
+#: app/templates/_context-solution-list.html:63
+msgid "edit"
+msgstr "editar"
+
+#: app/templates/_context-solution-list.html:94
 msgid "contribute a solution"
-msgstr "contribuir una solución"
+msgstr "aportar una solución"
 
 #: app/templates/_resource-list.html:6
-msgid "Context resources"
-msgstr "Recursos del contexto"
+msgid "context resources"
+msgstr "recursos del contexto"
 
 #: app/templates/_resource-list.html:16
-msgid "Context %(resource)ss"
-msgstr "%(resource)ss del contexto"
+#, python-format
+msgid "context %(resource)s"
+msgstr "%(resource)s del contexto"
 
 #: app/templates/_resource-list.html:22 app/templates/_resource-list.html:27
-msgid "Participate"
-msgstr "Participa"
+msgid "see more"
+msgstr "ver más"
 
 #: app/templates/base.html:4
 msgid "Welcome to Sugar Network"
 msgstr "Bienvenido(a) a Red Azúcar"
 
 #: app/templates/base.html:70 app/templates/base.html:307
-#: app/templates/toolbar.html:73
 msgid "New resource"
 msgstr "Nuevo recurso"
 
@@ -254,7 +255,7 @@ msgstr "Versión Alfa"
 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 contribuir!"
+msgstr "¡Por ahora es necesario tener conexión para aportar!"
 
 #: app/templates/base.html:140
 msgid "Edit project"
@@ -290,7 +291,6 @@ msgid "License"
 msgstr "Licencia"
 
 #: app/templates/context-view.html:87 app/templates/resource-list.html:16
-#: app/templates/toolbar.html:89
 msgid "Work in progress."
 msgstr "En construcción."
 
@@ -325,28 +325,49 @@ msgstr "Proyectos"
 #: app/templates/toolbar.html:10 app/templates/toolbar.html:49
 #: app/templates/toolbar.html:62
 msgid "All"
-msgstr "Todo"
+msgstr "Todos"
 
 #: app/templates/toolbar.html:18
-msgid "Connect to"
-msgstr "Conectar con"
+msgid "connect with"
+msgstr "conectar con"
 
 #: app/templates/toolbar.html:41
-msgid "Context grid"
-msgstr "Grilla de contextos"
+msgid "context grid"
+msgstr "grilla de contextos"
 
 #: app/templates/toolbar.html:53
-msgid "Resources list"
-msgstr "Lista de recursos"
+msgid "resources list"
+msgstr "lista de recursos"
+
+#: app/templates/toolbar.html:57
+msgid "Questions"
+msgstr "Preguntas"
+
+#: app/templates/toolbar.html:58
+msgid "Ideas"
+msgstr "Ideas"
+
+#: app/templates/toolbar.html:59
+msgid "Problems"
+msgstr "Problemas"
+
+#: app/templates/toolbar.html:60
+msgid "Reviews"
+msgstr "Reseñas"
 
 #: app/templates/toolbar.html:68
-msgid "Type to search contexts"
-msgstr "Escribe para buscar contextos"
+msgid "type to search contexts"
+msgstr "escribe para buscar contextos"
+
+#: app/templates/toolbar.html:73
+msgid "create new resource"
+msgstr "crear nuevo recurso"
 
 #: app/templates/toolbar.html:78
-msgid "New context"
-msgstr "Nuevo contexto"
+msgid "create new context"
+msgstr "crear nuevo proyecto"
 
 #: app/templates/toolbar.html:83
-msgid "Reload"
-msgstr "Recargar"
+msgid "reload"
+msgstr "recargar"
+
diff --git a/messages.pot b/messages.pot
index 3fecd68..6da4171 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-08-28 03:44-0500\n"
+"POT-Creation-Date: 2012-08-28 22:24-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"
@@ -30,19 +30,27 @@ msgstr ""
 msgid "page %(page)s of %(total)s"
 msgstr ""
 
-#: app/app.py:368 app/app.py:629
+#: app/app.py:368 app/app.py:629 app/templates/_browser-grid.html:5
+#: app/templates/context-view.html:5 app/templates/context-view.html:25
+#: app/templates/resource-list.html:5
 msgid "questions"
 msgstr ""
 
-#: app/app.py:371 app/app.py:632
+#: app/app.py:371 app/app.py:632 app/templates/_browser-grid.html:11
+#: app/templates/context-view.html:11 app/templates/context-view.html:31
+#: app/templates/resource-list.html:11
 msgid "problems"
 msgstr ""
 
-#: app/app.py:374 app/app.py:635
+#: app/app.py:374 app/app.py:635 app/templates/_browser-grid.html:8
+#: app/templates/context-view.html:8 app/templates/context-view.html:28
+#: app/templates/resource-list.html:8
 msgid "ideas"
 msgstr ""
 
-#: app/app.py:377 app/app.py:569
+#: app/app.py:377 app/app.py:569 app/templates/_browser-grid.html:14
+#: app/templates/context-view.html:14 app/templates/context-view.html:34
+#: app/templates/resource-list.html:14
 msgid "reviews"
 msgstr ""
 
@@ -96,63 +104,47 @@ msgstr ""
 msgid "address to listen for Web clients"
 msgstr ""
 
-#: app/templates/_browser-grid.html:5 app/templates/context-view.html:5
-#: app/templates/context-view.html:25 app/templates/resource-list.html:5
-#: app/templates/toolbar.html:57
-msgid "Questions"
-msgstr ""
-
-#: app/templates/_browser-grid.html:8 app/templates/context-view.html:8
-#: app/templates/context-view.html:28 app/templates/resource-list.html:8
-#: app/templates/toolbar.html:58
-msgid "Ideas"
-msgstr ""
-
-#: app/templates/_browser-grid.html:11 app/templates/context-view.html:11
-#: app/templates/context-view.html:31 app/templates/resource-list.html:11
-#: app/templates/toolbar.html:59
-msgid "Problems"
-msgstr ""
-
-#: app/templates/_browser-grid.html:14 app/templates/context-view.html:14
-#: app/templates/context-view.html:34 app/templates/resource-list.html:14
-#: app/templates/toolbar.html:60
-msgid "Reviews"
-msgstr ""
-
 #: app/templates/_browser-grid.html:17 app/templates/context-view.html:17
 #: app/templates/context-view.html:37 app/templates/resource-list.html:17
-msgid "Artifact gallery"
+msgid "artifact gallery"
 msgstr ""
 
 #: app/templates/_browser-grid.html:20 app/templates/context-view.html:20
 #: app/templates/context-view.html:40 app/templates/resource-list.html:20
-msgid "All resources"
+msgid "all resources"
 msgstr ""
 
 #: app/templates/_browser-grid.html:23 app/templates/context-view.html:42
-msgid "Launch"
+msgid "launch"
 msgstr ""
 
 #: app/templates/_browser-grid.html:34 app/templates/context-view.html:54
-msgid "Make available when offline"
+msgid "available offline"
 msgstr ""
 
 #: app/templates/_browser-grid.html:41 app/templates/context-view.html:61
-msgid "Make favourite"
+msgid "favorite"
 msgstr ""
 
 #: app/templates/_context-comment-list.html:9
 #: app/templates/_context-resource-list.html:39
 #: app/templates/_context-review-list.html:27
 #: app/templates/_context-solution-list.html:14
-#: app/templates/_context-solution-list.html:53
+#: app/templates/_context-solution-list.html:54
 #: app/templates/_resource-list.html:31
 #, python-format
 msgid "by %(author)s on %(date)s"
 msgstr ""
 
+#: app/templates/_context-comment-list.html:11
+msgid "delete"
+msgstr ""
+
 #: app/templates/_context-comment-list.html:29
+#: app/templates/_context-comment-list.html:32
+#: app/templates/_context-review-list.html:46
+#: app/templates/_context-solution-list.html:31
+#: app/templates/_context-solution-list.html:73
 msgid "comment"
 msgstr ""
 
@@ -160,6 +152,10 @@ msgstr ""
 msgid "can't comment in offline mode yet"
 msgstr ""
 
+#: app/templates/_context-comment-list.html:36
+msgid "collapse"
+msgstr ""
+
 #: app/templates/_context-resource-list.html:48
 #: app/templates/_resource-list.html:49
 msgid "followers"
@@ -187,33 +183,38 @@ msgid "contribute a review"
 msgstr ""
 
 #: app/templates/_context-review-list.html:10
-#: app/templates/_context-solution-list.html:95
+#: app/templates/_context-solution-list.html:98
 msgid "can't contribute in offline mode yet"
 msgstr ""
 
 #: app/templates/_context-review-list.html:16
-#: app/templates/_context-solution-list.html:42
+#: app/templates/_context-solution-list.html:43
 #, python-format
 msgid ""
 "No %(resource)s have been shared yet for this context.<br><br>Be the "
 "first to share with the community!"
 msgstr ""
 
-#: app/templates/_context-solution-list.html:91
+#: app/templates/_context-review-list.html:36
+#: app/templates/_context-solution-list.html:63
+msgid "edit"
+msgstr ""
+
+#: app/templates/_context-solution-list.html:94
 msgid "contribute a solution"
 msgstr ""
 
 #: app/templates/_resource-list.html:6
-msgid "Context resources"
+msgid "context resources"
 msgstr ""
 
 #: app/templates/_resource-list.html:16
 #, python-format
-msgid "Context %(resource)ss"
+msgid "context %(resource)s"
 msgstr ""
 
 #: app/templates/_resource-list.html:22 app/templates/_resource-list.html:27
-msgid "Participate"
+msgid "see more"
 msgstr ""
 
 #: app/templates/base.html:4
@@ -221,7 +222,6 @@ msgid "Welcome to Sugar Network"
 msgstr ""
 
 #: app/templates/base.html:70 app/templates/base.html:307
-#: app/templates/toolbar.html:73
 msgid "New resource"
 msgstr ""
 
@@ -287,7 +287,6 @@ msgid "License"
 msgstr ""
 
 #: app/templates/context-view.html:87 app/templates/resource-list.html:16
-#: app/templates/toolbar.html:89
 msgid "Work in progress."
 msgstr ""
 
@@ -325,26 +324,46 @@ msgid "All"
 msgstr ""
 
 #: app/templates/toolbar.html:18
-msgid "Connect to"
+msgid "connect with"
 msgstr ""
 
 #: app/templates/toolbar.html:41
-msgid "Context grid"
+msgid "context grid"
 msgstr ""
 
 #: app/templates/toolbar.html:53
-msgid "Resources list"
+msgid "resources list"
+msgstr ""
+
+#: app/templates/toolbar.html:57
+msgid "Questions"
+msgstr ""
+
+#: app/templates/toolbar.html:58
+msgid "Ideas"
+msgstr ""
+
+#: app/templates/toolbar.html:59
+msgid "Problems"
+msgstr ""
+
+#: app/templates/toolbar.html:60
+msgid "Reviews"
 msgstr ""
 
 #: app/templates/toolbar.html:68
-msgid "Type to search contexts"
+msgid "type to search contexts"
+msgstr ""
+
+#: app/templates/toolbar.html:73
+msgid "create new resource"
 msgstr ""
 
 #: app/templates/toolbar.html:78
-msgid "New context"
+msgid "create new context"
 msgstr ""
 
 #: app/templates/toolbar.html:83
-msgid "Reload"
+msgid "reload"
 msgstr ""
 
diff --git a/sweets.recipe b/sweets.recipe
index 3287732..e1c6b38 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.4
+version   = 0.5
 stability = developer
 
 requires  = flask; flask-babel