add collapse/open all v.1.4.0

raagin · raagin · commit ca783ebabb63 · 2021-06-29T11:10:40.000+03:00
diff --git a/README.md b/README.md
@@ -440,8 +440,15 @@ def save(self, *args, **kwargs):
 # settings.py
 ```
 
+### STREAMFIELD_SHOW_ADMIN_COLLAPSE
+If you want to hide "Collapse" link in admin.  
+Set:
+```python
+STREAMFIELD_SHOW_ADMIN_COLLAPSE = False
+```
+
 ### STREAMFIELD_SHOW_ADMIN_HELP_TEXT
-If you want to hide "Help" link in admin, above the "Add new block" link.
+If you want to hide "Help" link in admin.  
 Set: 
 ```python
 STREAMFIELD_SHOW_ADMIN_HELP_TEXT = False
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="django-streamfield",
-    version="1.3.9",
+    version="1.4.0",
     author="Yury Lapshinov",
     author_email="y.raagin@gmail.com",
     description="StreamField for native Django Admin or with Grappelli",
diff --git a/streamfield/__init__.py b/streamfield/__init__.py
@@ -1,2 +1,2 @@
 name = "streamfield"
-VERSION = '1.3.9'
+VERSION = '1.4.0'
diff --git a/streamfield/fields.py b/streamfield/fields.py
@@ -7,6 +7,7 @@
 from .settings import (
     BLOCK_OPTIONS, 
     SHOW_ADMIN_HELP_TEXT, 
+    SHOW_ADMIN_COLLAPSE,
     DELETE_BLOCKS_FROM_DB, 
     BASE_ADMIN_URL
     )
@@ -37,6 +38,7 @@ def __init__(self, attrs=None):
         
         attrs["model_list_info"] = json.dumps(model_list_info)
         attrs['show_admin_help_text'] = SHOW_ADMIN_HELP_TEXT
+        attrs['show_admin_collapse'] = SHOW_ADMIN_COLLAPSE
         attrs['delete_blocks_from_db'] = DELETE_BLOCKS_FROM_DB
         attrs['base_admin_url'] = BASE_ADMIN_URL
         super().__init__(attrs)
diff --git a/streamfield/locale/en/LC_MESSAGES/django.mo b/streamfield/locale/en/LC_MESSAGES/django.mo
diff --git a/streamfield/locale/en/LC_MESSAGES/django.po b/streamfield/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-01 23:26+0300\n"
+"POT-Creation-Date: 2021-06-29 11:06+0300\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"
@@ -18,6 +18,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: templates/streamfield/admin/change_form.html:19
+msgid "Please correct the error below."
+msgstr ""
+
+#: templates/streamfield/admin/change_form.html:19
+msgid "Please correct the errors below."
+msgstr ""
+
+#: templates/streamfield/admin/fields/file_browse_widget.html:24
+msgid "File not found"
+msgstr ""
+
+#: templates/streamfield/admin/streamfield_popup_response.html:3
+msgid "Popup closing..."
+msgstr ""
 
 #: templates/streamfield/streamfield_admin_help.html:2
 msgid ""
@@ -46,20 +61,31 @@ msgstr ""
 msgid "Help?"
 msgstr ""
 
-#: templates/streamfield/streamfield_widget.html:45
-#: templates/streamfield/streamfield_widget.html:50
-#: templates/streamfield/streamfield_widget.html:77
+#: templates/streamfield/streamfield_widget.html:20
+msgid "Collapse all"
+msgstr ""
+
+#: templates/streamfield/streamfield_widget.html:20
+msgid "Open all"
+msgstr ""
+
+#: templates/streamfield/streamfield_widget.html:53
+#: templates/streamfield/streamfield_widget.html:58
+#: templates/streamfield/streamfield_widget.html:80
+#: templates/streamfield/streamfield_widget.html:85
 msgid "Change"
 msgstr ""
 
-#: templates/streamfield/streamfield_widget.html:60
+#: templates/streamfield/streamfield_widget.html:65
+#: templates/streamfield/streamfield_widget.html:68
 msgid "Add one more"
 msgstr ""
 
-#: templates/streamfield/streamfield_widget.html:85
+#: templates/streamfield/streamfield_widget.html:90
+#: templates/streamfield/streamfield_widget.html:93
 msgid "Add content"
 msgstr ""
 
-#: templates/streamfield/streamfield_widget.html:103
+#: templates/streamfield/streamfield_widget.html:119
 msgid "Add new block"
 msgstr ""
diff --git a/streamfield/locale/it/LC_MESSAGES/django.mo b/streamfield/locale/it/LC_MESSAGES/django.mo
diff --git a/streamfield/locale/it/LC_MESSAGES/django.po b/streamfield/locale/it/LC_MESSAGES/django.po
@@ -7,16 +7,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-01 23:26+0300\n"
+"POT-Creation-Date: 2021-06-29 11:06+0300\n"
 "PO-Revision-Date: 2020-02-08 14:10+0100\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: it_IT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language-Team: \n"
 "X-Generator: Poedit 2.3\n"
-"Last-Translator: \n"
-"Language: it_IT\n"
+
+#: templates/streamfield/admin/change_form.html:19
+msgid "Please correct the error below."
+msgstr ""
+
+#: templates/streamfield/admin/change_form.html:19
+msgid "Please correct the errors below."
+msgstr ""
+
+#: templates/streamfield/admin/fields/file_browse_widget.html:24
+msgid "File not found"
+msgstr ""
+
+#: templates/streamfield/admin/streamfield_popup_response.html:3
+msgid "Popup closing..."
+msgstr ""
 
 #: templates/streamfield/streamfield_admin_help.html:2
 msgid ""
@@ -58,20 +74,31 @@ msgstr "Sei sicuro di voler cancellare questo sotto blocco?"
 msgid "Help?"
 msgstr "Un aiutino?"
 
-#: templates/streamfield/streamfield_widget.html:45
-#: templates/streamfield/streamfield_widget.html:50
-#: templates/streamfield/streamfield_widget.html:77
+#: templates/streamfield/streamfield_widget.html:20
+msgid "Collapse all"
+msgstr "Crolla tutto"
+
+#: templates/streamfield/streamfield_widget.html:20
+msgid "Open all"
+msgstr "Apri tutto"
+
+#: templates/streamfield/streamfield_widget.html:53
+#: templates/streamfield/streamfield_widget.html:58
+#: templates/streamfield/streamfield_widget.html:80
+#: templates/streamfield/streamfield_widget.html:85
 msgid "Change"
 msgstr "Modifica"
 
-#: templates/streamfield/streamfield_widget.html:60
+#: templates/streamfield/streamfield_widget.html:65
+#: templates/streamfield/streamfield_widget.html:68
 msgid "Add one more"
 msgstr "Aggiungine un altro"
 
-#: templates/streamfield/streamfield_widget.html:85
+#: templates/streamfield/streamfield_widget.html:90
+#: templates/streamfield/streamfield_widget.html:93
 msgid "Add content"
 msgstr "Aggiungi contenuto"
 
-#: templates/streamfield/streamfield_widget.html:103
+#: templates/streamfield/streamfield_widget.html:119
 msgid "Add new block"
 msgstr "Aggiungi un nuovo blocco"
diff --git a/streamfield/locale/ru/LC_MESSAGES/django.mo b/streamfield/locale/ru/LC_MESSAGES/django.mo
diff --git a/streamfield/locale/ru/LC_MESSAGES/django.po b/streamfield/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-01 23:26+0300\n"
+"POT-Creation-Date: 2021-06-29 11:06+0300\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"
@@ -20,6 +20,21 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#: templates/streamfield/admin/change_form.html:19
+msgid "Please correct the error below."
+msgstr ""
+
+#: templates/streamfield/admin/change_form.html:19
+msgid "Please correct the errors below."
+msgstr ""
+
+#: templates/streamfield/admin/fields/file_browse_widget.html:24
+msgid "File not found"
+msgstr ""
+
+#: templates/streamfield/admin/streamfield_popup_response.html:3
+msgid "Popup closing..."
+msgstr ""
 
 #: templates/streamfield/streamfield_admin_help.html:2
 msgid ""
@@ -59,21 +74,32 @@ msgstr "Вы уверены, что хотите удалить этот под
 msgid "Help?"
 msgstr "Помощь?"
 
-#: templates/streamfield/streamfield_widget.html:45
-#: templates/streamfield/streamfield_widget.html:50
-#: templates/streamfield/streamfield_widget.html:77
+#: templates/streamfield/streamfield_widget.html:20
+msgid "Collapse all"
+msgstr "Закрыть все"
+
+#: templates/streamfield/streamfield_widget.html:20
+msgid "Open all"
+msgstr "Открыть все"
+
+#: templates/streamfield/streamfield_widget.html:53
+#: templates/streamfield/streamfield_widget.html:58
+#: templates/streamfield/streamfield_widget.html:80
+#: templates/streamfield/streamfield_widget.html:85
 msgid "Change"
 msgstr "Изменить"
 
-#: templates/streamfield/streamfield_widget.html:60
+#: templates/streamfield/streamfield_widget.html:65
+#: templates/streamfield/streamfield_widget.html:68
 msgid "Add one more"
 msgstr "Добавить ещё"
 
-#: templates/streamfield/streamfield_widget.html:85
+#: templates/streamfield/streamfield_widget.html:90
+#: templates/streamfield/streamfield_widget.html:93
 msgid "Add content"
 msgstr "Добавить контент"
 
-#: templates/streamfield/streamfield_widget.html:103
+#: templates/streamfield/streamfield_widget.html:119
 msgid "Add new block"
 msgstr "Добавить новый блок"
 
diff --git a/streamfield/settings.py b/streamfield/settings.py
@@ -3,5 +3,6 @@
 
 BLOCK_OPTIONS = getattr(settings, "STREAMFIELD_BLOCK_OPTIONS", {})
 SHOW_ADMIN_HELP_TEXT = getattr(settings, "STREAMFIELD_SHOW_ADMIN_HELP_TEXT", True)
+SHOW_ADMIN_COLLAPSE = getattr(settings, "STREAMFIELD_SHOW_ADMIN_COLLAPSE", True)
 DELETE_BLOCKS_FROM_DB = getattr(settings, "STREAMFIELD_DELETE_BLOCKS_FROM_DB", True)
 BASE_ADMIN_URL = getattr(settings, "STREAMFIELD_BASE_ADMIN_URL", reverse_lazy('admin:index'))
diff --git a/streamfield/static/streamfield/css/streamfield_widget.css b/streamfield/static/streamfield/css/streamfield_widget.css
@@ -19,6 +19,17 @@
     background-image: none;
 }
 
+.streamfield_app .streamfield-models.collapsed .stream-model-block__content {
+    display: none;
+}
+.streamfield_app .streamfield-models.collapsed .stream-model-block {
+    margin-bottom: 10px;
+}
+.collapse-handler {
+    display: inline-block;
+    margin: 5px 0;
+    font-weight: bold;
+}
 .streamfield_app .stream-model-block {
     position: relative;
     background: white;
diff --git a/streamfield/static/streamfield/js/streamfield_widget.js b/streamfield/static/streamfield/js/streamfield_widget.js
@@ -33,7 +33,8 @@
                 blocks: {}, // save content of all instances
                 show_help: false,
                 show_add_block: false,
-                will_removed: [] // blocks that will be removed from db
+                will_removed: [], // blocks that will be removed from db
+                collapsed: false
             }
 
             var app = new Vue({
diff --git a/streamfield/templates/streamfield/streamfield_widget.html b/streamfield/templates/streamfield/streamfield_widget.html
@@ -15,7 +15,13 @@
     </div>
     {% endif %}
 
-    <div class="streamfield-models">
+    {% if widget.attrs.show_admin_collapse %}
+    <div style="text-align: right;" v-if="stream.length > 1">
+        <a href="javascript:;" @click="collapsed=!collapsed" v-html=" !collapsed ? '&minus; {% trans "Collapse all" %}' : '&plus; {% trans "Open all" %}'" class="collapse-handler"></a>
+    </div>
+    {% endif %}
+
+    <div class="streamfield-models" :class="{collapsed}">
         <draggable v-model="stream" group="stream" handle=".block-move">
         <div v-for="block in stream" 
             class="stream-model-block" 
@@ -26,7 +32,7 @@ <h3 class="streamblock__block__title"><span v-text="model_title(block)"></span>
                     <span class="block-delete" @click="deleteBlock(block.unique_id)"></span>
                 </span>
             </h3>
-            <div v-if="!isAbstract(block)">
+            <div v-if="!isAbstract(block)" >
                 <div v-if="isArray(block.id)" 
                     class="stream-model-block__content"
                     :class="model_name_lower(block)"
@@ -61,7 +67,7 @@ <h3 class="streamblock__block__title"><span v-text="model_title(block)"></span>
                         @click.prevent="openPopup"
                         >+ {% trans "Add one more" %}</a>
                 </div>
-                <div v-else 
+                <div v-else
                     class="stream-model-block__content no-subblocks"
                     :class="model_name_lower(block)">
                     <template v-if="block.id != -1">
@@ -88,7 +94,7 @@ <h3 class="streamblock__block__title"><span v-text="model_title(block)"></span>
                     </template>
                 </div>
             </div> <!-- /v-if="isAbstract" -->
-            <div v-else>
+            <div v-else >
                 <div class="stream-model-block__content no-subblocks abstract-block"
                     :class="model_name_lower(block)">
                     <span v-html="getAbstractBlockContent(block)"></span>

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`name = "streamfield"`
`2`		`-VERSION = '1.3.9'`
	`2`	`+VERSION = '1.4.0'`