update install page ui

diff --git a/public/js/app.js b/public/js/app.js
index 8b0e5cd62c6f1532936908f042ce98ed26cd7b80..5bebeaf877719364110b356fa7d4a621ca353137 100644 (file)
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -352,6 +352,24 @@ function initRepository() {
     }());
 }
 
+function initInstall(){
+    $('#install-database').on("change", function () {
+        var val = $(this).val();
+        if (val != "sqlite") {
+            $('.server-sql').show();
+            $('.sqlite-setting').addClass("hide");
+            if (val == "pgsql") {
+                $('.pgsql-setting').removeClass("hide");
+            } else {
+                $('.pgsql-setting').addClass("hide");
+            }
+        } else {
+            $('.server-sql').hide();
+            $('.sqlite-setting').removeClass("hide");
+        }
+    });
+}
+
 (function ($) {
     $(function () {
         initCore();
@@ -365,5 +383,8 @@ function initRepository() {
         if ($('.repo-nav').length) {
             initRepository();
         }
+        if($('#install-card').length){
+            initInstall();
+        }
     });
 })(jQuery);

diff --git a/templates/install.tmpl b/templates/install.tmpl
index 849491f898517071541bc556ff546169f5282fc3..b2ae3bac21995ef0a6f908652887f587e5d83050 100644 (file)
--- a/templates/install.tmpl
+++ b/templates/install.tmpl
@@ -2,44 +2,81 @@
 <div id="body" class="container">
     <form action="/install" method="post" class="form-horizontal card" id="install-card">
         {{.CsrfTokenHtml}}
-        <h3>Install Steps</h3>
+        <h3>Install Steps For First Running</h3>
+
         <div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>
         <p class="help-block text-center">GoGits need MySQL or PostgreSQL server</p>
-        <div class="form-group {{if .Err_User}}has-error has-feedback{{end}}">
-            <label class="col-md-3 control-label"><strong>MySQL </strong>Host: </label>
+        <div class="form-group">
+            <label class="col-md-3 control-label">Database Type: </label>
+
             <div class="col-md-8">
-                <input name="host" class="form-control" placeholder="Type mysql server ip or domain" value="localhost" required="required">
+                <select name="database" id="install-database" class="form-control">
+                    <option value="mysql">MySQL</option>
+                    <option value="pgsql">PostgreSQL</option>
+                    <option value="sqlite">SQLite</option>
+                </select>
             </div>
         </div>
-        <div class="form-group {{if .Err_User}}has-error has-feedback{{end}}">
-            <label class="col-md-3 control-label">Port: </label>
-            <div class="col-md-8">
-                <input name="port" class="form-control" placeholder="Type mysql server port" value="3306" required="required">
+        <div class="server-sql">
+            <div class="form-group">
+                <label class="col-md-3 control-label">Host: </label>
+
+                <div class="col-md-8">
+                    <input name="host" class="form-control" placeholder="Type mysql server ip or domain" value="localhost" required="required">
+                </div>
             </div>
-        </div>
-        <div class="form-group {{if .Err_User}}has-error has-feedback{{end}}">
-            <label class="col-md-3 control-label">User: </label>
-            <div class="col-md-8">
-                <input name="user" class="form-control" placeholder="Type mysql username" required="required">
+            <div class="form-group">
+                <label class="col-md-3 control-label">Port: </label>
+
+                <div class="col-md-8">
+                    <input name="port" class="form-control" placeholder="Type mysql server port" value="3306" required="required">
+                </div>
             </div>
-        </div>
-        <div class="form-group {{if .Err_Password}}has-error has-feedback{{end}}">
-            <label class="col-md-3 control-label">Password: </label>
-            <div class="col-md-8">
-                <input name="passwd" type="password" class="form-control" placeholder="Type mysql password" required="required">
+            <div class="form-group">
+                <label class="col-md-3 control-label">User: </label>
+
+                <div class="col-md-8">
+                    <input name="user" class="form-control" placeholder="Type mysql username" required="required">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-3 control-label">Password: </label>
+
+                <div class="col-md-8">
+                    <input name="passwd" type="password" class="form-control" placeholder="Type mysql password" required="required">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-md-3 control-label">Database: </label>
+
+                <div class="col-md-8">
+                    <input name="database" type="text" class="form-control" placeholder="Type mysql database name" value="gogs" required="required">
+
+                    <p class="help-block">Recommend use INNODB engine with utf8_general_ci charset.</p>
+                </div>
+            </div>
+            <div class="form-group pgsql-setting hide">
+                <label class="col-md-3 text-right">SSL MODE: </label>
+                <div class="col-md-8">
+                    <input name="ssl-mode" type="checkbox" class="form-control">
+                    <p class="help-block">Use SSL protocol to connect PostgreSQL.</p>
+                </div>
             </div>
         </div>
-        <div class="form-group {{if .Err_Password}}has-error has-feedback{{end}}">
-            <label class="col-md-3 control-label">Database: </label>
-            <div class="col-md-8">
-                <input name="database" type="text" class="form-control" placeholder="Type mysql database name" value="gogs" required="required">
-                <p class="help-block">Recommend use INNODB engine with utf8_general_ci charset.</p>
+        <div class="sqlite-setting hide">
+            <div class="form-group">
+                <label class="col-md-3 control-label">Path: </label>
+
+                <div class="col-md-8">
+                    <input name="path" class="form-control" placeholder="Type sqlite file path" value="xxx/file.db">
+                    <p class="help-block">The file path of SQLite database.</p>
+                </div>
             </div>
         </div>
 
         <div class="form-group">
             <div class="col-md-8 col-md-offset-3">
-                   <button class="btn btn-sm btn-info">Test Connection</button>
+                <button class="btn btn-sm btn-info">Test Connection</button>
             </div>
         </div>
 
@@ -47,24 +84,106 @@
 
         <p class="help-block text-center">General settings for GoGits</p>
 
-        <div class="form-group {{if .Err_Password}}has-error has-feedback{{end}}">
+        <div class="form-group">
             <label class="col-md-3 control-label">Repository Path: </label>
+
             <div class="col-md-8">
                 <input name="repo-path" type="text" class="form-control" placeholder="Type your repository directory" value="/var/gogs/repostiory" required="required">
+
                 <p class="help-block">The git copy of each repository is saved in this directory.</p>
             </div>
         </div>
-        <div class="form-group {{if .Err_Password}}has-error has-feedback{{end}}">
-            <label class="col-md-3 control-label">System User: </label>
+        <div class="form-group">
+            <label class="col-md-3 control-label">Run User: </label>
+
             <div class="col-md-8">
                 <input name="system-user" type="text" class="form-control" placeholder="Type mysql password" value="root" required="required">
+
                 <p class="help-block">The user has access to visit and run GoGits.</p>
             </div>
         </div>
+
+        <hr/>
+
+        <p class="help-block text-center">Admin Account Settings</p>
+
+        <div class="form-group">
+            <label class="col-md-3 control-label">Username: </label>
+
+            <div class="col-md-8">
+                <input name="repo-path" type="text" class="form-control" placeholder="Type admin user name" value="admin" required="required">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-md-3 control-label">Password: </label>
+
+            <div class="col-md-8">
+                <input name="system-user" type="password" class="form-control" placeholder="Type admin user password" required="required">
+            </div>
+        </div>
+
         <hr/>
+
         <div class="form-group text-center">
-            <a class="btn btn-danger btn-lg">Install GoGits</a>
+            <button class="btn btn-danger btn-lg">Install GoGits</button>
+            <button class="btn btn-default btn-sm" type="button" data-toggle="modal" data-target="#advance-options-modal">
+                Advanced Options
+            </button>
         </div>
+
+        <div class="modal fade" id="advance-options-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header"><h4 class="modal-title">Advanced Options</h4></div>
+                    <div class="modal-body">
+                        <p class="help-block text-center">Email Service Settings</p>
+
+                        <div class="form-group">
+                            <label class="col-md-3 control-label">SMTP Host: </label>
+
+                            <div class="col-md-8">
+                                <input name="repo-path" type="text" class="form-control" placeholder="Type admin user name">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-md-3 control-label">Email: </label>
+
+                            <div class="col-md-8">
+                                <input name="repo-path" type="text" class="form-control" placeholder="Type admin user name">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-md-3 control-label">Password: </label>
+
+                            <div class="col-md-8">
+                                <input name="system-user" type="password" class="form-control" placeholder="Type admin user password">
+                            </div>
+                        </div>
+                        <hr/>
+                        <p class="text-center help-block">Notification Settings</p>
+
+                        <div class="form-group">
+                            <label class="col-md-6 text-right">Enable Register Confirmation: </label>
+
+                            <div class="col-md-4">
+                                <input name="system-user" type="checkbox" class="form-control">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-md-6 text-right">Enable Mail Notification: </label>
+
+                            <div class="col-md-4">
+                                <input name="system-user" type="checkbox" class="form-control">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-success" data-dismiss="modal">Confirm</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+
     </form>
 </div>
 {{template "base/footer" .}}
\ No newline at end of file