Thread: [Codestriker-commits] CVS update: codestriker/template/en/default viewdeltaheader.html.tmpl viewdel
Brought to you by:
sits
From: <si...@us...> - 2008-03-13 06:11:37
|
User: sits Date: 08/03/12 23:11:34 Modified: template/en/default viewdeltas.html.tmpl viewtopic.html.tmpl Added: template/en/default viewdeltaheader.html.tmpl Log: Render the delta header in the footer if only one file is being viewed. Index: viewdeltas.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/viewdeltas.html.tmpl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- viewdeltas.html.tmpl 12 Mar 2008 08:29:15 -0000 1.2 +++ viewdeltas.html.tmpl 13 Mar 2008 06:11:34 -0000 1.3 @@ -13,30 +13,8 @@ [% END %] <table width="100%" cellspacing="0" cellpadding="0" border="0"> - <tr> - <td class="file" align="left"> - [% IF delta.repository_file_view_url != "" %] - File - <a href="[% delta.repository_file_view_url %]"> - [% delta.filename | html_entity %] - </a> - [% ELSE %] - File [% delta.filename | html_entity %] - [% END %] - (Revision [% delta.revision %]) - </td> - - <td class="file" align="right"> - [% delta.add_file_comment_element %] - [% IF delta.previous_file_url != "" %] - <a href="[% delta.previous_file_url %]">[<<]</a> - [% END %] - <a href="#contents">[Top]</a> - [% IF delta.next_file_url != "" %] - <a href="[% delta.next_file_url %]">[>>]</a> - [% END %] - </td> - </tr> + + [% PROCESS viewdeltaheader.html.tmpl delta = delta %] [%# Output the diff description if it is present. #%] [% IF delta.description != "" %] @@ -55,7 +33,7 @@ [%# Now output the delta header. #%] [% SET diff_current_filename = delta.filename %] <tr> - <td> </td><td> </td><td> </td><td> </td> + <td colspan="4"> </td> </tr> <tr> [% IF delta.view_old_full_url != "" %] @@ -95,7 +73,15 @@ <td class="[% line.new_data_class %]">[% line.new_data %]</td> </tr> [% END %] + <tr><td colspan="4"> </td></tr> + [% END %] [%# Close off the table from the last file's delta set. #%] </table> + +[% IF render_header_in_footer %] +<table width="100%" cellspacing="0" cellpadding="0" border="0"> +[% PROCESS viewdeltaheader.html.tmpl delta = delta %] +</table> +[% END %] Index: viewtopic.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/viewtopic.html.tmpl,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- viewtopic.html.tmpl 13 Mar 2008 00:56:03 -0000 1.43 +++ viewtopic.html.tmpl 13 Mar 2008 06:11:34 -0000 1.44 @@ -102,7 +102,8 @@ <span class="general_comment">[% add_general_comment_element %] to topic.</span> <p> -[% PROCESS viewdeltas.html.tmpl deltas = deltas %] +[%# Render the delta header in the footer if only one file is being viewed. #%] +[% PROCESS viewdeltas.html.tmpl deltas = deltas render_header_in_footer = fview != -1 %] [%# Output the legend at the bottom. #%] Index: viewdeltaheader.html.tmpl =================================================================== RCS file: viewdeltaheader.html.tmpl diff -N viewdeltaheader.html.tmpl --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ viewdeltaheader.html.tmpl 13 Mar 2008 06:11:34 -0000 1.1 @@ -0,0 +1,26 @@ +[%# HTML for rendering a delta header. #%] + + <tr> + <td class="file" align="left"> + [% IF delta.repository_file_view_url != "" %] + File + <a href="[% delta.repository_file_view_url %]"> + [% delta.filename | html_entity %] + </a> + [% ELSE %] + File [% delta.filename | html_entity %] + [% END %] + (Revision [% delta.revision %]) + </td> + + <td class="file" align="right"> + [% delta.add_file_comment_element %] + [% IF delta.previous_file_url != "" %] + <a href="[% delta.previous_file_url %]">[<<]</a> + [% END %] + <a href="#contents">[Top]</a> + [% IF delta.next_file_url != "" %] + <a href="[% delta.next_file_url %]">[>>]</a> + [% END %] + </td> + </tr> |
From: <si...@us...> - 2008-03-13 22:39:09
|
User: sits Date: 08/03/13 15:39:07 Modified: lib/Codestriker/Action ViewTopic.pm template/en/default viewdeltaheader.html.tmpl viewdeltas.html.tmpl viewtopic.html.tmpl Log: Support named anchors again for filenames Index: ViewTopic.pm =================================================================== RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/Action/ViewTopic.pm,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- ViewTopic.pm 13 Mar 2008 00:56:02 -0000 1.58 +++ ViewTopic.pm 13 Mar 2008 22:39:07 -0000 1.59 @@ -209,9 +209,6 @@ $filerow->{href_filename_url} = $url_builder->view_url($topicid, -1, $mode, $brmode, $i) . "#" . $filename; - $filerow->{anchor_filename_url} = - $url_builder->view_url($topicid, -1, $mode, $brmode, -1) . - "#" . $filename; $filerow->{binary} = $binary[$i]; my $revision = $revisions[$i]; Index: viewdeltaheader.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/viewdeltaheader.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- viewdeltaheader.html.tmpl 13 Mar 2008 06:11:34 -0000 1.1 +++ viewdeltaheader.html.tmpl 13 Mar 2008 22:39:07 -0000 1.2 @@ -2,13 +2,13 @@ <tr> <td class="file" align="left"> + [% IF render_anchor %]<a name="[% delta.filename %]">File</a> [% ELSE %]File [% END %] [% IF delta.repository_file_view_url != "" %] - File <a href="[% delta.repository_file_view_url %]"> [% delta.filename | html_entity %] </a> [% ELSE %] - File [% delta.filename | html_entity %] + [% delta.filename | html_entity %] [% END %] (Revision [% delta.revision %]) </td> Index: viewdeltas.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/viewdeltas.html.tmpl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- viewdeltas.html.tmpl 13 Mar 2008 06:11:34 -0000 1.3 +++ viewdeltas.html.tmpl 13 Mar 2008 22:39:07 -0000 1.4 @@ -14,7 +14,7 @@ <table width="100%" cellspacing="0" cellpadding="0" border="0"> - [% PROCESS viewdeltaheader.html.tmpl delta = delta %] + [% PROCESS viewdeltaheader.html.tmpl delta = delta render_anchor = 1 %] [%# Output the diff description if it is present. #%] [% IF delta.description != "" %] @@ -82,6 +82,6 @@ [% IF render_header_in_footer %] <table width="100%" cellspacing="0" cellpadding="0" border="0"> -[% PROCESS viewdeltaheader.html.tmpl delta = delta %] +[% PROCESS viewdeltaheader.html.tmpl delta = delta render_anchor = 0 %] </table> [% END %] Index: viewtopic.html.tmpl =================================================================== RCS file: /cvsroot/codestriker/codestriker/template/en/default/viewtopic.html.tmpl,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- viewtopic.html.tmpl 13 Mar 2008 06:11:34 -0000 1.44 +++ viewtopic.html.tmpl 13 Mar 2008 22:39:07 -0000 1.45 @@ -65,7 +65,7 @@ [%# Display the jump to link in the case when all files are displayed. #%] [% IF fview == -1 %] - [<a href="[% file.anchor_filename_url %]">Jump to</a>] + [<a href="#[% file.filename %]">Jump to</a>] [% END %] [%# Display the filename with an internal link if its not binary. #%] |