Commit graph

23 commits

Author SHA1 Message Date
Martey Dodoo
a487f78f7e Make sponsor description default empty string.
Set sponsor listing text to an empty string instead of None. If a
sponsor doesn't have a benefit named "Sponsor Description", this will
prevent the text "None" from displaying in the Django template.
2016-01-25 15:17:23 -05:00
Didier Raboud
b50a42f243 Fix SponsorBenefit __str__ by using self.benefit.type instead of self.benefit_type 2015-10-26 12:40:22 +01:00
Patrick Altman
6dd80f9ddb Fix some flake8 issues 2015-09-13 21:34:40 -05:00
Patrick Altman
67433cacb4 Merge branch 'i18n-all' of https://github.com/miurahr/symposion into miurahr-i18n-all
Conflicts:
	symposion/boxes/models.py
	symposion/conference/models.py
	symposion/schedule/models.py
	symposion/speakers/models.py
	symposion/sponsorship/admin.py
	symposion/sponsorship/models.py
	symposion/teams/models.py
2015-09-08 15:07:24 -05:00
Patrick Altman
509e275706 Merge branch 'admin_sponsor_benefit' of https://github.com/miurahr/symposion into miurahr-admin_sponsor_benefit
Conflicts:
	symposion/sponsorship/admin.py
	symposion/sponsorship/models.py
2015-09-08 15:03:06 -05:00
Hiroshi Miura
3207621058 i18n all part
- forms for labels and helps
- views for success or warning messages
- apps and models verbose_names for admin

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2015-08-03 23:37:33 +09:00
Hiroshi Miura
a95825ede8 python3 compatibility
- Things are suggested in python3 porting guide.
https://docs.djangoproject.com/en/1.8/topics/python3/

     1. adding ```from django.utils.encoding import
     python_2_unicode_compatible```

     2. ``` __str__``` instead of ```__unicode__```
     https://docs.djangoproject.com/en/1.8/topics/python3/#str-and-unicode-methods

     3. Adding ```from __future__ import unicode_literals``` at the top
     of your Python modules
     https://docs.djangoproject.com/en/1.8/topics/python3/#unicode-literals

     4. Removing the `u` prefix before unicode strings;
     https://docs.djangoproject.com/en/1.8/topics/python3/#unicode-literals

- also closed #66

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2015-08-03 23:32:25 +09:00
Patrick Altman
cf4168ca6a Merge pull request #87 from miurahr/sponsorship-display-url
display_url
2015-08-03 08:00:14 -05:00
Hiroshi Miura
d174008149 sponsor benefit type richitext, simple and option
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2015-07-11 11:28:57 +09:00
Hiroshi Miura
0d7df4db00 sponsor benfit is complete?
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2015-07-11 11:28:52 +09:00
Hiroshi Miura
8bc696a2dc sponsorship benefit relation administration
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2015-07-11 11:27:12 +09:00
Hiroshi Miura
b50974263c i18n sponsor fields
Feedback from PyConJP development

```
commit 5973e32ebdc231b209b5c058664e8b2b4a1dbc54
Author: MURAOKA Yusuke <yusuke@jbking.org>
Date:   Mon Mar 31 15:35:40 2014 +0900

    introduce Benefit.content_type which is used to display localized
    text
```

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2015-06-21 15:44:23 +09:00
Hiroshi Miura
c43b84fe94 display_url
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2015-06-21 15:16:22 +09:00
Carlos Henrique Romano
36ab6d599f Fix flake8 warnings 2014-07-30 15:19:26 -03:00
James Tauber
7c3d4f2912 Merge pull request #35 from taavi/better-word-limit-error-message
Provides a better error message when a sponsor benefit text field is lon...
2013-07-03 16:52:45 -07:00
Brian Rosner
6c1cfd1a53 cleaned up code style 2013-06-11 11:10:29 -06:00
Taavi Burns
0a597d38bf Provides a better error message when a sponsor benefit text field is longer than the allowed limit.
It tells you how many words you've written!
2013-05-17 09:31:55 -04:00
Luke Hatcher
584392e897 sponsor signals to handle benefits 2012-07-18 19:24:46 -04:00
Luke Hatcher
53e37d6ec0 properties for logo and listing text benefits 2012-07-18 19:23:59 -04:00
James Tauber
9d367667f2 got sponsorship app flow working, adding missing templates, etc 2012-07-13 08:59:25 -04:00
James Tauber
3ffcc4da7c first pass at merging pycon's sponsorship app with more basic symposion one 2012-07-12 15:17:49 -04:00
James Tauber
c9e600e42c updated imports to reflect new layout 2012-05-29 15:08:05 -04:00
James Tauber
09aa60777f updated project layout for 1.4 (without content changes) 2012-05-29 14:53:04 -04:00
Renamed from symposion_project/apps/sponsorship/models.py (Browse further)