aboutsummaryrefslogtreecommitdiff
path: root/mod/profile
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-19 19:02:23 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-19 19:02:23 +0000
commit34a9a3e8c4514683cc71c82981da69249c09574e (patch)
tree5e7a0941e0352eb2db09f813ca6f94dde64c7114 /mod/profile
parenta7b0a98e223e36090f7b2fc2a68a036e655727cc (diff)
downloadelgg-34a9a3e8c4514683cc71c82981da69249c09574e.tar.gz
elgg-34a9a3e8c4514683cc71c82981da69249c09574e.tar.bz2
using elgg-user-icon instead of usericon and moving the css into core
git-svn-id: http://code.elgg.org/elgg/trunk@7689 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/profile')
-rw-r--r--mod/profile/start.php1
-rw-r--r--mod/profile/views/default/profile/css.php138
-rw-r--r--mod/profile/views/default/profile/javascript.php8
3 files changed, 4 insertions, 143 deletions
diff --git a/mod/profile/start.php b/mod/profile/start.php
index 2f817b644..017f91378 100644
--- a/mod/profile/start.php
+++ b/mod/profile/start.php
@@ -33,7 +33,6 @@ function profile_init() {
elgg_extend_view('html_head/extend', 'profile/metatags');
elgg_extend_view('css/screen', 'profile/css');
- elgg_extend_view('js/elgg', 'profile/javascript');
// Register actions
elgg_register_action("profile/addcomment", $CONFIG->pluginspath . "profile/actions/addcomment.php");
diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php
index 3ad8d7a29..9de6d0a0b 100644
--- a/mod/profile/views/default/profile/css.php
+++ b/mod/profile/views/default/profile/css.php
@@ -47,49 +47,6 @@
}
/* ***************************************
- default avatar icons
-*************************************** */
-.usericon {
- position:relative;
-}
-.usericon.tiny,
-img.tiny {
- width:25px;
- height:25px;
- /* remove the border-radius if you don't want rounded avatars in supported browsers */
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- -moz-background-clip: border;
-
- -o-background-size: 25px;
- -webkit-background-size: 25px;
- -khtml-background-size: 25px;
- -moz-background-size: 25px;
-}
-.usericon.small,
-img.small {
- width:40px;
- height:40px;
- /* remove the border-radius if you don't want rounded avatars in supported browsers */
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- -moz-background-clip: border;
-
- -o-background-size: 40px;
- -webkit-background-size: 40px;
- -khtml-background-size: 40px;
- -moz-background-size: 40px;
-}
-img.large {
- width:200px;
- height:200px;
-}
-img.medium {
- width:100px;
- height:100px;
-}
-
-/* ***************************************
ownerblock in sidebar
*************************************** */
#profile_sidebar #owner_block {
@@ -371,98 +328,3 @@ p.visit_twitter a {
}
-/* ***************************************
- avatar drop-down menu
-*************************************** */
-.avatar_menu_button {
- width:15px;
- height:15px;
- position:absolute;
- cursor:pointer;
- display:none;
- right:0;
- bottom:0;
-}
-.avatar_menu_arrow {
- background: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -150px top;
- width:15px;
- height:15px;
-}
-.avatar_menu_arrow_on {
- background: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -150px -16px;
- width:15px;
- height:15px;
-}
-.avatar_menu_arrow_hover {
- background: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -150px -32px;
- width:15px;
- height:15px;
-}
-/* user avatar submenu options */
-.usericon .sub_menu {
- display:none;
- position:absolute;
- padding:0;
- margin:0;
- border-top:solid 1px #E5E5E5;
- border-left:solid 1px #E5E5E5;
- border-right:solid 1px #999999;
- border-bottom:solid 1px #999999;
- width:164px;
- background:#FFFFFF;
- text-align:left;
- -webkit-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);
- -moz-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);
- font-size:14px;
-}
-div.usericon a.icon img {
- z-index:10;
-}
-.usericon .sub_menu a:link,
-.usericon .sub_menu a:visited,
-.usericon .sub_menu a:hover {
- display:block;
- font-weight: normal;
-}
-.usericon .sub_menu a:hover {
- background:#cccccc;
- text-decoration:none;
-}
-.usericon .sub_menu .displayname {
- padding:0 !important;
- margin:0 !important;
- border-bottom:solid 1px #dddddd !important;
- font-size:14px !important;
-}
-.usericon .sub_menu .displayname a {
- padding:3px 3px 3px 8px;
- font-size:14px;
- font-weight: bold;
-}
-.usericon .sub_menu .displayname a .username {
- display:block;
- font-weight: normal;
- font-size:12px;
- text-align: left;
- margin:0;
-}
-.sub_menu ul.sub_menu_list {
- list-style: none;
- margin-bottom:0;
- padding-left:0;
-}
-.usericon .sub_menu a {
- padding:2px 3px 2px 8px;
- font-size:12px;
-}
-/* admin menu options in avatar submenu */
-.user_menu_admin {
- border-top:solid 1px #dddddd;
-}
-.usericon .sub_menu li.user_menu_admin a {
- color:red;
-}
-.usericon .sub_menu li.user_menu_admin a:hover {
- color:white;
- background:red;
-}
diff --git a/mod/profile/views/default/profile/javascript.php b/mod/profile/views/default/profile/javascript.php
index 96b57fb95..b0dbc79ee 100644
--- a/mod/profile/views/default/profile/javascript.php
+++ b/mod/profile/views/default/profile/javascript.php
@@ -22,7 +22,7 @@ function setup_avatar_menu(parent) {
}
// avatar image menu link
- $(parent).find("div.usericon img").mouseover(function() {
+ $(parent).find("div.elgg-user-icon img").mouseover(function() {
// find nested avatar_menu_button and show
$(this.parentNode.parentNode).children(".avatar_menu_button").show();
$(this.parentNode.parentNode).children("div.avatar_menu_button").addClass("avatar_menu_arrow");
@@ -56,7 +56,7 @@ function setup_avatar_menu(parent) {
}
else {
// get avatar dimensions
- var avatar = $(this).parent().parent().parent().find("div.usericon");
+ var avatar = $(this).parent().parent().parent().find("div.elgg-user-icon");
//alert( "avatarWidth: " + avatar.width() + ", avatarHeight: " + avatar.height() );
// move submenu position so it aligns with arrow graphic
@@ -118,8 +118,8 @@ function setup_avatar_menu(parent) {
// and hide arrow button
$(document).click(function(event) {
var target = $(event.target);
- if (target.parents(".usericon").length == 0) {
- $(".usericon div.sub_menu").fadeOut();
+ if (target.parents(".elgg-user-icon").length == 0) {
+ $(".elgg-user-icon div.sub_menu").fadeOut();
$(".avatar_menu_button").removeClass("avatar_menu_arrow");
$(".avatar_menu_button").removeClass("avatar_menu_arrow_on");
$(".avatar_menu_button").removeClass("avatar_menu_arrow_hover");