DodoApp: Move app action forms at the top
Change-Id: Ic3749333f1fccabba748cb843a5d43fa788f9a68
diff --git a/core/installer/welcome/dodo-app-tmpl/app_status.html b/core/installer/welcome/dodo-app-tmpl/app_status.html
index 879d0ec..71f86b3 100644
--- a/core/installer/welcome/dodo-app-tmpl/app_status.html
+++ b/core/installer/welcome/dodo-app-tmpl/app_status.html
@@ -2,6 +2,7 @@
dodo app: {{ .Name }}
{{ end }}
{{- define "content" -}}
+<h3>Branch: {{- .Branch -}}</h3>
{{ .GitCloneCommand }}<br/>
<form action="/{{ .Name }}/dev-branch/create" method="POST">
<fieldset class="grid">
@@ -9,6 +10,14 @@
<button id="create-dev-branch-button" aria-busy="false" type="submit" name="create-dev-branch">create dev branch</button>
</fieldset>
</form>
+{{- if ne .Branch "master" -}}
+<form action="/{{ .Name }}/branch/{{ .Branch }}/delete" method="POST" class="app-actions">
+ <button aria-busy="false" type="submit" name="delete" class="secondary">delete branch</button>
+</form>
+{{- end -}}
+<form action="/{{ .Name }}/delete" method="POST" class="app-actions">
+ <button aria-busy="false" type="submit" name="delete" class="secondary">delete app</button>
+</form>
<a href="/{{ .Name }}/logs">Logs</a>
<hr class="divider">
{{- template "resources" .LastCommit -}}
@@ -22,12 +31,4 @@
{{- range .Branches -}}
<a href="/{{ $.Name }}/branch/{{ . }}">{{ . }}</a><br/>
{{- end -}}
-{{- if ne .Branch "master" -}}
-<form action="/{{ .Name }}/branch/{{ .Branch }}/delete" method="POST">
- <button aria-busy="false" type="submit" name="delete">delete branch</button>
-</form>
-{{- end -}}
-<form action="/{{ .Name }}/delete" method="POST">
- <button aria-busy="false" type="submit" name="delete">delete app</button>
-</form>
{{- end -}}
diff --git a/core/installer/welcome/dodo-app-tmpl/base.html b/core/installer/welcome/dodo-app-tmpl/base.html
index a4917de..0e20ff5 100644
--- a/core/installer/welcome/dodo-app-tmpl/base.html
+++ b/core/installer/welcome/dodo-app-tmpl/base.html
@@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{{ block "title" . }}{{ end }}</title>
<link rel="stylesheet" href="/stat/pico.2.0.6.min.css">
- <link rel="stylesheet" href="/stat/dodo_app.css?v=0.0.9">
+ <link rel="stylesheet" href="/stat/dodo_app.css?v=0.0.10">
</head>
<body class="container">
<nav aria-label="breadcrumb">
diff --git a/core/installer/welcome/stat/dodo_app.css b/core/installer/welcome/stat/dodo_app.css
index 627579f..454fb33 100644
--- a/core/installer/welcome/stat/dodo_app.css
+++ b/core/installer/welcome/stat/dodo_app.css
@@ -77,8 +77,8 @@
}
@media (min-width: 768px) {
- fieldset.grid {
- grid-template-columns: 1fr 1fr 1fr 1fr 200px;
+ #create-app fieldset.grid {
+ grid-template-columns: 1fr 1fr 1fr 1fr 150;
}
}
@@ -102,3 +102,6 @@
width: fit-content;
}
+.app-actions button {
+ width: 150px;
+}