Bug 356077 - "Changes to Firefox Party tool" [p=rflint@dslr.net]

git-svn-id: svn://10.0.0.236/trunk@213456 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/webtools/partytool/config/routes.php

@@ -1,5 +1,5 @@
 <?php
-/* SVN FILE: $Id: routes.php,v 1.4 2006-10-08 03:39:21 reed%reedloden.com Exp $ */
+/* SVN FILE: $Id: routes.php,v 1.5 2006-10-10 20:18:59 reed%reedloden.com Exp $ */
 /**
  * Short description for file.
  *
@@ -23,9 +23,9 @@
  * @package			cake
  * @subpackage		cake.app.config
  * @since			CakePHP v 0.2.9
- * @version			$Revision: 1.4 $
+ * @version			$Revision: 1.5 $
  * @modifiedby		$LastChangedBy: phpnut $
- * @lastmodified	$Date: 2006-10-08 03:39:21 $
+ * @lastmodified	$Date: 2006-10-10 20:18:59 $
  * @license			http://www.opensource.org/licenses/mit-license.php The MIT License
  */
 /**
@@ -37,6 +37,7 @@
 /**
  * ...and connect the rest of 'Pages' controller's urls.
  */
+  $Route->connect('/pages/edit', array('controller' => 'pages', 'action' => 'edit'));
   $Route->connect('/pages/*', array('controller' => 'pages', 'action' => 'display'));
   $Route->connect('/privacy-policy', array('controller' => 'pages', 'action' => 'privacy'));
 ?>

mozilla/webtools/partytool/config/sql/dist.sql

@@ -16,6 +16,15 @@ CREATE TABLE `guests` (
   KEY `pid` (`pid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
+CREATE TABLE `pages` (
+  `id` int(10) NOT NULL auto_increment,
+  `text` text collate utf8_unicode_ci NOT NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+INSERT INTO `pages` (`id`, `text`) VALUES (1, '<h2>Join the Fun!</h2>\n<p>All over the world, we're celebrating the launch of Firefox 2. Join the fun by hosting or attending a party. We're targeting the weekend of October 27th for the shared celebration, but if you're hosting, you make the call.</p>\n\n<p>To join the fun, <a href="/users/register">register</a> for a Firefox Party account, and sign up to host or attend.</p>\n\n<p style="border: 1px solid #555; background: #faffd4; padding: 5px; font-weight: bold">Be one of the first 50 party hosts registered and get three extra launch exclusive t-shirts with your purchase of the <a href="">Firefox 2 Party Pack</a>.  We're selling the party packs and shirts at cost, so it's a great deal, and for parties with unusually large attendance, we'll be sending out additional swag for door prizes and other give-aways. Stay tuned for updates!</p>');
+INSERT INTO `pages` (`id`, `text`) VALUES (2, '1162007940');
+
 CREATE TABLE `parties` (
   `id` int(10) NOT NULL auto_increment,
   `owner` int(10) NOT NULL default '0',

mozilla/webtools/partytool/controllers/components/mail.php

@@ -40,7 +40,7 @@ class MailComponent extends Object {
           break;
 
         case "invite":
-          $this->message = $this->head."<br/>\nYou've been invited by a friend to join them in celebrating the release of Firefox 2. To join them, just <a href=\"".$params['link']."\">click here</a> and sign up for an account.\n
+          $this->message = $this->head."<br/>\nYou've been invited by a friend to join them in celebrating the release of Firefox 2. Simply <a href=\"".$params['link']."\">click here</a> to confirm or cancel this invitation. If you don't already have an account, you'll need to create one.\n
                            If you're unable to use the link above, simply paste the following URL into your browser: ".$params['link'].$this->foot;
           break;
       }

mozilla/webtools/partytool/controllers/feeds_controller.php

@@ -34,40 +34,60 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+vendor('webServices');
 class FeedsController extends AppController {
   var $name = 'Feeds';
 
   function index() {
-    header('Content-type: text/xml');
+    header('Content-type: application/rss+xml');
     $this->layout = 'ajax';
     $this->set('count', $this->Feed->findCount());
   }
 
   function latest() {
-    header('Content-type: text/xml');
+    header('Content-type: application/rss+xml');
     $this->layout = 'ajax';
     $this->set('latest', $this->Feed->findAll('', '', 'id DESC', 10, 1));
   }
 
   function users() {
-    header('Content-type: text/xml');
+    header('Content-type: application/rss+xml');
     $this->layout = 'ajax';
     $this->set('count', $this->Feed->getUserCount());
   }
 
   function comments($id = null) {
     $this->layout = 'ajax';
-    header('Content-type: text/xml');
+    header('Content-type: application/rss+xml');
     if (!is_numeric($id))
       return;
 
     $this->set('comments', $this->Feed->getComments($id));
     $this->set('pid', $id);
   }
+  
+  function photos($id = null) {
+    $this->layout = 'ajax';
+    header('Content-type: application/atom+xml');
+    if (!is_numeric($id))
+      return;
+
+    $party = $this->Feed->findById($id);
+    $this->set('party', $party);
+
+    if (FLICKR_API_KEY != null) {
+      if ($party['Feeds']['useflickr'] == 1) {
+        $data = array('type' => 'flickr', 'userid' => $party['Feeds']['flickrid'], 'randomize' => false);
+        $flickr = new webServices($data);
+        $photoset = $flickr->fetchPhotos(FLICKR_TAG_PREFIX.$id, 10, (($party['Feeds']['flickrperms']) ? false : true));
+        $this->set('flickr', $photoset, 0, 9);
+      }
+    }
+  }
 
   function upcoming() {
     $this->layout = 'ajax';
-    header('Content-type: text/xml');
+    header('Content-type: application/rss+xml');
     $this->set('latest', $this->Feed->findAll('WHERE date > '. time(), '', 'date ASC', 10, 1));
   }
 

mozilla/webtools/partytool/controllers/pages_controller.php

@@ -34,17 +34,59 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+uses('sanitize');
 class PagesController extends AppController {
   var $name = 'Pages';
+  var $components = array('Unicode');
 
   function display() {
     $this->pageTitle = 'Home';
     $this->set('current', 'home');
     $this->set('pcount', $this->Page->findCount());
     $this->set('ucount', $this->Page->getUsers());
+    $text = $this->Page->query('SELECT text FROM pages WHERE id = 1');
+    $time = $this->Page->query('SELECT text FROM pages WHERE id = 2');
+    $this->set('time', $time[0]['pages']['text']);
+    $this->set('front_text', preg_replace("/&#(\d{2,5});/e", 
+                                          '$this->Unicode->unicode2utf(${1})',
+                                          html_entity_decode($text[0]['pages']['text'])));
   }
 
   function privacy() {
     $this->pageTitle = 'Privacy Policy';
   }
-}
+  
+  function edit() {
+    if (isset($_SESSION['User']['id']) && $_SESSION['User']['role'] == 1) {
+      if (empty($this->data)) {
+        $text = $this->Page->query('SELECT text FROM pages WHERE id = 1');
+        $time = $this->Page->query('SELECT text FROM pages WHERE id = 2');
+        $this->data['Pages']['text'] = preg_replace("/&#(\d{2,5});/e", 
+                                                    '$this->Unicode->unicode2utf(${1})',
+                                                    html_entity_decode($text[0]['pages']['text']));
+        $this->set('selected', date('Y-m-d H:i:s', $time[0]['pages']['text']));
+      }
+    
+      else {
+        // Paranoid? Nah...
+        if ($_SESSION['User']['role'] == 1) {
+          $clean = new Sanitize();
+          $clean->cleanArray($this->data);
+          $date = mktime($this->data['Pages']['date_hour'],
+                         $this->data['Pages']['date_min'],
+                         0,
+                         $this->data['Pages']['date_month'],
+                         $this->data['Pages']['date_day'],
+                         $this->data['Pages']['date_year']);
+
+          $this->Page->execute('UPDATE pages SET text = "'.$this->data['Pages']['text'].'" WHERE pages.id = 1');
+          $this->Page->execute('UPDATE pages SET text = "'.$date.'" WHERE pages.id = 2');
+          $this->redirect('/');
+        }
+      }
+    }
+    else
+     die();
+  }
+}
+?>

mozilla/webtools/partytool/controllers/parties_controller.php

@@ -218,7 +218,7 @@ class PartiesController extends AppController {
       $this->set('current', 'parties');
       $this->set('host', $this->Party->getHost($party['Party']['owner']));
       $this->set('party', $party);
-      $this->set('isguest', $this->Party->isGuest($id, $_SESSION['User']['id']));
+      $this->set('isguest', $this->Party->isGuest($id, @$_SESSION['User']['id']));
       $this->pageTitle = $party['Party']['name'];
       $this->set('map', 'mapInit('.$party['Party']['lat'].','.$party['Party']['long'].
                         ','.$party['Party']['zoom'].',\'stationary\')');
@@ -227,7 +227,7 @@ class PartiesController extends AppController {
 
       if (FLICKR_API_KEY != null) {
         if ($party['Party']['useflickr'] == 1) {
-          $data = array('type' => 'flickr', 'userid' => $party['Party']['flickrid']);
+          $data = array('type' => 'flickr', 'userid' => $party['Party']['flickrid'], 'randomize' => true);
           $flickr = new webServices($data);
           $photoset = $flickr->fetchPhotos(FLICKR_TAG_PREFIX.$party['Party']['id'], 15, (($party['Party']['flickrperms']) ? false : true));
           $this->set('flickr', array_slice($photoset, 0, 9));
@@ -271,6 +271,7 @@ class PartiesController extends AppController {
             $this->Session->setFlash($this->data['Party']['einvite'].' has been
               invited. You can invite another guest below or <a href="'.APP_BASE.'/parties/view/'.$id.'/">click here</a>
               to return to your party.', 'infoFlash');
+            $this->data['Party']['einvite'] = null;
           }
           else {
             $this->validateErrors($this->Party);
@@ -281,28 +282,38 @@ class PartiesController extends AppController {
     }
   }
 
-  function invited($icode = null) {
-    if ($icode == "cancel") {
+  function invited($icode = null, $conf = null) {
+    $this->pageTitle = "Confirm Invite";
+    if ($icode == 'cancel') {
       $this->Session->delete('invite');
+      $this->Session->delete('invitestep');
       $this->redirect('/');
     }
 
     else {
-      $this->pageTitle = "Confirm Invite";
       $clean = new Sanitize();
       $icode = $clean->sql($icode);
       $party = $this->Party->findByInvitecode($icode);
+
       if (empty($party['Party']['id'])) {
         $this->Session->setFlash('Could not find a party matching that invite code, please check it and try again.', 'errorFlash');
       }
 
       else {
-        if (!empty($_SESSION['User']['id'])) {
-          $this->Party->addGuest($_SESSION['User']['id'], $icode);
+        if (!empty($_SESSION['User']['id']) && !empty($_SESSION['invitestep']) && $conf == 'confirm') {
+          $this->Party->addGuest($_SESSION['User']['id'], $_SESSION['invite']);
           $this->Session->setFlash('You have been successfully added to this party.', 'infoFlash');
           $this->redirect('/parties/view/'.$party['Party']['id']);
         }
 
+        else if (!empty($_SESSION['User']['id'])) {
+          $this->set('confirm_only', true);
+          $this->set('party', $party);
+          $this->set('icode', $icode);
+          $this->Session->write('invitestep', 'true');
+          $this->Session->write('invite', $icode);
+        }
+
         else {
           $this->Session->write('invite', $icode);
           $this->set('party', $party);

mozilla/webtools/partytool/controllers/users_controller.php

@@ -138,7 +138,7 @@ class UsersController extends AppController {
     }
   }
 
-  function edit($id) {
+  function edit() {
     if (!isset($_SESSION['User'])) {
       $this->redirect('/users/login');
     }
@@ -271,10 +271,10 @@ class UsersController extends AppController {
       $this->pageTitle = $user['User']['name'];
       $this->set('user', $user);
       if (GMAP_API_KEY != null && !empty($user['User']['lat']))
-        $this->set('map', $user['User']['lat'].','.$user['User']['long'].','.$user['User']['zoom'].',\'stationary\'');
+        $this->set('map', 'mapInit('.$user['User']['lat'].','.$user['User']['long'].','.$user['User']['zoom'].',\'stationary\');');
 
       $this->Party->unbindModel(array('hasMany' => array('Comment')));
-      $this->set('hparties', $this->Party->findByOwner($id));
+      $this->set('hparties', $this->User->hostOf($id));
       $att = $this->User->query('SELECT parties.id, parties.name
                                  FROM parties 
                                  LEFT JOIN guests

mozilla/webtools/partytool/models/party.php

@@ -101,5 +101,10 @@ class Party extends AppModel {
       }
     }
   }
+  
+  function findByInvitecode($icode) {
+    $rv = $this->query('SELECT * FROM parties AS Party WHERE invitecode = "'.$icode.'" LIMIT 1');
+    return @$rv[0];
+  }
 }
-?>
+?>

mozilla/webtools/partytool/vendors/webServices.php

@@ -38,15 +38,18 @@ class webServices {
   
   var $userid;
   var $host;
+  var $randomize;
 
   function webServices($data) {
     switch ($data['type']) {
       case "flickr":
         $this->host = "api.flickr.com";
 
-        if (array_key_exists('userid', $data)) {
+        if (array_key_exists('userid', $data))
           $this->userid = $data['userid'];
-        }
+
+        if (array_key_exists('randomize', $data))
+          $this->randomize = $data['randomize'];
 
         if (array_key_exists('username', $data)) {
           $head  = "GET /services/rest/?method=flickr.people.findByUsername&api_key=".FLICKR_API_KEY."&username=".$data['username']." HTTP/1.1\r\n";
@@ -99,8 +102,10 @@ class webServices {
                          'title'  => $titles[$i][1]);
       }
 
-      // Randomize the results
-      shuffle($arr);
+      if ($this->randomize) {
+        // Randomize the results
+        shuffle($arr);
+      }
 
       return $arr;
     }

mozilla/webtools/partytool/views/feeds/comments.thtml

@@ -7,7 +7,7 @@
     <title><?php echo APP_NAME." - Latest Comments"; ?></title>
     <?php foreach($comments as $comment): ?>
     <item>
-      <title><![CDATA[<?php echo substr($comment['comments']['text'], 0, 25); ?>]]></title>
+      <title><![CDATA[<?php echo substr($comment['comments']['text'], 0, 25).'...'; ?>]]></title>
       <description><?php echo $comment['comments']['text'] ?></description>
       <link><?php echo "http://".$_SERVER["SERVER_NAME"].$html->url('/party/view/'.$comment['comments']['assoc'].'#c'.$comment['comments']['id']); ?></link>
     </item>

mozilla/webtools/partytool/views/layouts/default.thtml

@@ -19,10 +19,10 @@
         </div>
         <div id="key-menu">
           <ul id="menu-firefox">
-            <li<?php echo (@$current == "home") ? ' class="current"' : ''?>><a href="<?php echo $html->url('/'); ?>">Home</a></li>
-            <li<?php echo (@$current == "map") ? ' class="current"' : ''?>><a href="<?php echo $html->url('/parties/'); ?>">View Map</a></li>
-            <li<?php echo (@$current == "parties") ? ' class="current"' : ''?>><a href="<?php echo $html->url('/parties/view/all/'); ?>">View Parties</a></li>
-            <li<?php echo (@$current == "create") ? ' class="current"' : ''?>><a href="<?php echo $html->url('/parties/add/'); ?>">Create Party</a></li>
+            <li<?php echo (@$current == 'home') ? ' class="current"' : ''?>><a href="<?php echo $html->url('/'); ?>">Home</a></li>
+            <li<?php echo (@$current == 'map') ? ' class="current"' : ''?>><a href="<?php echo $html->url('/parties/'); ?>">View Map</a></li>
+            <li<?php echo (@$current == 'parties') ? ' class="current"' : ''?>><a href="<?php echo $html->url('/parties/view/all/'); ?>">View Parties</a></li>
+            <li<?php echo (@$current == 'create') ? ' class="current"' : ''?>><a href="<?php echo $html->url('/parties/add/'); ?>">Create Party</a></li>
           </ul>
         </div>
       </div>
@@ -32,8 +32,8 @@
         <?php echo $content_for_layout; ?>
       </div>
       <div id="footer">
-        Copyright &copy; 2006 Mozilla Corporation<br/>
-        <a href="<?php echo $html->url('/privacy-policy'); ?>">Privacy Policy</a> | <a href="http://www.mozilla.org/foundation/donate.html">Donate to Mozilla</a>
+        Copyright &copy; <?php echo date('Y'); ?> Mozilla Corporation<br/>
+        <a href="<?php echo $html->url('/privacy-policy'); ?>">Privacy Policy</a>
       </div>
     </div>
   </body>

mozilla/webtools/partytool/views/pages/display.thtml

@@ -1,28 +1,28 @@
 <?php
-  //Tuesday, October 24th 2006, 23:59:59
-  $difference = 1161734399 - time();
+  $difference = $time - time();
   $days_left = floor($difference/60/60/24);
 ?>
-<div id="f-left">
-        <p>
-          Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla porta tellus ac leo suscipit euismod. Aenean id ante. Vestibulum consectetuer. Integer diam neque, iaculis eget, ultricies ac, elementum sit amet, risus. Proin blandit. Cras quam. Aenean sollicitudin, lorem vel lobortis bibendum, lorem nibh gravida elit, et aliquam dolor libero bibendum sem. Cras pharetra. Vivamus ligula nisl, mattis sed, molestie nec, interdum ac, massa. In eros pede, dictum at, mollis eu, adipiscing eget, ante. Nunc elit nunc, tincidunt sit amet, tincidunt eu, euismod id, massa. Vivamus molestie. Sed non dui non velit semper egestas. Maecenas vulputate. Quisque sapien. Pellentesque interdum, libero rutrum tincidunt molestie, dui pede eleifend quam, quis tempor sapien ligula et turpis.
-          Maecenas ut sem. Nam adipiscing sem sit amet magna. Curabitur a risus non ipsum mattis tempor. Fusce in arcu. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Sed eu diam nec nisi ultrices laoreet. Pellentesque tincidunt, enim nec malesuada tristique, est neque luctus dui, sit amet posuere nunc nulla vel diam. Phasellus pharetra tortor ut massa lacinia adipiscing. Morbi in nulla. Proin ut diam et tortor hendrerit congue. Mauris porttitor fringilla augue. Etiam faucibus rutrum enim.
-          Maecenas varius massa sit amet nulla. Nunc sit amet mauris. Nunc eu purus a sapien aliquam aliquam. Donec sodales commodo dolor. Fusce volutpat. Sed quis ipsum nec dolor facilisis facilisis. Fusce leo massa, tincidunt in, sodales eu, sodales nec, libero. Etiam vehicula. Ut egestas. Ut consectetuer dolor ac est. Phasellus viverra euismod nisl. Nunc ut felis nec erat vulputate ullamcorper. Praesent rhoncus cursus nunc. Quisque elementum. Etiam euismod erat sit amet lorem.
-        </p>
-      </div>
-      <div id="f-right">
-        <div class="cbox">
-          <span class="ctxt"><?php echo $pcount."</span><br/>".(($pcount == 1) ? ' Party' : ' Parties'); ?>
-          <div class="ifeed">
-            <a style="padding-right: 2px;" title="ICAL Feed" href="<?php echo $html->url('/feeds/ical'); ?>"><img src="<?php echo $html->url('/img/ical.png'); ?>" alt="iCAL"/></a><a title="Party Count Feed" href="<?php echo $html->url('/feeds/'); ?>"><img src="<?php echo $html->url('/img/feed16.png'); ?>" alt="RSS"/></a>
-          </div>
+    <div id="f-left">
+      <?php echo $front_text; 
+      if (@$_SESSION['User']['role'] == 1): ?>
+      <a href="<?php echo $html->url('/pages/edit'); ?>">Edit</a>
+      <?php endif; ?>
+    </div>
+    <div id="f-right">
+      <div class="cbox">
+        <span class="ctxt"><?php echo $pcount."</span><br/>".(($pcount == 1) ? ' Party' : ' Parties'); ?>
+        <div class="ifeed">
+          <a style="padding-right: 2px;" title="Party Calendar" href="<?php echo $html->url('/feeds/ical'); ?>"><img src="<?php echo $html->url('/img/ical.png'); ?>" alt="iCAL"/></a><a title="Party Count Feed" href="<?php echo $html->url('/feeds/'); ?>"><img src="<?php echo $html->url('/img/feed16.png'); ?>" alt="RSS"/></a>
         </div>
-        <div class="cbox">
-          <span class="ctxt"><?php echo $ucount."</span><br/>".(($ucount == 1) ? ' Partygoer' : ' Partygoers'); ?>
-          <div class="cfeed">
-            <a title="User Count Feed" href="<?php echo $html->url('/feeds/users/'); ?>"><img src="<?php echo $html->url('/img/feed16.png'); ?>" alt="RSS"/></a>
-          </div>
-        </div>
-        <div class="cbox"><span class="ctxt"><?php echo $days_left."</span><br/>".(($days_left == 1) ? ' Day' : ' Days'); ?> left until Firefox 2!</div>
       </div>
-      <div style="clear: both"></div>
+      <div class="cbox">
+        <span class="ctxt"><?php echo $ucount."</span><br/>".(($ucount == 1) ? ' Partygoer' : ' Partygoers'); ?>
+        <div class="cfeed">
+          <a title="User Count Feed" href="<?php echo $html->url('/feeds/users/'); ?>"><img src="<?php echo $html->url('/img/feed16.png'); ?>" alt="RSS"/></a>
+        </div>
+      </div>
+      <div class="cbox">
+        <span class="ctxt"><?php echo $days_left."</span><br/>".(($days_left == 1) ? ' Day' : ' Days'); ?> left until Firefox 2!
+      </div>
+    </div>
+    <div style="clear: both"></div>

mozilla/webtools/partytool/views/parties/invited.thtml

@@ -1,5 +1,5 @@
 <h1>Confirm Invite</h1>
-<?php if (isset($party)): ?>
+<?php if (isset($party) && !isset($confirm_only)): ?>
 <p>You've been invited to attend <a href="<?php echo $html->url('/parties/view/'.$party['Party']['id']); ?>"><?php echo $party['Party']['name']; ?></a>.
   To join this party please select one of the options below, or <a href="<?php echo $html->url('/parties/invited/cancel/');?>">click here</a> to cancel this invitation.</p>
 <div style="text-align: center">
@@ -29,4 +29,8 @@
   </div>
   <div style="clear: both;"></div>
 </div>
+<?php endif; 
+if (isset($party) && isset($confirm_only)): ?>
+<p>You've been invited to attend <a href="<?php echo $html->url('/parties/view/'.$party['Party']['id']); ?>"><?php echo $party['Party']['name']; ?></a>.
+  To join this party, <a href="<?php echo $html->url('/parties/invited/'.$icode.'/confirm');?>">click here</a>, or cancel this invitation by <a href="<?php echo $html->url('/parties/invited/cancel/');?>">clicking here</a>.</p>
 <?php endif; ?>

mozilla/webtools/partytool/views/parties/view.thtml

@@ -58,7 +58,7 @@
     <a href="<?php echo $html->url('/parties/invite/'.$party['Party']['id']);?>">Invite a guest</a>
     <?php endif; ?>
     <?php if (isset($flickr)): ?>
-    <h1 id="photos">Photos</h1>
+    <h1 id="photos">Photos <a title="Photo Feed" href="<?php echo $html->url('/feeds/photos/'.$party['Party']['id']); ?>"><img src="<?php echo $html->url('/img/feed16.png'); ?>" alt="Atom"/></a></h1>
     <div style="text-align: center">
       <?php if (empty($flickr)): ?>
       <p>No photos yet. Tag your flickr pictures with <?php echo FLICKR_TAG_PREFIX.$party['Party']['id']; ?> to display them here.</p>
@@ -71,7 +71,7 @@
     </div>
     <?php endif; 
       if (!empty($comments)): ?>
-    <h1 id="comments">Comments</h1>
+    <h1 id="comments">Comments <a title="Comment Feed" href="<?php echo $html->url('/feeds/comments/'.$party['Party']['id']); ?>"><img src="<?php echo $html->url('/img/feed16.png'); ?>" alt="RSS"/></a></h1>
     <?php $i = 0;
     foreach ($comments as $comment): 
       if ($i % 2 == 0) 
@@ -101,9 +101,11 @@
   
   <?php if (isset($parties)):
     if (isset($prev))
-      echo '<a href="'.$html->url('/parties/view/all/'.$prev).'">Previous Page</a> ';
+      echo '<a href="'.$html->url('/parties/view/all/'.$prev).'">&laquo; Previous Page</a> ';
+    if (isset($prev) && isset($next))
+      echo ' | ';
     if (isset($next))
-      echo '<a href="'.$html->url('/parties/view/all/'.$next).'">Next Page</a>';
+      echo '<a href="'.$html->url('/parties/view/all/'.$next).'">Next Page &raquo;</a>';
     $i = 0;
     foreach ($parties as $party): ?>
     <div>
@@ -127,8 +129,10 @@
     </div>
   <?php endforeach;
     if (isset($prev))
-      echo '<a href="'.$html->url('/parties/view/all/'.$prev).'">Previous Page</a> ';
+      echo '<a href="'.$html->url('/parties/view/all/'.$prev).'">&laquo; Previous Page</a> ';
+    if (isset($prev) && isset($next))
+      echo ' | ';
     if (isset($next))
-      echo '<a href="'.$html->url('/parties/view/all/'.$next).'">Next Page</a>';
+      echo '<a href="'.$html->url('/parties/view/all/'.$next).'">Next Page &raquo;</a>';
   endif;?>
 

mozilla/webtools/partytool/views/users/view.thtml

@@ -1,6 +1,6 @@
 <?php
   if (!empty($user['User']['name']))
-    echo "<h1>".$user['User']['name']."</h1>";
+    echo "<h1>".$user['User']['name']."</h1><br/>";
     
   if ($user['User']['showemail'] == 1 && @$_SESSION['User'])
     echo "Email: ".$user['User']['email']."<br/>"; 
@@ -29,14 +29,15 @@
     $i = 0;
     
     foreach ($hparties as $party) {
-      echo '<a href="'.$html->url('/parties/view/'.$party['id']).'">'.$party['name'].'</a>';
+      echo '<a href="'.$html->url('/parties/view/'.$party['parties']['id']).'">'.$party['parties']['name'].'</a>';
       echo ($i < $c) ? ', ' : '<br/>';
       $i++;
     }
   }
 ?>
 
-<?php if(isset($body_args) && $user['User']['showmap'] == 1): ?>
+<?php if(isset($map) && $user['User']['showmap'] == 1): ?>
+<br/>
 <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=<?php echo GMAP_API_KEY; ?>" type="text/javascript"></script>
 <script src="<?php echo $html->url('/js/maps.js'); ?>" type="text/javascript"></script>
 <div id="map" style="height: 200px; width: 350px;"></div>