Merge lp:~tristan-rivoallan/vanilla-miner/vm-597913 into lp:vanilla-miner

[Tristan Rivoallan]

[Tristan Rivoallan (tristan-rivoallan)]

review: Approve

=== modified file 'apps/frontend/config/app.yml'
--- apps/frontend/config/app.yml	2010-06-03 14:47:58 +0000
+++ apps/frontend/config/app.yml	2010-06-29 16:08:28 +0000
@@ -3,16 +3,8 @@
 
 # default values
 all:
-  resources:
-    collections: [link]
-    link:
-      segments:  [all, images, mp3, youtube]
-      all:
-        formats: [html, json]
-      mp3:
-        formats: [html, json, xspf]
-      youtube:
-        formats: [html, json, xspf]
-      images:
-        formats: [html, json]
-        
\ No newline at end of file
+  miner:
+    collections:
+      links:
+        model: Link
+        segments: [all, mp3, images, youtube]
\ No newline at end of file

=== modified file 'apps/frontend/modules/resource/actions/actions.class.php'
--- apps/frontend/modules/resource/actions/actions.class.php	2010-06-04 15:59:32 +0000
+++ apps/frontend/modules/resource/actions/actions.class.php	2010-06-29 16:08:28 +0000
@@ -8,99 +8,114 @@
  */
 class resourceActions extends sfActions
 {
-  public function executeCollections(sfWebRequest $request)
-  {
-    $collections = array();
-    $collections_names = sfConfig::get('app_resources_collections', array());
-    foreach ($collections_names as $collection_name)
-    {
-      $collections[$collection_name] = array('count' => Doctrine::getTable(ucfirst($collection_name))->count());
-    }
-    $this->collections = $collections;
-  }
-  
-  public function executeSegments(sfWebRequest $request)
-  {
-    $segments = array();
-    if ($resource_parameters = sfConfig::get(sprintf('app_resources_%s', $request->getParameter('collection')), false))
-    {
-      $segments = $resource_parameters['segments'];
-    }
-
-    $this->segments = $segments;
-  }
-  
-  public function executeFormats(sfWebRequest $request)
-  {
-    $segment_formats = array();
-    if ($resource_parameters = sfConfig::get(sprintf('app_resources_%s', $request->getParameter('collection')), false))
-    {
-      $segment_formats = $resource_parameters[$request->getParameter('segment')]['formats'];
-    }
-
-    $this->formats = $segment_formats;
-  }
-  
-  public function executeGet(sfWebRequest $request)
-  {
-    // TODO : a good place to learn about dependency injection ?
-    // TODO : "q" query parameter makes it possible to directly query solr (no sfLuceneCriteria)
-    
-    // Gather meaningful parameters
-    $resource_collection = $request->getParameter('collection', 'unknown');
-    $resource_segment = $request->getParameter('segment', 'all');
-    $format = $request->getParameter('format', 'html');
-    
-    // TODO : autoload those clases
-    include sprintf(sfConfig::get('sf_lib_dir').'/vendor/CI/Search/%s/Segment.php', ucfirst($resource_collection));
-    include sprintf(sfConfig::get('sf_lib_dir').'/vendor/CI/Search/%s/Segment/%s.php', ucfirst($resource_collection), ucfirst($resource_segment));
-    include sprintf(sfConfig::get('sf_lib_dir').'/vendor/CI/Search/Formatter/%s.php', ucfirst($format));
-    
-    // Get results from selected resource segment
-    $resource_segment_class  = sprintf('CI_Search_%s_Segment_%s', ucfirst($resource_collection), ucfirst($resource_segment));
-    if (!class_exists($resource_segment_class))
-    {
-      throw new InvalidArgumentException(sprintf('Search class "%s" does not exist for "%s/%s" resource segment', $resource_segment_class, $resource_collection, $resource_segment));
-    }
-    // TODO : lucene index must be configurable
-    $resource_segment_instance = new $resource_segment_class($this->getContext()->getEventDispatcher(), sfLucene::getInstance('IndexA', 'fr'));
-    $raw_results = $resource_segment_instance->search($request->getParameterHolder());
-    
-    // Make sure results are unique (this a just a hack)
-    // see http://www.php.net/manual/en/function.array-unique.php#91134
-    // NOTE : it sucks as it makes the "limit" parameter not trustable
-    // TODO : resource unicity must be enforced when importing documents into solr
-    if ($this->getRequestParameter('hack_unique_results', false))
-    {
-      $raw_results_unique = array();
-      foreach ($raw_results as $result)
-      {
-        $raw_results_unique[md5($result['url'])] = $result;
-      }
-      $raw_results = $raw_results_unique;
-    }
-    
-    // Format results
-    $formatter_class = sprintf('CI_Search_Formatter_%s', ucfirst($format));
-    if (!class_exists($formatter_class))
-    {
-      throw new InvalidArgumentException(sprintf('Formatter class "%s" does not exist for format "%s"', $formatter_class, $format));
-    }
-    $formatter = new $formatter_class($this->getContext()->getEventDispatcher());
-    $results = $formatter->format($raw_results);
-    
-    // Tweak response depending on formatter
-    $this->getResponse()->setContentType($formatter->content_type);
-    $this->setLayout($formatter->sf_has_layout);
-    if (!$formatter->sf_has_layout)
-    {
-      sfConfig::set('sf_web_debug', false);
-    }
-    
-    // Pass results to view
-    $this->results = $results;
-    
-    // Select template
-    return ucfirst($format);
-  }  
+    public function executeCollections(sfWebRequest $request)
+    {
+        $collections = array();
+        $collections_names = sfConfig::get('app_miner_collections', array());
+
+        foreach ($collections_names as $collection_name => $collection_info)
+        {
+            include sprintf(sfConfig::get('sf_lib_dir').'/vendor/CI/Search/%s/Segment.php', $collection_info['model']);
+
+            // Alphabetical sort of segments
+            sort($collection_info['segments']);
+
+            // Gather informations about each collection segment
+            $segments_infos = array();
+            foreach ($collection_info['segments'] as $segment_name)
+            {
+                include sprintf(sfConfig::get('sf_lib_dir').'/vendor/CI/Search/%s/Segment/%s.php', $collection_info['model'], ucfirst($segment_name));
+                $search_classname = sprintf('CI_Search_%s_Segment_%s', $collection_info['model'], $segment_name);
+                // TODO : Lucene instance must be configurable
+                $search = new $search_classname($this->dispatcher, sfLucene::getInstance('IndexA', 'fr'));
+                $segments_infos[$segment_name] = array('count' => $search->count($request->getParameterHolder()));
+            }
+
+            $collections[$collection_name] = array(
+                'count'    => Doctrine::getTable($collection_info['model'])->count(),
+                'segments' => $segments_infos
+            );
+        }
+        $this->collections = $collections;
+    }
+
+    public function executeSegments(sfWebRequest $request)
+    {
+        $collections = sfConfig::get('app_miner_collections');
+        $segments = array();
+        if (isset($collections[$request->getParameter('collection')]));
+        {
+            $segments = $collections[$request->getParameter('collection')]['segments'];
+        }
+        $this->segments = $segments;
+    }
+
+    public function executeFormats(sfWebRequest $request)
+    {
+        $segment_formats = array();
+        if ($resource_parameters = sfConfig::get(sprintf('app_resources_%s', $request->getParameter('collection')), false))
+        {
+            $segment_formats = $resource_parameters[$request->getParameter('segment')]['formats'];
+        }
+
+        $this->formats = $segment_formats;
+    }
+
+    public function executeGet(sfWebRequest $request)
+    {
+        // TODO : a good place to learn about dependency injection ?
+        // TODO : "q" query parameter makes it possible to directly query solr (no sfLuceneCriteria)
+
+        // Gather meaningful parameters
+        $resource_collection = $request->getParameter('collection', 'unknown');
+        $resource_segment = $request->getParameter('segment', 'all');
+        $format = $request->getParameter('format', 'html');
+
+        // Get model corresponding to collection
+        $collections_infos = sfConfig::get('app_miner_collections');
+        if (!isset($collections_infos[$resource_collection]))
+        {
+            throw new InvalidArgumentException(sprintf('Unknown collection "%s"', $resource_collection));
+        }
+        $collection = $collections_infos[$resource_collection];
+        $resource_model = $collection['model'];
+
+        // TODO : autoload those classes
+        include sprintf(sfConfig::get('sf_lib_dir').'/vendor/CI/Search/%s/Segment.php', ucfirst($resource_model));
+        include sprintf(sfConfig::get('sf_lib_dir').'/vendor/CI/Search/%s/Segment/%s.php', ucfirst($resource_model), ucfirst($resource_segment));
+        include sprintf(sfConfig::get('sf_lib_dir').'/vendor/CI/Search/Formatter/%s.php', ucfirst($format));
+
+        // Get results from selected resource segment
+        $resource_segment_class  = sprintf('CI_Search_%s_Segment_%s', ucfirst($resource_model), ucfirst($resource_segment));
+        if (!class_exists($resource_segment_class))
+        {
+            throw new InvalidArgumentException(sprintf('Search class "%s" does not exist for "%s/%s" resource segment', $resource_segment_class, $resource_model, $resource_segment));
+        }
+        // TODO : lucene index must be configurable
+        $resource_segment_instance = new $resource_segment_class($this->getContext()->getEventDispatcher(), sfLucene::getInstance('IndexA', 'fr'));
+        $raw_results = $resource_segment_instance->search($request->getParameterHolder());
+
+        // Format results
+        $formatter_class = sprintf('CI_Search_Formatter_%s', ucfirst($format));
+        if (!class_exists($formatter_class))
+        {
+            throw new InvalidArgumentException(sprintf('Formatter class "%s" does not exist for format "%s"', $formatter_class, $format));
+        }
+        $formatter = new $formatter_class($this->getContext()->getEventDispatcher());
+        $results = $formatter->format($raw_results);
+
+        // Tweak response depending on formatter
+        $this->getResponse()->setContentType($formatter->content_type);
+        $this->setLayout($formatter->sf_has_layout);
+        if (!$formatter->sf_has_layout)
+        {
+            sfConfig::set('sf_web_debug', false);
+        }
+
+        // Pass results to view
+        $this->results = $results;
+
+        // Select template
+        return ucfirst($format);
+    }
 }

=== modified file 'apps/frontend/modules/resource/templates/_documentation/howto.php'
--- apps/frontend/modules/resource/templates/_documentation/howto.php	2010-06-04 14:55:07 +0000
+++ apps/frontend/modules/resource/templates/_documentation/howto.php	2010-06-29 16:08:28 +0000
@@ -1,9 +1,9 @@
 <h3 id="howto-segment">Choix du segment</h3>
 <p>
   La première chose à faire est de choisir le <a href="#segments">segment</a> à requêter. Cela permet d'obtenir l'URL de requêtage.
-  Par exemple, l'URL de requêtage du segment <a href="#segments-images">images</a> est 
+  Par exemple, l'URL de requêtage du segment <a href="#segments-images">images</a> est
 </p>
-<pre>GET <?php echo url_for('@resources_collection_segment_get?collection=link&segment=images', true) ?></pre>
+<pre>GET <?php echo url_for('@resources_collection_segment_get?collection=links&segment=images', true) ?></pre>
 
 <h3 id="howto-response">Définition de la forme de la réponse</h3>
 <h4 id="howto-response-limit">Limitation du nombre d'enregistrements</h4>
@@ -12,7 +12,7 @@
   Il faut utiliser le paramètre <a href="#common-parameters-limit">limit</a>.
   Par exemple, pour récupérer trois enregistrements :
 </p>
-<pre>GET <?php echo url_for('@resources_collection_segment_get?collection=link&segment=images', true) ?>?<strong>limit=3</strong></pre>
+<pre>GET <?php echo url_for('@resources_collection_segment_get?collection=links&segment=images', true) ?>?<strong>limit=3</strong></pre>
 
 <h4 id="howto-response-sort">Définition du mode de tri</h4>
 <p>
@@ -20,7 +20,7 @@
   Par défaut, les enregistrements sont triés par <a href="#schema-contributed_at">date de contribution</a> croissante.
   Ainsi, pour trier les enregistrement par <a href="#schema-discussion_id">identifiant de discussion</a> décroissant :
 </p>
-<pre>GET <?php echo url_for('@resources_collection_segment_get?collection=link&segment=images&limit=3', true) ?>&amp;<strong>sort_field=discussion_id</strong>&amp;<strong>sort_direction=desc</strong></pre>
+<pre>GET <?php echo url_for('@resources_collection_segment_get?collection=links&segment=images&limit=3', true) ?>&amp;<strong>sort_field=discussion_id</strong>&amp;<strong>sort_direction=desc</strong></pre>
 
 <h4 id="howto-response-format">Définition du format de réponse</h4>
 <p>
@@ -28,14 +28,14 @@
   Le format par défaut est <a href="#formats-html">HTML</a>.
   Pour obtenir la réponse au format JSON :
 </p>
-<pre>GET <?php echo url_for('@resources_collection_segment_get?collection=link&segment=images&limit=3&sort_field=discussion_id&sort_direction=desc', true) ?>&amp;<strong>format=json</strong></pre>
+<pre>GET <?php echo url_for('@resources_collection_segment_get?collection=links&segment=images&limit=3&sort_field=discussion_id&sort_direction=desc', true) ?>&amp;<strong>format=json</strong></pre>
 
 <h4 id="howto-filter">Filtrage en fonction des attributs</h4>
 <p>
   Il est enfin possible de restreindre le jeu d'enregistrements retourné en fonction de valeurs de leurs attributs <a href="#schema">schema</a>.
   Par exemple, pour limiter les enregistrements retournés au images contribuées par l'utilisateur "mbertier" :
 </p>
-<pre>GET <?php echo url_for('@resources_collection_segment_get?collection=link&segment=images&limit=3&sort_field=discussion_id&sort_direction=desc&format=json', true) ?>&amp;<strong>contributor_name=mbertier</strong></pre>
+<pre>GET <?php echo url_for('@resources_collection_segment_get?collection=links&segment=images&limit=3&sort_field=discussion_id&sort_direction=desc&format=json', true) ?>&amp;<strong>contributor_name=mbertier</strong></pre>
 
 <p>La réponse à cette requête :</p>
 <pre id="howto-response-test">
@@ -43,7 +43,7 @@
 </pre>
 <script type="text/javascript">
 $('#howto-response-test')
-    .load('<?php echo url_for('@resources_collection_segment_get?collection=link&segment=images&limit=3&sort_field=discussion_id&sort_direction=desc&format=json&contributor_name=mbertier') ?>');
+    .load('<?php echo url_for('@resources_collection_segment_get?collection=links&segment=images&limit=3&sort_field=discussion_id&sort_direction=desc&format=json&contributor_name=mbertier') ?>');
 </script>
 <p>
   Il est possible d'ajouter de requêter plusieurs attributs. Dans ce cas la requête est de type ET.

=== renamed directory 'apps/frontend/modules/resource/templates/_documentation/link' => 'apps/frontend/modules/resource/templates/_documentation/links'
=== modified file 'apps/frontend/modules/resource/templates/_documentation/links/cookbook.php'
--- apps/frontend/modules/resource/templates/_documentation/link/cookbook.php	2010-06-14 21:43:23 +0000
+++ apps/frontend/modules/resource/templates/_documentation/links/cookbook.php	2010-06-29 16:08:28 +0000
@@ -12,7 +12,7 @@
 <h3 id="example-1">Récupération de 5 liens vers des MP3, par ordre décroissant de date de contribution, au format XSPF</h3>
 
 <h4 id="example-1-request">Requête</h4>
-<pre>GET <?php echo $prefix ?><strong>/collections/link/segments/mp3/get</strong>?<strong>limit=5</strong>&amp;<strong>sort_direction=desc</strong>&amp;<strong>sort_field=contributed_at</strong>&amp;<strong>format=xspf</strong></pre>
+<pre>GET <?php echo $prefix ?><strong>/collections/links/segments/mp3/get</strong>?<strong>limit=5</strong>&amp;<strong>sort_direction=desc</strong>&amp;<strong>sort_field=contributed_at</strong>&amp;<strong>format=xspf</strong></pre>
 
 <h4 id="example-1-response">Réponse</h4>
 <pre class="sh_xml"><?php echo htmlentities('
@@ -41,7 +41,7 @@
 <h3 id="example-2">Récupération du premier lien posté vers une vidéo Youtube par l'utilisateur "mbertier", au format Json</h3>
 
 <h4 id="example-2-request">Requête</h4>
-<pre>GET <?php echo $prefix?><strong>/collections/link/segments/youtube/get</strong>?<strong>limit=1</strong>&amp;<strong>sort_direction=asc</strong>&amp;<strong>sort_field=contributed_at</strong>&amp;<strong>contributor_name=mbertier</strong>&amp;<strong>format=json</strong></pre>
+<pre>GET <?php echo $prefix?><strong>/collections/links/segments/youtube/get</strong>?<strong>limit=1</strong>&amp;<strong>sort_direction=asc</strong>&amp;<strong>sort_field=contributed_at</strong>&amp;<strong>contributor_name=mbertier</strong>&amp;<strong>format=json</strong></pre>
 
 <h4 id="example-2-response">Réponse</h4>
 <pre class="sh_javascript"><?php echo htmlentities('
@@ -64,7 +64,7 @@
 <h3 id="example-3">Récupération de toutes les vidéos du topic "Des clips, des clips, rien que des clips", au format PHP sérialisé</h3>
 
 <h4 id="example-3-request">Requête</h4>
-<pre>GET <?php echo $prefix?><strong>/collections/link/segments/youtube/get</strong>?<strong>limit=-1</strong>&amp;<strong>discusion_id=1679</strong>&amp;<strong>format=php</strong></pre>
+<pre>GET <?php echo $prefix?><strong>/collections/links/segments/youtube/get</strong>?<strong>limit=-1</strong>&amp;<strong>discusion_id=1679</strong>&amp;<strong>format=php</strong></pre>
 
 <h4 id="example-3-response">Réponse (tronquée)</h4>
 <pre class="sh_php"><?php echo htmlentities('

=== modified file 'apps/frontend/modules/resource/templates/collectionsSuccess.php'
--- apps/frontend/modules/resource/templates/collectionsSuccess.php	2010-06-14 21:43:23 +0000
+++ apps/frontend/modules/resource/templates/collectionsSuccess.php	2010-06-29 16:08:28 +0000
@@ -23,9 +23,14 @@
   <h2>Collections de ressources</h2>
   <?php foreach ($collections as $collection_name => $collection_data): ?>
     <h3><?php echo $collection_name ?></h3>
-    <?php // TODO : data are not accessible in partial. WTF ? ?>
     <?php include_partial(sprintf('resource/documentation/%s/description', $collection_name), array('collection_name' => $collection_name, 'collection_data' => $collection_data)) ?>
-    <p>À ce jour, cette collection regroupe <strong><?php echo $collection_data['count'] ?></strong> ressources.</p>
+    <p>À ce jour, cette collection regroupe <strong><?php echo $collection_data['segments']['all']['count'] ?></strong> ressources.</p>
     <p><?php echo link_to('Consulter la documentation', '@resources_collection?collection='.$collection_name) ?></p>
+    <p>Segments disponibles :</p>
+    <ul>
+    <?php foreach ($collection_data['segments'] as $segment_name => $segment_infos): ?>
+        <li><a href="<?php echo url_for(sprintf('@resources_collection?collection=%s#segments-%s', $collection_name, $segment_name)) ?>" title="Consulter la documentation du segment <?php echo $segment_name ?>"><?php echo $segment_name ?></a> : <strong><?php echo $segment_infos['count']?></strong> ressources</li>
+    <?php endforeach; ?>
+    </ul>
   <?php endforeach; ?>
 </div>
\ No newline at end of file

=== modified file 'apps/frontend/modules/resource/templates/getHtml.php'
--- apps/frontend/modules/resource/templates/getHtml.php	2010-06-02 15:44:11 +0000
+++ apps/frontend/modules/resource/templates/getHtml.php	2010-06-29 16:08:28 +0000
@@ -1,4 +1,4 @@
-<p>Found <?php echo count($results) ?> results :</p>
+<p>Displaying <?php echo count($results) ?> out of <?php echo $results['num_found']?> found results :</p>
 <ul>
 <?php foreach ($results as $resource): ?>
   <li><pre><?php echo print_r($resource, true) ?></pre></li>

=== modified file 'apps/frontend/modules/resource/templates/segmentsSuccess.php'
--- apps/frontend/modules/resource/templates/segmentsSuccess.php	2010-06-14 21:43:23 +0000
+++ apps/frontend/modules/resource/templates/segmentsSuccess.php	2010-06-29 16:08:28 +0000
@@ -36,7 +36,7 @@
     <h4 id="segments-<?php echo $segment?>"><?php echo $segment ?></h4>
     <?php include_partial(sprintf('resource/documentation/%s/segment/%s', $sf_request->getParameter('collection'), $segment)); ?>
     <p>URL de requête :</p>
-    <pre>GET <?php echo url_for(sprintf('@resources_collection_segment_get?collection=%s&segment=%s', $sf_request->getParameter('collection'), $segment), true) ?></pre>
+    <pre>GET <a href="<?php echo url_for(sprintf('@resources_collection_segment_get?collection=%s&segment=%s', $sf_request->getParameter('collection'), $segment), true) ?>" ><?php echo url_for(sprintf('@resources_collection_segment_get?collection=%s&segment=%s', $sf_request->getParameter('collection'), $segment), true) ?></a></pre>
   <?php endforeach; ?>
 </div>
 </div>
\ No newline at end of file

=== modified file 'apps/frontend/templates/layout.php'
--- apps/frontend/templates/layout.php	2010-06-24 16:24:46 +0000
+++ apps/frontend/templates/layout.php	2010-06-29 16:08:28 +0000
@@ -20,7 +20,7 @@
 
     <hr />
 
-    <p><a href="https://launchpad.net/vanilla-miner/+milestone/0.4.0">Vanilla Miner 0.4.0</a> a été développé par <a href="http://www.constructions-incongrues.net/">Constructions Incongrues</a> et est hébergé par <a href="http://www.pastis-hosting.net">Pastis Hosting</a>.</p>
+    <p><a href="https://launchpad.net/vanilla-miner/+milestone/0.4.0">Vanilla Miner 0.4.0</a> est développé par <a href="http://www.constructions-incongrues.net/">Constructions Incongrues</a> et est hébergé par <a href="http://www.pastis-hosting.net">Pastis Hosting</a>.</p>
     <p>Le code source du service est <a href="https://launchpad.net/vanilla-miner">distribué</a> sous licence <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero GPLv3</a>.</p>
     <p>Ce service utilise (notamment) <a href="http://www.symfony-project.org">symfony</a>, <a href="http://www.doctrine-project.org">Doctrine</a> et <a href="http://lucene.apache.org/solr/">Solr</a>.</p>
     <p>Contact : contact @ musiques-incongrues . net</p>

=== modified file 'lib/vendor/CI/Search/Formatter/Json.php'
--- lib/vendor/CI/Search/Formatter/Json.php	2010-06-02 13:35:38 +0000
+++ lib/vendor/CI/Search/Formatter/Json.php	2010-06-29 16:08:28 +0000
@@ -3,16 +3,17 @@
 {
   public $content_type = 'application/json';
   public $sf_has_layout = false;
-  
+
   protected $event_dispatcher;
-  
+
   public function __construct(sfEventDispatcher $dispatcher)
   {
     $this->event_dispatcher = $dispatcher;
   }
-  
+
   public function format(array $resources)
   {
+
     return json_encode($resources);
   }
 }
\ No newline at end of file

=== modified file 'lib/vendor/CI/Search/Link/Segment.php'
--- lib/vendor/CI/Search/Link/Segment.php	2010-06-23 20:09:52 +0000
+++ lib/vendor/CI/Search/Link/Segment.php	2010-06-29 16:08:28 +0000
@@ -35,6 +35,18 @@
     return $results_array;
   }
 
+  public function count(sfParameterHolder $parameters)
+  {
+    // Build search criteria from request parameters
+    $c = $this->buildLuceneCriteria($parameters);
+    $c->setLimit(0);
+
+    // Retrieve results from Solr
+    $results_lucene = $this->lucene->friendlyFind($c);
+
+    return $results_lucene->count();
+  }
+
   protected function buildLuceneCriteria(sfParameterHolder $parameters)
   {
     $c = new sfLuceneCriteria();
@@ -103,6 +115,9 @@
       $results_array[] = $result_array;
     }
 
+    // Total number of results found
+    $results_array['num_found'] = $results_lucene->count();
+
     return $results_array;
   }
 

=== modified file 'web/css/main.css'
--- web/css/main.css	2010-06-14 21:43:23 +0000
+++ web/css/main.css	2010-06-29 16:08:28 +0000
@@ -1,7 +1,7 @@
 body { margin: 0; text-align: center; font-size: large; font-family: "Crimson Text"; }
 h1, h2 { font-family: "Lobster"; }
 h1 { text-align: center }
-pre { padding: 1em; }
+pre { padding: 1em; background-color: #eee; }
 dl { margin-left: 1em; }
 dt { font-weight: bold; }
 a { color: #666; }