Changeset 635:0f39a1e81b90

Timestamp:

25/06/12 10:07:30 (11 months ago)

Author:

nicoechaniz <nicoechaniz@…>

Branch:

default

Message:

frontend edit: added translation strings, initial migration and minor fixes

Files:

• cyclope/admin.py (modified) (1 diff)
• cyclope/core/collections/templates/collections/category_contents_base.html (modified) (2 diffs)
• cyclope/core/perms/migrations/0001_initial.py (added)
• cyclope/core/perms/migrations/__init__.py (added)
• cyclope/core/perms/models.py (modified) (1 diff)
• cyclope/tests.py (modified) (1 diff)
• demo/cyclope_project/db/site.db (modified) (previous)

cyclope/admin.py

@@ -107 +107 @@
             category_slug = request.REQUEST['_from_category']
             category = Category.objects.get(slug=category_slug)
-            #            extra_context['initial_category'] = category.id
-            #            extra_context['initial_collection'] = category.collection.id
+            extra_context['initial_category'] = category.id
+            extra_context['initial_collection'] = category.collection.id
         return super(BaseContentAdmin, self).add_view(request, form_url, extra_context)
     

cyclope/core/collections/templates/collections/category_contents_base.html

@@ -2 +2 @@
 
 {% load i18n cyclope_utils fb_versions obj_perms %}
+
+{% block extra_head %}
+{{ block.super }}
+<script type="text/javascript">
+var hide_children = function (el){
+    $(el).children('ul').css('display', 'none');
+}
+
+var show_children = function (el){
+    $(el).children('ul').css('display', 'block');
+}
+
+jQuery(document).ready(function(){
+    $('.category_add_content').each(function(){
+        hide_children($(this));
+    });
+    $('.category_add_content').each(function(){
+        $(this).mouseenter(function(){
+            show_children($(this));
+            return false;
+        })
+        $(this).mouseleave(function(){
+            hide_children($(this));
+            return false;
+        });
+    });
+});
+</script>
+{% endblock %}
 
 {% block content %}
@@ -7 +36 @@
   {% per_category_perms category as cat_perms %}
   {% if cat_perms.add_content %}
-
   <div class="category_add_content">
-    <a href="{% url category-default category.slug %}">Add content</a>
+    <a href="{% url category-default category.slug %}">{% trans "Add content" %}</a>
     <ul class="content_types">
       {% for c_type in category.collection.content_types.all %}

cyclope/core/perms/models.py

@@ -27 +27 @@
 from django.db import models
 from django.contrib.auth.models import User
+from django.utils.translation import ugettext_lazy as _
+
 from cyclope.core.collections.models import Category
 
 
 class CategoryPermission(models.Model):
-    user = models.ForeignKey(User)
-    can_edit_content = models.BooleanField()
-    can_add_content = models.BooleanField()    
-    category = models.ForeignKey(Category)
-
-    def _available_perms(self):
-        return [ f.name for f in self.fields if f.name.startswith('can_') ]
-
-    available_perms = property(_available_perms)
+    user = models.ForeignKey(User, verbose_name=_('user'))
+    can_edit_content = models.BooleanField(_('can edit content'))
+    can_add_content = models.BooleanField(_('can add content'))
+    category = models.ForeignKey(Category, verbose_name=_('category'))
 
     class Meta:
         unique_together = ('category', 'user')
-
+        verbose_name = _('category permission')
+        verbose_name_plural = _('category permissions')

cyclope/tests.py

@@ -636 +636 @@
         response = self.client.post(url, data={})
         self.assertEqual(response.status_code, 200)
-        print response
         self.assertTrue("This field is required" in response.content)