Permalink
Browse files

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

  • Loading branch information...
2 parents 028f8b7 + 3703da0 commit cfe8ba9771f78680763d07d3aa088ef422c00ef6 @r-breu r-breu committed Dec 21, 2011
Showing with 20 additions and 19 deletions.
  1. +0 −4 app/views/Application/search.html
  2. +2 −1 app/views/rightbox.html
  3. +18 −14 app/views/tags/groupList.html
View
4 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}
View
3 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}
View
32 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}

0 comments on commit cfe8ba9

Please sign in to comment.