diff --git a/pkg/controller/account/inner_circle.go b/pkg/controller/account/inner_circle.go index d3b81ee..d8366ae 100644 --- a/pkg/controller/account/inner_circle.go +++ b/pkg/controller/account/inner_circle.go @@ -77,11 +77,12 @@ func InviteCircle() http.HandlerFunc { // Add them! if err := models.AddToInnerCircle(user); err != nil { session.FlashError(w, r, "Couldn't add to the inner circle: %s", err) + } else { + session.Flash(w, r, "%s has been added to the inner circle!", user.Username) } log.Info("InnerCircle: %s adds %s to the inner circle", currentUser.Username, user.Username) - session.Flash(w, r, "%s has been added to the inner circle!", user.Username) templates.Redirect(w, "/photo/u/"+user.Username) return } diff --git a/pkg/controller/photo/user_gallery.go b/pkg/controller/photo/user_gallery.go index 7477d1e..b35fb27 100644 --- a/pkg/controller/photo/user_gallery.go +++ b/pkg/controller/photo/user_gallery.go @@ -33,6 +33,9 @@ func UserPhotos() http.HandlerFunc { filterVisibility = r.FormValue("visibility") sort = r.FormValue("sort") sortOK bool + + // Inner circle invite view? + innerCircleInvite = r.FormValue("intent") == "inner_circle" ) // Sort options. @@ -78,6 +81,11 @@ func UserPhotos() http.HandlerFunc { isShyFrom = !isOwnPhotos && (currentUser.IsShyFrom(user) || (isShy && !areFriends)) ) + // Inner circle invite: not if we are not in the circle ourselves. + if innerCircleInvite && !currentUser.IsInnerCircle() { + innerCircleInvite = false + } + // Bail early if we are shy from this user. if isShy && isShyFrom { var vars = map[string]interface{}{ @@ -207,6 +215,7 @@ func UserPhotos() http.HandlerFunc { "CommentMap": commentMap, "ViewStyle": viewStyle, "ExplicitCount": explicitCount, + "InnerCircleInviteView": innerCircleInvite, // Search filters "Sort": sort, diff --git a/web/templates/account/invite_circle.html b/web/templates/account/invite_circle.html index cd8f1c5..f9a3313 100644 --- a/web/templates/account/invite_circle.html +++ b/web/templates/account/invite_circle.html @@ -38,53 +38,54 @@ -
- {{InputCSRF}} - +
+

+ Do you want to invite {{.User.Username}} to join the + {{PrettyCircle}}? Please review the following notes: +

-
-

- Do you want to invite {{.User.Username}} to join the - {{PrettyCircle}}? Please review the following notes: -

+
    +
  • + The inner circle is designed for {{PrettyTitle}} members who actually post + several nude photos with face on their profile page. + If {{.User.Username}} only has clothed selfies on their page, or keeps + their face hidden or cropped out of their nudes, please do not + invite them to join the inner circle. +
    • +
  • + We especially want people who post such pics on public visibility. + If {{.User.Username}} has several public nude pics with face (e.g. + at least 5 or so pictures), invite them into the circle! +
    • +
  • + All members of the inner circle are allowed to invite others to join the + circle. We trust your judgment -- help ensure that the inner circle is only + made up of truly non-shy nudists who show their whole body on their profile + page. +
    • +
-
    -
  • - The inner circle is designed for {{PrettyTitle}} members who actually post - several nude photos with face on their profile page. - If {{.User.Username}} only has clothed selfies on their page, or keeps - their face hidden or cropped out of their nudes, please do not - invite them to join the inner circle. -
    • -
  • - We especially want people who post such pics on public visibility. - If {{.User.Username}} has several public nude pics with face (e.g. - at least 5 or so pictures), invite them into the circle! -
    • -
  • - All members of the inner circle are allowed to invite others to join the - circle. We trust your judgment -- help ensure that the inner circle is only - made up of truly non-shy nudists who show their whole body on their profile - page. -
    • -
+

+ Note: while we use the word "invite" they will actually be added to the inner circle + immediately and receive a notification that they had been added. They won't know that + it was you who invited them to join the circle. +

-

- Note: while we use the word "invite" they will actually be added to the inner circle - immediately and receive a notification that they had been added. They won't know that - it was you who invited them to join the circle. -

-
+

+ To proceed, please double check that they have 5 Public photos + that include their face and nude body. +

+
-
- - -
-
+
+ + Continue to their Public gallery... + + + Cancel + +
diff --git a/web/templates/photo/gallery.html b/web/templates/photo/gallery.html index df880c1..5f4c24b 100644 --- a/web/templates/photo/gallery.html +++ b/web/templates/photo/gallery.html @@ -192,6 +192,31 @@ {{end}} + + {{if .InnerCircleInviteView}} +
+

+ + {{PrettyCircle}} invitation +

+ +

+ You are now viewing @{{.User.Username}}'s Public gallery photos to verify + they should be invited to the {{PrettyCircle}}. +

+ +

+ Please take a look and see if they have at least five (5) photos that clearly show + their face as well as their full nude body together. +

+ +

+ If they qualify to join the {{PrettyCircle}}, the button to invite them will be at + the bottom of this page. +

+
+ {{end}} +
@@ -663,6 +688,34 @@ {{SimplePager .Pager}} + + {{if .InnerCircleInviteView}} +
+

+ + {{PrettyCircle}} invitation +

+ +

+ If @{{.User.Username}} shows at least 5 nude photos with face + on their public gallery, click on the button below to add them to the {{PrettyCircle}}. +

+ +
+ {{InputCSRF}} + + + + +
+ +
+ {{end}} +