rejigged the account wireframes a bit

htdocs/account/activity/index.php

@@ -26,7 +26,7 @@
 
 define('INTERNAL', 1);
 define('MENUITEM', 'account');
-define('SUBMENUITEM', 'activityprefs');
+define('SUBMENUITEM', 'activity');
 
 require(dirname(dirname(dirname(__FILE__))) . '/init.php');
 

htdocs/account/activity/preferences/index.php

+<?php
+/**
+ * This program is part of Mahara
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ *
+ * @package    mahara
+ * @subpackage core
+ * @author     Penny Leach <penny@catalyst.net.nz>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
+ * @copyright  (C) 2006,2007 Catalyst IT Ltd http://catalyst.net.nz
+ *
+ */
+
+define('INTERNAL', 1);
+define('MENUITEM', 'account');
+define('SUBMENUITEM', 'activityprefs');
+
+require(dirname(dirname(dirname(dirname(__FILE__)))) . '/init.php');
+
+$smarty = smarty();
+
+$smarty->display('account/activity/preferences/index.tpl');
+
+?>

htdocs/lang/en.utf8/mahara.php

@@ -92,6 +92,7 @@ $string['account'] =  'My account';
 $string['accountprefs'] = 'Account preferences';
 $string['activityprefs'] = 'Activity preferences';
 $string['changepassword'] = 'Change password';
+$string['activity'] = 'Recent activity';
 
 $string['emailname'] = 'Mahara System'; // robot! 
 ?>

htdocs/lib/mahara.php

@@ -790,9 +790,14 @@ function main_nav() {
                 'link'    => $wwwroot . 'account/',
                 'section' => 'mahara',
             ),
+            'activity' => array(
+                'name'    => 'activity',
+                'link'    => $wwwroot . 'account/activity/',
+                'section' => 'mahara',
+            ),
             'activityprefs' => array(
                 'name'    => 'activityprefs',
-                'link'    => $wwwroot . 'account/activity',
+                'link'    => $wwwroot . 'account/activity/preferences',
                 'section' => 'mahara',
             ),
             'changepassword' => array(

htdocs/theme/default/templates/account/activity/preferences/index.tpl

+{include file="header.tpl"}
+
+{include file="adminmenu.tpl"}
+
+<h2>{str tag="account"}</h2>
+
+<div class="content">
+    Content from database here
+</div>
+
+{include file="footer.tpl"}