Changeset 54

Timestamp:

11/30/10 04:47:31 (14 years ago)

Author:

nanardon

Message:

complete /distrib

Location:

server/trunk/web

Files:

• lib/Sophie/Controller/Distrib.pm (modified) (6 diffs)
• lib/Sophie/Controller/Root.pm (modified) (2 diffs)
• root/static/sophie.css (modified) (1 diff)
• root/templates/html/distrib/distrib.tt (modified) (1 diff)
• root/templates/html/distrib/media.tt (modified) (1 diff)
• root/templates/html/distrib/media_rpm_bypkgid.tt (modified) (1 diff)
• root/templates/html/distrib/rpm_bypkgid.html (added)
• root/templates/html/distrib/rpm_bypkgid.tt (added)

server/trunk/web/lib/Sophie/Controller/Distrib.pm

@@ -160 +160 @@
 }
 
-sub distrib :Chained('distrib_view') PathPart('') {
+sub distrib :Chained('distrib_view') PathPart('') :Args(0) {
     my ( $self, $c ) = @_;
     $c->forward('list', [ $c->stash->{dist} ]);
@@ -167 +167 @@
 }
 
-sub media :Chained('distrib_view') PathPart('media') {
+sub media :Chained('/distrib/distrib_view') PathPart('media') :Args(0) {
     my ( $self, $c ) = @_;
     $c->forward('struct', [ $c->stash->{dist} ]);
@@ -290 +290 @@
 }
 
-sub srpm_by_name :Chained('distrib_view') PathPart('srpms/by-name') Args(1) {
+sub srpm_by_name :Chained('distrib_view') PathPart('srpms') Args(1) {
     my ($self, $c, $name) = @_;
     $c->stash->{dist}{src} = 1;
@@ -299 +299 @@
 }
 
-sub rpm_by_name :Chained('distrib_view') PathPart('rpms/by-name') Args(1) {
+sub rpm_by_name :Chained('distrib_view') PathPart('rpms') Args(1) {
     my ($self, $c, $name) = @_;
     $c->stash->{dist}{src} = 0;
@@ -308 +308 @@
 }
 
-sub rpm_by_pkid :Chained('distrib_view') PathPart('by-pkgid') Args(1) {
+sub rpm_bypkgid :Chained('distrib_view') PathPart('by-pkgid') {
+    my ( $self, $c, $pkgid ) = @_;
+    if ($pkgid) {
+        $c->go('/rpms/rpms', [ $pkgid ]);
+    } else {
+        $c->forward('anyrpms', [ $c->stash->{dist} ]);
+    }
 }
 
@@ -316 +322 @@
 }
 
-sub media_list_rpms :Chained('_media_list_rpms') PathPart('') {
+sub media_list_rpms :Chained('_media_list_rpms') PathPart('') :Args(0) {
     my ( $self, $c ) = @_;
     $c->forward('anyrpms', [ $c->stash->{dist} ]);
 }
 
-sub media_rpm_byname :Chained('_media_list_rpms') PathPart('rpms/by-name') {
-    my ( $self, $c ) = @_;
-}
-sub media_srpm_byname :Chained('_media_list_rpms') PathPart('srpms/by-name') {
-    my ( $self, $c ) = @_;
-}
+sub media_rpm_byname :Chained('_media_list_rpms') PathPart('rpms') {
+    my ( $self, $c, $name ) = @_;
+}
+sub media_srpm_byname :Chained('_media_list_rpms') PathPart('srpms') {
+    my ( $self, $c, $name ) = @_;
+}
+
 sub media_rpm_bypkgid :Chained('_media_list_rpms') PathPart('by-pkgid') {
     my ( $self, $c, $pkgid ) = @_;
-    $c->forward('/rpms/rpms', [ $pkgid ]);
+    if ($pkgid) {
+        $c->go('/rpms/rpms', [ $pkgid ]);
+    } else {
+        $c->forward('anyrpms', [ $c->stash->{dist} ]);
+    }
 }
 

server/trunk/web/lib/Sophie/Controller/Root.pm

@@ -26 +26 @@
     my ( $self, $c ) = @_;
 
-    if ($c->req->path =~ m:[^/]+\/$:) {
+    if ($c->req->path =~ m:[^/]+\/+$:) {
         my $path = $c->req->path;
         $path =~ s:/*$::;
@@ -33 +33 @@
     }
 
-    if (!$c->stash->{path}) {
+    if (!$c->stash->{sitepath}) {
         my @path;
-        my @reqpath = grep { $_ } split('/', $c->req->path);
+        my @reqpath = split('/', $c->req->path);
         foreach (@reqpath) {
             push(@path, $_);
-            push(@{ $c->stash->{sitepath} }, { path => $c->uri_for('/', @path), name => $_ });
+            push(@{ $c->stash->{sitepath} }, { path => $c->uri_for('/', @path),
+                    name => $_ || '*' });
         }
     }

server/trunk/web/root/static/sophie.css

@@ -8 +8 @@
     padding-left: 1em;
 }
+
+.pkgid {
+    font-family: monospace;
+}

server/trunk/web/root/templates/html/distrib/distrib.tt

@@ -1 +1 @@
 <ol>
 [% FOREACH media = xmlrpc %]
-<li><a href="[% c.uri_for('/', c.req.path, media.label) %]">[% media.label %]</a></li>
+<li><a href="[% c.uri_for('/', c.req.path, 'media', media) %]">[% media %]</a></li>
 [% END %]
 </ol>

server/trunk/web/root/templates/html/distrib/media.tt

@@ -1 @@
-
-[% INCLUDE 'distrib/distrib.tt' %]
+<ol>
+[% FOREACH media = xmlrpc %]
+<li><a href="[% c.uri_for('/', c.req.path, media.label) %]">[% media.label %]</a></li>
+[% END %]
+</ol>

server/trunk/web/root/templates/html/distrib/media_rpm_bypkgid.tt

@@ -1 +1 @@
 <!-- $Id$ -->
-
-[% INCLUDE 'rpms/rpms.tt' %]
+[% FOREACH rpm = xmlrpc %]
+[% IF loop.first %]
+<ul>
+[% END %]
+<li>
+    <a href="[% c.uri_for('/', c.req.path, rpm.pkgid) %]"><span class="pkgid">[%
+rpm.pkgid %]</span></a>
+([% rpm.filename | html %])
+</li>
+[% IF loop.last %]
+</ul>
+[% END %]
+[% END %]