0003-misc-extend-cell-size-options-use-a-dedicated-widget.patch

Frédéric Péters, 25 février 2022 09:50

Voir les différences: en ligne côte à côte

Subject: [PATCH 3/3] misc: extend cell size options, use a dedicated widget
 (#62072)

 combo/data/models.py                          | 17 +++++--
 combo/data/widgets.py                         | 21 ++++++++
 combo/manager/static/css/combo.manager.scss   | 49 +++++++++++++++++++
 .../templates/combo/widgets/flexsize.html     | 10 ++++
 tests/test_manager.py                         |  2 +-
 5 files changed, 95 insertions(+), 4 deletions(-)
 create mode 100644 combo/data/widgets.py
 create mode 100644 combo/manager/templates/combo/widgets/flexsize.html

     from .fields import RichTextField, TemplatableURLField
     from .library import get_cell_class, get_cell_classes, register_cell_class
     from .widgets import FlexSize
     class PostException(Exception):
-...
                             label=_('Size'),
                             choices=[
                                 ('', ''),
                                 ('size--1-1', '1/1'),
                                 ('size--t1-2', '1/2'),
                                 ('size--t1-3', '1/3'),
                                 ('size--1-1', '1'),
                                 ('size--t1-2', '½'),
                                 ('size--t1-3', '⅓'),
                                 ('size--t1-4', '¼'),
                                 ('size--t1-5', '⅕'),
                                 ('size--t1-6', '⅙'),
                                 ('size--t2-3', '⅔'),
                                 ('size--t2-5', '⅖'),
                                 ('size--t3-4', '¾'),
                                 ('size--t3-5', '⅗'),
                                 ('size--t4-5', '⅘'),
                                 ('size--t5-6', '⅚'),
                             ],
                             required=False,
                             widget=FlexSize,
+                        )
                         self.fields.move_to_end('extra_css_class')
                         extra_css_class = self.initial['extra_css_class'].split()

     # combo - content management system
     # Copyright (C) 2014-2022  Entr'ouvert
+    #
     # This program is free software: you can redistribute it and/or modify it
     # under the terms of the GNU Affero General Public License as published
     # by the Free Software Foundation, either version 3 of the License, or
     # (at your option) any later version.
+    #
     # This program is distributed in the hope that it will be useful,
     # but WITHOUT ANY WARRANTY; without even the implied warranty of
     # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     # GNU Affero General Public License for more details.
+    #
     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     from django.forms.widgets import Select
     class FlexSize(Select):
         template_name = 'combo/widgets/flexsize.html'

     .search-engine-add {
     	margin: 2em 0;
+    }
     .flex-size-select {
     	position: relative;
     	margin: 0;
     	padding: 0;
     	list-style: none;
     	&::before {
     		display: block;
     		position: absolute;
     		content: "";
     		width: calc(100% - 0.5em);
     		height: 2px;
     		top: -0.6em;
     		background: #386ede;
+    	}
     	li {
     		display: inline-block;
     		margin: 0;
     		padding: 0;
     		text-align: center;
     		input {
     			display: block;
     			margin: 0;
+    		}
     		label::before {
     			display: block;
     			position: absolute;
     			content: "";
     			background: #386ede;
     			height: 0.9em;
     			width: 2px;
     			top: -1em;
     			right: 0.4em;
+    		}
+    	}
     	.size--1-1 {
     		right: 0;
+    	}
     	@for $i from 1 through 6 {
     		@for $j from 1 through $i {
     			.size--t#{$j}-#{$i} {
     				right: calc(100% - #{100%*$j/$i});
+    			}
+    		}
+    	}
     	[class*="size--"] {
     		position: absolute;
+    	}
+    }

     {% load i18n %}
     {% with id=widget.attrs.id %}
     <ul{% if id %} id="{{ id }}"{% endif %} class="flex-size-select {{ widget.attrs.class|default:"" }}">{% for group, options, index in widget.optgroups %}
       {% for option in options %}
       <li class="{{ option.value|default:"size-auto" }}"><label class="{{ option.value }}"
               ><input type="radio" name="{{ widget.name }}" value="{{ option.value }}"
                     {% if option.selected %}checked{% endif %}>{{ option.label|default:_("Auto") }}</label></li>
       {% endfor %}
     {% endfor %}
     </ul>{% endwith %}

         resp = app.get('/manage/pages/%s/' % page.id)
         resp = resp.click('Options', href=r'cell.*options')
         resp.form['cdata_textcell-%s-fx_size' % cell.id].select(text='1/2')
         resp.form['cdata_textcell-%s-fx_size' % cell.id].select('size--t1-2')
         resp = resp.form.submit().follow()
         cell.refresh_from_db()
         assert cell.extra_css_class == 'size--t1-2'
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0003-misc-extend-cell-size-options-use-a-dedicated-widget.patch