initial commit of new friends pages

htdocs/lang/en.utf8/mahara.php

@@ -334,6 +334,7 @@ $string['myportfolio'] = 'My Portfolio';
 $string['myviews']       = ' My Views';
 $string['settings']    = 'Settings';
 $string['myfriends']          = 'My Friends';
+$string['findfriends']        = 'Find Friends';
 $string['groups']             = 'Groups';
 $string['mygroups']           = 'My Groups';
 $string['findgroups']         = 'Find Groups';

htdocs/lib/web.php

@@ -1583,19 +1583,24 @@ function main_nav() {
                 'title' => get_string('mygroups'),
                 'weight' => 10
             ),
-            array(
-                'path' => 'groups/myfriends',
-                'url' => 'user/',
-                'title' => get_string('myfriends'),
-                'weight' => 20,
-            ),
             array(
                 'path' => 'groups/find',
                 'url' => 'group/find.php',
                 'title' => get_string('findgroups'),
+                'weight' => 20
+            ),
+            array(
+                'path' => 'groups/myfriends',
+                'url' => 'friends/myfriends.php',
+                'title' => get_string('myfriends'),
                 'weight' => 30
             ),
-
+            array(
+                'path' => 'groups/findfriends',
+                'url' => 'friends/find.php',
+                'title' => get_string('findfriends'),
+                'weight' => 40
+            ),
             array(
                 'path' => 'settings',
                 'url' => 'account/',

htdocs/theme/default/templates/user/find.tpl

+{include file="header.tpl"}
+{include file="sidebar.tpl"}
+
+{include file="columnleftstart.tpl"}
+
+<h2>{$heading}</h2>
+
+{include file="columnleftend.tpl"}
+{include file="footer.tpl"}

htdocs/theme/default/templates/user/myfriends.tpl

+{include file="header.tpl"}
+{include file="sidebar.tpl"}
+
+{include file="columnleftstart.tpl"}
+
+<h2>{$heading}</h2>
+
+{include file="columnleftend.tpl"}
+{include file="footer.tpl"}

htdocs/user/find.php

+<?php
+/**
+ * Mahara: Electronic portfolio, weblog, resume builder and social networking
+ * Copyright (C) 2006-2007 Catalyst IT Ltd (http://www.catalyst.net.nz)
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    mahara
+ * @subpackage core
+ * @author     Clare Lenihan <clare@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', 'friends/find');
+require(dirname(dirname(__FILE__)) . '/init.php');
+require_once('pieforms/pieform.php');
+define('TITLE', get_string('findfriends'));
+
+$smarty = smarty();
+$smarty->assign('heading', TITLE);
+$smarty->display('user/find.tpl');
+
+?>

htdocs/user/myfriends.php

+<?php
+/**
+ * Mahara: Electronic portfolio, weblog, resume builder and social networking
+ * Copyright (C) 2006-2007 Catalyst IT Ltd (http://www.catalyst.net.nz)
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    mahara
+ * @subpackage core
+ * @author     Clare Lenihan <clare@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', 'friends/myfriends');
+require(dirname(dirname(__FILE__)) . '/init.php');
+require_once('pieforms/pieform.php');
+define('TITLE', get_string('myfriends'));
+
+$smarty = smarty();
+$smarty->assign('heading', TITLE);
+$smarty->display('user/myfriends.tpl');
+
+?>