From 2f224e4ee258c61e9de6add60ec23a5e9716edb8 Mon Sep 17 00:00:00 2001
From: Eric Rasmussen <erasmussen2@unl.edu>
Date: Fri, 18 Sep 2009 21:19:56 +0000
Subject: [PATCH] more work on globe
---
plugins/globe/start.php | 2 +-
plugins/globe/views/default/globe/content.php | 15 ++++++++-------
plugins/globe/views/default/globe/css.php | 2 +-
plugins/globe/views/default/globe/globecontrol.js | 2 +-
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/plugins/globe/start.php b/plugins/globe/start.php
index c17bf4af..9256ff98 100644
--- a/plugins/globe/start.php
+++ b/plugins/globe/start.php
@@ -31,7 +31,7 @@
- // Extend system CSS with our own styles, which are defined in the thewire/css view
+ // Extend system CSS with our own styles, which are defined in the globe/css view
extend_view('css','globe/css');
diff --git a/plugins/globe/views/default/globe/content.php b/plugins/globe/views/default/globe/content.php
index 1647e5b8..65c1d7ad 100644
--- a/plugins/globe/views/default/globe/content.php
+++ b/plugins/globe/views/default/globe/content.php
@@ -118,7 +118,7 @@
}
}
else
- echo 'You haven\'t added any friends yet but that\'s ok, we\'ll help you find some.';
+ echo 'You haven\'t added any friends yet but that\'s ok, <a href="' . $CONFIG->url .'pg/browse">we\'ll help you find some</a>.';
?>
@@ -131,13 +131,13 @@
<div class="globeGroup two_col middle" id="plotRoles">
- <h3 class="sec_header">Other <?php
+ <h3 class="sec_header"><?php
if($me->profile_role == 'prospect')
echo 'Prospective Students';
else if($me->profile_role == 'student')
echo 'Students';
else if($me->profile_role == 'parent')
- echo 'Parents';
+ echo 'Fellow Parents';
else if($me->profile_role == 'alum')
echo 'Alumni';
else if($me->profile_role == 'facstaff')
@@ -147,14 +147,14 @@
else if($me->profile_role == 'friends')
echo 'Friends of UNL';
else
- echo 'Users Like You';
+ echo 'Other Users Like You';
?> <span class="plotOnMap">Show All</span></h3>
<script type="text/javascript">var role = new Array();</script>
<?php
$rc = 0;
$currentUser = get_loggedin_user();
- $roles = get_entities_from_relationship("friend",$currentUser->guid,false,"user","",0,"",100);
- if($roles){
+ $roles = get_entities_from_metadata("profile_role", $me->profile_role, "user","",0,300);
+ if($me->profile_role){
foreach($roles as $user){
$user = get_user($user->guid);
@@ -186,7 +186,7 @@
}
}
else
- echo 'You haven\'t added any friends yet but that\'s ok, we\'ll help you find some.';
+ echo 'Define your relationship to UNL by <a href="'.$CONFIG->url.'mod/profile/edit.php?username='.$me->username.'">editing your profile</a> and see other users like you!';
?>
@@ -197,6 +197,7 @@
<div class="globeGroup col right" id="plotFeatured">
<h3 class="sec_header">Featured Huskers <span class="plotOnMap">Show All</span></h3>
+
<!-- row 1 -->
<div class="member_icon">
<img onclick="displayFeaturedPerson(husker[0]);" src="<?php echo $CONFIG->url ?>mod/customindex/witw_icons/Nancy_Andreasen_tiny.jpg" alt="Profile Icon" />
diff --git a/plugins/globe/views/default/globe/css.php b/plugins/globe/views/default/globe/css.php
index 3c07cedf..6c7bf833 100644
--- a/plugins/globe/views/default/globe/css.php
+++ b/plugins/globe/views/default/globe/css.php
@@ -32,7 +32,7 @@ span.plotOnMap.hide {
#plotMe {
background:#eeeeee;
margin:10px 0;
- padding:5px 5px 13px 15px;
+ padding:5px 5px 3px 15px;
-moz-border-radius:5px;
position:relative;
}
diff --git a/plugins/globe/views/default/globe/globecontrol.js b/plugins/globe/views/default/globe/globecontrol.js
index da7a1592..2da7eb56 100644
--- a/plugins/globe/views/default/globe/globecontrol.js
+++ b/plugins/globe/views/default/globe/globecontrol.js
@@ -50,7 +50,7 @@ function show(type){
//auto fill the globe with featured huskers
counter=0;
- setTimeout("displayPeople('fole');",1000);
+ setTimeout("displayPeople('role');",1000);
} else if(type=='featured'){
counterMax = husker.length;
//put in the pins for featured huskers
--
GitLab