[Jifty-commit] r1345 - in jifty/trunk: . lib/Jifty lib/Jifty/Web
share/web/templates/__jifty share/web/templates/_elements
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Thu Jun 22 09:40:43 EDT 2006
Author: seanmil
Date: Thu Jun 22 09:40:29 2006
New Revision: 1345
Modified:
jifty/trunk/ (props changed)
jifty/trunk/lib/Jifty/Web.pm
jifty/trunk/lib/Jifty/Web/Menu.pm
jifty/trunk/share/web/templates/__jifty/halo
jifty/trunk/share/web/templates/_elements/wrapper
jifty/trunk/t/TestApp/share/web/templates/index.html
Log:
r556 at pc102: sean | 2006-06-22 09:37:11 -0400
* Minor tag cleanup so default index.html validates as XHTML 1.0 Strict
Modified: jifty/trunk/lib/Jifty/Web.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web.pm (original)
+++ jifty/trunk/lib/Jifty/Web.pm Thu Jun 22 09:40:29 2006
@@ -143,7 +143,7 @@
# We don't use a lexical for the serial number, because then it
# would be reset on module refresh
$SERIAL ||= 0;
- return join( "S", ++$SERIAL, $$ ); # Start at 1.
+ return join('', "S", ++$SERIAL, $$ ); # Start at 1.
}
=head2 SESSION MANAGEMENT
Modified: jifty/trunk/lib/Jifty/Web/Menu.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Menu.pm (original)
+++ jifty/trunk/lib/Jifty/Web/Menu.pm Thu Jun 22 09:40:29 2006
@@ -222,7 +222,7 @@
Jifty->web->out(qq{</span>});
if (@kids) {
Jifty->web->out(
- qq{<span class="expand"><a href="#" onClick="Jifty.ContextMenu.hideshow('}
+ qq{<span class="expand"><a href="#" onclick="Jifty.ContextMenu.hideshow('}
. $id
. qq{'); return false;">+</a></span>}
. qq{<ul id="}
Modified: jifty/trunk/share/web/templates/__jifty/halo
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/halo (original)
+++ jifty/trunk/share/web/templates/__jifty/halo Thu Jun 22 09:40:29 2006
@@ -1,28 +1,29 @@
-<a href="#" id="render_info" onClick="Element.toggle('render_info_tree'); return false">Page info</a>
+<div><a href="#" id="render_info" onclick="Element.toggle('render_info_tree'); return false">Page info</a></div>
<div style="display: none" id="render_info_tree">
-<ul>
% foreach my $item (@stack) {
% if ( $item->{depth} > $depth ) {
<ul>
% } elsif ( $item->{depth} < $depth ) {
% for ($item->{depth}+1 .. $depth) {
-</ul>
+</li></ul>
% }
+</li>
+% } elsif ( $item->{depth} == $depth ) {
+</li>
% }
-<li><a href="#" class="halo_comp_info" onMouseOver="halo_over('<% $item->{id} %>')"
- onMouseOut="halo_out('<% $item->{id} %>')"
- onClick="halo_toggle('<% $item->{id} %>'); return false;">
+<li><a href="#" class="halo_comp_info" onmouseover="halo_over('<% $item->{id} %>')"
+ onmouseout="halo_out('<% $item->{id} %>')"
+ onclick="halo_toggle('<% $item->{id} %>'); return false;">
<% $item->{'path'} %> - <% $item->{'render_time'} %></a>
% unless ($item->{subcomponent}) {
<% Jifty->web->tangent( url =>"/__jifty/edit/mason_component/".$item->{'path'}, label => 'Edit') %>
% }
-</li>
% $depth = $item->{'depth'};
% }
% for (1 .. $depth) {
-</ul>
+</li></ul>
% }
</div>
@@ -49,7 +50,7 @@
}
}
-my $depth = 1;
+my $depth = 0;
</%init>
@@ -58,7 +59,7 @@
<%def .frame>
<div class="halo_actions" id="halo-<% $id %>-menu" style="display: none; top: 5px; left: 500px; min-width: 200px; width: 300px; z-index: 5;">
<h1 id="halo-<% $id %>-title">
- <span style="float: right;"><a href="#" onClick="halo_toggle('<% $id %>'); return false">[ X ]</a></span>
+ <span style="float: right;"><a href="#" onclick="halo_toggle('<% $id %>'); return false">[ X ]</a></span>
<% $frame->{name} %>
</h1>
<div style="position: absolute; bottom: 3px; right: 3px"><span class="resize" title="Resize" id="halo-<% $id %>-resize"></span></div>
@@ -70,9 +71,9 @@
% if ($frame->{parent}) {
<div class="section">Parent</div>
<div class="body"><ul>
-<li><a href="#" class="halo_comp_info" onMouseOver="halo_over('<% $frame->{parent}{id} %>')"
- onMouseOut="halo_out('<% $frame->{parent}{id} %>')"
- onClick="halo_toggle('<% $frame->{parent}{id} %>'); return false;">
+<li><a href="#" class="halo_comp_info" onmouseover="halo_over('<% $frame->{parent}{id} %>')"
+ onmouseout="halo_out('<% $frame->{parent}{id} %>')"
+ onclick="halo_toggle('<% $frame->{parent}{id} %>'); return false;">
<% $frame->{parent}{'path'} %> - <% $frame->{parent}{'render_time'} %></a></li>
</ul></div>
% }
@@ -80,9 +81,9 @@
<div class="section">Children</div>
<div class="body"><ul>
% for my $item (@{$frame->{kids}}) {
-<li><a href="#" class="halo_comp_info" onMouseOver="halo_over('<% $item->{id} %>')"
- onMouseOut="halo_out('<% $item->{id} %>')"
- onClick="halo_toggle('<% $item->{id} %>'); return false;">
+<li><a href="#" class="halo_comp_info" onmouseover="halo_over('<% $item->{id} %>')"
+ onmouseout="halo_out('<% $item->{id} %>')"
+ onclick="halo_toggle('<% $item->{id} %>'); return false;">
<% $item->{'path'} %> - <% $item->{'render_time'} %></a></li>
% }
</ul>
Modified: jifty/trunk/share/web/templates/_elements/wrapper
==============================================================================
--- jifty/trunk/share/web/templates/_elements/wrapper (original)
+++ jifty/trunk/share/web/templates/_elements/wrapper Thu Jun 22 09:40:29 2006
@@ -14,6 +14,7 @@
<% Jifty->web->render_messages %>
<% $m->content |n%>
<& /_elements/keybindings &>
+ </div>
<div id="jifty-wait-message" style="display: none"><%_('Loading...')%></div>
% Jifty::Mason::Halo->render_component_tree() if (Jifty->config->framework('DevelMode') );
</body>
Modified: jifty/trunk/t/TestApp/share/web/templates/index.html
==============================================================================
--- jifty/trunk/t/TestApp/share/web/templates/index.html (original)
+++ jifty/trunk/t/TestApp/share/web/templates/index.html Thu Jun 22 09:40:29 2006
@@ -1,3 +1,3 @@
<&|/_elements/wrapper, title => 'Jifty Test Application' &>
-<img src="/images/pony.jpg" />
+<img src="/images/pony.jpg" alt="A Pony"/>
</&>
More information about the Jifty-commit
mailing list