Changeset 82 for server/trunk

Timestamp:

12/05/10 23:59:38 (14 years ago)

Author:

nanardon

Message:

• add initial page

Location:

server/trunk/web

Files:

• lib/Sophie/Controller/Distrib.pm (modified) (1 diff)
• root/static/sophie.css (modified) (2 diffs)
• root/templates/html/index.html (modified) (1 diff)
• root/templates/html/index.tt (modified) (1 diff)
• root/templates/includes/header.tt (modified) (1 diff)
• t/controller_Distrib.t (modified) (2 diffs)

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

@@ -316 +316 @@
 
 sub rpm_bypkgid :Chained('distrib_view') PathPart('by-pkgid') {
-    my ( $self, $c, $pkgid ) = @_;
+    my ( $self, $c, $pkgid, @subpart ) = @_;
     if ($pkgid) {
-        if (@{ $c->forward('/search/bypkgid', [ $c->stash->{dist}, $pkgid ])
-            }->{results} ) {
-            $c->go('/rpms/rpms', [ $pkgid ]);
+        if (@{ $c->forward('/search/bypkgid',
+            [ $c->stash->{dist}, $pkgid ])->{results} } ) {
+            $c->go('/rpms/rpms', [ $pkgid, @subpart ]);
         } else {
             $c->go('/404/index');

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

@@ -12 +12 @@
     padding-left: 1em;
     padding-right: 1em;
+}
+
+div.sophie_package_list {
+    background: #F5F5DC;
+    margin-top: 2em;
+}
+
+.sophie_package_list h2 {
+    margin-top: 0em;
+    margin-bottom: 0.5em;
+}
+.sophie_package_list p {
+    padding-left: 2em;
+    padding-right: 0em;
+    padding-top: 0em;
+    padding-bottom: 0em;
+    margin: 0em;
+    margin-bottom: 0.2em;
 }
 
@@ -34 +52 @@
     border: outset;
 }
+
+

server/trunk/web/root/templates/html/index.html

@@ -1 +1 @@
 <!-- $Id -->
+
+[% INCLUDE 'index.tt' %]

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

@@ -1 +1 @@
 <!-- $Id -->
+
+[% FOREACH package = c.forward('/search/bydate', [
+    {
+    src => 1,
+    rows => 10,
+    },
+    1 ]) %]
+
+<div class="sophie_package_list">
+<h2><a href="[% c.uri_for('/distrib', package.distribution, package.release,
+    package.arch, 'by-pkgid',  package.pkgid) %]">
+    [% package.filename %]</a></h2>
+<p>
+[% c.forward('/rpms/queryformat', [ package.pkgid, '%{summary}' ]) | html %]
+</p>
+<p>[% package.distribution | html %] - [% package.release | html %] -
+    [% package.arch | html %] / [% package.media | html %]
+</p>
+</div>
+[% END %]

server/trunk/web/root/templates/includes/header.tt

@@ -19 +19 @@
 
     <div id="sophie_header">
+    <a href="[% c.uri_for('/') %]">
     <img src="[% c.uri_for('/static', 'sophie.png') -%]" style="float:left">
+    </a>
     <div style="float:left">
         <p id="sitename">Sophie</p>

server/trunk/web/t/controller_Distrib.t

@@ -34 +34 @@
 ok( request("/distrib/$distribution/$release/$arch")->is_success, 'Request should succeed' );
 ok( request("/distrib/$distribution/$release/$arch/media")->is_success, 'Request should succeed' );
-warn "/distrib/$distribution/$release/$arch/media/$media/by-pkgid/$pkgid";
 ok(
     request("/distrib/$distribution/$release/$arch/media/$media/by-pkgid/$pkgid")
@@ -55 +54 @@
     ->is_success, "request srpms/$rpmname");
 
+ok(
+    request("/distrib/$distribution/$release/$arch/by-pkgid/$pkgid")
+    ->is_success, "request distrib bypkgid");
 
 done_testing();