[Python-modules-commits] [python-django-crispy-forms] 04/06: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Fri Jan 15 11:31:28 UTC 2016
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository python-django-crispy-forms.
commit e35119d499bb713641e94ecf8d11c174054418a6
Merge: b884391 e195963
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Fri Jan 15 11:54:30 2016 +0100
merge patched into master
.gitignore | 5 +
.travis.yml | 21 ++--
CHANGELOG.md | 8 ++
crispy_forms/__init__.py | 2 +-
crispy_forms/bootstrap.py | 45 ++++----
crispy_forms/compatibility.py | 14 +--
crispy_forms/helper.py | 17 ++-
crispy_forms/layout.py | 21 ++--
crispy_forms/templates/bootstrap/display_form.html | 2 +-
crispy_forms/templates/bootstrap/uni_form.html | 2 +-
.../templates/bootstrap3/display_form.html | 2 +-
.../templates/bootstrap3/layout/buttonholder.html | 4 +
crispy_forms/templates/bootstrap3/uni_form.html | 2 +-
.../templates/bootstrap4/accordion-group.html | 12 ++
crispy_forms/templates/bootstrap4/accordion.html | 3 +
crispy_forms/templates/bootstrap4/betterform.html | 22 ++++
.../templates/bootstrap4/display_form.html | 9 ++
crispy_forms/templates/bootstrap4/errors.html | 8 ++
.../templates/bootstrap4/errors_formset.html | 9 ++
crispy_forms/templates/bootstrap4/field.html | 48 ++++++++
crispy_forms/templates/bootstrap4/inputs.html | 13 +++
.../templates/bootstrap4/layout/alert.html | 4 +
.../templates/bootstrap4/layout/baseinput.html | 9 ++
.../templates/bootstrap4/layout/button.html | 1 +
.../templates/bootstrap4/layout/buttonholder.html | 4 +
.../bootstrap4/layout/checkboxselectmultiple.html | 18 +++
.../layout/checkboxselectmultiple_inline.html | 14 +++
crispy_forms/templates/bootstrap4/layout/div.html | 4 +
.../templates/bootstrap4/layout/field_errors.html | 5 +
.../bootstrap4/layout/field_errors_block.html | 5 +
.../bootstrap4/layout/field_with_buttons.html | 17 +++
.../templates/bootstrap4/layout/fieldset.html | 6 +
.../templates/bootstrap4/layout/formactions.html | 9 ++
.../templates/bootstrap4/layout/help_text.html | 7 ++
.../bootstrap4/layout/help_text_and_errors.html | 13 +++
.../templates/bootstrap4/layout/inline_field.html | 21 ++++
.../templates/bootstrap4/layout/multifield.html | 27 +++++
.../bootstrap4/layout/prepended_appended_text.html | 30 +++++
.../templates/bootstrap4/layout/radioselect.html | 17 +++
.../bootstrap4/layout/radioselect_inline.html | 14 +++
.../templates/bootstrap4/layout/tab-link.html | 1 +
crispy_forms/templates/bootstrap4/layout/tab.html | 6 +
.../bootstrap4/layout/uneditable_input.html | 10 ++
.../templates/bootstrap4/table_inline_formset.html | 51 +++++++++
.../{bootstrap3 => bootstrap4}/uni_form.html | 6 +-
crispy_forms/templates/bootstrap4/uni_formset.html | 8 ++
.../templates/bootstrap4/whole_uni_form.html | 14 +++
.../templates/bootstrap4/whole_uni_formset.html | 30 +++++
crispy_forms/templates/uni_form/display_form.html | 2 +-
crispy_forms/templates/uni_form/uni_form.html | 2 +-
crispy_forms/templatetags/crispy_forms_field.py | 6 +-
crispy_forms/templatetags/crispy_forms_filters.py | 15 ++-
crispy_forms/templatetags/crispy_forms_tags.py | 7 +-
crispy_forms/tests/conftest.py | 6 +-
crispy_forms/tests/forms.py | 6 +
crispy_forms/tests/test_form_helper.py | 122 +++++++++++++++++++--
crispy_forms/tests/test_layout.py | 97 ++++++++--------
crispy_forms/tests/test_layout_objects.py | 33 +++++-
crispy_forms/tests/test_settings.py | 22 ++++
crispy_forms/tests/test_tags.py | 74 ++++++++++++-
crispy_forms/tests/test_utils.py | 39 +++++++
crispy_forms/tests/urls.py | 7 +-
crispy_forms/utils.py | 44 ++++++++
debian/.git-dpm | 6 +-
debian/patches/no-remote-resources.patch | 3 +-
docs/crispy_tag_forms.rst | 11 +-
docs/form_helper.rst | 3 +
docs/install.rst | 4 +-
requirements.txt | 3 +-
tox.ini | 7 +-
70 files changed, 981 insertions(+), 158 deletions(-)
diff --cc debian/.git-dpm
index 89e7c5b,0000000..95b8eb1
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- d4597ac2b690507c54a24dfbf7366082d12356a0
- d4597ac2b690507c54a24dfbf7366082d12356a0
- 344c07764ac3ae019953240edfdc5045a4af1dc9
++e19596362921c6a9e8db689aba455e14a8d6b294
++e19596362921c6a9e8db689aba455e14a8d6b294
++8d1af358bbc8ff4c43719425776ce42abba63cde
+8d1af358bbc8ff4c43719425776ce42abba63cde
+python-django-crispy-forms_1.6.0.orig.tar.gz
+047631b0b95f1b7c20817af8f0320723027beaa5
+155045
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/no-remote-resources.patch
index 2c956b1,0000000..7e05577
mode 100644,000000..100644
--- a/debian/patches/no-remote-resources.patch
+++ b/debian/patches/no-remote-resources.patch
@@@ -1,54 -1,0 +1,55 @@@
- Subject: remove remote resource references to avoid privacy issues
++From e19596362921c6a9e8db689aba455e14a8d6b294 Mon Sep 17 00:00:00 2001
+From: Jan Dittberner <jandd at debian.org>
+Date: Sat, 11 Oct 2014 17:59:23 +0200
++Subject: remove remote resource references to avoid privacy issues
+
+Patch-Name: no-remote-resources.patch
+---
+ docs/_templates/sidebarintro.html | 9 ---------
+ docs/_themes/kr/layout.html | 11 -----------
+ 2 files changed, 20 deletions(-)
+
+diff --git a/docs/_templates/sidebarintro.html b/docs/_templates/sidebarintro.html
+index 11f654e..ecd71b0 100644
+--- a/docs/_templates/sidebarintro.html
++++ b/docs/_templates/sidebarintro.html
+@@ -1,8 +1,4 @@
+ <h3 style="font-size: 30px;"><a href="{{ pathto(master_doc) }}">crispy-forms</a></h3>
+-<p>
+- <iframe src="http://ghbtns.com/github-btn.html?user=maraujop&repo=django-crispy-forms&type=watch&count=true&size=large"
+- allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px"></iframe>
+-</p>
+
+ <p>
+ django-crispy-forms is a Django application that lets you easily build, customize and reuse forms using your favorite CSS framework, without writing template code and without having to take care of annoying details. You are currently looking at the documentation of the development release.
+@@ -13,8 +9,3 @@
+ <p>
+ If you love django-crispy-forms, consider making a small donation <a href="http://flattr.com/thing/512037/django-crispy-forms">on Flattr</a>:
+ </p>
+-<p>
+- <a class="FlattrButton" style="display:none;" rev="flattr;button:compact;" href="http://django-crispy-forms.rtfd.org"></a>
+- <noscript><a href="http://flattr.com/thing/512037/django-crispy-forms" target="_blank">
+- <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Click to flattr django-crispy-forms" border="0" /></a></noscript>
+-</p>
+diff --git a/docs/_themes/kr/layout.html b/docs/_themes/kr/layout.html
+index 4d50f1e..d7c8792 100644
+--- a/docs/_themes/kr/layout.html
++++ b/docs/_themes/kr/layout.html
+@@ -9,17 +9,6 @@
+ {% endblock %}
+ {%- block relbar2 %}{% endblock %}
+ {%- block footer %}
+- <script type="text/javascript">
+- /* <![CDATA[ */
+- (function() {
+- var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
+- s.type = 'text/javascript';
+- s.async = true;
+- s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
+- t.parentNode.insertBefore(s, t);
+- })();
+- /* ]]> */</script>
+-
+ <div class="footer">
+ © Copyright {{ copyright }}.
+ Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django-crispy-forms.git
More information about the Python-modules-commits
mailing list