mirror of
https://github.com/hrfee/jfa-go.git
synced 2024-12-22 17:10:10 +00:00
remove windows related messages
self restarts now work, so no need.
This commit is contained in:
parent
bbb0568cc4
commit
831296a3e8
@ -269,15 +269,6 @@
|
|||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<h5 class="modal-title">Warning</h5>
|
<h5 class="modal-title">Warning</h5>
|
||||||
</div>
|
</div>
|
||||||
{{ if .windows }}
|
|
||||||
<div class="modal-body">
|
|
||||||
<p>A restart is needed to apply some settings. Self-restarts aren't possible on Windows, so you must restart manually.</p>
|
|
||||||
</div>
|
|
||||||
<div class="modal-footer">
|
|
||||||
<button type="button" class="btn btn-light" data-dismiss="modal">Cancel</button>
|
|
||||||
<button type="button" class="btn btn-secondary" id="applyRestarts" data-dismiss="modal">Apply, Restart manually</button>
|
|
||||||
</div>
|
|
||||||
{{ else }}
|
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<p>A restart is needed to apply some settings. Restart now, later, or cancel?</p>
|
<p>A restart is needed to apply some settings. Restart now, later, or cancel?</p>
|
||||||
</div>
|
</div>
|
||||||
@ -286,7 +277,6 @@
|
|||||||
<button type="button" class="btn btn-secondary" id="applyRestarts" data-dismiss="modal">Apply, Restart later</button>
|
<button type="button" class="btn btn-secondary" id="applyRestarts" data-dismiss="modal">Apply, Restart later</button>
|
||||||
<button type="button" class="btn btn-primary" id="applyAndRestart" data-dismiss="modal">Apply & Restart</button>
|
<button type="button" class="btn btn-primary" id="applyAndRestart" data-dismiss="modal">Apply & Restart</button>
|
||||||
</div>
|
</div>
|
||||||
{{ end }}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -359,11 +359,7 @@
|
|||||||
<div class="card-body text-center">
|
<div class="card-body text-center">
|
||||||
<h5 class="card-title">Finished!</h5>
|
<h5 class="card-title">Finished!</h5>
|
||||||
<p class="card-text">
|
<p class="card-text">
|
||||||
{{ if .windows }}
|
|
||||||
Press the button below to submit your settings. Unfortunately you're running on Windows, so jfa-go <a href="https://github.com/golang/go/issues/30662">cannot restart itself.</a> You will manually have to restart.
|
|
||||||
{{ else }}
|
|
||||||
Press the button below to submit your settings. The program will restart. Once it's done, refresh this page.
|
Press the button below to submit your settings. The program will restart. Once it's done, refresh this page.
|
||||||
{{ end }}
|
|
||||||
</p>
|
</p>
|
||||||
<button id="submitButton" class="btn btn-primary">Submit</button>
|
<button id="submitButton" class="btn btn-primary">Submit</button>
|
||||||
</div>
|
</div>
|
||||||
|
8
main.go
8
main.go
@ -415,14 +415,8 @@ func start(asDaemon, firstCall bool) {
|
|||||||
}
|
}
|
||||||
app.info.Printf("Starting router @ %s", address)
|
app.info.Printf("Starting router @ %s", address)
|
||||||
} else {
|
} else {
|
||||||
windows := false
|
|
||||||
if PLATFORM == "windows" {
|
|
||||||
windows = true
|
|
||||||
}
|
|
||||||
router.GET("/", func(gc *gin.Context) {
|
router.GET("/", func(gc *gin.Context) {
|
||||||
gc.HTML(200, "setup.html", gin.H{
|
gc.HTML(200, "setup.html", gin.H{})
|
||||||
"windows": windows,
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
router.POST("/testJF", app.TestJF)
|
router.POST("/testJF", app.TestJF)
|
||||||
router.POST("/modifyConfig", app.ModifyConfig)
|
router.POST("/modifyConfig", app.ModifyConfig)
|
||||||
|
5
views.go
5
views.go
@ -11,10 +11,6 @@ func (app *appContext) AdminPage(gc *gin.Context) {
|
|||||||
emailEnabled, _ := app.config.Section("invite_emails").Key("enabled").Bool()
|
emailEnabled, _ := app.config.Section("invite_emails").Key("enabled").Bool()
|
||||||
notificationsEnabled, _ := app.config.Section("notifications").Key("enabled").Bool()
|
notificationsEnabled, _ := app.config.Section("notifications").Key("enabled").Bool()
|
||||||
ombiEnabled := app.config.Section("ombi").Key("enabled").MustBool(false)
|
ombiEnabled := app.config.Section("ombi").Key("enabled").MustBool(false)
|
||||||
windows := false
|
|
||||||
if PLATFORM == "windows" {
|
|
||||||
windows = true
|
|
||||||
}
|
|
||||||
gc.HTML(http.StatusOK, "admin.html", gin.H{
|
gc.HTML(http.StatusOK, "admin.html", gin.H{
|
||||||
"bs5": bs5,
|
"bs5": bs5,
|
||||||
"cssFile": app.cssFile,
|
"cssFile": app.cssFile,
|
||||||
@ -24,7 +20,6 @@ func (app *appContext) AdminPage(gc *gin.Context) {
|
|||||||
"version": VERSION,
|
"version": VERSION,
|
||||||
"commit": COMMIT,
|
"commit": COMMIT,
|
||||||
"ombiEnabled": ombiEnabled,
|
"ombiEnabled": ombiEnabled,
|
||||||
"windows": windows,
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user