diff --git a/ietf/doc/models.py b/ietf/doc/models.py index 7cfdcf55b..063e66e94 100644 --- a/ietf/doc/models.py +++ b/ietf/doc/models.py @@ -200,9 +200,9 @@ class Document(DocumentInfo): else: filename = self.external_url if meeting.type_id == 'ietf': - url = '%s/proceedings/%s/%s/%s' % (settings.MEDIA_URL,meeting.number,self.type_id,filename) + url = '%sproceedings/%s/%s/%s' % (settings.MEDIA_URL,meeting.number,self.type_id,filename) elif meeting.type_id == 'interim': - url = "%s/proceedings/interim/%s/%s/%s/%s" % ( + url = "%sproceedings/interim/%s/%s/%s/%s" % ( settings.MEDIA_URL, meeting.date.strftime('%Y/%m/%d'), session.group.acronym, diff --git a/ietf/secr/proceedings/models.py b/ietf/secr/proceedings/models.py index 38e455881..77ce32edd 100644 --- a/ietf/secr/proceedings/models.py +++ b/ietf/secr/proceedings/models.py @@ -52,7 +52,7 @@ class InterimMeeting(Meeting): If the proceedings file doesn't exist return empty string. For use in templates. ''' if os.path.exists(self.get_proceedings_path()): - url = "%s/proceedings/interim/%s/%s/proceedings.html" % ( + url = "%sproceedings/interim/%s/%s/proceedings.html" % ( settings.MEDIA_URL, self.date.strftime('%Y/%m/%d'), self.group().acronym) @@ -70,4 +70,4 @@ class Registration(models.Model): def __unicode__(self): return "%s %s" % (fname, lname) class Meta: - db_table = 'registrations' \ No newline at end of file + db_table = 'registrations' diff --git a/ietf/secr/proceedings/proc_utils.py b/ietf/secr/proceedings/proc_utils.py index cd47e52bc..694f8f2a2 100644 --- a/ietf/secr/proceedings/proc_utils.py +++ b/ietf/secr/proceedings/proc_utils.py @@ -207,9 +207,9 @@ def create_proceedings(meeting, group, is_final=False): meeting_root = get_upload_root(meeting) if meeting.type.slug == 'ietf': - url_root = "%s/proceedings/%s/" % (settings.MEDIA_URL,meeting.number) + url_root = "%sproceedings/%s/" % (settings.MEDIA_URL,meeting.number) else: - url_root = "%s/proceedings/interim/%s/%s/" % ( + url_root = "%sproceedings/interim/%s/%s/" % ( settings.MEDIA_URL, meeting.date.strftime('%Y/%m/%d'), group.acronym) @@ -338,7 +338,7 @@ def gen_areas(context): # append proceedings URL for group in gmet + gnot: - group.proceedings_url = "%s/proceedings/%s/%s.html" % (settings.MEDIA_URL,meeting.number,group.acronym) + group.proceedings_url = "%sproceedings/%s/%s.html" % (settings.MEDIA_URL,meeting.number,group.acronym) for (counter,area) in enumerate(context['areas'], start=1): groups_met = {'wg':filter(lambda a: a.parent==area and a.state.slug not in ('bof','bof-conc') and a.type_id=='wg',gmet), @@ -514,7 +514,7 @@ def gen_research(context): # append proceedings URL for group in groups: - group.proceedings_url = "%s/proceedings/%s/%s.html" % (settings.MEDIA_URL,meeting.number,group.acronym) + group.proceedings_url = "%sproceedings/%s/%s.html" % (settings.MEDIA_URL,meeting.number,group.acronym) html = render_to_response('proceedings/rg_irtf.html',{ 'meeting': meeting, diff --git a/ietf/secr/proceedings/views.py b/ietf/secr/proceedings/views.py index 3bb04c945..8f8ea12b3 100644 --- a/ietf/secr/proceedings/views.py +++ b/ietf/secr/proceedings/views.py @@ -150,12 +150,12 @@ def get_proceedings_path(meeting,group): def get_proceedings_url(meeting,group=None): if meeting.type_id == 'ietf': - url = "%s/proceedings/%s/" % (settings.MEDIA_URL,meeting.number) + url = "%sproceedings/%s/" % (settings.MEDIA_URL,meeting.number) if group: url = url + "%s.html" % group.acronym elif meeting.type_id == 'interim': - url = "%s/proceedings/interim/%s/%s/proceedings.html" % ( + url = "%sproceedings/interim/%s/%s/proceedings.html" % ( settings.MEDIA_URL, meeting.date.strftime('%Y/%m/%d'), group.acronym) diff --git a/ietf/secr/templates/includes/proceedings_functions.html b/ietf/secr/templates/includes/proceedings_functions.html index 9c3c7b836..ef6ff48e7 100644 --- a/ietf/secr/templates/includes/proceedings_functions.html +++ b/ietf/secr/templates/includes/proceedings_functions.html @@ -21,6 +21,6 @@
Use this to generate the progress report for the plenary.
\ No newline at end of file + diff --git a/ietf/secr/templates/proceedings/convert.html b/ietf/secr/templates/proceedings/convert.html index f6411b424..817afad65 100644 --- a/ietf/secr/templates/proceedings/convert.html +++ b/ietf/secr/templates/proceedings/convert.html @@ -31,7 +31,7 @@