--- lib/A3C/View/Strix.pm	2008/06/20 21:49:16	216
+++ lib/A3C/View/Strix.pm	2008/06/20 22:37:33	217
@@ -148,28 +148,6 @@
 
 };
 
-=head2 layout
-
-=cut
-
-template 'layout' => sub {
-
-	my $url = get('url') || '/';
-
-	my $category = strix->category( $url );
-
-	warn dump( $category );
-
-	strix_link( $category->{url}, $category->{naziv} );
-
-	my $layout = strix->layout( $url );
-
-	pre {
-		dump( $layout );
-	}
-
-};
-
 =head1 REGIONS
 
 =head2 execute-sql
@@ -409,6 +387,43 @@
 	}
 };
 
+=head2 layout
+
+Shows layout for C<url>
+
+=cut
+
+template 'layout' => sub {
+
+	my $url = get('url') || '/';
+	my $category = strix->category( $url );
+	my $layout = strix->layout( $url );
+
+	h1 { $category->{naziv} }
+	pre {
+		dump( $layout );
+	}
+
+};
+
+=head2 category
+
+Show category data for C<url>
+
+=cut
+
+template 'category' => sub {
+
+	my $url = get('url') || '/';
+	my $category = strix->category( $url );
+
+	h1 { $category->{naziv} }
+	pre {
+		dump( $category );
+	}
+
+};
+
 =head1 PRIVATE TEMPLATES
 
 =head2 navigation-tree-category
@@ -421,11 +436,21 @@
 	my $self = shift;
 	#warn "## navigation-tree-category",dump( @_ );
 	my $p = shift;
-	strix_link( $p->{url}, $p->{naziv} );
+	hyperlink(
+		onclick => {
+			region => 'strix-site-layout',	# FIXME do we have to hard-code region name here?
+			replace_with => '/strix/category',
+			args => {
+				url => $p->{url},
+				instance => get('instance'),
+			}
+		},
+		label => $p->{naziv},
+	);
+	outs_raw('&nbsp;');
 	if ( $p->{type} eq 'category' ) {
-		outs_raw('&nbsp;');
 		hyperlink(
-#			url => '/strix/layout?url=' . $p->{url} . ';instance=' . get('instance'),
+#				url => '/strix/layout?url=' . $p->{url} . ';instance=' . get('instance'),
 			onclick => {
 				region => 'strix-site-layout',	# FIXME do we have to hard-code region name here?
 				replace_with => '/strix/layout',
@@ -438,6 +463,8 @@
 			class => 'layout',
 		);
 	}
+	outs_raw('&nbsp;');
+	strix_link( $p->{url}, '>>' );
 };
 
 =head2 navigation-tree
@@ -450,11 +477,10 @@
 	my $self = shift;
 	my ( $instance, $site_id ) = @_;
 
-	warn ">>>> instance: $instance site_id: $site_id";
+	warn "## navigation-tree instance: $instance site_id: $site_id";
 
 	set 'instance' => $instance;
 
-
 	sub children {
 		my $c = shift;
 		return unless defined $c->{children};
@@ -477,6 +503,7 @@
 	#warn "## navigation = ",dump( $navigation );
 	if ( $navigation ) {
 		ul {
+			{ class is 'navigation' };
 			foreach my $p ( @$navigation ) {
 				li {
 					show( 'navigation-tree-category', $p );