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

Fixed the overflow of the alert message's url when adding an admin user or a team member. #56

Closed
wants to merge 1 commit into from
Closed

Fixed the overflow of the alert message's url when adding an admin user or a team member. #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions cmd/droned/assets/css/drone.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1074,3 +1074,6 @@ ul.account-radio-group li img {
padding: 20px;
margin-bottom: 30px;
}
.url {
word-break: break-all;
}
6 changes: 5 additions & 1 deletion cmd/droned/assets/css/drone.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1260,4 +1260,8 @@ pre {
padding: 20px;
margin-bottom:30px;
}
}
}

.url {
word-break: break-all;
}
6 changes: 3 additions & 3 deletions pkg/template/pages/admin_users_add.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ <h1>Sysadmin</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: " + this.responseText;
msg = "Email is not currently enabled. In order to invite the user, you'll need to provide them the following link:\n<span class='url'>" + this.responseText + "</span>";
}
$("#successAlert").text(msg);
$("#successAlert").html(msg);
$("#successAlert").show().removeClass("hide");
$('#submitButton').button('reset')

Expand All @@ -75,4 +75,4 @@ <h1>Sysadmin</h1>
return false;
}
</script>
{{ end }}
{{ end }}
6 changes: 3 additions & 3 deletions pkg/template/pages/members_add.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ <h1 class="user">
if (this.status == 200) {
var msg = "An invitation has been sent (via email) to join the Team.";
if (this.responseText != "OK") {
msg = "Email is not currently enabled. In order to invite this team member user, you'll need to provide them the following link: " + this.responseText;
msg = "Email is not currently enabled. In order to invite this team member user, you'll need to provide them the following link:\n<span class='url'>" + this.responseText + "</span>";
}
$("#successAlert").text(msg);
$("#successAlert").html(msg);
$("#successAlert").show().removeClass("hide");
$('#submitButton').button('reset')
} else {
Expand All @@ -84,4 +84,4 @@ <h1 class="user">
return false;
}
</script>
{{ end }}
{{ end }}