Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-13 08:55:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'issue-893' of https://github.com/McFoggy/gitbucket into McFoggy-issue-893

Browse Source
This commit is contained in:
Naoki Takezoe
2015-09-24 01:21:00 +09:00
parent 317a6fde30 0772070523
commit 3c53fd8618
5 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/twirl/gitbucket/core/admin/system.scala.html
View File

@@ -224,14 +224,25 @@
<!-- Notification email -->
<!--====================================================================-->
<hr>
<label class="strong">Notification email</label>
<label class="strong">Notifications</label>
<fieldset>
<label class="checkbox">
<input type="checkbox" id="notification" name="notification"@if(settings.notification){ checked}/>
Send notifications
</label>
</fieldset>
<div class="form-horizontal notification">
<!--====================================================================-->
<!-- Communication email -->
<!--====================================================================-->
<hr>
<label class="strong">Communication</label>
<fieldset>
<label class="checkbox">
<input type="checkbox" id="useSMTP" name="useSMTP" @if(settings.useSMTP){ checked}/>
use SMTP
</label>
</fieldset>
<div class="form-horizontal useSMTP">
<div class="control-group">
<label class="control-label" for="smtpHost">SMTP Host</label>
<div class="controls">
@@ -292,8 +303,16 @@ $(function(){
$('.ssh input').prop('disabled', !$(this).prop('checked'));
}).change();
$('#notification').change(function(){
$('.notification input').prop('disabled', !$(this).prop('checked'));
$('#useSMTP').change(function(){
$('.useSMTP input').prop('disabled', !$(this).prop('checked'));
// With only SMTP in current version, notification cannot be enabled if no communication channel exists
$('#notification').prop('disabled', !$(this).prop('checked'));
if (!$(this).prop('checked')) {
// With only SMTP in current version, if SMTP is unchecked then we disable notification
$('#notification').prop('checked', false);
}
}).change();
$('#ldapAuthentication').change(function(){