Your hostname is used in the default web address of your partner site. ' u'The web address created from the hostname myorganisation would be ' @@ -2164,6 +2195,12 @@ def custom_logo_path(instance, filename): u'should be returned when leaving the partner site.
' ) ) + custom_return_url_text = ValidXMLCharField(_(u'Return URL text'), blank=True, max_length=50, default='', + help_text=_( + u'Enter a text for the back button and return URL. ' + u'Leave empty to display "Back to myorganisation".
' + ) + ) custom_css = models.FileField(_(u'stylesheet'), blank=True, upload_to=custom_css_path) custom_logo = models.FileField(_(u'organisation banner logo'), blank=True, upload_to=custom_logo_path, help_text=_( @@ -2177,7 +2214,7 @@ def custom_logo_path(instance, filename): u'on tabs and in the bookmark menu.' ) ) - about_box = models.TextField(_(u'about box text'), max_length=500, blank=True, + about_box = ValidXMLTextField(_(u'about box text'), max_length=500, blank=True, help_text=_(dedent(u''' Enter HTML that will make up the top left box of the home page. (500 characters)@@ -2210,7 +2247,7 @@ def custom_logo_path(instance, filename): ) enabled = models.BooleanField(_(u'enabled'), default=True) - default_language = models.CharField(_(u'Site UI default language'), + default_language = ValidXMLCharField(_(u'Site UI default language'), max_length=5, choices=settings.LANGUAGES, default=settings.LANGUAGE_CODE) @@ -2219,7 +2256,7 @@ def custom_logo_path(instance, filename): google_translation = models.BooleanField(_(u'Google translation widget'), default=False) facebook_button = models.BooleanField(_(u'Facebook Like button'), default=False) twitter_button = models.BooleanField(_(u'Twitter button'), default=False) - facebook_app_id = models.CharField(_(u'Facebook App Id'), max_length=40, blank=True, null=True, + facebook_app_id = ValidXMLCharField(_(u'Facebook App Id'), max_length=40, blank=True, null=True, help_text=_( u'
Your FaceBook app id is used when sharing pages from your partner site. ' u'It can be obtained by creating a Facebook app, which will let you monitor when your pages are referenced. ' @@ -2227,6 +2264,7 @@ def custom_logo_path(instance, filename): ) ) + def __unicode__(self): return u'Partner site for %(organisation_name)s' % {'organisation_name': self.organisation.name} diff --git a/akvo/rsr/templatetags/google_maps.py b/akvo/rsr/templatetags/google_maps.py.old similarity index 100% rename from akvo/rsr/templatetags/google_maps.py rename to akvo/rsr/templatetags/google_maps.py.old diff --git a/akvo/rsr/templatetags/map.py b/akvo/rsr/templatetags/map.py.old similarity index 100% rename from akvo/rsr/templatetags/map.py rename to akvo/rsr/templatetags/map.py.old diff --git a/akvo/rsr/templatetags/maps.py b/akvo/rsr/templatetags/maps.py new file mode 100644 index 0000000000..f4c3d93313 --- /dev/null +++ b/akvo/rsr/templatetags/maps.py @@ -0,0 +1,264 @@ +# -*- coding: utf-8 -*- +""" + Akvo RSR is covered by the GNU Affero General Public License. + See more details in the license.txt file located at the root folder of the + Akvo RSR module. For additional details on the GNU license please + see < http://www.gnu.org/licenses/agpl.html >. +""" + +import os +from django import template +from django.conf import settings + +from akvo.rsr.models import Project, Organisation, ProjectLocation, OrganisationLocation + +register = template.Library() + +PROJECT_MARKER_ICON = getattr(settings, 'GOOGLE_MAPS_PROJECT_MARKER_ICON', '') +ORGANISATION_MARKER_ICON = getattr(settings, 'GOOGLE_MAPS_ORGANISATION_MARKER_ICON', '') +MEDIA_URL = getattr(settings, 'MEDIA_URL', '/media/') + + +# TODO: this should be fixed so partner sites use their own domain +HOST = 'http://%s' % getattr(settings, 'RSR_DOMAIN', 'akvo.org') + +@register.inclusion_tag('inclusion_tags/maps.html') +def project_map(id, width, height, dynamic='dynamic'): + """ + params: + id: integer, id of project or organisation. + width, height: the dimensions of the map. + dynamic: 'dynamic' (default) or 'static', map is scrollable and clickable if 'dynamic'. + """ + + if dynamic != 'dynamic': + dynamic = False + + map_id = 'akvo_map_%s' % os.urandom(8).encode('hex') + marker_icon = PROJECT_MARKER_ICON + + locations = [] + + for location in ProjectLocation.objects.filter(location_target=id): + locations.append([location.latitude, location.longitude]) + + template_context = { + 'map_id': map_id, + 'width': width, + 'height': height, + 'marker_icon': marker_icon, + 'locations': locations, + 'dynamic': dynamic, + 'infowindows': False, + 'partnersite_widget': False + } + + return template_context + + +@register.inclusion_tag('inclusion_tags/maps.html') +def organisation_map(id, width, height, dynamic='dynamic'): + """ + params: + id: integer, id of project or organisation. + width, height: the dimensions of the map. + dynamic: 'dynamic' (default) or 'static', map is scrollable and clickable if 'dynamic'. + """ + + if dynamic != 'dynamic': + dynamic = False + + map_id = 'akvo_map_%s' % os.urandom(8).encode('hex') + marker_icon = ORGANISATION_MARKER_ICON + + locations = [] + + for location in OrganisationLocation.objects.filter(location_target_id=id): + locations.append([location.latitude, location.longitude]) + + template_context = { + 'map_id': map_id, + 'width': width, + 'height': height, + 'marker_icon': marker_icon, + 'locations': locations, + 'dynamic': dynamic, + 'infowindows': False, + 'partnersite_widget': False + } + + return template_context + + +@register.inclusion_tag('inclusion_tags/maps.html') +def global_project_map(width, height, dynamic='dynamic'): + """ + params: + width, height: the dimensions of the map. + dynamic: 'dynamic' (default) or 'static', map is scrollable and clickable if 'dynamic'. + """ + + if dynamic != 'dynamic': + dynamic = False + + map_id = 'akvo_map_%s' % os.urandom(8).encode('hex') + marker_icon = PROJECT_MARKER_ICON + + locations = [] + + for project in Project.objects.all().active(): + try: + location = project.primary_location + thumbnail = project.current_image.extra_thumbnails['map_thumb'].absolute_url + locations.append([location.latitude, + location.longitude, + [str(project.pk),project.title.encode('utf8'), thumbnail, 'project']]) + except: + pass + + template_context = { + 'map_id': map_id, + 'width': width, + 'height': height, + 'marker_icon': marker_icon, + 'locations': locations, + 'dynamic': dynamic, + 'infowindows': True, + 'partnersite_widget': False + } + + return template_context + + +@register.inclusion_tag('inclusion_tags/maps.html') +def global_organisation_map(width, height, dynamic='dynamic'): + """ + params: + width, height: the dimensions of the map. + dynamic: 'dynamic' (default) or 'static', map is scrollable and clickable if 'dynamic'. + """ + + if dynamic != 'dynamic': + dynamic = False + + map_id = 'akvo_map_%s' % os.urandom(8).encode('hex') + marker_icon = ORGANISATION_MARKER_ICON + + locations = [] + + for organisation in Organisation.objects.all(): + try: + location = organisation.primary_location + thumbnail = organisation.logo.extra_thumbnails['map_thumb'].absolute_url + locations.append([location.latitude, + location.longitude, + [str(organisation.pk),organisation.name.encode('utf8'), thumbnail, 'organisation']]) + except: + pass + + template_context = { + 'map_id': map_id, + 'width': width, + 'height': height, + 'marker_icon': marker_icon, + 'locations': locations, + 'dynamic': dynamic, + 'infowindows': True, + 'partnersite_widget': False + } + + return template_context + + +@register.inclusion_tag('inclusion_tags/maps.html') +def organisation_projects_map(organisation_id, width, height, dynamic='dynamic'): + """ + params: + organisation_id: id of organisation. + width, height: the dimensions of the map. + dynamic: 'dynamic' (default) or 'static', map is scrollable and clickable if 'dynamic'. + """ + + if dynamic != 'dynamic': + dynamic = False + + map_id = 'akvo_map_%s' % os.urandom(8).encode('hex') + marker_icon = PROJECT_MARKER_ICON + + locations = [] + + projects = Project.objects.filter(partnerships__organisation=organisation_id).active() + + for project in projects: + proj_locations = ProjectLocation.objects.filter(location_target=project) + for location in proj_locations: + try: + thumbnail = project.current_image.extra_thumbnails['map_thumb'].absolute_url + locations.append([location.latitude, + location.longitude, + [str(project.pk),project.title.encode('utf8'), thumbnail, 'project']]) + except: + pass + + template_context = { + 'map_id': map_id, + 'width': width, + 'height': height, + 'marker_icon': marker_icon, + 'locations': locations, + 'dynamic': dynamic, + 'infowindows': True, + 'partnersite_widget': False + } + + return template_context + + +@register.inclusion_tag('inclusion_tags/maps.html') +def partnersite_widget_project_map(organisation_id, width, height, dynamic='dynamic'): + """ + params: + organisation_id: id of organisation. + width, height: the dimensions of the map. + dynamic: 'dynamic' (default) or 'static', map is scrollable and clickable if 'dynamic'. + """ + + if dynamic != 'dynamic': + dynamic = False + + map_id = 'akvo_map_%s' % os.urandom(8).encode('hex') + marker_icon = PROJECT_MARKER_ICON + + locations = [] + + projects = Project.objects.filter(partnerships__organisation=organisation_id).active() + + for project in projects: + proj_locations = ProjectLocation.objects.filter(location_target=project) + for location in proj_locations: + location_name = location.country.name + if location.state: + location_name += ", " + location.state + if location.city: + location_name += ", " + location.city + + try: + locations.append([location.latitude, + location.longitude, + [str(project.pk), project.title.encode('utf8'), 'project'], + location_name.encode('utf8')]) + except: + pass + + template_context = { + 'map_id': map_id, + 'width': width, + 'height': height, + 'marker_icon': marker_icon, + 'locations': locations, + 'dynamic': dynamic, + 'infowindows': True, + 'partnersite_widget': True + } + + return template_context \ No newline at end of file diff --git a/akvo/rsr/templatetags/project_map.py b/akvo/rsr/templatetags/project_map.py.old similarity index 100% rename from akvo/rsr/templatetags/project_map.py rename to akvo/rsr/templatetags/project_map.py.old diff --git a/akvo/rsr/validators.py b/akvo/rsr/validators.py new file mode 100644 index 0000000000..575e63d775 --- /dev/null +++ b/akvo/rsr/validators.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- + +# Akvo RSR is covered by the GNU Affero General Public License. +# See more details in the license.txt file located at the root folder of the Akvo RSR module. +# For additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >. + +import sys, re + +from django.core.exceptions import ValidationError + + +def string_validator(value): + # Based on http://stackoverflow.com/questions/1707890/fast-way-to-filter-illegal-xml-unicode-chars-in-python + # Example of non-allowed character: + _illegal_unichrs = [(0x00, 0x08), (0x0B, 0x0C), (0x0E, 0x1F), (0x7F, 0x84), (0x86, 0x9F), (0xFDD0, 0xFDDF), + (0xFFFE, 0xFFFF)] + + if sys.maxunicode >= 0x10000: # not narrow build + _illegal_unichrs.extend([(0x1FFFE, 0x1FFFF), (0x2FFFE, 0x2FFFF), (0x3FFFE, 0x3FFFF), (0x4FFFE, 0x4FFFF), + (0x5FFFE, 0x5FFFF), (0x6FFFE, 0x6FFFF), (0x7FFFE, 0x7FFFF), (0x8FFFE, 0x8FFFF), + (0x9FFFE, 0x9FFFF), (0xAFFFE, 0xAFFFF), (0xBFFFE, 0xBFFFF), (0xCFFFE, 0xCFFFF), + (0xDFFFE, 0xDFFFF), (0xEFFFE, 0xEFFFF), (0xFFFFE, 0xFFFFF), (0x10FFFE, 0x10FFFF)]) + + _illegal_ranges = ["%s-%s" % (unichr(low), unichr(high)) for (low, high) in _illegal_unichrs] + + RESTRICTED_CHARACTERS = re.compile(u'[%s]' % u''.join(_illegal_ranges)) + + match = re.search(RESTRICTED_CHARACTERS, value) + if match: + raise ValidationError('%s is not an allowed character' % match.group(0)) diff --git a/akvo/rsr/views.py b/akvo/rsr/views.py index 2f2712690d..db095bfb2a 100644 --- a/akvo/rsr/views.py +++ b/akvo/rsr/views.py @@ -75,7 +75,8 @@ def forbidden(request, template_name='403.html'): t = loader.get_template(template_name) return http.HttpResponseForbidden(t.render(Context({ 'error_message': message, - 'MEDIA_URL': settings.MEDIA_URL + 'MEDIA_URL': settings.MEDIA_URL, + 'user': request.user }))) @@ -411,9 +412,16 @@ def partners_widget(request, org_type='all'): def login(request, template_name='registration/login.html', redirect_field_name=REDIRECT_FIELD_NAME): "Displays the login form and handles the login action." redirect_to = request.REQUEST.get(redirect_field_name, '') - # Check for exeptions to the return to start of sign in process - if redirect_to == "/accounts/register/complete/": - redirect_to = "/home" + + # Non logical URLs for redirection after signing in + redirect_blacklist = [reverse('signin'), + reverse('signout'), + reverse('register1'), + reverse('register2'), + reverse('registration_update_complete')] + + if redirect_to in redirect_blacklist: + redirect_to = "/" if request.method == "POST": form = AuthenticationForm(data=request.POST) @@ -670,6 +678,7 @@ def projectcomments(request, project_id): comments = Project.objects.get(id=project_id).comments.all().order_by('-time') form = CommentForm() updates = project.project_updates.all().order_by('-created_at')[:3] + can_add_update = project.connected_to_user(request.user) return { 'project': project, 'comments': comments, @@ -677,6 +686,7 @@ def projectcomments(request, project_id): 'project_section': 'comments', 'hide_comments': True, 'updates': updates, + 'can_add_update': can_add_update } @@ -919,6 +929,8 @@ def projectmain(request, project, draft=False, can_add_update=False): else: admin_change_url = None + can_add_update = project.connected_to_user(request.user) + return { 'admin_change_url': admin_change_url, 'benchmarks': benchmarks, @@ -944,6 +956,7 @@ def projectdetails(request, project_id): def projectpartners(request, project, draft=False, can_add_update=False): updates = project.project_updates.all().order_by('-created_at')[:3] comments = project.comments.all().order_by('-time')[:3] + can_add_update = project.connected_to_user(request.user) return { 'can_add_update': can_add_update, 'draft': draft, @@ -961,6 +974,7 @@ def projectfunding(request, project, draft=False, can_add_update=False): public_donations = project.public_donations() updates = project.project_updates.all().order_by('-created_at')[:3] comments = project.comments.all().order_by('-time')[:3] + can_add_update = project.connected_to_user(request.user) return { 'can_add_update': can_add_update, 'draft': draft, @@ -1145,7 +1159,7 @@ def project_map_widget(request, org_id): textcolor = request.GET.get('textcolor', 'FFFFFF') width = request.GET.get('width', '600') zoom = request.GET.get('zoom', '1') - state = request.GET.get('state', 'static') + state = request.GET.get('state', 'dynamic') if state != 'dynamic': state = 'static' diff --git a/akvo/rsr/views_partner_sites/auth.py b/akvo/rsr/views_partner_sites/auth.py index 0798476a34..55960194f0 100644 --- a/akvo/rsr/views_partner_sites/auth.py +++ b/akvo/rsr/views_partner_sites/auth.py @@ -42,7 +42,15 @@ def dispatch(self, *args, **kwargs): def form_valid(self, form): """On valid form login and redirect the user to the appropriate url""" login(self.request, form.get_user()) - return HttpResponseRedirect(self.request.POST.get('next', '/')) + + redirect_blacklist = [reverse('sign_in'), + reverse('sign_out')] + + redirect_to = self.request.POST.get('next', '/') + if redirect_to in redirect_blacklist: + redirect_to = "/" + + return HttpResponseRedirect(redirect_to) def get_context_data(self, **kwargs): context = super(SignInView, self).get_context_data(**kwargs) @@ -88,8 +96,8 @@ def _get_redirect_url(self): hostname = self.request.partner_site.hostname app_domain = getattr(settings, 'AKVOAPP_DOMAIN', 'akvoapp.org') request_path = self.request.get_full_path() - url = 'http://%s.%s%s' % (hostname, app_domain, request_path) + url = 'http://%s.%s%s' % (hostname, app_domain, request_path) if getattr(settings, 'HTTPS_SUPPORT', True): return url.replace('http://', 'https://') return url diff --git a/akvo/rsr/views_partner_sites/base.py b/akvo/rsr/views_partner_sites/base.py index 43ab954578..1291c4676b 100644 --- a/akvo/rsr/views_partner_sites/base.py +++ b/akvo/rsr/views_partner_sites/base.py @@ -52,6 +52,7 @@ def get_context_data(self, **kwargs): Organisation, pk=self.request.organisation_id ) context['return_url'] = self.request.partner_site.return_url + context['return_url_text'] = self.request.partner_site.custom_return_url_text context['stylesheet'] = self.request.partner_site.stylesheet context['akvoapp_root_url'] = self.request.akvoapp_root_url context['domain_url'] = self.request.domain_url diff --git a/akvo/rsr/views_partner_sites/partner.py b/akvo/rsr/views_partner_sites/partner.py index 330d5ddea7..de4953ffd9 100644 --- a/akvo/rsr/views_partner_sites/partner.py +++ b/akvo/rsr/views_partner_sites/partner.py @@ -44,7 +44,4 @@ def get_context_data(self, **kwargs): context['partner'] = get_object_or_404( Organisation, pk=self.kwargs['org_id'] ) - if context['partner'] != context['organisation'] and \ - context['partner'] not in context['organisation'].partners(): - raise Http404 return context diff --git a/akvo/rsr/views_partner_sites/project.py b/akvo/rsr/views_partner_sites/project.py index 262540e80d..1a24da274c 100644 --- a/akvo/rsr/views_partner_sites/project.py +++ b/akvo/rsr/views_partner_sites/project.py @@ -31,7 +31,8 @@ 'ProjectUpdateEditView', 'ProjectUpdateListView', 'ProjectUpdateView', - 'ProjectDonationThanksView' + 'ProjectDonationThanksView', + 'ProjectDonationRedirectView' ] @@ -224,3 +225,12 @@ def get_context_data(self, invoice=None, **kwargs): raise Http404 context["invoice"] = invoice return context + +class ProjectDonationRedirectView(BaseProjectView): + "Show a redirect page before redirecting to the core RSR donate page" + template_name = "partner_sites/project/donate/donate_redirect.html" + + def get_context_data(self, **kwargs): + context = super(ProjectDonationRedirectView, self).get_context_data(**kwargs) + _project = get_object_or_404(Project, id=context['project'].pk) + return context \ No newline at end of file diff --git a/akvo/scripts/budget_totals.py b/akvo/scripts/budget_totals.py new file mode 100644 index 0000000000..10d7178736 --- /dev/null +++ b/akvo/scripts/budget_totals.py @@ -0,0 +1,68 @@ +# -*- coding: utf-8 -*- +#!/usr/bin/env python + +""" +Script for setting all budgets with budget item 13 to 14 and remove budget item 13 (total) from RSR. +""" + +from django.core.management import setup_environ +from akvo import settings +setup_environ(settings) + +from akvo.rsr.models import BudgetItem, BudgetItemLabel, Project + + +def set_budget_totals(): + '''Change all budget items with id 13 to 14''' + + print "\nGetting all budget items...\n" + + budget_items = BudgetItem.objects.filter(label_id="13") + budgets_count = budget_items.count() + + for count, item in enumerate(budget_items, start=1): + item.label_id = 14 + item.save() + + print "Budget item", str(item.pk), "adjusted (" + str(count), "out of", str(budgets_count) + ")..." + + +def remove_budgetitem_label(): + '''Remove budget item label 13 (total)''' + + BudgetItemLabel.objects.filter(id="13").delete() + print "\nRemoved the total budget item, label 13..." + + +def update_budgetitem_label(): + '''Update label of budget item 14''' + + total_budget_label = BudgetItemLabel.objects.get(id="14") + total_budget_label.label = 'total' + total_budget_label.save() + + print "\nUpdated label of item 14 to 'total'...\n" + + +def update_projects(): + '''Updates all projects using the budget sum calculator''' + + print "\nGetting all projects...\n" + + projects = Project.objects.all() + projects_count = projects.count() + + for count, project in enumerate(projects): + project.update_budget() + project.update_funds_needed() + + print "Updating project:", project.id, "(" + str(count), "out of", str(projects_count) + ")..." + + +if __name__ == '__main__': + set_budget_totals() + remove_budgetitem_label() + update_budgetitem_label() + update_projects() + + print "\nDone!\n" diff --git a/akvo/settings/10-base.conf b/akvo/settings/10-base.conf index d65601f5d3..4678dce875 100644 --- a/akvo/settings/10-base.conf +++ b/akvo/settings/10-base.conf @@ -70,6 +70,7 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.middleware.doc.XViewMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', + 'akvo.rsr.middleware.ExceptionLoggingMiddleware', ) ROOT_URLCONF = 'akvo.urls.rsr' @@ -96,88 +97,6 @@ TEMPLATE_LOADERS = ( ) # Logging -LOGGING = { - 'version': 1, - 'disable_existing_loggers': True, - 'formatters': { - 'verbose': { - 'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s' - }, - 'verbose_request': { - 'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s %(request)s' - }, - 'simple': { - 'format': '%(levelname)s %(message)s' - }, - }, - 'filters': { - #'special': { - # '()': 'project.logging.SpecialFilter', - # 'foo': 'bar', - #}, - }, - 'handlers': { - 'null': { - 'level':'DEBUG', - 'class':'django.utils.log.NullHandler', - }, - 'console':{ - 'level':'DEBUG', - 'class':'logging.StreamHandler', - 'formatter': 'verbose', - }, - 'file':{ - 'level':'DEBUG', - 'class':'logging.handlers.RotatingFileHandler', - 'filename': os.path.join(os.path.dirname(__file__), '../log/akvo.log').replace('\\','/'), - 'maxBytes': 1024*1024, - 'backupCount': 4, - 'formatter': 'verbose', - }, - 'request_to_console':{ - 'level':'DEBUG', - 'class':'logging.StreamHandler', - 'formatter': 'verbose_request', - }, - 'request_to_file':{ - 'level':'DEBUG', - 'class':'logging.handlers.RotatingFileHandler', - 'filename': os.path.join(os.path.dirname(__file__), '../log/akvo.log').replace('\\','/'), - 'maxBytes': 1024*1024, - 'backupCount': 4, - 'formatter': 'verbose_request', - }, - #'mail_admins': { - # 'level': 'ERROR', - # 'class': 'django.utils.log.AdminEmailHandler', - # 'filters': ['special'] - #}, - }, - 'loggers': { - 'django': { - 'handlers':['null'], - 'propagate': True, - 'level':'INFO', - }, - #'django.request': { - # 'handlers': ['mail_admins'], - # 'level': 'ERROR', - # 'propagate': False, - #}, - # 'django.request': { - # 'handlers': ['request_to_file', ], #'request_to_console',], - # 'level': 'DEBUG', - # 'propagate': False, - # }, - 'akvo.rsr': { - 'handlers': ['file', ], #'console', ], - 'level': 'DEBUG', - 'propagate': False, - }, - 'cacheback': { - 'handlers': ['file'], - 'level': 'DEBUG', - 'propagate': False, - }, - }, -} +LOG_FILE_PATH = '/var/akvo/rsr/logs/' +ACCESS_LOG_FILE_NAME = 'akvo.log' +ERROR_LOG_FILE_NAME = 'akvo.error.log' diff --git a/akvo/settings/90-finish.conf b/akvo/settings/90-finish.conf index 05546e0d27..b6f78595ca 100644 --- a/akvo/settings/90-finish.conf +++ b/akvo/settings/90-finish.conf @@ -16,6 +16,9 @@ TEMPLATE_DIRS = ( ) # Logging +ACCESS_LOG_FILE_FULL_NAME = os.path.join(LOG_FILE_PATH, ACCESS_LOG_FILE_NAME).replace('\\','/') +ERROR_LOG_FILE_FULL_NAME = os.path.join(LOG_FILE_PATH, ERROR_LOG_FILE_NAME).replace('\\','/') + LOGGING = { 'version': 1, 'disable_existing_loggers': True, @@ -29,18 +32,11 @@ LOGGING = { 'simple': { 'format': '%(levelname)s %(message)s' }, - }, - 'filters': { - #'special': { - # '()': 'project.logging.SpecialFilter', - # 'foo': 'bar', - #}, + 'production_errors': { + 'format': '%(levelname)s %(asctime)s %(message)s' + }, }, 'handlers': { - 'null': { - 'level':'DEBUG', - 'class':'django.utils.log.NullHandler', - }, 'console':{ 'level':'DEBUG', 'class':'logging.StreamHandler', @@ -49,50 +45,30 @@ LOGGING = { 'file':{ 'level':'DEBUG', 'class':'logging.handlers.RotatingFileHandler', - 'filename': os.path.join(LOG_FILE_PATH, 'akvo.log').replace('\\','/'), + 'filename': ACCESS_LOG_FILE_FULL_NAME, 'maxBytes': 1024*1024, 'backupCount': 4, 'formatter': 'verbose', }, - 'request_to_console':{ - 'level':'DEBUG', - 'class':'logging.StreamHandler', - 'formatter': 'verbose_request', - }, - 'request_to_file':{ + 'production_errors':{ 'level':'DEBUG', 'class':'logging.handlers.RotatingFileHandler', - 'filename': os.path.join(LOG_FILE_PATH, 'akvo.log').replace('\\','/'), + 'filename': ERROR_LOG_FILE_FULL_NAME, 'maxBytes': 1024*1024, 'backupCount': 4, - 'formatter': 'verbose_request', + 'formatter': 'production_errors', }, - #'mail_admins': { - # 'level': 'ERROR', - # 'class': 'django.utils.log.AdminEmailHandler', - # 'filters': ['special'] - #}, }, 'loggers': { - 'django': { - 'handlers':['null'], - 'propagate': True, - 'level':'INFO', + 'django.request': { + 'handlers': ['production_errors', 'console', ], + 'level': 'ERROR', + 'propagate': False, }, - #'django.request': { - # 'handlers': ['mail_admins'], - # 'level': 'ERROR', - # 'propagate': False, - #}, - # 'django.request': { - # 'handlers': ['request_to_file', ], #'request_to_console',], - # 'level': 'DEBUG', - # 'propagate': False, - # }, 'akvo.rsr': { 'handlers': ['file', ], #'console', ], 'level': 'DEBUG', 'propagate': False, }, - }, + } } diff --git a/akvo/templates/admin/rsr/project/change_form.html b/akvo/templates/admin/rsr/project/change_form.html index b153e9f245..c7d3d156f8 100644 --- a/akvo/templates/admin/rsr/project/change_form.html +++ b/akvo/templates/admin/rsr/project/change_form.html @@ -35,6 +35,22 @@
{% trans 'Adding and Editing Projects.' %}
{% endif %} {% endif %} {% endblock object-tools %} + {% if original.sync_owner %} + + {% endif %} diff --git a/akvo/templates/partner_sites/project/update_main.html b/akvo/templates/partner_sites/project/update_main.html index bafd3a6959..b66a229a2f 100644 --- a/akvo/templates/partner_sites/project/update_main.html +++ b/akvo/templates/partner_sites/project/update_main.html @@ -6,7 +6,7 @@ {% block title %}{{update.title}} - {% endblock title %} {% block head %} - + {% if update.photo %} @@ -120,14 +120,6 @@{{update.title}}
{% endif %} - - {% if update.text_location == 'B' %} -- {% autoescape off %} - {{ update.text|force_escape|urlize|markdown }} - {% endautoescape %} -
- {% endif %} {% if update.video %}{{update.title}}
{% update_thumb update 580 435 %}- {% autoescape off %} - {{ update.text|force_escape|urlize|markdown }} - {% endautoescape %} -
- {% endif %} ++ {% autoescape off %} + {{ update.text|force_escape|urlize|markdown }} + {% endautoescape %} +
{% trans "Size" %}
- +
+
