Projet

Général

Profil

0001-backoffice-rename-and-style-the-appearance-of-remove.patch

Frédéric Péters, 25 février 2016 12:09

Télécharger (2,45 ko)

Voir les différences:

Subject: [PATCH] backoffice: rename and style the appearance of "remove draft"
 link (#10084)

 tests/test_backoffice_pages.py      | 4 ++--
 wcs/backoffice/submission.py        | 2 +-
 wcs/qommon/static/css/dc2/admin.css | 6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)
tests/test_backoffice_pages.py
980 980
    resp = resp.follow()
981 981

  
982 982
    # and try to delete the form (but cancel)
983
    resp = resp.click('Delete')
983
    resp = resp.click('Delete this form')
984 984
    resp = resp.form.submit('cancel')
985 985
    assert resp.location == 'http://example.net/backoffice/submission/'
986 986
    assert data_class.count() == 1
......
990 990
    resp = app.get('/backoffice/submission/')
991 991
    resp = resp.click('#%s' % formdata_no)
992 992
    resp = resp.follow()
993
    resp = resp.click('Delete')
993
    resp = resp.click('Delete this form')
994 994
    resp = resp.form.submit('delete')
995 995
    assert resp.location == 'http://example.net/backoffice/submission/'
996 996
    assert data_class.count() == 0
wcs/backoffice/submission.py
110 110

  
111 111
        if formdata and not self.edit_mode:
112 112
            r += htmltext('<div><p>')
113
            r += htmltext('<a rel="popup" href="remove/%s">%s</a>') % (formdata.id, _('Delete'))
113
            r += htmltext('<a rel="popup" href="remove/%s">%s</a>') % (formdata.id, _('Delete this form'))
114 114
            r += htmltext('</p></div>')
115 115

  
116 116
        return r.getvalue()
wcs/qommon/static/css/dc2/admin.css
1145 1145
	border: 1px solid #ffae15;
1146 1146
}
1147 1147

  
1148
div.user-pending-forms {
1149
	border-bottom: 1px solid #aaa;
1150
	padding-bottom: 2em;
1151
	margin-bottom: 2em;
1152
}
1153

  
1148 1154
div.user-pending-forms ul {
1149 1155
	margin-left: 0;
1150 1156
	padding-left: 1.5em;
1151
-