diff options
| author | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-06-27 10:33:28 +0000 |
|---|---|---|
| committer | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-06-27 10:33:28 +0000 |
| commit | 6b6d0bf9f1881d18959a2ee5241a94559ef2765a (patch) | |
| tree | 4f95357f2e1cf332158d04964f2669d008c817fe | |
| parent | 283a7758eaae7a4f8f1165eb7d31f2a60c32edea (diff) | |
| download | elgg-6b6d0bf9f1881d18959a2ee5241a94559ef2765a.tar.gz elgg-6b6d0bf9f1881d18959a2ee5241a94559ef2765a.tar.bz2 | |
Initial inclusion of profile icon navigation
git-svn-id: https://code.elgg.org/elgg/trunk@1163 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | mod/profile/javascript.php | 18 | ||||
| -rw-r--r-- | mod/profile/views/default/profile/icon.php | 20 | ||||
| -rw-r--r-- | mod/profile/views/default/profile/javascript.php (renamed from mod/profile/profile.js) | 18 | ||||
| -rw-r--r-- | mod/profile/views/default/profile/metatags.php | 8 | ||||
| -rw-r--r-- | views/default/navigation/topmenu.php | 2 |
5 files changed, 56 insertions, 10 deletions
diff --git a/mod/profile/javascript.php b/mod/profile/javascript.php new file mode 100644 index 000000000..f5af590bf --- /dev/null +++ b/mod/profile/javascript.php @@ -0,0 +1,18 @@ +<?php
+
+ /**
+ * Elgg profile JS
+ *
+ * @package ElggProfile
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Ben Werdmuller <ben@curverider.co.uk>
+ * @copyright Curverider Ltd 2008
+ * @link http://elgg.com/
+ */
+
+ // Get engine
+ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+ echo elgg_view('profile/javascript');
+
+?>
\ No newline at end of file diff --git a/mod/profile/views/default/profile/icon.php b/mod/profile/views/default/profile/icon.php index b98445981..c477a4cb0 100644 --- a/mod/profile/views/default/profile/icon.php +++ b/mod/profile/views/default/profile/icon.php @@ -46,4 +46,22 @@ ?>
- <a href="<?php echo $vars['entity']->getURL(); ?>" class="icon" rel="<?php echo $hoverover; ?>"><img src="<?php echo $vars['url']; ?>pg/icon/<?php echo $username; ?>/<?php echo $vars['size']; ?>/<?php echo $icontime; ?>.jpg" border="0" <?php echo $align; ?> title="<?php echo $name; ?>" <?php echo $vars['js']; ?> /></a>
\ No newline at end of file +<div class="usericon">
+<div class="avatar_menu_button"><img src="graphics/avatar_menu_arrow.gif" width="15" height="15" class="arrow" /></div>
+
+ <div class="sub_menu">
+ <a href="#"><h3>User Name</h3></a>
+ <a href="#" class="item_line">Remove friend</a>
+ <a href="#">Friends</a>
+ <a href="#">Friends of</a>
+
+ <a href="#" class="item_line">Recent activity</a>
+ <a href="#">Visit blog</a>
+ <a href="#" class="item_line">Send private message</a>
+ <a href="#" class="item_line">Ban</a>
+ <a href="#">Edit</a>
+ <a href="#">Report</a>
+
+ </div>
+ <a href="<?php echo $vars['entity']->getURL(); ?>" class="icon" rel="<?php echo $hoverover; ?>"><img src="<?php echo $vars['url']; ?>pg/icon/<?php echo $username; ?>/<?php echo $vars['size']; ?>/<?php echo $icontime; ?>.jpg" border="0" <?php echo $align; ?> title="<?php echo $name; ?>" <?php echo $vars['js']; ?> /></a>
+</div>
\ No newline at end of file diff --git a/mod/profile/profile.js b/mod/profile/views/default/profile/javascript.php index 6043fea98..b7770de05 100644 --- a/mod/profile/profile.js +++ b/mod/profile/views/default/profile/javascript.php @@ -1,3 +1,21 @@ +<?php
+
+ /**
+ * Elgg profile image Javascript
+ *
+ * @package ElggProfile
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Pete Harris <pete@elgg.com>
+ * @copyright Curverider Ltd 2008
+ * @link http://elgg.com/
+ *
+ * @uses $vars['entity'] The user entity
+ */
+
+ header("Content-type: text/javascript");
+
+?>
+
$(document).ready(function() {
// avatar image menu link
diff --git a/mod/profile/views/default/profile/metatags.php b/mod/profile/views/default/profile/metatags.php index 1be959c5a..77b5544e4 100644 --- a/mod/profile/views/default/profile/metatags.php +++ b/mod/profile/views/default/profile/metatags.php @@ -13,10 +13,4 @@ ?>
- <!--
-
- Removed for now.
-
- <script type="text/javascript" src="<?php echo $vars['url']; ?>mod/profile/profile.js" ></script>
-
- -->
\ No newline at end of file + <script type="text/javascript" src="<?php echo $vars['url']; ?>mod/profile/javascript.php" ></script>
diff --git a/views/default/navigation/topmenu.php b/views/default/navigation/topmenu.php index e0e10bfb9..40793c546 100644 --- a/views/default/navigation/topmenu.php +++ b/views/default/navigation/topmenu.php @@ -19,11 +19,9 @@ if (isloggedin()) {
?>
<div id="topmenu">
-<div class="usericon">
<?php
echo elgg_view("profile/icon",array('entity' => $vars['user'], 'size' => 'small'));
?>
-</div>
<div id="header_search">
<form id="searchform" action="<?php echo $vars['url']; ?>search/" method="get">
|