Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Open invitation setting #67

Merged
merged 3 commits into from
Feb 16, 2014
Merged

Open invitation setting #67

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6937b7b
Open invitation setting
floatdrop Feb 13, 2014
0bd8ef2
Fixup signup and settings template
floatdrop Feb 13, 2014
460ec90
Fixup behavior on uninstalled state
floatdrop Feb 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixup signup and settings template
  • Loading branch information
@floatdrop
floatdrop committed Feb 14, 2014
commit 0bd8ef28dd7cda04c32591376079e80daaa7ef54
5 changes: 3 additions & 2 deletions pkg/template/pages/admin_settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ <h1>Sysadmin</h1>
{{ end }}
</select>
<input class="form-control form-control-xlarge" type="text" name="Domain" value="{{.Settings.Domain}}" />
<label>Open invitations:</label>
<input class="form-control form-control-xlarge" type="checkbox" name="OpenInvitations" {{ if .Settings.OpenInvitations }} checked {{ end }} /> enable open invintation requests from users
<label class="checkbox">
Open invitations <input type="checkbox" name="OpenInvitations" {{ if .Settings.OpenInvitations }} checked {{ end }} />
</label>
</div>
<div class="form-group">
<div class="alert">GitHub OAuth Consumer Key and Secret</div>
Expand Down
4 changes: 2 additions & 2 deletions pkg/template/pages/signup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<h1>Sign up</h1>
<form action="/signup" method="POST" role="form">
<div>
<input type="text" name="email" placeholder="Email address" autocomplete="off" spellcheck="false" class="form-control" />
<input type="text" name="email" placeholder="Email address" autocomplete="off" spellcheck="false" class="form-control only-child" />
</div>
<div>
<div class="alert alert-success hide" id="successAlert"></div>
Expand Down Expand Up @@ -32,7 +32,7 @@ <h1>Sign up</h1>
if (this.status == 200) {
var msg = "User Invitation was sent successfully";
if (this.responseText != "OK") {
msg = "Email is not currently enabled. In order to invite the user, you'll need to provide them the following link:<br><span class='url'>" + this.responseText + "</span>";
msg = "Email is not currently enables. Follow the link:<br><a href='" + this.responseText + "'>" + this.responseText + "</a>";
}
$("#successAlert").html(msg);
$("#successAlert").show().removeClass("hide");
Expand Down