cobricks-cvscommit

[lochmann <loc...@us...>]

Update of /cvsroot/cobricks/cobricks2/web/user
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17035/web/user

Modified Files:
	user-buddylist.html.en card.html.en 
Added Files:
	user-buddylist-search.html.en user-allpaths.html.en 
Log Message:
Social Networks.

--- NEW FILE: user-allpaths.html.en ---
#parse ( "pageheader.html" )

#set ( $userida =  $userManager.getUserIdForUserLogin($!usera) )
#set ( $useridb =  $userManager.getUserIdForUserLogin($!userb) )

#set ( $usera = $userManager.getUser($userida) )
#set ( $userb = $userManager.getUser($useridb) )

#set ( $usernamea = $usera.getUserLogin() )
#set ( $usernameb = $userb.getUserLogin() )

<h1>Social Networks</h1>

<p>
	Paths from user <em> $usernamea </em> to user <em> $usernameb </em>
</p>

#set ( $paths = $userPresenter.getUserPaths($userida, $useridb) )
#set ( $pathssize = $paths.size() )
#set ( $pathsmaxindex = $pathssize - 1 )

<p>
	Number of found paths: $pathssize<br>
	Showing only the first 10 results.
</p>
#set ( $first = 1 )
#set ( $indexpath = 0 )
<table border=0 style="table-layout:fixed;">
	#foreach ($j in $paths)
		#set ( $indexpath = $indexpath + 1 )
		#if ( $indexpath < 10 ) 
				
		<tr>
			<td>$indexpath</td>
		
			#set ( $maxindex = $j.size() - 1 )
			#set ( $index = 0 )
			#foreach ($i in $j)
				#set ( $useri = $userManager.getUser($i) )
				<td height=32 valign=bottom align=center style="border:1px solid #DFDFDF;">
					
					#set ($imageuri = "")
					#set ($imageuri = $useri.getAttribute("basic.personal.imageuri"))
					#if ($imageuri == "")
						#set ($imageuri = "/images/nouser.png")
					#end
			
					&nbsp;<img src="$imageuri" width=32 height=32>
		
					#set ($userLogin = $useri.getUserLogin())
		
					<br> $userLogin 
				</td>
				#if($index != $maxindex)
					<td valign=middle align=center>
						<img src="/images/arrow.png">
					</td>
				#end
				#set ($index = $index + 1)
			#end
		</tr>
		#end
	#end
</table>

#parse ( "pagefooter.html" )

--- NEW FILE: user-buddylist-search.html.en ---
#parse ( "pageheader.html" )

<h1>Search user</h1>

<form action="user-buddylist-search.html" method=get>
	<input type=hidden name=auserlogin value=$!auserlogin>
	<input type=hidden name=print value=$!print>
	
	<table border=0>
		<tr>
			<td>User login</td>
			<td>
				<input type=text name=searchUserLogin>
			</td>
		</tr>
		<tr>
			<td>First name</td>
			<td>
				<input type=text name=searchFirstName>
			</td>
		</tr>
		<tr>
			<td>Last name</td>
			<td>
				<input type=text name=searchLastName>
			</td>
		</tr>
		<tr>
			<td>Sort by</td>
			<td>
				<select width="40" name="sort">
	      			<option value="1">Login name</option>
	      			<option value="2">Lastname</option>
	      			<option value="3">Firstname</option>
	      		</select>
	      	</td>
	    </select>
		<tr>
			<td>
				<input type=submit name=cmd value=Search>
			</td>
		</tr>
	</table>
</form>
		
<br><br>

<script type="text/javascript">
//<!--
	function OkSubmit() {
		selected = "";
		for(i=0; i < document.getElementById("frm").elements.length; i++) {
			if(document.getElementById("frm").elements[i].name == "newUserLogin") {
				if(document.getElementById("frm").elements[i].checked == true) {
					selected = document.getElementById("frm").elements[i].value;
				}
			}
		}
		opener.document.getElementById("frm1").newUserLogin.value = selected;
		window.close();
	}
	
	function openerGoTo(s) {
		opener.location.href = s;
		window.close();
	}

	document.write("<form name=frm id=frm onSubmit=\"OkSubmit();return false;\">");
// -->
</script>

<noscript>
	<form action="user-buddylist.html" method=get>
</noscript>

	<input type=hidden name=auserlogin value=$!auserlogin>

	<table border=0 width="100%">
		<tr bgcolor="#dfdfdf">
			<td>
				&nbsp;
			</td>
			<td>
				<b>Image</b>
			</td>
			
			<td>
				<b>Login</b>
			</td>
			<td>
				<b>Name</b>
			</td>
			<td>
				<b>e-mail</b>
			</td>
		</tr>
		
#set ( $cmd = $!cmd )
#if ($cmd == "Search")

	#set ( $loginCond = "1" )
	#set ( $fnameCond = "1" )
	#set ( $lnameCond = "1" )

	#set ( $login = $!searchUserLogin )
	#set ( $fname = $!searchFirstName )
	#set ( $lname = $!searchLastName )

	#set ( $listNames = ["auserlogin", "basic.personal.firstname", "basic.personal.lastname"] )
	#set ( $listConditions = [$loginCond, $fnameCond, $lnameCond] )
	#set ( $listValues = [$login, $fname, $lname] )
	#set ( $orFlag = false )
	#set ( $sortBy = "$!sort" )

	#set ($result = $userPresenter.searchUsers($!listNames, $!listConditions, $!listValues, $!orFlag, $!sortBy, -1, "user"))

	#if (($result))
		#set( $number = 0 )
  		#foreach ($i in $result)  
    		#set ($uId = $i.getUserId())
    		#set( $number = $number + 1 )
      		<tr bgcolor = "#dfdfdf">
      			<td>
      				<input type=radio name=newUserLogin value="$i.getUserLogin()">
      			</td>
        		<td>
			#set ($imageuri = "")
			#set ($imageuri = $i.getAttribute("basic.personal.imageuri"))
			#if ("$!imageuri"!="")
					<img src="$imageuri" width="32" height=32>&nbsp;
			#end
			
			</td>
			
			<td>
          	
          	<script type="text/javascript">
			// <!--
          		document.write("<a href=\"javascript:openerGoTo('/user/card.html?auserlogin=$i.getUserLogin()');\"> $i.getUserLogin()</a>");
          	// -->
          	</script>
          	
          	<noscript>
	          	<a href="card.html?auserlogin=$i.getUserLogin()"> $i.getUserLogin()</a>
	        </noscript>
          			
        		</td>
        		<td>
          			$i.getName()
        		</td>
        		<td>
          			$!i.getAttribute("basic.contact.online.email")
        		</td>
      		</tr>
  		#end
	#else
		<tr bgcolor="#dfdfdf">
			<td colspan=4>
				<div class="info">The search for users has no results</div>
			</td>
		</tr>
	#end

#else
	<tr bgcolor="#dfdfdf">
		<td colspan=4>
			No search was performed
		</td>
	</tr>
#end

	</table>
	<input type=submit value=OK>
</form>


#parse ( "pagefooter.html" )


Index: user-buddylist.html.en
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/web/user/user-buddylist.html.en,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- user-buddylist.html.en	5 Jul 2005 05:35:35 -0000	1.2
+++ user-buddylist.html.en	12 Feb 2006 19:07:48 -0000	1.3
@@ -83,12 +83,32 @@
 
 <br><br>
 <table width="100%">
-  <tr bgcolor="dfdfdf"><td width="7%"><b>Delete</b></td><td width="43%"><b>Name</b></td><td width="50%"><b>E-Mail</b></td></tr>
+  <tr bgcolor="dfdfdf">
+  	<td width="7%">
+  		<b>Delete</b>
+  	</td>
+  	<td width="12%">
+  		<b>Image</b>
+  	</td>
+  	<td width="43%">
+  		<b>Name</b>
+  	</td>
+	<td width="38%">
+		<b>E-Mail</b>
+	</td>
+  </tr>
   #set ($result = $userPresenter.getUserAttrSet($auserid, "pim.network.buddylist"))
   #if ($result.size() > 0)  
     #foreach ($i in $result)
       <tr bgcolor="dfdfdf"> 	
         <td align="center"><input type="checkbox" name="id" value="$i.getId()"></td>
+        <td valign=center>&nbsp;
+        #set ($imageuri = "")
+		#set ($imageuri = $i.getAttribute("basic.personal.imageuri"))
+		#if ("$!imageuri"!="")
+			<img src="$imageuri" width="32" height=32>
+		#end
+		</td>
         <td><a href="/user/card.html?auserlogin=$i.getUserLogin()">$i.getName()</a></td>    
         <td>
           #if ($i.getAttribute("basic.contact-work.online.email"))
@@ -108,7 +128,7 @@
 
 <p>
 
-<form action="/USER" method="post">
+<form action="/USER" method="post" name=frm1 id=frm1>
 <input type="hidden" name="cmd" value="addListMember" />
 <input type="hidden" name="cmd.success" value="/user/user-buddylist.html" />
 <input type="hidden" name="cmd.error" value="/user/user-buddylist.html" />
@@ -123,6 +143,16 @@
 <input type="submit" value="Add to the list">
 <input name="newUserLogin" size="20" value="$!newUserLogin">
 
+<script type="text/javascript">
+// <!--
+	document.write("<input type=button value=Search onClick=\"window.open('/user/user-buddylist-search.html?print=true&auserlogin=$auserlogin','usersearch','width=500,height=500,scrollbar=yes,menu=no');\">");
+// -->
+</script>
+
+<noscript>
+	<a href="/user/user-buddylist-search.html?auserlogin=$auserlogin">Search</a>
+</noscript>
+
 </td></tr></table>
 
 </td></tr></table>

Index: card.html.en
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/web/user/card.html.en,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- card.html.en	18 Mar 2005 14:18:20 -0000	1.11
+++ card.html.en	12 Feb 2006 19:07:48 -0000	1.12
@@ -36,6 +36,59 @@
 
 <hr>
 
+#set ( $loggedinid = $userManager.getUserIdForUserLogin($userLogin) )
+
+<h3>Path to this user</h3>
+
+(<a href="/user/user-allpaths?usera=$userLogin&userb=$auserlogin">show all paths</a>)
+<br>
+
+#set ($result = $userPresenter.getUserPath($loggedinid, $auserid))
+#set ($resultsize = $result.size())
+#set ($maxindex = $resultsize - 1)
+
+#if ($resultsize == 0)
+	No path to this user found.
+#else
+	<table border=0 style="table-layout:fixed;">
+	<tr>
+	#set ($index = 0)
+	#foreach ($i in $result)
+		<td height=32 valign=bottom align=center style="border:1px solid #DFDFDF;">
+			#set ($imageuri = "")
+			#set ($imageuri = $i.getAttribute("basic.personal.imageuri"))
+			#if ($imageuri == "")
+				#set ($imageuri = "/images/nouser.png")
+			#end
+			
+			&nbsp;<img src="$imageuri" width=32 height=32>
+		
+		#set ($userLogin = $i.getUserLogin())
+		
+			<br> $userLogin 
+		</td>
+		#if($index != $maxindex)
+			<td valign=middle rowspan=2 align=center>
+				<img src="/images/arrow.png">
+			</td>
+		#end
+		#set ($index = $index + 1)
+	#end
+	<!--
+	</tr><tr>
+	#foreach ($i in $result)
+		#set ($userLogin = $i.getUserLogin())
+		<td align=center>
+			$userLogin 
+		</td>
+	#end
+	-->
+	</tr>
+	</table>
+#end
+
+<hr>
+
 <h3>All public attributes</h3>
 
 #set ($attrNames = [])