
rolfm at bricolage
Mar 3, 2009, 2:20 PM
Post #1 of 1
(402 views)
Permalink
|
|
[8435] Some small fixes that bring workspace and desk markup much closer
|
|
Revision: 8435 Author: rolfm Date: 2009-03-03 14:20:45 -0800 (Tue, 03 Mar 2009) ViewCVS: http://viewsvn.bricolage.cc/?rev=8435&view=rev Log Message: ----------- Some small fixes that bring workspace and desk markup much closer to validating. Modified Paths: -------------- bricolage/trunk/comp/widgets/debug/data.mc bricolage/trunk/comp/widgets/debug/dump.mc bricolage/trunk/comp/widgets/desk/desk_item.html bricolage/trunk/comp/widgets/wrappers/header.mc Modified: bricolage/trunk/comp/widgets/debug/data.mc =================================================================== --- bricolage/trunk/comp/widgets/debug/data.mc 2009-03-03 18:48:17 UTC (rev 8434) +++ bricolage/trunk/comp/widgets/debug/data.mc 2009-03-03 22:20:45 UTC (rev 8435) @@ -5,7 +5,7 @@ # Get headers. $m->out('<font face="Verdana, Helvetica, Arial"><b>Headers:</b></font>'); $m->out(qq{<table border="0" width="600" cellspacing="2">\n}); -$m->out(qq{<tr bgcolor="lightgrey"><td nowrap><font face="Verdana, Helvetica, Arial"><b>Key</b></font></td><td><font face="Verdana, Helvetica, Arial"><b>Value</b></font></td></tr>\n}); +$m->out(qq{<tr bgcolor="lightgrey"><td style="white-space: nowrap;"><font face="Verdana, Helvetica, Arial"><b>Key</b></font></td><td><font face="Verdana, Helvetica, Arial"><b>Value</b></font></td></tr>\n}); while (my ($k, $v) = each %h) { my $c = $i ? 'lemonchiffon' : 'lightblue'; @@ -20,7 +20,7 @@ # Get ARGS data. $m->out('<br /><font face="Verdana, Helvetica, Arial"><b>ARGS:</b></font>'); $m->out(qq{<table border="0" width="600" cellspacing="2">\n}); -$m->out(qq{<tr bgcolor="lightgrey"><td nowrap><font face="Verdana, Helvetica, Arial"><b>Key</b></font></td><td><font face="Verdana, Helvetica, Arial"><b>Value</b></font></td></tr>\n}); +$m->out(qq{<tr bgcolor="lightgrey"><td style="white-space: nowrap;"><font face="Verdana, Helvetica, Arial"><b>Key</b></font></td><td><font face="Verdana, Helvetica, Arial"><b>Value</b></font></td></tr>\n}); while (my ($k, $v) = each %ARGS) { my $c = $i ? 'lemonchiffon' : 'lightblue'; $i = !$i; Modified: bricolage/trunk/comp/widgets/debug/dump.mc =================================================================== --- bricolage/trunk/comp/widgets/debug/dump.mc 2009-03-03 18:48:17 UTC (rev 8434) +++ bricolage/trunk/comp/widgets/debug/dump.mc 2009-03-03 22:20:45 UTC (rev 8435) @@ -1,18 +1,18 @@ <font face="Verdana, Helvetica, Arial"><b>Session:</b></font> -<p><font size="-1"><blockquote><pre><% $sess | h %></pre></blockquote></font></p> +<blockquote><pre><% $sess | h %></pre></blockquote> <font face="Verdana, Helvetica, Arial"><b>Cache:</b></font> -<p><font size="-1"><blockquote><pre><% $cache | h %></pre></blockquote></font></p> +<blockquote><pre><% $cache | h %></pre></blockquote> <font face="Verdana, Helvetica, Arial"><b>Request Cache:</b></font> -<p><font size="-1"><blockquote><pre><% $rcache | h %></pre></blockquote></font></p> +<blockquote><pre><% $rcache | h %></pre></blockquote> <font face="Verdana, Helvetica, Arial"><b>Environment:</b></font> -<p><font size="-1"><blockquote><pre><% $env | h %></pre></blockquote></font></p> +<blockquote><pre><% $env | h %></pre></blockquote> <%args> $sess Modified: bricolage/trunk/comp/widgets/desk/desk_item.html =================================================================== --- bricolage/trunk/comp/widgets/desk/desk_item.html 2009-03-03 18:48:17 UTC (rev 8434) +++ bricolage/trunk/comp/widgets/desk/desk_item.html 2009-03-03 22:20:45 UTC (rev 8435) @@ -46,14 +46,14 @@ % } <li style="margin-right: 1.2em;"><a href="/workflow/events/<% $class %>/<% $id %>?filter_by=<% $class %>_moved" title="<% $lang->maketext('Trail/Log') %>"><img src="/media/images/log.png" alt="<% $lang->maketext('Trail/Log') %>" /><% $lang->maketext('Trail/Log') %></a></li> % if ($can_edit) { - <li> <a name="<% ${class} %>_delete_ids" id="<% ${widget} %>_<% $id %>" title="<% $lang->maketext('Delete') %>" onclick="if (Desk.confirmDelete()) { Desk.request({ parameters: '<% ${widget} %>|delete_cb=<% ${class} %>_<% $id %>' }); Effect.Shrink('<% ${class} %>_<% $id %>'); } return false"> <img src="/media/images/trash.png" />Delete</a> </li> + <li> <a name="<% ${class} %>_delete_ids" id="<% ${widget} %>_<% $id %>" title="<% $lang->maketext('Delete') %>" onclick="if (Desk.confirmDelete()) { Desk.request({ parameters: '<% ${widget} %>|delete_cb=<% ${class} %>_<% $id %>' }); Effect.Shrink('<% ${class} %>_<% $id %>'); } return false"> <img src="/media/images/trash.png" alt="Trash Can" />Delete</a> </li> % } </ul> <ul> % if (!$user && $action eq 'checkin_cb') { - <li style"padding-right: 8em !important;"> -<a name="check_in_<% ${class} %>_<% $id %>" id="check_in_<% ${class} %>_<% $id %>" title="Check in (double click to check in to " <% $desk->get_name %> ")" value="Check in (double click to check in to " <% $desk->get_name %> ")" onclick="Desk.menuHandler(this, event); return false" ondblclick="Desk.request({ parameters: '<% ${widget} %>|checkin_cb=<% ${class} %>_<% $id %>' }, function (r) { Effect.DropOut('<% ${class} %>_<% $id %>') } ); return false"><img src = "/media/images/checkin.gif" />Check In</a> + <li style="padding-right: 8em !important;"> +<a name="check_in_<% ${class} %>_<% $id %>" id="check_in_<% ${class} %>_<% $id %>" title="Check in (double click to check in to <% $desk->get_name %>)" onclick="Desk.menuHandler(this, event); return false" ondblclick="Desk.request({ parameters: '<% ${widget} %>|checkin_cb=<% ${class} %>_<% $id %>' }, function (r) { Effect.DropOut('<% ${class} %>_<% $id %>') } ); return false"><img src = "/media/images/checkin.gif" alt="Check In" />Check In</a> <div id="<% "check_in_$class\_$id" %>_desks" class="popup-menu" style="right: 0; display: none"> <h4>Check in:</h4> <ul> Modified: bricolage/trunk/comp/widgets/wrappers/header.mc =================================================================== --- bricolage/trunk/comp/widgets/wrappers/header.mc 2009-03-03 18:48:17 UTC (rev 8434) +++ bricolage/trunk/comp/widgets/wrappers/header.mc 2009-03-03 22:20:45 UTC (rev 8435) @@ -64,7 +64,7 @@ </%init> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta name="bricolage-version" content="<% Bric->VERSION %>" /> <link rel="stylesheet" type="text/css" href="/media/css/style.css" />
|