dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8546
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-10-16 17:30:28 +0200
message:
  Improved profile js
modified:
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/profile.js
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/profile.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/profile.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/profile.js	2012-10-16 12:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/profile.js	2012-10-16 15:30:28 +0000
@@ -1,6 +1,19 @@
 
+function showProfileIntro()
+{
+	$( ".userRow" ).each( function( index, element ) 
+	{
+		var fromTop = $( element ).position().top;
+		
+		if ( fromTop > 420 )
+		{
+			$( element ).hide();
+		}
+	} );
+}
+
 function showFullProfile()
 {
+	$( ".userRow" ).show();
 	$( "#userInfoLink" ).hide();
-	$( "#userInfo" ).css( "height", "auto" );
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/profile.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/profile.vm	2012-10-16 12:18:26 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/profile.vm	2012-10-16 15:30:28 +0000
@@ -1,5 +1,6 @@
 <script type="text/javascript">
-jQuery( document ).ready( function() {   
+jQuery( document ).ready( function() {
+    showProfileIntro();
     jQuery( "#profileInterpretationFeed" ).load( "getInterpretations.action?userId=${user.uid}" );
 } );
 </script>

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2012-10-16 12:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2012-10-16 15:30:28 +0000
@@ -438,9 +438,8 @@
 #userInfo
 {
   margin-left: 36px;
-  height: 304px;
   overflow: hidden;
-  margin-bottom: 6px;
+  margin-bottom: 14px;
 }
 
 #userInfoLink