adds an upper bar

rezometz · Sep 10, 2015 · db8b6a8 · db8b6a8
1 parent 8685675
commit db8b6a8
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 27 deletions.
diff --git a/modular_blocks/fields.py b/modular_blocks/fields.py
@@ -19,7 +19,12 @@ def to_python(self, value):
         return [x for x in value.split(self.separator) if x != '']
 
     def get_prep_value(self, value):
-        return self.separator.join(value)
+        if value is None:
+            return value
+        if isinstance(value, list):
+            return self.separator.join(value)
+        else:
+            return self.separator.join([value])
 
     def value_to_string(self, obj):
         value = self._get_val_from_obj(obj)

diff --git a/modular_blocks/forms.py b/modular_blocks/forms.py
@@ -10,8 +10,13 @@ def _format_value(self, value):
 class ModularChangeForm(forms.ModelForm):
     class Meta:
         model = get_user_model()
-        fields = ('sidebar_left', 'sidebar_right', )
+        fields = (
+            'sidebar_left',
+            'sidebar_right',
+            'topbar',
+        )
         widgets = {
             'sidebar_left': HiddenListInput(),
             'sidebar_right': HiddenListInput(),
+            'topbar': HiddenListInput(),
         }
diff --git a/modular_blocks/locale/fr/LC_MESSAGES/django.po b/modular_blocks/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-23 14:00+0200\n"
+"POT-Creation-Date: 2015-09-10 13:45+0200\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"
@@ -22,24 +22,25 @@ msgstr ""
 msgid "Changing my sidebars"
 msgstr "Modification des barres latérales"
 
-#: templates/modular_blocks/sidebars.html:14
+#: templates/modular_blocks/sidebars.html:15
 msgid ""
 "\n"
-"            You are currently modifying your sidebars. To do so, drag and\n"
-"            drop them where you want and do not forget to save your "
-"changes.\n"
+"            You are currently modifying your sidebars and your upper bar. To "
+"do so, drag and\n"
+"            drop them where you want (including above this square) and do "
+"not forget to save your changes.\n"
 "            "
 msgstr ""
 "\n"
-"           Vous êtes en train de modifier vos barres latérales.\n"
-"           Pour cela, tirez et déposez les widgets où vous voulez et "
-"           n’oubliez pas d’enregistrer vos changements.\n"
+"           Vous êtes en train de modifier vos barres latérales et votre barre supérieure.\n"
+"           Pour cela, tirez et déposez les widgets où vous voulez, y compris au-dessus de ce carré "
+"et            n’oubliez pas d’enregistrer vos changements.\n"
 "           "
 
-#: templates/modular_blocks/sidebars.html:23
+#: templates/modular_blocks/sidebars.html:25
 msgid "Save"
 msgstr "Enregistrer"
 
-#: templates/modular_blocks/sidebars.html:27
+#: templates/modular_blocks/sidebars.html:29
 msgid "Non used widgets"
 msgstr "Widgets non utilisés"
diff --git a/modular_blocks/models.py b/modular_blocks/models.py
@@ -15,3 +15,13 @@ class TwoModularColumnsMixin(models.Model):
 
     class Meta:
         abstract = True
+
+
+class TopModularColumnMixin(models.Model):
+    topbar = ListTextField(
+        blank=True,
+        null=True,
+    )
+
+    class Meta:
+        abstract = True
diff --git a/modular_blocks/static/modular_blocks/js/modulable.js b/modular_blocks/static/modular_blocks/js/modulable.js
@@ -1,7 +1,8 @@
 $(function() {
 
-    $('.module *').hide();
-    $('.module h3').show();
+    //$('.module *').hide();
+    //$('.module h3').show();
+    $('.module img').hide();
     $('.droppable-modules').sortable({
         connectWith: '.droppable-modules', 
         placeholder: 'module-placeholder alert alert-warning',
@@ -15,16 +16,21 @@ $(function() {
         var sidebar_left = $('.sidebar-left .module').map(function() {
             return $(this).attr('data-module');
         }).toArray();
+        var topbar = $('.topbar .module').map(function() {
+            return $(this).attr('data-module');
+        }).toArray();
         var sidebar_right = $('.sidebar-right .module').map(function() {
             return $(this).attr('data-module');
         }).toArray();
 
         var data = {
-            left: sidebar_left.join(','),
-            right: sidebar_right.join(','),
+            left_l: sidebar_left.join(','),
+            top_l: topbar.join(','),
+            right_l: sidebar_right.join(','),
         };
-        $('#id_sidebar_left').val(data.left);
-        $('#id_sidebar_right').val(data.right);
+        $('#id_sidebar_left').val(data.left_l);
+        $('#id_topbar').val(data.top_l);
+        $('#id_sidebar_right').val(data.right_l);
 
 
         console.log(data);

diff --git a/modular_blocks/templates/modular_blocks/sidebars.html b/modular_blocks/templates/modular_blocks/sidebars.html
@@ -13,8 +13,8 @@ <h3 class="panel-title">{% trans 'Changing my sidebars' %}</h3>
         <div class="panel-body">
             <p>
             {% blocktrans %}
-            You are currently modifying your sidebars. To do so, drag and
-            drop them where you want and do not forget to save your changes.
+            You are currently modifying your sidebars and your upper bar. To do so, drag and
+            drop them where you want (including above this square) and do not forget to save your changes.
             {% endblocktrans %}
             </p>
             <form action="{{ request.get_full_path }}" method="post" id="module-form">
@@ -30,15 +30,20 @@ <h3>{% trans 'Non used widgets' %}</h3>
             <div class="row">
                 <div class="col-sm-6">
                     <div class="droppable-modules non-used-modules">
-                    {% for block in non_used_blocks %}
-                    <div class="well module" data-module="{{ block.name }}">
-                        <h3>{{ block.title }}</h3>
-                    </div>
-                    {% endfor %}
+                        {% for block in non_used_blocks_1 %}
+                        <div class="well module" data-module="{{ block.name }}">
+                            <h3>{{ block.title }}</h3>
+                        </div>
+                        {% endfor %}
                     </div>
                 </div>
                 <div class="col-sm-6">
                     <div class="droppable-modules non-used-modules">
+                        {% for block in non_used_blocks_2 %}
+                        <div class="well module" data-module="{{ block.name }}">
+                            <h3>{{ block.title }}</h3>
+                        </div>
+                        {% endfor %}
                     </div>
                 </div>
             </div>

diff --git a/modular_blocks/views.py b/modular_blocks/views.py
@@ -19,7 +19,14 @@ def get_context_data(self, *args, **kwargs):
         user = self.request.user
 
         blocks_names = user.sidebar_left + user.sidebar_right
-
-        cd['non_used_blocks'] = modules.get_non_used_blocks(*blocks_names)
+        if isinstance(user.topbar, list):
+            blocks_names += user.topbar
+        elif user.topbar is not None:
+            blocks_names += [user.topbar]
+
+        nub = modules.get_non_used_blocks(*blocks_names)
+        mid = len(nub)/2
+        cd['non_used_blocks_1'] = nub[:mid]
+        cd['non_used_blocks_2'] = nub[mid:]
 
         return cd