From 41955ed427467a0e774ff85fdcdaef104fb69302 Mon Sep 17 00:00:00 2001
From: init <x17152141010@163.com>
Date: Fri, 29 Aug 2025 16:26:49 +0800
Subject: [PATCH] change devcontainer button of install page

---
 modules/setting/devcontainer.go          |  2 +-
 routers/web/devcontainer/devcontainer.go |  1 +
 templates/install.tmpl                   | 20 ++++++++------------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/modules/setting/devcontainer.go b/modules/setting/devcontainer.go
index 6a353e3add..7e02e15244 100644
--- a/modules/setting/devcontainer.go
+++ b/modules/setting/devcontainer.go
@@ -9,6 +9,6 @@ var DevContainerConfig = struct {
 func loadDevContainerSettingsFrom(rootCfg ConfigProvider) {
 	sec := rootCfg.Section("devcontainer")
 	DevContainerConfig.Enable = sec.Key("ENABLE").MustBool(false)
-	DevContainerConfig.Web_Terminal_Image = sec.Key("WEB_TERMINAL_IMAGE").MustString("devstar.cn/init/webterminal:latest")
+	DevContainerConfig.Web_Terminal_Image = sec.Key("WEB_TERMINAL_IMAGE").MustString("devstar.cn/devstar/webterminal:latest")
 	DevContainerConfig.Web_Terminal_Port = sec.Key("WEB_TERMINAL_PORT").MustString("7681")
 }
diff --git a/routers/web/devcontainer/devcontainer.go b/routers/web/devcontainer/devcontainer.go
index 5fa7e2989d..98e7dc00a0 100644
--- a/routers/web/devcontainer/devcontainer.go
+++ b/routers/web/devcontainer/devcontainer.go
@@ -149,6 +149,7 @@ func CreateDevContainerConfiguration(ctx *context.Context) {
 	}
 	isAdmin, err := devcontainer_service.IsAdmin(ctx, ctx.Doer, ctx.Repo.Repository.ID)
 	if err != nil {
+		log.Info(err.Error())
 		ctx.Flash.Error(err.Error(), true)
 		return
 	}
diff --git a/templates/install.tmpl b/templates/install.tmpl
index 4a4133b077..7ba9773ca9 100644
--- a/templates/install.tmpl
+++ b/templates/install.tmpl
@@ -158,18 +158,7 @@
 					<!-- Optional Settings -->
 					<h4 class="ui dividing header">{{ctx.Locale.Tr "install.optional_title"}}</h4>
 					<div>
-					<!-- devcontainer -->
-							<details class="optional field">
-								<summary class="right-content tw-py-2{{if .Err_DevContainer}} text red{{end}}">
-									{{ctx.Locale.Tr "install.devcontainer_title"}}
-								</summary>
-								<div class="inline field">
-									<div class="ui checkbox" id="enable-devcontainer">
-										<label data-tooltip-content="{{ctx.Locale.Tr "install.devcontainer_enable"}}">{{ctx.Locale.Tr "install.devcontainer_enable"}}</label>
-										<input name="devcontainer_enable" type="checkbox" {{if .devcontainer_enable}}checked{{end}}>
-									</div>
-								</div>
-							</details>
+					
 						<!-- k8s -->
 							<details class="optional field">
 								<summary class="right-content tw-py-2{{if .Err_K8s}} text red{{end}}">
@@ -236,6 +225,13 @@
 							<summary class="right-content tw-py-2{{if .Err_Services}} text red{{end}}">
 								{{ctx.Locale.Tr "install.server_service_title"}}
 							</summary>
+							<!-- devcontainer -->
+							<div class="inline field">
+								<div class="ui checkbox" id="enable-devcontainer">
+									<label data-tooltip-content="{{ctx.Locale.Tr "install.devcontainer_enable"}}">{{ctx.Locale.Tr "install.devcontainer_enable"}}</label>
+									<input name="devcontainer_enable" type="checkbox" {{if .devcontainer_enable}}checked{{end}}>
+								</div>
+							</div>
 							<div class="inline field">
 								<div class="ui checkbox" id="offline-mode">
 									<label data-tooltip-content="{{ctx.Locale.Tr "install.offline_mode_popup"}}">{{ctx.Locale.Tr "install.offline_mode"}}</label>