diff options
| author |   Kurt Lieber <klieber@gentoo.org> | 2003-11-17 13:22:53 +0000 |
|---|---|---|
| committer | Kurt Lieber <klieber@gentoo.org> | 2003-11-17 13:22:53 +0000 |
| commit | 77a30d5a33b2140b30473440ac51021da7e7489f (patch) | |
| tree | 4a49282fb54bcd6dac189b7e31019f725e1740f1 /admin | |
| parent | Added link to source_mirrors.xml (diff) | |
| download | gentoo-77a30d5a33b2140b30473440ac51021da7e7489f.tar.gz gentoo-77a30d5a33b2140b30473440ac51021da7e7489f.tar.bz2 gentoo-77a30d5a33b2140b30473440ac51021da7e7489f.zip | |
fixes for stuff
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/www.gentoo.org/viewcvs/templates/log.ezt | 177 | ||||
| -rw-r--r-- | admin/www.gentoo.org/viewcvs/templates/log_table.ezt | 176 |
2 files changed, 252 insertions, 101 deletions
diff --git a/admin/www.gentoo.org/viewcvs/templates/log.ezt b/admin/www.gentoo.org/viewcvs/templates/log.ezt index c4527f2106..0b2b91815f 100644 --- a/admin/www.gentoo.org/viewcvs/templates/log.ezt +++ b/admin/www.gentoo.org/viewcvs/templates/log.ezt @@ -4,17 +4,17 @@ <!-- ViewCVS -- http://viewcvs.sourceforge.net/ by Greg Stein -- mailto:gstein@lyra.org --> -<title>[is roottype "svn"]Subversion[else]CVS[end] log for [where]</title> +<title>CVS log for [where]</title> </head> <body text="#000000" bgcolor="#ffffff"> <table width="100%" border=0 cellspacing=0 cellpadding=0> <tr> - <td rowspan=2><h1>[is roottype "svn"]Subversion[else]CVS[end] log for [where]</h1></td> + <td rowspan=2><h1>CVS log for [where]</h1></td> <td align=right><img src="/images/gentoo-new.gif" alt="(logo)" border=0></td> </tr> <tr> <td align=right><h3><b><a target="_blank" - href="[request.script_name]/*docroot*/help_log.html">ViewCVS and CVS Help</a></b></h3></td> + href="[request.script_name]/*docroot*/help_log.html">Help</a></b></h3></td> </tr> </table> @@ -27,11 +27,31 @@ [end] <hr noshade> -[include "include/branch.ezt"] - -[include "include/view_tag.ezt"] +[if-any branch] + Default branch: [branch] + <br> + Bookmark a link to: + [if-any viewable] + <a href="[head_href]"><b>HEAD</b></a> + / + (<a href="[head_abs_href]" target="cvs_checkout" + onClick="window.open('about:blank', 'cvs_checkout', + 'resizeable=1,scrollbars=1[is mime_type "text/html"],status,toolbar[end]')" + ><b>download</b></a>) + [else] + <a href="[head_href]" target="cvs_checkout" + onClick="window.open('about:blank', 'cvs_checkout', + 'resizeable=1,scrollbars=1[is mime_type "text/html"],status,toolbar[end]')" + ><b>HEAD</b></a> + [end] +[else] + No default branch +[end] +<br> -[include "include/paging.ezt"] +[if-any view_tag] + Current tag: [view_tag] <br> +[end] [for entries] <hr size=1 noshade> @@ -45,47 +65,48 @@ [for entries.branch_names]<a name="[entries.branch_names]"></a> [end] - Revision <b>[entries.rev]</b> - - [if-any is_text] - <a href="[entries.href]" - [if-any is_text] - type="text/plain" - [else] - [if-any mime_type] - type="[mime_type]" - [end] - [end]> - (download)</a>, view - <a href="[entries.text_href]">(text)</a> - <a href="[entries.view_href]">(markup)</a> - - [# if you don't want to allow annotation, then remove this line] - [is roottype "svn"][else]<a href="[href]?annotate=[entries.rev][query]">(annotate)</a>[end] + Revision + [if-any viewable] + <a href="[entries.href]" target="cvs_checkout" + onClick="window.open('about:blank', 'cvs_checkout', + 'resizeable=1,scrollbars=1[is mime_type "text/html"],status,toolbar[end]')" + ><b>[entries.rev]</b></a> [else] - [if-any viewable] - , <a href="[entries.view_href]">(view)</a> - [else] - , <a href="[entries.href]" - [if-any mime_type] - type="[mime_type]" - [end]>(view/download)</a> - [end] + <a href="[entries.view_href]"><b>[entries.rev]</b></a> + / + (<a href="[entries.href]" target="cvs_checkout" + onClick="window.open('about:blank', 'cvs_checkout', + 'resizeable=1,scrollbars=1[is mime_type "text/html"],status,toolbar[end]')" + ><b>download</b></a>) + [end] + [is mime_type "text/plain"] + [else] + / + (<a href="[entries.text_href]" target="cvs_checkout" + onClick="window.open('about:blank', 'cvs_checkout', + 'resizeable=1,scrollbars=1')"><b>as text</b></a>) + [end] + [if-any viewable] + / + <a href="[entries.view_href]"><b>(view)</b></a> [end] + [# if you don't want to allow annotation, then remove this line] + - <a href="[href]?annotate=[entries.rev][query]">annotate</a> + [# if you don't want to allow select for diffs then remove this section] [is entries.rev rev_selected] - <b>[[]selected]</b> [else] - <a href="[href]?r1=[entries.rev][query]">[[]select for diffs]</a> [end] - [end] [if-any entries.vendor_branch] <i>(vendor branch)</i> [end] - <br><i>[entries.date_str]</i> ([entries.ago] ago) by <i>[entries.author]</i> + , <i>[entries.utc_date] UTC</i> ([entries.ago] ago) by <i>[entries.author]</i> [if-any entries.branches] <br>Branch: @@ -110,9 +131,7 @@ [if-any entries.prev] [if-any entries.changed] - [is roottype "cvs"] <br>Changes since <b>[entries.prev]: [entries.changed] lines</b> - [end] [end] [end] @@ -120,35 +139,35 @@ <br><b><i>FILE REMOVED</i></b> [else] [if-any entries.prev] - <br>Diff to <a href="[href]?r1=[entries.prev]&r2=[entries.rev][query]">previous [entries.prev]</a> + <br>Diff to <a href="[href].diff?r1=[entries.prev]&r2=[entries.rev][query]">previous [entries.prev]</a> [if-any human_readable] [else] - (<a href="[href]?r1=[entries.prev]&r2=[entries.rev]&diff_format=h[query]">colored</a>) + (<a href="[href].diff?r1=[entries.prev]&r2=[entries.rev]&diff_format=h[query]">colored</a>) [end] [end] [if-any entries.branch_point] - , to <a href="[href]?r1=[entries.branch_point]&r2=[entries.rev][query]">branch point [entries.branch_point]</a> + to <a href="[href].diff?r1=[entries.branch_point]&r2=[entries.rev][query]">branch point [entries.branch_point]</a> [if-any human_readable] [else] - , (<a href="[href]?r1=[entries.branch_point]&r2=[entries.rev]&diff_format=h[query]">colored</a>) + (<a href="[href].diff?r1=[entries.branch_point]&r2=[entries.rev]&diff_format=h[query]">colored</a>) [end] [end] [if-any entries.next_main] - , to <a href="[href]?r1=[entries.next_main]&r2=[entries.rev][query]">next main [entries.next_main]</a> + to <a href="[href].diff?r1=[entries.next_main]&r2=[entries.rev][query]">next main [entries.next_main]</a> [if-any human_readable] [else] - , (<a href="[href]?r1=[entries.next_main]&r2=[entries.rev]&diff_format=h[query]">colored</a>) + (<a href="[href].diff?r1=[entries.next_main]&r2=[entries.rev]&diff_format=h[query]">colored</a>) [end] [end] [if-any entries.to_selected] - [if-any entries.prev], [else]<br>Diff[end] - to <a href="[href]?r1=[rev_selected]&r2=[entries.rev][query]">selected [rev_selected]</a> + [if-any entries.prev][else]<br>Diff[end] + to <a href="[href].diff?r1=[rev_selected]&r2=[entries.rev][query]">selected [rev_selected]</a> [if-any human_readable] [else] - (<a href="[href]?r1=[rev_selected]&r2=[entries.rev]&diff_format=h[query]">colored</a>) + (<a href="[href].diff?r1=[rev_selected]&r2=[entries.rev]&diff_format=h[query]">colored</a>) [end] [end] [end] @@ -156,12 +175,72 @@ <pre>[entries.html_log]</pre> [end] -[include "include/paging.ezt"] - -[include "include/diff_form.ezt"] +<a name=diff></a> +<hr noshade> +This form allows you to request diffs between any two revisions of +a file. You may select a symbolic revision name using the selection +box or you may type in a numeric name using the type-in text box. +<p> +<form method="GET" action="[href].diff[qquery]" name="diff_select"> + + [hidden_values] +Diffs between +<select name="r1"> + <option value="text" selected>Use Text Field</option> +[for tags] + <option value="[tags.rev]:[tags.name]">[tags.name]</option> +[end] +</select> +<input type="TEXT" size="12" name="tr1" value="[tr1]" + onChange="document.diff_select.r1.selectedIndex=0"> + +and +<select name="r2"> + <option value="text" selected>Use Text Field</option> +[for tags] + <option value="[tags.rev]:[tags.name]">[tags.name]</option> +[end] +</select> +<input type="TEXT" size="12" name="tr2" value="[tr2]" + onChange="document.diff_select.r1.selectedIndex=0"> + +<br>Type of Diff should be a +<select name="diff_format" onchange="submit()"> +<option value="h" [is diff_format "h"]selected[end]>Colored Diff</option> +<option value="l" [is diff_format "l"]selected[end]>Long Colored Diff</option> +<option value="u" [is diff_format "u"]selected[end]>Unidiff</option> +<option value="c" [is diff_format "c"]selected[end]>Context Diff</option> +<option value="s" [is diff_format "s"]selected[end]>Side by Side</option> +</select> + +<input type=submit value=" Get Diffs "></form> +<hr noshade> -[include "include/branch_form.ezt"] +[if-any branch_names] + <a name=branch></a> + <form method="GET" action="[href][qquery]"> + [hidden_values] + View only Branch: + <select name="only_with_tag" onchange="submit()"> + <option value="" [is view_tag ""]selected[end]>Show all branches</option> + [for branch_names] + <option value="[branch_names]" [is branch_names view_tag]selected[end]>[branch_names]</option> + [end] + </select> + <input type=submit value=" View Branch "> + </form> +[end] -[include "include/sort.ezt"] +<a name=logsort></a> +<form method="GET" action="[href]"> + [hidden_values] + Sort log by: + <select name="logsort" onchange="submit()"> + <option value="cvs" [is logsort "cvs"]selected[end]>Not sorted</option> + <option value="date" [is logsort "date"]selected[end]>Commit date</option> + <option value="rev" [is logsort "rev"]selected[end]>Revision</option> + </select> + <input type=submit value=" Sort "> +</form> [include "footer.ezt"] diff --git a/admin/www.gentoo.org/viewcvs/templates/log_table.ezt b/admin/www.gentoo.org/viewcvs/templates/log_table.ezt index 85ac38560d..e94edcc067 100644 --- a/admin/www.gentoo.org/viewcvs/templates/log_table.ezt +++ b/admin/www.gentoo.org/viewcvs/templates/log_table.ezt @@ -14,7 +14,7 @@ </tr> <tr> <td align=right><h3><b><a target="_blank" -href="[request.script_name]/*docroot*/help_logtable.html">ViewCVS and CVS Help</a></b></h3></td> +href="[request.script_name]/*docroot*/help_logtable.html">Help</a></b></h3></td> </tr> </table> @@ -27,18 +27,37 @@ href="[request.script_name]/*docroot*/help_logtable.html">ViewCVS and CVS Help</ [end] <hr noshade> -[include "include/branch.ezt"] - -[include "include/view_tag.ezt"] - -[include "include/paging.ezt"] +[if-any branch] + Default branch: [branch] + <br> + Bookmark a link to: + [if-any viewable] + <a href="[head_href]"><b>HEAD</b></a> + / + (<a href="[head_abs_href]" target="cvs_checkout" + onClick="window.open('about:blank', 'cvs_checkout', + 'resizeable=1,scrollbars=1[is mime_type "text/html"],status,toolbar[end]')" + ><b>download</b></a>) + [else] + <a href="[head_href]" target="cvs_checkout" + onClick="window.open('about:blank', 'cvs_checkout', + 'resizeable=1,scrollbars=1[is mime_type "text/html"],status,toolbar[end]')" + ><b>HEAD</b></a> + [end] +[else] + No default branch +[end] +<br> +[if-any view_tag] + Current tag: [view_tag] <br> +[end] <hr noshade> <table width="100%" border=0 cellspacing=1 cellpadding=2> <th align=left bgcolor="#88ff88">Revision</th> <th align=left bgcolor="#88ff88">Tasks</th> - <th align=left bgcolor="#88ff88">Diffs</th> - <th align=left bgcolor="#88ff88">Branches/<br>Tags</th> + <th align=left bgcolor="#88ff88">Diffs</th> + <th align=left bgcolor="#88ff88">Branches and Tags</th> <th align=left bgcolor="#88ff88">Age</th> <th align=left bgcolor="#88ff88">Author</th> [for entries] @@ -52,58 +71,51 @@ href="[request.script_name]/*docroot*/help_logtable.html">ViewCVS and CVS Help</ <td> [# Tasks column] - [if-any is_text] - <a href="[entries.href]" - [if-any is_text] - type="text/plain" - [else] - [if-any mime_type] - type="[mime_type]" - [end] - [end]> - <b>Download</b></a><br> - <a href="[entries.text_href]"><b>View as text</b></a><br> - <a href="[entries.view_href]"><b>View markup</b></a><br> - - [# if you don't want to allow annotation, then remove this line] - [is roottype "svn"][else]<a href="[href]?annotate=[entries.rev][query]"><b>View annotated</b></a><br>[end] + <a href="[entries.href]" target="cvs_checkout" + onClick="window.open('about:blank', 'cvs_checkout', + 'resizeable=1,menubar=1,scrollbars=1[is mime_type "text/html"],status, + toolbar[end]')"><b>Download</b></a><br> + [is mime_type "text/plain"] [else] - [if-any viewable] - <a href="[entries.view_href]"><b>View</b></a><br> - [else] - <a href="[entries.href]" - [if-any mime_type] - type="[mime_type]" - [end]><b>View/Download</b></a><br> - [end] + <a href="[entries.text_href]" target="cvs_checkout" + onClick="window.open('about:blank', 'cvs_checkout', + 'resizeable=1,scrollbars=1')"><b>View as text</b></a><br> + [end] + [if-any viewable] + <a href="[entries.view_href]"><b>View [entries.rev]</b></a><br> [end] + + [# if you don't want to allow annotation, then remove this line] + <a href="[href]?annotate=[entries.rev][query]"><b>View annotated</b></a><br> + </td> <td> - [is entries.state "dead"] - <b><i>FILE REMOVED</i></b> - [else] [# if you don't want to allow select for diffs then remove this section] [is entries.rev rev_selected] <b>[[]selected]</b><br> [else] - <a href="[href]?r1=[entries.rev][query]"><b>[[]select for diffs]</b></a><br> + <a href="[href]?r1=[entries.rev][query]"><b>[[]select for diffs]</b></a><br> [end] - [if-any entries.to_selected] - <a href="[href]?r1=[rev_selected]&r2=[entries.rev][query]"><b>Diff to selected [rev_selected]</b></a><br> + + [is entries.state "dead"] + <b><i>FILE REMOVED</i></b> + [else] + [if-any entries.prev] + <a href="[href].diff?r1=[entries.prev]&r2=[entries.rev][query]"><b>Diff to previous [entries.prev]</b></a><br> [if-any human_readable] [else] - <a href="[href]?r1=[rev_selected]&r2=[entries.rev]&diff_format=h[query]"><b>colored</b></a><br> + <a href="[href].diff?r1=[entries.prev]&r2=[entries.rev]&diff_format=h[query]"><b>colored</b></a><br> [end] [end] - [if-any entries.prev] - <a href="[href]?r1=[entries.prev]&r2=[entries.rev][query]"><b>Diff to previous [entries.prev]</b></a><br> + [if-any entries.to_selected] + <a href="[href].diff?r1=[rev_selected]&r2=[entries.rev][query]"><b>Diff to selected [rev_selected]</b></a><br> [if-any human_readable] [else] - <a href="[href]?r1=[entries.prev]&r2=[entries.rev]&diff_format=h[query]"><b>colored</b></a><br> + <a href="[href].diff?r1=[rev_selected]&r2=[entries.rev]&diff_format=h[query]"><b>colored</b></a><br> [end] [end] [end] - </td> + </td> <td> [# Branches column] @@ -122,17 +134,17 @@ href="[request.script_name]/*docroot*/help_logtable.html">ViewCVS and CVS Help</ [end] [end] [if-any entries.next_main] - <a href="[href]?r1=[entries.next_main]&r2=[entries.rev][query]"><b>Diff to next MAIN [entries.next_main]</b></a><br> + <a href="[href].diff?r1=[entries.next_main]&r2=[entries.rev][query]"><b>Diff to next MAIN [entries.next_main]</b></a><br> [if-any human_readable] [else] - <a href="[href]?r1=[entries.next_main]&r2=[entries.rev]&diff_format=h[query]"><b>colored</b></a><br> + <a href="[href].diff?r1=[entries.next_main]&r2=[entries.rev]&diff_format=h[query]"><b>colored</b></a><br> [end] [end] [if-any entries.branch_point] - <a href="[href]?r1=[entries.branch_point]&r2=[entries.rev][query]"><b>Diff to branch point [entries.branch_point]</b></a><br> + <a href="[href].diff?r1=[entries.branch_point]&r2=[entries.rev][query]"><b>Diff to branch point [entries.branch_point]</b></a><br> [if-any human_readable] [else] - <a href="[href]?r1=[entries.branches.name]&r2=[entries.rev]&diff_format=h[query]"><b>colored</b></a><br> + <a href="[href].diff?r1=[entries.branches.name]&r2=[entries.rev]&diff_format=h[query]"><b>colored</b></a><br> [end] [end] @@ -152,7 +164,7 @@ href="[request.script_name]/*docroot*/help_logtable.html">ViewCVS and CVS Help</ [# Time column] <td> - [entries.ago] ago<br><i>[entries.date_str]</i> + [entries.ago] ago<br><i>[entries.utc_date]</i> </td> [# Author column] @@ -168,12 +180,72 @@ href="[request.script_name]/*docroot*/help_logtable.html">ViewCVS and CVS Help</ [end] </table> -[include "include/paging.ezt"] - -[include "include/diff_form.ezt"] +<a name=diff></a> +<hr noshade> +This form allows you to request diffs between any two revisions of +a file. You may select a symbolic revision name using the selection +box or you may type in a numeric name using the type-in text box. +<p> +<form method="GET" action="[href].diff[qquery]" name="diff_select"> + [hidden_values] + +Diffs between +<select name="r1"> + <option value="text" selected>Use Text Field</option> +[for tags] + <option value="[tags.rev]:[tags.name]">[tags.name]</option> +[end] +</select> +<input type="TEXT" size="12" name="tr1" value="[tr1]" + onChange="document.diff_select.r1.selectedIndex=0"> + +and +<select name="r2"> + <option value="text" selected>Use Text Field</option> +[for tags] + <option value="[tags.rev]:[tags.name]">[tags.name]</option> +[end] +</select> +<input type="TEXT" size="12" name="tr2" value="[tr2]" + onChange="document.diff_select.r1.selectedIndex=0"> + +<br>Type of Diff should be a +<select name="diff_format" onchange="submit()"> +<option value="h" [is diff_format "h"]selected[end]>Colored Diff</option> +<option value="l" [is diff_format "l"]selected[end]>Long Colored Diff</option> +<option value="u" [is diff_format "u"]selected[end]>Unidiff</option> +<option value="c" [is diff_format "c"]selected[end]>Context Diff</option> +<option value="s" [is diff_format "s"]selected[end]>Side by Side</option> +</select> + +<input type=submit value=" Get Diffs "></form> +<hr noshade> -[include "include/branch_form.ezt"] +[if-any branch_names] + <a name=branch></a> + <form method="GET" action="[href]"> + [hidden_values] + View only Branch: + <select name="only_with_tag" onchange="submit()"> + <option value="" [is view_tag ""]selected[end]>Show all branches</option> + [for branch_names] + <option value="[branch_names]" [is branch_names view_tag]selected[end]>[branch_names]</option> + [end] + </select> + <input type=submit value=" View Branch "> + </form> +[end] -[include "include/sort.ezt"] +<a name=logsort></a> +<form method="GET" action="[href]"> + [hidden_values] + Sort log by: + <select name="logsort" onchange="submit()"> + <option value="cvs" [is logsort "cvs"]selected[end]>Not sorted</option> + <option value="date" [is logsort "date"]selected[end]>Commit date</option> + <option value="rev" [is logsort "rev"]selected[end]>Revision</option> + </select> + <input type=submit value=" Sort "> +</form> [include "footer.ezt"] |