profile, forum and canvas updated

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

4 files changed, 42 insertions, 12 deletions

diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php
index 7eb5fa624..e6223bec7 100644
--- a/mod/profile/views/default/profile/css.php
+++ b/mod/profile/views/default/profile/css.php
@@ -48,4 +48,4 @@
 .usericon div.sub_menu a:hover{ background:#cccccc; text-decoration:none;}

 .usericon .item_line { border-top:solid 1px #dddddd;}

 

-.usericon div.sub_menu h3 {font-size:1.2em;}
\ No newline at end of file
+.usericon div.sub_menu h3 {font-size:1.2em;}

diff --git a/mod/profile/views/default/profile/userdetails.php b/mod/profile/views/default/profile/userdetails.php
index fd6c2c2bf..e17104d22 100644
--- a/mod/profile/views/default/profile/userdetails.php
+++ b/mod/profile/views/default/profile/userdetails.php
@@ -73,9 +73,12 @@
 					$value = $vars['entity']->$shortname;
 					if (!empty($value)) {
 					
-	?>
+				//This function controls the alternating class
+                $even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';					
+	
 
-	<p>
+	echo "<p class=\"{$even_odd}\">";
+	?>
 		<b><?php
 
 			echo elgg_echo("profile:{$shortname}");
diff --git a/views/default/canvas/layouts/narrow_right_sidebar.php b/views/default/canvas/layouts/narrow_right_sidebar.php
index abb1ca733..00615afbb 100644
--- a/views/default/canvas/layouts/narrow_right_sidebar.php
+++ b/views/default/canvas/layouts/narrow_right_sidebar.php
@@ -26,7 +26,7 @@
     

 <!-- main content -->

 <div id="layout_maincontent" class="has_narrow_sidebar_right">

-<div id="wrapper_maincontent">

+<div id="wrapper_maincontent" class="content_area">

 

     <?php echo $vars['area1']; ?>

 	

diff --git a/views/default/css.php b/views/default/css.php
index 5f72f56f3..44fdde05b 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -191,7 +191,11 @@ h6 { font-size: 0.8em; }
 	width:160px;
 	min-height: 260px;
 	float:right;
-	padding:0px 0px 20px 10px;
+	/* padding:0px 0px 20px 10px;*/
+	background: white;
+	padding:10px;
+	border-bottom:1px solid #cccccc;
+	border-right:1px solid #cccccc;
 }
 
 #layout_maincontent {
@@ -223,6 +227,12 @@ h6 { font-size: 0.8em; }
 	border-bottom:1px solid #cccccc;
 	border-right:1px solid #cccccc;
 }
+#wrapper_maincontent.content_area {
+	background: white;
+	padding:20px;
+	border-bottom:1px solid #cccccc;
+	border-right:1px solid #cccccc;
+}
 
 
 
@@ -855,7 +865,7 @@ input[type="submit"] {
 .input-tags,
 .input-url,
 .input-textarea {
-	width:100%;
+	width:98%;
 }
 
 .input-textarea {
@@ -910,6 +920,11 @@ input[type="submit"] {
 	letter-spacing: -0.03em;
 }
 
+/* title within main content area */
+.page_title {
+	padding:0px 10px 20px 0px;
+}
+
 
 .elggtoolbar .elggtoolbar_header h1,
 .collapsable_box_header h1 {
@@ -963,10 +978,15 @@ p.user_menu_friends_of {
 #profile_info_column_right {
 	float:left;
 	width:260px;
+	/* width:100%; */
 }
 #profile_info_column_right p {
 	margin:7px 0 7px 0;
 	line-height:1.3em;
+	padding:2px 4px 2px 4px;
+}
+#profile_info_column_right .odd {
+	background:#f5f5f5;
 }
 #profile_info_wide p {
 	margin:7px 0 7px 0;
@@ -1034,7 +1054,7 @@ p.user_menu_friends_of {
 	
 .search_listing_info {
 	margin-left: 50px;
-	height: 40px;
+	min-height: 40px;
 }
 
 .search_listing_info p {
@@ -1129,16 +1149,23 @@ p.user_menu_friends_of {
 	border:1px solid red;
 }
 
+
+/* ***************************************
+	GENERIC COMMENTS
+*************************************** */
+.generic_comment_owner {
+	font-size: 90%;
+	color:#666666;
+}
+
+
 /* ***************************************
 	END
 *************************************** */
 
-.page_title {
-	padding:0px 10px 20px 0px;
-}
-	
+/* not needed? - replaced by #wrapper_maincontent.single_column */
 #forums, #forum_topics, #topic_posts {
-	background:white;
+	/* background:white;*/
 }