Author: cmpilato
Date: 2006-04-13 21:58:33-0700
New Revision: 1335
Modified:
trunk/lib/viewvc.py
trunk/templates/dir_new.ezt
trunk/templates/directory.ezt
trunk/templates/docroot/styles.css
trunk/viewvc.org/template-authoring-guide.html
trunk/viewvc.org/upgrading.html
Log:
Make the dir_new template able to show as much of the log message as
can fix on the screen, and have a fixed layout (which promotes rapid
navigation).
* lib/viewvc.py
(view_directory): Don't truncate rows.log any more, but provide a
new member rows.short_log that is truncate.
* viewvc.org/upgrading.html
Note rename of directory entries' "log" variable to "short_log".
* viewvc.org/template-authoring-guide.html
Describe entries.log and (new) entries.short_log.
* templates/docroot/styles.css
(table.fixed, table.fixed td): New fixed table styles, for use with
the dir_new template.
* templates/dir_new.ezt
Use new fixed table styles, and display as much of the log messages
as screen-real-estate-ily possible (with ellipsis for truncation on
IE, even).
* templates/directory.ezt
Use entries.short_log now instead of entries.log.
Modified: trunk/lib/viewvc.py
Url:
http://viewvc.tigris.org/source/browse/viewvc/trunk/lib/viewvc.py?view=diff&rev=1335&p1=trunk/lib/viewvc.py&p2=trunk/lib/viewvc.py&r1=1334&r2=1335
==============================================================================
--- trunk/lib/viewvc.py (original)
+++ trunk/lib/viewvc.py 2006-04-13 21:58:33-0700
@@ -1554,8 +1554,8 @@
where_prefix = where and where + '/'
for file in file_data:
- row = _item(graph_href=None, author=None, log=None, log_file=None,
- log_rev=None, state=None, size=None, mime_type=None,
+ row = _item(author=None, log=None, short_log=None, state=None, size=None,
+ log_file=None, log_rev=None, graph_href=None, mime_type=None,
date=None, ago=None, view_href=None, log_href=None,
revision_href=None, annotate_href=None, download_href=None,
download_text_href=None, prefer_markup=ezt.boolean(0))
@@ -1567,7 +1567,8 @@
row.date = make_time_string(file.date, cfg)
row.ago = html_time(request, file.date)
if cfg.options.show_logs and file.log is not None:
- row.log = format_log(file.log, cfg)
+ row.short_log = format_log(file.log, cfg)
+ row.log = htmlify(file.log)
row.anchor = request.server.escape(file.name)
row.name = request.server.escape(file.name)
Modified: trunk/templates/dir_new.ezt
Url:
http://viewvc.tigris.org/source/browse/viewvc/trunk/templates/dir_new.ezt?view=diff&rev=1335&p1=trunk/templates/dir_new.ezt&p2=trunk/templates/dir_new.ezt&r1=1334&r2=1335
==============================================================================
--- trunk/templates/dir_new.ezt (original)
+++ trunk/templates/dir_new.ezt 2006-04-13 21:58:33-0700
@@ -1,9 +1,9 @@
[include "include/dir_header.ezt"]
-<table cellspacing="1" cellpadding="2">
+<table cellspacing="1" cellpadding="2" class="fixed">
<thead>
<tr>
- <th class="vc_header[is sortby "file"]_sort[end]" colspan="2">
+ <th style="width: 20%" class="vc_header[is sortby "file"]_sort[end]">
<a href="[sortby_file_href]#dirlist">File
[is sortby "file"]
<img class="vc_sortarrow" alt="[is sortdir "down"](rev)[end]"
@@ -12,6 +12,7 @@
[end]
</a>
</th>
+ <th style="width: 96px; font-size: 0" class="vc_header"> </th>
<th class="vc_header[is sortby "rev"]_sort[end]">
<a href="[sortby_rev_href]#dirlist">Last Change
[is sortby "rev"]
@@ -27,18 +28,18 @@
<tbody>
[if-any up_href]
<tr class="vc_row_odd">
- <td>
+ <td style="width: 20%">
<a href="[up_href]">
<img src="[docroot]/images/back_small.png" alt="" class="vc_icon"
/> Parent Directory</a>
</td>
- <td> </td>
+ <td style="width: 96px; font-size: 0;"> </td>
<td> </td>
</tr>
[end]
[for entries]
<tr class="vc_row_[if-index entries even]even[else]odd[end]">
- <td>
+ <td style="width: 20%">
<a name="[entries.anchor]" href="[is entries.pathtype
"dir"][entries.view_href][else][if-any
entries.prefer_markup][entries.view_href][else][entries.download_href][end][end]"
title="[is entries.pathtype "dir"]View Directory Contents[else][if-any
entries.prefer_markup]View[else]Download[end] File Contents[end]">
<img src="[docroot]/images/[is entries.pathtype "dir"]dir[else][is
entries.state "dead"]broken[else]text[end][end].png" alt="" class="vc_icon" />
[entries.name][is entries.pathtype "dir"]/[end]</a>
@@ -48,7 +49,7 @@
[if-any entries.errors]
<td colspan="2">[for entries.errors]<em>[entries.errors]</em>[end]</td>
[else]
- <td style="width:1%; white-space: nowrap">
+ <td style="width: 96px; font-size: 0">
[# Icon column. We might want to add more icons like a tarball
# icon for directories or a diff to previous icon for files. ]
Modified: trunk/templates/directory.ezt
Url:
http://viewvc.tigris.org/source/browse/viewvc/trunk/templates/directory.ezt?view=diff&rev=1335&p1=trunk/templates/directory.ezt&p2=trunk/templates/directory.ezt&r1=1334&r2=1335
==============================================================================
--- trunk/templates/directory.ezt (original)
+++ trunk/templates/directory.ezt 2006-04-13 21:58:33-0700
@@ -101,8 +101,8 @@
<td> [entries.ago]</td>
<td> [entries.author]</td>
[is cfg.options.show_logs "1"]
- [if-any entries.log]
- <td> [entries.log][is entries.pathtype "dir"][is roottype
"cvs"]
+ [if-any entries.short_log]
+ <td> [entries.short_log][is entries.pathtype "dir"][is
roottype "cvs"]
<em>(from
[entries.log_file]/[entries.log_rev])</em>[end][end]</td>
[else]
<td> </td>
Modified: trunk/templates/docroot/styles.css
Url:
http://viewvc.tigris.org/source/browse/viewvc/trunk/templates/docroot/styles.css?view=diff&rev=1335&p1=trunk/templates/docroot/styles.css&p2=trunk/templates/docroot/styles.css&r1=1334&r2=1335
==============================================================================
--- trunk/templates/docroot/styles.css (original)
+++ trunk/templates/docroot/styles.css 2006-04-13 21:58:33-0700
@@ -21,6 +21,15 @@
table.auto {
width: auto;
}
+table.fixed {
+ width: 100%;
+ table-layout: fixed;
+}
+table.fixed td {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
tr, td, th { vertical-align: top; }
form { margin: 0; }
Modified: trunk/viewvc.org/template-authoring-guide.html
Url:
http://viewvc.tigris.org/source/browse/viewvc/trunk/viewvc.org/template-authoring-guide.html?view=diff&rev=1335&p1=trunk/viewvc.org/template-authoring-guide.html&p2=trunk/viewvc.org/template-authoring-guide.html&r1=1334&r2=1335
==============================================================================
--- trunk/viewvc.org/template-authoring-guide.html (original)
+++ trunk/viewvc.org/template-authoring-guide.html 2006-04-13 21:58:33-0700
@@ -747,8 +747,8 @@
</tr>
<tr class="varlevel2">
<td class="varname">entries.log</td>
- <td></td>
- <td></td>
+ <td>String</td>
+ <td>Log message of last modification to the directory entry.</td>
</tr>
<tr class="varlevel2">
<td class="varname">entries.log_file</td>
@@ -792,6 +792,13 @@
<tt>svn</tt>.</td>
</tr>
<tr class="varlevel2">
+ <td class="varname">entries.short_log</td>
+ <td>String</td>
+ <td>Log message of last modification to the directory entry,
+ truncated to contain no more than the number of characters
+ specified by the <code>short_log_len</code> configuration option.</td>
+</tr>
+<tr class="varlevel2">
<td class="varname">entries.size</td>
<td>String</td>
<td>Size (in bytes) of the directory entry. Valid only when
Modified: trunk/viewvc.org/upgrading.html
Url:
http://viewvc.tigris.org/source/browse/viewvc/trunk/viewvc.org/upgrading.html?view=diff&rev=1335&p1=trunk/viewvc.org/upgrading.html&p2=trunk/viewvc.org/upgrading.html&r1=1334&r2=1335
==============================================================================
--- trunk/viewvc.org/upgrading.html (original)
+++ trunk/viewvc.org/upgrading.html 2006-04-13 21:58:33-0700
@@ -761,7 +761,7 @@
<tr class="renamed">
<td class="varname">rows.log</td>
<td>dir_alternate.ezt, directory.ezt</td>
- <td>renamed to <code>entries.log</code></td>
+ <td>renamed to <code>entries.short_log</code></td>
</tr>
<tr class="renamed">
<td class="varname">rows.log_file</td>
|
