Merged interface changes to profile in.

git-svn-id: http://code.elgg.org/elgg/trunk@5284 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 382 insertions, 54 deletions

diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php
index cf95d9bdb..b475b6bdd 100644
--- a/mod/profile/views/default/profile/css.php
+++ b/mod/profile/views/default/profile/css.php
@@ -1,25 +1,326 @@
 <?php
-
-	/**
-	 * Elgg Profile 
-	 * 
-	 * @package Profile
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 */
-	 
+/**
+ * Elgg Profile 
+ * 
+ * @package Profile
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
 ?>
-
-#profile_icon_wrapper {
+/* ***************************************
+	main layout blocks
+*************************************** */
+#profile_content {
+	float:right;
+	width:700px;
+	position: relative;
+}
+#profile_sidebar {
+	width:230px;
 	float:left;
 }
-	
+.elgg_horizontal_tabbed_nav.profile {
+	margin-top:0px;
+	margin-bottom:25px;
+	position:relative;
+}
+.elgg_horizontal_tabbed_nav.profile .profile_name {
+	display:block;
+	width:265px;
+	position:absolute;
+}
+.elgg_horizontal_tabbed_nav.profile .profile_name h2 {
+	margin:0;
+	padding:0;
+	border:none;
+}
+.elgg_horizontal_tabbed_nav.profile ul {
+	margin-left:260px;
+}
+
+/* ***************************************
+	default avatar icons
+*************************************** */
 .usericon {
 	position:relative;
 }
+.usericon.tiny {
+	width:25px;
+	height:25px;
+}
+.usericon.small {
+	width:40px;
+	height:40px;
+}
+
+/* ***************************************
+	ownerblock in sidebar
+*************************************** */
+#profile_sidebar #owner_block {
+	background-color: #eeeeee;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+	padding:15px;
+	min-height:270px;
+}
+#owner_block .owner_block_icon {
+	float:left;
+	padding:0;
+	margin:0;
+}
+#owner_block .owner_block_icon.large {
+	width:200px;
+	height:200px;
+	overflow: hidden;
+	float:none;
+}
+#owner_block .owner_block_contents {
+	margin-left: 50px;
+}
+#owner_block .owner_block_contents h3 {
+	margin-top:-4px;
+}
+#owner_block .owner_block_contents p.profile_info {
+	margin:0;
+	padding:0;
+	color: #666666;
+}
+#owner_block .owner_block_contents p.profile_info.briefdescription {
+	font-size: 90%;
+	line-height:1.2em;
+	font-style: italic;
+}
+#owner_block .owner_block_contents p.profile_info.location {
+	font-size: 90%;
+}
+#owner_block .profile_actions {
+	margin-top:10px;
+}
+#owner_block .profile_actions a.action_button {
+	margin-bottom:4px;
+	display: table;
+}
+/* ownerblock links to owners tools */
+.owner_block_links {
+	margin-top:5px;
+}
+.owner_block_links ul {
+	margin:0;
+	padding:0;
+	list-style: none;
+}
+.owner_block_links ul li.selected a {
+	background: #4690D6;
+	color:white;
+}
+.owner_block_links ul li a {
+	display:block;
+	-webkit-border-radius: 8px; 
+	-moz-border-radius: 8px;
+	background-color:white;
+	margin:3px 0 5px 0;
+	padding:2px 4px 2px 8px;
+}
+.owner_block_links ul li a:hover {
+	background:#0054A7;
+	color:white;
+	text-decoration:none;
+}
+
+
+/* ***************************************
+	admin menu in sidebar
+*************************************** */
+.owner_block_links .admin_menu_options {
+	display: none;
+}
+.owner_block_links ul.admin_menu {
+	background-color:white;
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	cursor:pointer;
+}
+.owner_block_links ul.admin_menu li a {
+	background-color: red;
+	color:white;
+	margin-bottom:0;
+}
+.owner_block_links ul.admin_menu li ul.admin_menu_options li a {
+	color:red;
+	background-color:white;
+	display:block;
+	margin:0px;
+	padding:2px 4px 2px 13px;
+}
+.owner_block_links ul.admin_menu li ul.admin_menu_options li a:hover {
+	color:black;
+	background:none;
+	text-decoration: underline;
+}
+
+
+/* ***************************************
+	full profile info panel
+*************************************** */
+#profile_content .odd {
+	background-color:#f4f4f4;
+	-webkit-border-radius: 4px; 
+	-moz-border-radius: 4px;
+	margin:0 0 7px 0;
+	padding:2px 4px 2px 4px;
+}
+#profile_content .even {
+	background-color:#f4f4f4;
+	-webkit-border-radius: 4px; 
+	-moz-border-radius: 4px;
+	margin:0 0 7px 0;
+	padding:2px 4px 2px 4px;
+}
+#profile_content .aboutme_title {
+	background-color:#f4f4f4;
+	-webkit-border-radius: 4px; 
+	-moz-border-radius: 4px;
+	margin:0 0 0px 0;
+	padding:2px 4px 2px 4px;
+}
+#profile_content .aboutme_contents {
+	padding:2px 0 0 3px;
+}
+
 
+/* ***************************************
+	friends panel within profile
+*************************************** */
+#profile_content .entity_listing .entity_listing_info {
+	width:664px;
+}
+
+
+/* ***************************************
+	twitter panel within profile
+*************************************** */
+ul#twitter_update_list li {
+	background-image: url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/speech_bubble_tail.gif);
+	background-position:right bottom;
+	background-repeat: no-repeat;
+	list-style-image:none;
+	list-style-position:outside;
+	list-style-type:none;
+	margin:0 0 5px 0;
+	padding:0;
+	overflow-x: hidden;
+}
+ul#twitter_update_list li span {
+	color:#666666;
+	background:#ececec;
+	-webkit-border-radius: 4px; 
+	-moz-border-radius: 4px;
+	padding:3px 5px 4px 5px;
+	display:block;
+}
+ul#twitter_update_list li a {
+	display:block;
+	margin:-2px 0 0 4px;
+}
+ul#twitter_update_list li span a {
+	display:inline !important;
+}
+p.visit_twitter a {
+    background:url(<?php echo $vars['url']; ?>mod/elgg_layout/graphics/twitter16px.png) left no-repeat;
+    padding:0 0 0 20px;
+    margin:0;
+}
+.visit_twitter {
+	padding:5px 0;
+	margin:0 0 0 0;
+	border-top:1px solid #dedede;
+}
+
+
+/* ***************************************
+	edit profile page
+*************************************** */
+form#edit_profile {
+	margin-top:10px;
+}
+
+
+/* ***************************************
+	user avatar upload & crop page
+*************************************** */
+#avatar_upload {
+	height:145px;
+}	
+#current_user_avatar {
+	float:left;
+	width:160px;
+	height:130px;
+	border-right:1px solid #cccccc;
+	margin:0 20px 0 0;
+}	
+#avatar_croppingtool {
+	border-top: 1px solid #cccccc;
+	margin:20px 0 0 0;
+	padding:10px 0 0 0;
+}	
+#avatar_croppingtool .current_user_avatar {
+	float: left;
+	margin-right: 20px;
+}	
+#avatar_croppingtool .user_avatar_crop_preview {
+	float: left;
+	position: relative;
+	overflow: hidden;
+	width: 100px;
+	height: 100px;
+}
+
+
+/* ***************************************
+	banned user
+*************************************** */
+/* banned user full profile panel */
+#profile_content .banned_user {
+	border:2px solid red;
+	padding:4px 8px;
+	-webkit-border-radius: 6px; 
+	-moz-border-radius: 6px;
+}
+/* banned user in friends lists */
+.entity_listing_info p.entity_title.user.banned {
+	text-decoration: line-through;
+}
+.entity_listing_info p.entity_title.user.banned a {
+	color:red;
+}
+
+
+/* ***************************************
+	admin area - custom profile fields
+*************************************** */
+.default_profile_reset {
+	border-top: 1px solid #dedede;
+	margin-top:30px;
+}
+.default_profile_reset input[type="submit"] {
+	background: #dedede;
+	border-color: #dedede;
+	color:#666666;
+	text-shadow: none;
+	float:right;
+}
+.default_profile_reset input[type="submit"]:hover {
+	background: red;
+	border-color: red;
+	color:white;
+}
+
+
+/* ***************************************
+	avatar drop-down menu
+*************************************** */
 .avatar_menu_button {
 	width:15px;
 	height:15px;
@@ -44,53 +345,56 @@
 	width:15px;
 	height:15px;
 }
+/* user avatar submenu options */
 .usericon div.sub_menu { 
 	display:none; 
 	position:absolute; 
-	padding:2px; 
+	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:160px; 
+	width:164px; 
 	background:#FFFFFF; 
 	text-align:left;
+	-webkit-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50); /* safari v3+ */
+	-moz-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50); /* FF v3.5+ */
 }
 div.usericon a.icon img {
 	z-index:10;
 }
-
-.usericon div.sub_menu a {margin:0;padding:2px;}
 .usericon div.sub_menu a:link, 
 .usericon div.sub_menu a:visited, 
-.usericon div.sub_menu a:hover{ display:block;}	
-.usericon div.sub_menu a:hover{ background:#cccccc; text-decoration:none;}
-
+.usericon div.sub_menu a:hover { 
+	display:block;
+}	
+.usericon div.sub_menu a:hover {
+	background:#cccccc;
+	text-decoration:none;
+}
 .usericon div.sub_menu h3 {
-	font-size:1.2em;
-	padding-bottom:3px;
+	font-size:1.3em;
+	line-height: 1.1em;
+	padding:0;
 	border-bottom:solid 1px #dddddd;
 	color: #4690d6;
 	margin:0 !important;
 }
-.usericon div.sub_menu h3:hover {
-
+.usericon div.sub_menu h3 a {
+	padding:3px 3px 3px 6px !important;
 }
-
-.user_menu_addfriend,
-.user_menu_removefriend,
-.user_menu_profile,
-.user_menu_friends,
-.user_menu_friends_of,
-.user_menu_blog,
-.user_menu_file,
-.user_menu_messages,
-.user_menu_admin,
-.user_menu_pages {
-	margin:0;
-	padding:0;
+.usericon div.sub_menu p {
+	margin:0 !important;
+	padding:0 !important;
+	height:auto !important;
+	line-height:1.2em !important;
+	font-size:12px !important;
 }
+.usericon div.sub_menu p a {
+	padding:3px 3px 3px 6px !important;
+}
+/* admin menu options in avatar submenu */
 .user_menu_admin {
 	border-top:solid 1px #dddddd;
 }
@@ -101,24 +405,48 @@ div.usericon a.icon img {
 	color:white !important;
 	background:red !important;
 }
+/* /////////////////////////////////////////////////////////////// >>>END verified */
+
 
-.resetdefaultprofile {
-	padding:0 10px 0 10px;
+
+/*
+#profile_status_wrapper {
+	background-color:#eeeeee;
+	-webkit-border-radius: 4px; 
+	-moz-border-radius: 4px;
+	padding:2px 4px 2px 4px;
+	margin:0 0 7px 0;
+	line-height:1.2em;
+	min-height:16px;
+	
+	position: relative;
 }
-.resetdefaultprofile input[type="submit"] {
-	background: #dedede;
-	border-color: #dedede;
-	color:#333333;
+#profile_status_wrapper.inline {
+	margin-top:10px;
 }
-.resetdefaultprofile input[type="submit"]:hover {
-	background: red;
-	border-color: red;
-	color:white;
+.profile_status span {
+	display:block;
+	font-size:90%;
+	color:#666666;	
 }
+a.status_update {
+	float:right;	
+}
+div.profile_status {
+	z-index: 2;
+	position: relative;
+}
+#profile_status_tail {
+	position: absolute;
+	width:17px;
+	height:12px;
+	left:-11px;
+	bottom:-5px;
 
-/* Banned user */
-#profile_banned {
-	background-color:#FF8888;
-	border:3px solid #FF0000;
-	padding:2px;
-}
\ No newline at end of file
+	background-image: url(<?php echo $vars['url']; ?>mod/thewire/graphics/speech_tail.png);
+	background-position: 0 0;
+	background-repeat: no-repeat;
+	background-color:transparent;
+	z-index: 1;
+}
+*/
\ No newline at end of file