Issue 12351044: Issue 447 - The prerender directive is included twice in the same page

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Issue 12351044: Issue 447 - The prerender directive is included twice in the same page

Can't Edit
Can't Publish+Mail
Start Review

Created:
12 years, 5 months ago by PhistucK

Modified:
12 years, 5 months ago

Reviewers:
Andi Albrecht, Andi, M-A

CC:
codereview-list_googlegroups.com

Visibility:
Public.

More Reviews

Description

The prerender directive is included twice in the diff pages. Removed the directive from a common template and moved it into the various diff templates instead. Now there is only one directive per page. This fixes issue 447. https://code.google.com/p/rietveld/issues/detail?id=447

Patch Set 1 #

Patch Set 2 : Removed an unrelated change #

Total comments: 2

Created: 12 years, 5 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+8 lines, -5 lines)			Patch
M	templates/diff.html	View	1 chunk	+0 lines, -1 line	0 comments	Download
M	templates/diff2.html	View	1 chunk	+0 lines, -2 lines	0 comments	Download
M	templates/diff_navigation.html	View	1 chunk	+4 lines, -0 lines	1 comment	Download
M	templates/file_navigation.html	View	1 chunk	+0 lines, -2 lines	0 comments	Download
M	templates/patch.html	View	1 chunk	+4 lines, -0 lines	1 comment	Download

Messages

Total messages: 2

Expand All Messages | Collapse All Messages

Andi

12 years, 5 months ago (2013-08-06 05:51:32 UTC) #2

sorry for the delay...

https://codereview.appspot.com/12351044/diff/4001/templates/diff_navigation.html
File templates/diff_navigation.html (right):

https://codereview.appspot.com/12351044/diff/4001/templates/diff_navigation.h...
templates/diff_navigation.html:4: href="{%ifequal view_style 'patch'%}{%url
codereview.views.patch
issue.key.id,patchset.key.id,patch.next.key.id%}{%else%}{%url
codereview.views.diff
issue.key.id,patchset.key.id,patch.next.filename%}{%endifequal%}{%urlappend_view_settings%}"></link>
Since diff_navigation.html is only included in diff.html view_style should
always be "diff" here.

https://codereview.appspot.com/12351044/diff/4001/templates/patch.html
File templates/patch.html (right):

https://codereview.appspot.com/12351044/diff/4001/templates/patch.html#newcod...
templates/patch.html:108: href="{%ifequal view_style 'patch'%}{%url
codereview.views.patch
issue.key.id,patchset.key.id,patch.next.key.id%}{%else%}{%url
codereview.views.diff
issue.key.id,patchset.key.id,patch.next.filename%}{%endifequal%}{%urlappend_view_settings%}"></link>
If I see this correctly, view_style is always "patch" here.

Expand All Messages | Collapse All Messages