Improved group page layout

mixins/Comments.pixy

@@ -8,7 +8,7 @@ component Comments(parent arn.PostParent, user *arn.User)
 				else if parent.TypeName() != "Group" || parent.(*arn.Group).FindMember(user.ID) != nil
 					NewPostArea(parent, user, "Comment")
 			
-			if user == nil && parent.CountPosts() == 0
+			if parent.CountPosts() == 0
 				p.no-data.mountable No comments have been written yet.
 			else
 				each post in parent.PostsRelevantFirst(5)

pages/group/group.scarlet

@@ -1,7 +1,7 @@
 .group-view
 	vertical
 	width 100%
-	max-width 900px
+	max-width 650px
 	margin 0 auto
 
 .group-feed
@@ -24,18 +24,17 @@
 
 .group-header-intro
 	vertical
-	align-self center
 	align-items center
 	margin-top content-padding
 
-> 800px
+> 900px
 	.group-header
 		horizontal
+		align-items stretch
 
 	.group-header-intro
 		margin-top 0
 		margin-left calc(content-padding * 2)
-		align-self flex-start
 		align-items flex-start
 
 	.group-page-name

pages/group/header.pixy

@@ -29,9 +29,14 @@ component GroupHeader(group *arn.Group, member *arn.GroupMember, user *arn.User)
 		
 		.profile-actions(data-api="/api" + group.Link())
 			if member == nil
-				button.profile-action.action.mountable.never-unmount(data-action="join", data-trigger="click")
-					Icon("user-plus")
-					span Join group
+				if group.Restricted
+					button.profile-action.mountable.never-unmount
+						Icon("lock")
+						span Locked group
+				else
+					button.profile-action.action.mountable.never-unmount(data-action="join", data-trigger="click")
+						Icon("user-plus")
+						span Join group
 			else
 				button.profile-action.action.mountable.never-unmount(data-action="leave", data-trigger="click")
 					Icon("user-times")

pages/group/tabs.pixy

@@ -6,5 +6,5 @@ component GroupTabs(group *arn.Group, member *arn.GroupMember, user *arn.User)
 
 		if member != nil && member.Role == "founder"
 			Tab("Edit", "pencil", group.Link() + "/edit")
-			Tab("Edit image", "image", group.Link() + "/edit/image")
+			Tab("Image", "image", group.Link() + "/edit/image")
 			Tab("History", "history", group.Link() + "/history")