witten
/
luminotes
Archived
1
0
Fork 0
Code Releases Activity

When you invite other people to view or edit your notebook, you can now see the invite link they'll get.

This commit is contained in:
Dan Helfman 2008-07-18 15:01:09 -07:00
parent e106dc27f9
commit 9d2f0d344d
4 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NEWS
View File

@ -1,3 +1,10 @@
1.4.6:
* Slightly increased the size of the file upload pulldown to look better in
various browsers (and not cut off text within the frame).
* When you invite other people to view or edit your notebook, you can now
see the invite link they'll receive in case you want to copy and paste it
to them yourself.
1.4.15: July 15, 2008:
* Reduced the size of the font within the upload pulldown to match the other
pulldowns.

4
controller/Users.py
View File

@ -1096,12 +1096,12 @@ class Users( object ):
if email_count == 1:
return dict(
message = u"An invitation has been sent.",
message = u"An invitation has been sent. The person you invited will receive an invite link (shown above) by email. (Feel free to copy and paste the invite link to them yourself.)",
invites = invites,
)
else:
return dict(
message = u"%s invitations have been sent." % email_count,
message = u"%s invitations have been sent. The people you invited will each receive an invite link (shown above) by email. (Feel free to copy and paste the invite links to them yourself.)" % email_count,
invites = invites,
)

5
static/css/note.css
View File

@ -170,6 +170,11 @@ ol li {
font-size: 82%;
}
.invite_link_area {
font-size: 82%;
margin-left: 2em;
}
.user_status {
font-size: 82%;
}

17
static/js/Wiki.js
View File

@ -1885,11 +1885,18 @@ Wiki.prototype.display_invites = function ( invite_area ) {
appendChildNodes(
add_invite_to, createDOM( "div", { "class": "invite indented" },
invite.email_address, " ",
createDOM( "span", { "class": "invite_status" },
invite.redeemed_username ? "(invite accepted by " + invite.redeemed_username + ")" : "(waiting for invite to be accepted)"
),
" ", revoke_button )
invite.email_address, " ",
createDOM( "span", { "class": "invite_status" },
invite.redeemed_username ? "(invite accepted by " + invite.redeemed_username + ")" : "(waiting for invite to be accepted)"
),
" ", revoke_button,
!invite.redeemed_username && createDOM( "span", {},
createDOM( "br" ),
createDOM( "span", { "class": "invite_link_area" },
"invite link: " + location.protocol + "//" + location.host + "/i/" + invite.object_id
)
) || ""
)
);
addresses[ invite.email_address ] = true;