Merge lp:~ltp-devs/loco-team-portal/django-1-3-upgrade into lp:loco-team-portal
- django-1-3-upgrade
- Merge into 0.2
Proposed by
Chris Johnston
| Status: | Merged |
|---|---|
| Approved by: | Adnane Belmadiaf |
| Approved revision: | 593 |
| Merged at revision: | 589 |
| Proposed branch: | lp:~ltp-devs/loco-team-portal/django-1-3-upgrade |
| Merge into: | lp:loco-team-portal |
| Diff against target: |
352 lines (+48/-33) 21 files modified
loco_directory/local_settings.py.sample (+10/-4) loco_directory/media/js/comments.js (+1/-1) loco_directory/settings.py (+14/-5) loco_directory/templates/base.html (+2/-2) loco_directory/templates/events/global_event_delete_confirm.html (+1/-1) loco_directory/templates/events/global_event_new.html (+2/-2) loco_directory/templates/events/global_event_update.html (+1/-1) loco_directory/templates/events/team_event_comment_new.inc.html (+1/-1) loco_directory/templates/events/team_event_delete_confirm.html (+1/-1) loco_directory/templates/events/team_event_new.html (+1/-1) loco_directory/templates/events/team_event_register.html (+2/-2) loco_directory/templates/events/team_event_update.html (+2/-2) loco_directory/templates/meetings/agenda_item_delete_confirm.html (+1/-1) loco_directory/templates/meetings/team_meeting_delete_confirm.html (+1/-1) loco_directory/templates/meetings/team_meeting_new.html (+1/-1) loco_directory/templates/meetings/team_meeting_update.html (+1/-1) loco_directory/templates/teams/team_update.html (+1/-1) loco_directory/templates/venues/venue_update.html (+2/-2) loco_directory/urls.py (+1/-1) requirements/dev.txt (+1/-1) requirements/prod.txt (+1/-1) |
| To merge this branch: | bzr merge lp:~ltp-devs/loco-team-portal/django-1-3-upgrade |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| LoCo Team Portal Developers | Pending | ||
|
Review via email:
|
|||
Commit message
Update LTP to use django 1.3
Description of the change
Update LTP to use django 1.3
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'loco_directory/local_settings.py.sample' | |||
| 2 | --- loco_directory/local_settings.py.sample 2012-11-16 20:27:29 +0000 | |||
| 3 | +++ loco_directory/local_settings.py.sample 2012-12-26 17:25:24 +0000 | |||
| 4 | @@ -1,7 +1,13 @@ | |||
| 9 | 1 | DATABASE_ENGINE = 'sqlite3' # Change to postgresql_psycopg2 for postgres | 1 | DATABASES = { |
| 10 | 2 | DATABASE_NAME = 'loco_directory.db' # sqlite3 file or database name | 2 | 'default': { |
| 11 | 3 | #DATABASE_USER = '' | 3 | 'ENGINE': 'django.db.backends.sqlite3', |
| 12 | 4 | #DATABASE_PASSWORD = '' | 4 | 'NAME': 'ltp.db', |
| 13 | 5 | 'USER': '', | ||
| 14 | 6 | 'PASSWORD': '', | ||
| 15 | 7 | 'HOST': '', | ||
| 16 | 8 | 'PORT': '', | ||
| 17 | 9 | }, | ||
| 18 | 10 | } | ||
| 19 | 5 | 11 | ||
| 20 | 6 | SECRET_KEY = '' | 12 | SECRET_KEY = '' |
| 21 | 7 | 13 | ||
| 22 | 8 | 14 | ||
| 23 | === modified file 'loco_directory/media/js/comments.js' | |||
| 24 | --- loco_directory/media/js/comments.js 2012-09-08 21:45:10 +0000 | |||
| 25 | +++ loco_directory/media/js/comments.js 2012-12-26 17:25:24 +0000 | |||
| 26 | @@ -39,7 +39,7 @@ | |||
| 27 | 39 | function updateText(e) { | 39 | function updateText(e) { |
| 28 | 40 | $(this).hide(); | 40 | $(this).hide(); |
| 29 | 41 | orig_comment = $.trim($(this).parent().parent().children("div.comment-comment").text()); | 41 | orig_comment = $.trim($(this).parent().parent().children("div.comment-comment").text()); |
| 31 | 42 | $(this).parent().parent().children("div.comment-comment").addClass("selected").html('<form ><textarea class="edit">' + orig_comment + ' </textarea> </form><a href="#" class="save">Save</a> or <a href="#" class="revert">Cancel</a>').unbind('click', updateText); | 42 | $(this).parent().parent().children("div.comment-comment").addClass("selected").html('<form >{% csrf_token %}<textarea class="edit">' + orig_comment + ' </textarea> </form><a href="#" class="save">Save</a> or <a href="#" class="revert">Cancel</a>').unbind('click', updateText); |
| 32 | 43 | e.preventDefault(); | 43 | e.preventDefault(); |
| 33 | 44 | } | 44 | } |
| 34 | 45 | 45 | ||
| 35 | 46 | 46 | ||
| 36 | === modified file 'loco_directory/settings.py' | |||
| 37 | --- loco_directory/settings.py 2012-12-15 03:12:04 +0000 | |||
| 38 | +++ loco_directory/settings.py 2012-12-26 17:25:24 +0000 | |||
| 39 | @@ -53,8 +53,16 @@ | |||
| 40 | 53 | MANAGERS = ADMINS | 53 | MANAGERS = ADMINS |
| 41 | 54 | LP_PROJECT_NAME = 'loco-directory' | 54 | LP_PROJECT_NAME = 'loco-directory' |
| 42 | 55 | 55 | ||
| 45 | 56 | DATABASE_ENGINE = 'sqlite3' | 56 | DATABASES = { |
| 46 | 57 | DATABASE_NAME = 'loco_directory.db' | 57 | 'default': { |
| 47 | 58 | 'ENGINE': 'django.db.backends.postgresql_psycopg2', | ||
| 48 | 59 | 'NAME': 'ltp', | ||
| 49 | 60 | 'USER': 'postgres', | ||
| 50 | 61 | 'PASSWORD': '', | ||
| 51 | 62 | 'HOST': 'localhost', | ||
| 52 | 63 | 'PORT': '', | ||
| 53 | 64 | }, | ||
| 54 | 65 | } | ||
| 55 | 58 | 66 | ||
| 56 | 59 | # Local time zone for this installation. Choices can be found here: | 67 | # Local time zone for this installation. Choices can be found here: |
| 57 | 60 | # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name | 68 | # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name |
| 58 | @@ -90,13 +98,13 @@ | |||
| 59 | 90 | # Make this unique, and don't share it with anybody. | 98 | # Make this unique, and don't share it with anybody. |
| 60 | 91 | SECRET_KEY = '' | 99 | SECRET_KEY = '' |
| 61 | 92 | 100 | ||
| 62 | 93 | # List of callables that know how to import templates from various sources. | ||
| 63 | 94 | TEMPLATE_LOADERS = ( | 101 | TEMPLATE_LOADERS = ( |
| 66 | 95 | 'django.template.loaders.filesystem.load_template_source', | 102 | 'django.template.loaders.filesystem.Loader', |
| 67 | 96 | 'django.template.loaders.app_directories.load_template_source', | 103 | 'django.template.loaders.app_directories.Loader', |
| 68 | 97 | ) | 104 | ) |
| 69 | 98 | 105 | ||
| 70 | 99 | MIDDLEWARE_CLASSES = ( | 106 | MIDDLEWARE_CLASSES = ( |
| 71 | 107 | 'django.middleware.csrf.CsrfViewMiddleware', | ||
| 72 | 100 | 'django.middleware.common.CommonMiddleware', | 108 | 'django.middleware.common.CommonMiddleware', |
| 73 | 101 | 'django.contrib.sessions.middleware.SessionMiddleware', | 109 | 'django.contrib.sessions.middleware.SessionMiddleware', |
| 74 | 102 | 'django.contrib.auth.middleware.AuthenticationMiddleware', | 110 | 'django.contrib.auth.middleware.AuthenticationMiddleware', |
| 75 | @@ -108,6 +116,7 @@ | |||
| 76 | 108 | "django.core.context_processors.debug", | 116 | "django.core.context_processors.debug", |
| 77 | 109 | "django.core.context_processors.i18n", | 117 | "django.core.context_processors.i18n", |
| 78 | 110 | "django.core.context_processors.media", | 118 | "django.core.context_processors.media", |
| 79 | 119 | "django.core.context_processors.csrf", | ||
| 80 | 111 | "common.context_processors.loco_version", | 120 | "common.context_processors.loco_version", |
| 81 | 112 | "common.context_processors.google_api_key", | 121 | "common.context_processors.google_api_key", |
| 82 | 113 | "common.context_processors.flickr_api_key", | 122 | "common.context_processors.flickr_api_key", |
| 83 | 114 | 123 | ||
| 84 | === modified file 'loco_directory/templates/base.html' | |||
| 85 | --- loco_directory/templates/base.html 2012-12-15 03:12:04 +0000 | |||
| 86 | +++ loco_directory/templates/base.html 2012-12-26 17:25:24 +0000 | |||
| 87 | @@ -52,7 +52,7 @@ | |||
| 88 | 52 | {% endblock %} | 52 | {% endblock %} |
| 89 | 53 | 53 | ||
| 90 | 54 | {% block search_box %} | 54 | {% block search_box %} |
| 92 | 55 | <form id="site_search_form" action="{% url common.views.site_search %}" method="get"> | 55 | <form id="site_search_form" action="{% url common.views.site_search %}" method="get">{% csrf_token %} |
| 93 | 56 | {{ search_form.q }} | 56 | {{ search_form.q }} |
| 94 | 57 | <input type="image" src="/media/img/search.png" title="{% trans "Search" %}" alt="{% trans "Search" %}" /> | 57 | <input type="image" src="/media/img/search.png" title="{% trans "Search" %}" alt="{% trans "Search" %}" /> |
| 95 | 58 | </form> | 58 | </form> |
| 96 | @@ -75,7 +75,7 @@ | |||
| 97 | 75 | {% block footer %} | 75 | {% block footer %} |
| 98 | 76 | <div style="height: 40px;"> | 76 | <div style="height: 40px;"> |
| 99 | 77 | <div class="lang_switcher"> | 77 | <div class="lang_switcher"> |
| 101 | 78 | <form name="lang-switcher" style="text-align:right;" action="/language/" method="get"> | 78 | <form name="lang-switcher" style="text-align:right;" action="/language/" method="get">{% csrf_token %} |
| 102 | 79 | <input name="next" type="hidden" value="{{ request.path }}" /> | 79 | <input name="next" type="hidden" value="{{ request.path }}" /> |
| 103 | 80 | <select name="lang" onchange="document.forms['lang-switcher'].submit()"> | 80 | <select name="lang" onchange="document.forms['lang-switcher'].submit()"> |
| 104 | 81 | {% for lang in languages %} | 81 | {% for lang in languages %} |
| 105 | 82 | 82 | ||
| 106 | === modified file 'loco_directory/templates/events/global_event_delete_confirm.html' | |||
| 107 | --- loco_directory/templates/events/global_event_delete_confirm.html 2012-06-07 04:19:26 +0000 | |||
| 108 | +++ loco_directory/templates/events/global_event_delete_confirm.html 2012-12-26 17:25:24 +0000 | |||
| 109 | @@ -10,7 +10,7 @@ | |||
| 110 | 10 | {% block content %} | 10 | {% block content %} |
| 111 | 11 | <div class="row"> | 11 | <div class="row"> |
| 112 | 12 | <section class="span-9"> | 12 | <section class="span-9"> |
| 114 | 13 | <form action="." method="post"> | 13 | <form action="." method="post">{% csrf_token %} |
| 115 | 14 | <fieldset> | 14 | <fieldset> |
| 116 | 15 | <h3>{% trans "Delete global Event" %}</h3> | 15 | <h3>{% trans "Delete global Event" %}</h3> |
| 117 | 16 | <label>{% blocktrans with global_event_object.name as eventname %}Do you really want to delete the Global Event: {{eventname}}?{% endblocktrans %}</label> | 16 | <label>{% blocktrans with global_event_object.name as eventname %}Do you really want to delete the Global Event: {{eventname}}?{% endblocktrans %}</label> |
| 118 | 17 | 17 | ||
| 119 | === modified file 'loco_directory/templates/events/global_event_new.html' | |||
| 120 | --- loco_directory/templates/events/global_event_new.html 2012-06-07 04:19:26 +0000 | |||
| 121 | +++ loco_directory/templates/events/global_event_new.html 2012-12-26 17:25:24 +0000 | |||
| 122 | @@ -20,12 +20,12 @@ | |||
| 123 | 20 | {% block content %} | 20 | {% block content %} |
| 124 | 21 | <div class="row"> | 21 | <div class="row"> |
| 125 | 22 | <section class="span-9"> | 22 | <section class="span-9"> |
| 127 | 23 | <form action="." method="post"> | 23 | <form action="." method="post">{% csrf_token %} |
| 128 | 24 | <fieldset> | 24 | <fieldset> |
| 129 | 25 | <h3>{% trans "Add new Global Event" %}</h3> | 25 | <h3>{% trans "Add new Global Event" %}</h3> |
| 130 | 26 | {{ form.as_template }} | 26 | {{ form.as_template }} |
| 131 | 27 | </fieldset> | 27 | </fieldset> |
| 133 | 28 | {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} | 28 | {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} |
| 134 | 29 | <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" /> | 29 | <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" /> |
| 135 | 30 | </form> | 30 | </form> |
| 136 | 31 | </section> | 31 | </section> |
| 137 | 32 | 32 | ||
| 138 | === modified file 'loco_directory/templates/events/global_event_update.html' | |||
| 139 | --- loco_directory/templates/events/global_event_update.html 2012-06-07 04:19:26 +0000 | |||
| 140 | +++ loco_directory/templates/events/global_event_update.html 2012-12-26 17:25:24 +0000 | |||
| 141 | @@ -18,7 +18,7 @@ | |||
| 142 | 18 | {% block content %} | 18 | {% block content %} |
| 143 | 19 | <div class="row"> | 19 | <div class="row"> |
| 144 | 20 | <section class="span-9"> | 20 | <section class="span-9"> |
| 146 | 21 | <form action="." method="post"> | 21 | <form action="." method="post">{% csrf_token %} |
| 147 | 22 | <fieldset> | 22 | <fieldset> |
| 148 | 23 | <h3>{% trans "Update Global Event" %}</h3> | 23 | <h3>{% trans "Update Global Event" %}</h3> |
| 149 | 24 | {{ form.as_template }} | 24 | {{ form.as_template }} |
| 150 | 25 | 25 | ||
| 151 | === modified file 'loco_directory/templates/events/team_event_comment_new.inc.html' | |||
| 152 | --- loco_directory/templates/events/team_event_comment_new.inc.html 2012-10-30 12:30:02 +0000 | |||
| 153 | +++ loco_directory/templates/events/team_event_comment_new.inc.html 2012-12-26 17:25:24 +0000 | |||
| 154 | @@ -7,7 +7,7 @@ | |||
| 155 | 7 | <img alt="" class="photo fn" src="{% if comment.commenter_profile.mugshot %}{{ comment.commenter_profile.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}"> | 7 | <img alt="" class="photo fn" src="{% if comment.commenter_profile.mugshot %}{{ comment.commenter_profile.mugshot }}{% else %}{{MEDIA_URL}}img/default-mugshot.png{% endif %}"> |
| 156 | 8 | </a> | 8 | </a> |
| 157 | 9 | </div> | 9 | </div> |
| 159 | 10 | <form action="." method="post"> | 10 | <form action="." method="post">{% csrf_token %} |
| 160 | 11 | <textarea required id="id_comment" rows="10" cols="40" name="comment"></textarea> | 11 | <textarea required id="id_comment" rows="10" cols="40" name="comment"></textarea> |
| 161 | 12 | <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" /> | 12 | <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" /> |
| 162 | 13 | </form> | 13 | </form> |
| 163 | 14 | 14 | ||
| 164 | === modified file 'loco_directory/templates/events/team_event_delete_confirm.html' | |||
| 165 | --- loco_directory/templates/events/team_event_delete_confirm.html 2012-06-07 04:19:26 +0000 | |||
| 166 | +++ loco_directory/templates/events/team_event_delete_confirm.html 2012-12-26 17:25:24 +0000 | |||
| 167 | @@ -10,7 +10,7 @@ | |||
| 168 | 10 | {% block content %} | 10 | {% block content %} |
| 169 | 11 | <div class="row"> | 11 | <div class="row"> |
| 170 | 12 | <section class="span-9"> | 12 | <section class="span-9"> |
| 172 | 13 | <form action="." method="post"> | 13 | <form action="." method="post">{% csrf_token %} |
| 173 | 14 | <fieldset> | 14 | <fieldset> |
| 174 | 15 | <h3>{% trans "Delete Team Event" %}</h3> | 15 | <h3>{% trans "Delete Team Event" %}</h3> |
| 175 | 16 | <label>{% blocktrans with team_event_object.name as eventname %}Do you really want to delete the Team Event: {{eventname}}?{% endblocktrans %}</label> | 16 | <label>{% blocktrans with team_event_object.name as eventname %}Do you really want to delete the Team Event: {{eventname}}?{% endblocktrans %}</label> |
| 176 | 17 | 17 | ||
| 177 | === modified file 'loco_directory/templates/events/team_event_new.html' | |||
| 178 | --- loco_directory/templates/events/team_event_new.html 2012-06-07 04:19:26 +0000 | |||
| 179 | +++ loco_directory/templates/events/team_event_new.html 2012-12-26 17:25:24 +0000 | |||
| 180 | @@ -26,7 +26,7 @@ | |||
| 181 | 26 | {% block content %} | 26 | {% block content %} |
| 182 | 27 | <div class="row"> | 27 | <div class="row"> |
| 183 | 28 | <section class="span-9"> | 28 | <section class="span-9"> |
| 185 | 29 | <form action="." method="post"> | 29 | <form action="." method="post">{% csrf_token %} |
| 186 | 30 | <fieldset> | 30 | <fieldset> |
| 187 | 31 | <h3>{% trans "Add new Team Event for " %}{{ team_object.name}}<span class="supporting">{% trans 'is required' %}</span></h3> | 31 | <h3>{% trans "Add new Team Event for " %}{{ team_object.name}}<span class="supporting">{% trans 'is required' %}</span></h3> |
| 188 | 32 | {{ form.as_template }} | 32 | {{ form.as_template }} |
| 189 | 33 | 33 | ||
| 190 | === modified file 'loco_directory/templates/events/team_event_register.html' | |||
| 191 | --- loco_directory/templates/events/team_event_register.html 2012-06-07 04:19:26 +0000 | |||
| 192 | +++ loco_directory/templates/events/team_event_register.html 2012-12-26 17:25:24 +0000 | |||
| 193 | @@ -10,7 +10,7 @@ | |||
| 194 | 10 | {% block content %} | 10 | {% block content %} |
| 195 | 11 | <div class="row"> | 11 | <div class="row"> |
| 196 | 12 | <section class="span-9"> | 12 | <section class="span-9"> |
| 198 | 13 | <form action="." method="post"> | 13 | <form action="." method="post">{% csrf_token %} |
| 199 | 14 | <fieldset> | 14 | <fieldset> |
| 200 | 15 | <h3>{% trans "Register for event " %}</h3> | 15 | <h3>{% trans "Register for event " %}</h3> |
| 201 | 16 | {% if is_past_event %} | 16 | {% if is_past_event %} |
| 202 | @@ -18,7 +18,7 @@ | |||
| 203 | 18 | {% endif %} | 18 | {% endif %} |
| 204 | 19 | {{ form.as_template }} | 19 | {{ form.as_template }} |
| 205 | 20 | </fieldset> | 20 | </fieldset> |
| 207 | 21 | {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} | 21 | {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} |
| 208 | 22 | <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" /> | 22 | <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" /> |
| 209 | 23 | </form> | 23 | </form> |
| 210 | 24 | </section> | 24 | </section> |
| 211 | 25 | 25 | ||
| 212 | === modified file 'loco_directory/templates/events/team_event_update.html' | |||
| 213 | --- loco_directory/templates/events/team_event_update.html 2012-06-07 04:19:26 +0000 | |||
| 214 | +++ loco_directory/templates/events/team_event_update.html 2012-12-26 17:25:24 +0000 | |||
| 215 | @@ -18,12 +18,12 @@ | |||
| 216 | 18 | {% block content %} | 18 | {% block content %} |
| 217 | 19 | <div class="row"> | 19 | <div class="row"> |
| 218 | 20 | <section class="span-9"> | 20 | <section class="span-9"> |
| 220 | 21 | <form action="." method="post"> | 21 | <form action="." method="post">{% csrf_token %} |
| 221 | 22 | <fieldset> | 22 | <fieldset> |
| 222 | 23 | <h3>{% trans "Update Team Event" %}</h3> | 23 | <h3>{% trans "Update Team Event" %}</h3> |
| 223 | 24 | {{ form.as_template }} | 24 | {{ form.as_template }} |
| 224 | 25 | </fieldset> | 25 | </fieldset> |
| 226 | 26 | {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} | 26 | {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} |
| 227 | 27 | <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" /> | 27 | <input type="submit" name="submit" value="{% trans "Submit" %}" class="submit-button" /> |
| 228 | 28 | </form> | 28 | </form> |
| 229 | 29 | </section> | 29 | </section> |
| 230 | 30 | 30 | ||
| 231 | === modified file 'loco_directory/templates/meetings/agenda_item_delete_confirm.html' | |||
| 232 | --- loco_directory/templates/meetings/agenda_item_delete_confirm.html 2012-06-07 04:19:26 +0000 | |||
| 233 | +++ loco_directory/templates/meetings/agenda_item_delete_confirm.html 2012-12-26 17:25:24 +0000 | |||
| 234 | @@ -15,7 +15,7 @@ | |||
| 235 | 15 | {% block content %} | 15 | {% block content %} |
| 236 | 16 | <div class="row"> | 16 | <div class="row"> |
| 237 | 17 | <section class="span-9"> | 17 | <section class="span-9"> |
| 239 | 18 | <form action="." method="post"> | 18 | <form action="." method="post">{% csrf_token %} |
| 240 | 19 | <fieldset> | 19 | <fieldset> |
| 241 | 20 | <h3>{% trans "Delete Agenda Item" %}</h3> | 20 | <h3>{% trans "Delete Agenda Item" %}</h3> |
| 242 | 21 | {% if agenda_item_object.children.all %} | 21 | {% if agenda_item_object.children.all %} |
| 243 | 22 | 22 | ||
| 244 | === modified file 'loco_directory/templates/meetings/team_meeting_delete_confirm.html' | |||
| 245 | --- loco_directory/templates/meetings/team_meeting_delete_confirm.html 2012-06-07 04:19:26 +0000 | |||
| 246 | +++ loco_directory/templates/meetings/team_meeting_delete_confirm.html 2012-12-26 17:25:24 +0000 | |||
| 247 | @@ -10,7 +10,7 @@ | |||
| 248 | 10 | {% block content %} | 10 | {% block content %} |
| 249 | 11 | <div class="row"> | 11 | <div class="row"> |
| 250 | 12 | <section class="span-9"> | 12 | <section class="span-9"> |
| 252 | 13 | <form action="." method="post"> | 13 | <form action="." method="post">{% csrf_token %} |
| 253 | 14 | <fieldset> | 14 | <fieldset> |
| 254 | 15 | <h3>{% trans "Delete Team Meeting" %}</h3> | 15 | <h3>{% trans "Delete Team Meeting" %}</h3> |
| 255 | 16 | <label>{% blocktrans with team_meeting_object.name as meetingname %}Do you really want to delete the Team Meeting: {{meetingname}}?{% endblocktrans %}</label> | 16 | <label>{% blocktrans with team_meeting_object.name as meetingname %}Do you really want to delete the Team Meeting: {{meetingname}}?{% endblocktrans %}</label> |
| 256 | 17 | 17 | ||
| 257 | === modified file 'loco_directory/templates/meetings/team_meeting_new.html' | |||
| 258 | --- loco_directory/templates/meetings/team_meeting_new.html 2012-06-07 04:19:26 +0000 | |||
| 259 | +++ loco_directory/templates/meetings/team_meeting_new.html 2012-12-26 17:25:24 +0000 | |||
| 260 | @@ -18,7 +18,7 @@ | |||
| 261 | 18 | {% block content %} | 18 | {% block content %} |
| 262 | 19 | <div class="row"> | 19 | <div class="row"> |
| 263 | 20 | <section class="span-9"> | 20 | <section class="span-9"> |
| 265 | 21 | <form action="." method="post"> | 21 | <form action="." method="post">{% csrf_token %} |
| 266 | 22 | <fieldset> | 22 | <fieldset> |
| 267 | 23 | <h3>{% trans "Add new Team Meeting for " %}{{ team_object.name}}</h3> | 23 | <h3>{% trans "Add new Team Meeting for " %}{{ team_object.name}}</h3> |
| 268 | 24 | {{ form.as_template }} | 24 | {{ form.as_template }} |
| 269 | 25 | 25 | ||
| 270 | === modified file 'loco_directory/templates/meetings/team_meeting_update.html' | |||
| 271 | --- loco_directory/templates/meetings/team_meeting_update.html 2012-06-07 04:19:26 +0000 | |||
| 272 | +++ loco_directory/templates/meetings/team_meeting_update.html 2012-12-26 17:25:24 +0000 | |||
| 273 | @@ -18,7 +18,7 @@ | |||
| 274 | 18 | {% block content %} | 18 | {% block content %} |
| 275 | 19 | <div class="row"> | 19 | <div class="row"> |
| 276 | 20 | <section class="span-9"> | 20 | <section class="span-9"> |
| 278 | 21 | <form action="." method="post"> | 21 | <form action="." method="post">{% csrf_token %} |
| 279 | 22 | <fieldset> | 22 | <fieldset> |
| 280 | 23 | <h3>{% trans "Update Team Meeting" %}</h3> | 23 | <h3>{% trans "Update Team Meeting" %}</h3> |
| 281 | 24 | {{ form.as_template }} | 24 | {{ form.as_template }} |
| 282 | 25 | 25 | ||
| 283 | === modified file 'loco_directory/templates/teams/team_update.html' | |||
| 284 | --- loco_directory/templates/teams/team_update.html 2012-06-07 04:19:26 +0000 | |||
| 285 | +++ loco_directory/templates/teams/team_update.html 2012-12-26 17:25:24 +0000 | |||
| 286 | @@ -31,7 +31,7 @@ | |||
| 287 | 31 | </p> | 31 | </p> |
| 288 | 32 | {% endif %} | 32 | {% endif %} |
| 289 | 33 | 33 | ||
| 291 | 34 | <form action="{{ request.path_info }}" method="POST"> | 34 | <form action="{{ request.path_info }}" method="POST">{% csrf_token %} |
| 292 | 35 | <fieldset> | 35 | <fieldset> |
| 293 | 36 | <h3>{% trans "Update the information below" %}</h3> | 36 | <h3>{% trans "Update the information below" %}</h3> |
| 294 | 37 | {{ form.as_template }} | 37 | {{ form.as_template }} |
| 295 | 38 | 38 | ||
| 296 | === modified file 'loco_directory/templates/venues/venue_update.html' | |||
| 297 | --- loco_directory/templates/venues/venue_update.html 2012-06-07 04:19:26 +0000 | |||
| 298 | +++ loco_directory/templates/venues/venue_update.html 2012-12-26 17:25:24 +0000 | |||
| 299 | @@ -25,12 +25,12 @@ | |||
| 300 | 25 | {% block content %} | 25 | {% block content %} |
| 301 | 26 | <div class="row"> | 26 | <div class="row"> |
| 302 | 27 | <section class="span-9"> | 27 | <section class="span-9"> |
| 304 | 28 | <form action="." method="post" style="width:auto;"> | 28 | <form action="." method="post" style="width:auto;">{% csrf_token %} |
| 305 | 29 | <fieldset> | 29 | <fieldset> |
| 306 | 30 | <h3>{% if venue_object %}{% trans "Update Venue" %}{% else %}{% trans "New Venue" %}{% endif %}</h3> | 30 | <h3>{% if venue_object %}{% trans "Update Venue" %}{% else %}{% trans "New Venue" %}{% endif %}</h3> |
| 307 | 31 | {{ form.as_template }} | 31 | {{ form.as_template }} |
| 308 | 32 | </fieldset> | 32 | </fieldset> |
| 310 | 33 | {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} | 33 | {% if is_popup %}<input type="hidden" name="_popup" value="1">{% endif %} |
| 311 | 34 | <input type="submit" name="submit" value="Submit" class="submit-button" /> | 34 | <input type="submit" name="submit" value="Submit" class="submit-button" /> |
| 312 | 35 | </form> | 35 | </form> |
| 313 | 36 | </section> | 36 | </section> |
| 314 | 37 | 37 | ||
| 315 | === modified file 'loco_directory/urls.py' | |||
| 316 | --- loco_directory/urls.py 2012-12-13 22:48:12 +0000 | |||
| 317 | +++ loco_directory/urls.py 2012-12-26 17:25:24 +0000 | |||
| 318 | @@ -26,7 +26,7 @@ | |||
| 319 | 26 | url(r'^about-loco/setup/$', 'common.views.loco_setup', name='loco_setup'), | 26 | url(r'^about-loco/setup/$', 'common.views.loco_setup', name='loco_setup'), |
| 320 | 27 | url(r'^about-loco/$', 'common.views.about_loco', name='about_loco'), | 27 | url(r'^about-loco/$', 'common.views.about_loco', name='about_loco'), |
| 321 | 28 | url(r'^using-locodir/$', 'common.views.using_locodir', name='using_locodir'), | 28 | url(r'^using-locodir/$', 'common.views.using_locodir', name='using_locodir'), |
| 323 | 29 | url(r'^admin/(.*)', admin.site.root), | 29 | (r'^admin/', include(admin.site.urls)), |
| 324 | 30 | url(r'^data/xml', 'teams.views.xml_team_data', name='xml_team_data'), | 30 | url(r'^data/xml', 'teams.views.xml_team_data', name='xml_team_data'), |
| 325 | 31 | url(r'^teams/', include('teams.urls')), | 31 | url(r'^teams/', include('teams.urls')), |
| 326 | 32 | url(r'^planet/', include('articles.urls')), | 32 | url(r'^planet/', include('articles.urls')), |
| 327 | 33 | 33 | ||
| 328 | === modified file 'requirements/dev.txt' | |||
| 329 | --- requirements/dev.txt 2012-11-26 00:02:28 +0000 | |||
| 330 | +++ requirements/dev.txt 2012-12-26 17:25:24 +0000 | |||
| 331 | @@ -6,7 +6,7 @@ | |||
| 332 | 6 | # include patches applied by the package maintainers. | 6 | # include patches applied by the package maintainers. |
| 333 | 7 | # | 7 | # |
| 334 | 8 | 8 | ||
| 336 | 9 | Django==1.1.3 | 9 | Django==1.3.3 |
| 337 | 10 | South==0.7.3 | 10 | South==0.7.3 |
| 338 | 11 | distribute==0.6.10 | 11 | distribute==0.6.10 |
| 339 | 12 | django-openid-auth==0.4 | 12 | django-openid-auth==0.4 |
| 340 | 13 | 13 | ||
| 341 | === modified file 'requirements/prod.txt' | |||
| 342 | --- requirements/prod.txt 2012-11-16 18:33:47 +0000 | |||
| 343 | +++ requirements/prod.txt 2012-12-26 17:25:24 +0000 | |||
| 344 | @@ -6,7 +6,7 @@ | |||
| 345 | 6 | # include patches applied by the package maintainers. | 6 | # include patches applied by the package maintainers. |
| 346 | 7 | # | 7 | # |
| 347 | 8 | 8 | ||
| 349 | 9 | Django==1.1.3 | 9 | Django==1.3.3 |
| 350 | 10 | South==0.7.3 | 10 | South==0.7.3 |
| 351 | 11 | bzr==2.6b2 | 11 | bzr==2.6b2 |
| 352 | 12 | distribute==0.6.10 | 12 | distribute==0.6.10 |
