0001-admin-add-handles-to-sortable-items-11015.patch

Frédéric Péters, 20 mai 2016 20:03

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

Subject: [PATCH] admin: add handles to sortable items (#11015)

 tests/test_admin_pages.py           |  8 ++++----
 wcs/admin/fields.py                 |  4 +++-
 wcs/admin/workflows.py              | 14 +++++++------
 wcs/qommon/static/css/dc2/admin.css | 40 ++++++++++++++++++++++++++++++++++++-
 wcs/qommon/static/js/biglist.js     |  4 ++++
 5 files changed, 58 insertions(+), 12 deletions(-)

         assert resp.location == 'http://example.net/backoffice/forms/1/fields/'
         resp = resp.follow()
         assert 'foobar' in resp.body
         assert 'Use drag and drop to reorder fields.' in resp.body
         assert 'Use drag and drop' in resp.body
         assert len(FormDef.get(1).fields) == 1
         assert FormDef.get(1).fields[0].key == 'string'
-...
         resp = app.get('/backoffice/forms/1/')
         resp = resp.click(href='fields/')
         assert '1st field' in resp.body
         assert 'Use drag and drop to reorder fields.' in resp.body
         assert 'Use drag and drop' in resp.body
         resp = resp.click(href='1/delete')
         resp = resp.forms[0].submit()
-...
         assert resp.location == 'http://example.net/backoffice/forms/1/fields/'
         resp = resp.follow()
         assert 'foobar' in resp.body
         assert 'Use drag and drop to reorder fields.' in resp.body
         assert 'Use drag and drop' in resp.body
         assert len(FormDef.get(1).fields) == 1
         assert FormDef.get(1).fields[0].key == 'page'
-...
         resp = resp.forms[0].submit()
         assert resp.location == 'http://example.net/backoffice/workflows/1/status/1/'
         resp = resp.follow()
         assert 'Use drag and drop to reorder items' in resp.body
         assert 'Use drag and drop' in resp.body
         # fill action
         resp = resp.click('Display message')

     # -*- coding: utf-8 -*-
+    #
     # w.c.s. - web application for online forms
     # Copyright (C) 2005-2010  Entr'ouvert
+    #
-...
                         r += htmltext(_('In a multipage form, the first field should be of type "page".'))
                         r += htmltext('</div>')
                 r += htmltext('<p>%s</p>') % _('Use drag and drop to reorder fields.')
                 r += htmltext('<p class="hint">%s</p>') % _('Use drag and drop with the ⠿ handles to reorder items.')
                 if self.page_no is not None:
                     r += htmltext('<p>')
                     r += htmltext('<a href="../../">%s</a>') % _('Display all pages')

     # -*- coding: utf-8 -*-
+    #
     # w.c.s. - web application for online forms
     # Copyright (C) 2005-2010  Entr'ouvert
+    #
-...
                 if str(self.workflow.id).startswith(str('_')):
                     r += htmltext('<ul id="items-list" class="biglist">')
                 else:
                     r += htmltext('<p>')
                     r += _('Use drag and drop to reorder items.')
                     r += htmltext('<p class="hint">')
                     r += _('Use drag and drop with the ⠿ handles to reorder items.')
                     r += htmltext('</p>')
                     r += htmltext('<ul id="items-list" class="biglist sortable">')
                 for i, item in enumerate(self.status.items):
-...
                 if str(self.workflow.id).startswith('_'):
                     r += htmltext('<ul id="items-list" class="biglist">')
                 else:
                     r += htmltext('<p>')
                     r += _('Use drag and drop to reorder items.')
                     r += htmltext('<p class="items">')
                     r += _('Use drag and drop with the ⠿ handles to reorder items.')
                     r += htmltext('</p>')
                     r += htmltext('<ul id="items-list" class="biglist sortable">')
                 for i, item in enumerate(self.action.items):
-...
                 r += htmltext('<p>%s</p>') % _('There are not yet any status defined in this workflow.')
             else:
                 if not str(self.workflow.id).startswith(str('_')):
                     r += htmltext('<p>')
                     r += _('Use drag and drop to reorder status.')
                     r += htmltext('<p class="hint">')
                     r += _('Use drag and drop with the ⠿ handles to reorder status.')
                     r += htmltext('</p>')
                     r += htmltext('<ul id="status-list" class="biglist sortable">')
                 else:

     	padding: 0.5em 0;
+    }
     ul.biglist span.handle {
     	cursor: grab;
     	display: inline-block;
     	padding: 0.5ex;
     	text-align: center;
     	width: 1em;
+    }
     ul.biglist li,
     li.biglistitem {
     	list-style-type: none;
-...
     	line-height: 2.5em;
+    }
     ul.biglist.sortable li {
     	padding-left: 0;
+    }
     ul.biglist li.smallitem {
     	font-size: 80%;
     	background: #fffff4;
-...
     	padding-right: 5px;
+    }
     p.hint {
     	color: #aaa;
+    }
     div.bo-block p.hint {
     	color: inherit;
+    }
     p.hint::before {
     	content: "\f05a";
     	font-family: FontAwesome;
     	padding-right: 1ex;
+    }
     td.time {
     	text-align: right;
+    }
-...
     	border-width: 1px 0 0 0;
     	border-color: #e4e4e4;
     	padding: 0;
     	transition: background 0.25s ease 0s;
+    }
     div.bo-block ul.biglist h3 {
-...
     	color: #888;
+    }
     div.bo-block ul.biglist.sortable li strong a,
     div.bo-block ul.biglist.sortable li > a,
     ul.biglist.sortable a {
     	display: inline-block;
     	width: calc(100% - 1em - 3ex);
+    }
     div.bo-block ul.biglist li > a,
     div.bo-block ul.biglist strong a {
     	display: block;
-...
     	border: none;
     	font-weight: normal;
     	color: #215D9C;
     	transition: all 0.25s ease 0s;
+    }
     div.bo-block ul.biglist strong a.fake {
-...
     	color: white;
+    }
     div.bo-block ul.biglist.sortable li:hover,
     div.bo-block ul.biglist a:hover {
     	background: #ccc;
+    }
     div.bo-block ul.biglist.sortable li:hover a:hover {
     	background: transparent;
+    }
     div.bo-block span.disabled a {
     	color: #666;
     	text-decoration: none;

                  * set with position: relative and overflow properties */
                 $('#main-content').css('overflow', 'inherit');
+            }
             $('ul.biglist.sortable li').each(function(i, elem) {
                 $('<span class="handle">⠿</span>').prependTo(elem);
             });
             $('ul.biglist.sortable').sortable(
+                {
                     handle: '.handle',
                     accept: 'biglistitem',
                     scroll: true,
                     helper: 'clone',
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-admin-add-handles-to-sortable-items-11015.patch