UI: install - new version

1 files changed, 112 insertions, 7 deletions

diff --git a/templates/install.tmpl b/templates/install.tmpl
index 0f64ab8cda..eb63b71b6b 100644
--- a/templates/install.tmpl
+++ b/templates/install.tmpl
@@ -2,17 +2,21 @@
 <div class="install">
 	<div class="ui middle very relaxed page grid">
 		<div class="sixteen wide center aligned centered column">
+      
+
 			<h3 class="ui top attached header">
 			  {{.i18n.Tr "install.title"}}
 			</h3>
 			<div class="ui attached segment">
+        {{template "base/alert" .}}
+        
 			  <form class="ui form" action="{{AppSubUrl}}/install" method="post">
 			  	{{.CsrfTokenHtml}}
 
 			  	<!-- Dtabase Settings -->
 			  	<h4 class="ui dividing header">{{.i18n.Tr "install.db_title"}}</h4>
 			  	<p>{{.i18n.Tr "install.requite_db_desc"}}</p>
-			  	<div class="inline required field">
+			  	<div class="inline required field {{if .Err_DbType}}error{{end}}">
 	  	      <label>{{.i18n.Tr "install.db_type"}}</label>
 			      <div class="ui selection database type dropdown">
 			        <input type="hidden" id="db_type" name="db_type" value="{{.CurDbOption}}">
@@ -27,19 +31,19 @@
 	  	    </div>
 
           <div id="sql_settings" class="{{if eq .CurDbOption "SQLite3"}}hide{{end}}">
-            <div class="inline required field">
+            <div class="inline required field {{if .Err_DbSetting}}error{{end}}">
               <label for="db_host">{{.i18n.Tr "install.host"}}</label>
               <input id="db_host" name="db_host" value="{{.db_host}}">
             </div>
-            <div class="inline required field">
+            <div class="inline required field {{if .Err_DbSetting}}error{{end}}">
               <label for="db_user">{{.i18n.Tr "install.user"}}</label>
               <input id="db_user" name="db_user" value="{{.db_user}}">
             </div>
-            <div class="inline required field">
+            <div class="inline required field {{if .Err_DbSetting}}error{{end}}">
               <label for="db_passwd">{{.i18n.Tr "install.password"}}</label>
               <input id="db_passwd" name="db_passwd" type="password" value="{{.db_passwd}}">
             </div>
-            <div class="inline required field">
+            <div class="inline required field {{if .Err_DbSetting}}error{{end}}">
               <label for="db_name">{{.i18n.Tr "install.db_name"}}</label>
               <input id="db_name" name="db_name" value="{{.db_name}}">
               <span class="help">{{.i18n.Tr "install.db_helper"}}</span>
@@ -50,7 +54,7 @@
             <div class="inline required field">
               <label>{{.i18n.Tr "install.ssl_mode"}}</label>
               <div class="ui selection database type dropdown">
-                <input type="hidden" name="ssl_mode" value="disable">
+                <input type="hidden" name="ssl_mode" value="{{if .ssl_mode}}{{.ssl_mode}}{{else}}disable{{end}}">
                 <div class="default text">disable</div>
                 <i class="dropdown icon"></i>
                 <div class="menu">
@@ -63,7 +67,7 @@
           </div>
 
           <div id="sqlite_settings" class="{{if not (eq .CurDbOption "SQLite3")}}hide{{end}}">
-            <div class="inline required field">
+            <div class="inline required field {{if .Err_DbPath}}error{{end}}">
               <label for="db_path">{{.i18n.Tr "install.path"}}</label>
               <input id="db_path" name="db_path" value="{{.db_path}}">
               <span class="help">{{.i18n.Tr "install.sqlite_helper"}}</span>
@@ -72,6 +76,107 @@
 
 					<!-- General Settings -->
 					<h4 class="ui dividing header">{{.i18n.Tr "install.general_title"}}</h4>
+          <div class="inline required field {{if .Err_RepoRootPath}}error{{end}}">
+            <label for="repo_root_path">{{.i18n.Tr "install.repo_path"}}</label>
+            <input id="repo_root_path" name="repo_root_path" value="{{.repo_root_path}}" required>
+            <span class="help">{{.i18n.Tr "install.repo_path_helper"}}</span>
+          </div>
+          <div class="inline required field {{if .Err_RunUser}}error{{end}}">
+            <label for="run_user">{{.i18n.Tr "install.run_user"}}</label>
+            <input id="run_user" name="run_user" value="{{.run_user}}" required>
+            <span class="help">{{.i18n.Tr "install.run_user_helper"}}</span>
+          </div>
+          <div class="inline required field">
+            <label for="domain">{{.i18n.Tr "install.domain"}}</label>
+            <input id="domain" name="domain" value="{{.domain}}" required>
+            <span class="help">{{.i18n.Tr "install.domain_helper"}}</span>
+          </div>
+          <div class="inline required field">
+            <label for="http_port">{{.i18n.Tr "install.http_port"}}</label>
+            <input id="http_port" name="http_port" value="{{.http_port}}" required>
+            <span class="help">{{.i18n.Tr "install.http_port_helper"}}</span>
+          </div>
+          <div class="inline required field">
+            <label for="app_url">{{.i18n.Tr "install.app_url"}}</label>
+            <input id="app_url" name="app_url" value="{{.app_url}}" required>
+            <span class="help">{{.i18n.Tr "install.app_url_helper"}}</span>
+          </div>
+
+          <!-- Optional Settings -->
+          <h4 class="ui dividing header">{{.i18n.Tr "install.optional_title"}}</h4>
+          <div class="ui accordion optional field">
+            <div class="title {{if .Err_SMTP}}text-error{{end}}">
+              <i class="icon dropdown"></i>
+              {{.i18n.Tr "install.email_title"}}
+            </div>
+            <div class="content">
+              <div class="inline field">
+                <label for="smtp_host">{{.i18n.Tr "install.smtp_host"}}</label>
+                <input id="smtp_host" name="smtp_host" value="{{.smtp_host}}">
+              </div>
+              <div class="inline field {{if .Err_SMTPEmail}}error{{end}}">
+                <label for="smtp_user">{{.i18n.Tr "install.mailer_user"}}</label>
+                <input id="smtp_user" name="smtp_user" value="{{.smtp_user}}">
+              </div>
+              <div class="inline field">
+                <label for="smtp_passwd">{{.i18n.Tr "install.mailer_password"}}</label>
+                <input id="smtp_passwd" name="smtp_passwd" type="password" value="{{.smtp_passwd}}">
+              </div>
+            </div>
+          </div>
+
+          <div class="ui accordion optional field">
+            <div class="title">
+              <i class="icon dropdown"></i>
+              {{.i18n.Tr "install.notify_title"}}
+            </div>
+            <div class="content">
+              <div class="inline field">
+                <div class="ui checkbox">
+                  <label><strong>{{.i18n.Tr "install.register_confirm"}}</strong></label>
+                  <input name="register_confirm" type="checkbox" {{if .register_confirm}}checked{{end}}>
+                </div>
+              </div>
+              <div class="inline field">
+                <div class="ui checkbox">
+                  <label><strong>{{.i18n.Tr "install.mail_notify"}}</strong></label>
+                  <input name="mail_notify" type="checkbox" {{if .mail_notify}}checked{{end}}>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <div class="ui accordion optional field">
+            <div class="title {{if .Err_Admin}}text-error{{end}}">
+              <i class="icon dropdown"></i>
+              {{.i18n.Tr "install.admin_title"}}
+            </div>
+            <div class="content">
+              <p class="center">{{.i18n.Tr "install.admin_setting_desc"}}</p>
+              <div class="inline field {{if .Err_AdminName}}error{{end}}">
+                <label for="admin_name">{{.i18n.Tr "install.admin_name"}}</label>
+                <input id="admin_name" name="admin_name" value="{{.admin_name}}">
+              </div>
+              <div class="inline field {{if .Err_AdminPasswd}}error{{end}}">
+                <label for="admin_passwd">{{.i18n.Tr "install.admin_password"}}</label>
+                <input id="admin_passwd" name="admin_passwd" value="{{.admin_passwd}}">
+              </div>
+              <div class="inline field {{if .Err_AdminPasswd}}error{{end}}">
+                <label for="admin_confirm_passwd">{{.i18n.Tr "install.confirm_password"}}</label>
+                <input id="admin_confirm_passwd" name="admin_confirm_passwd" type="password" value="{{.admin_confirm_passwd}}">
+              </div>
+              <div class="inline field {{if .Err_AdminEmail}}error{{end}}">
+                <label for="admin_email">{{.i18n.Tr "install.admin_email"}}</label>
+                <input id="admin_email" name="admin_email" value="{{.admin_email}}">
+              </div>
+            </div>
+          </div>
+
+          <div class="ui divider"></div>
+          <div class="inline field">
+            <label></label>
+            <button class="ui primary button">{{.i18n.Tr "install.install_gogs"}}</button>
+          </div>
 			  </form>
 			</div>
 		</div>