Merge branch 'master' of github.com:ese-unibe-ch/ese2011-team5

ese-unibe-ch · Dec 21, 2011 · cfe8ba9 · cfe8ba9
2 parents 028f8b7 + 3703da0
commit cfe8ba9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/app/views/Application/search.html b/app/views/Application/search.html
@@ -3,7 +3,6 @@
 #{/ifnot}
 
 #{list items:results, as:'user'}
-
 		#{ifnot currentUser.equals(user)}
 			<li>
 				<a href=@{Application.showOtherCalendars(user.getName())}>${user.getName()}</a>
@@ -12,7 +11,4 @@
 				#{/ if}
 			</li>
 		#{/ ifnot}
-
-
-
 #{/list}
diff --git a/app/views/rightbox.html b/app/views/rightbox.html
@@ -14,7 +14,8 @@
 							<li style="margin-left: -20px;">${group.getGroupName()}</li>
 							<ul>
 								#{list items: group.getUserList(), as: 'userInList'}
-									<li style="margin-left: -40px;">${userInList.getName()}</li>
+									<li style="margin-left: -40px;"><a href=@{Application.showOtherCalendars(userInList.getName())}>${userInList.getName()}</a></li>
+
 								#{/list}
 							</ul>
 						#{/list}

diff --git a/app/views/tags/groupList.html b/app/views/tags/groupList.html
@@ -1,18 +1,22 @@
+
 #{list items:_groupList, as:'group'}
 	<b><li>${group.getGroupName()} <a href="@{Application.editGroup(group.getGroupID())}"><img title="edit" alt="edit" src="/public/images/edit.jpg"></a></li></b>
 	#{list items:group.getUserList(), as: 'userInList'}
-		<li>
-			<a href="@{Application.showOtherCalendars(userInList.getName())}">${userInList.getName()}</a>  
-			<a href="@{Application.removeUserFromGroup(userInList.getName(), group.getGroupID())}"><img title="remove" alt="remove" src="/public/images/delete.jpg"></a>
-			#{if group.getGroupName().equals("Friends")}
-			 	(add to:
-			 	#{list items:_groupList, as:'groupp'} 
-					#{if !groupp.groupName.equals("Friends") && !groupp.userAlreadyInGroup(userInList.getName())}
-			 			<a href="@{Application.addUserToGroup(userInList.getName(), groupp.getGroupID())}">${groupp.getGroupName()}</a>  
-			 		#{/if}
-			 	 #{/list}
-			 	 )
-			  #{/if}
-		 </li>
+		<ul>
+
+				<a href="@{Application.showOtherCalendars(userInList.getName())}">${userInList.getName()}</a>  
+				<a href="@{Application.removeUserFromGroup(userInList.getName(), group.getGroupID())}"><img title="remove" alt="remove" src="/public/images/delete.jpg"></a>
+
+
+				#{if group.getGroupName().equals("Friends")}
+				 	(add to:
+				 	#{list items:_groupList, as:'groupp'} 
+						#{if !groupp.groupName.equals("Friends") && !groupp.userAlreadyInGroup(userInList.getName())}
+				 			<a href="@{Application.addUserToGroup(userInList.getName(), groupp.getGroupID())}">${groupp.getGroupName()}</a>  
+				 		#{/if}
+				 	 #{/list}
+				 	 )
+				  #{/if}
+		 </ul>
 	#{/list}
-#{/list}
+#{/list}