diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/.VERSION | 2 | ||||
| -rw-r--r-- | templates/base/alert.tmpl | 7 | ||||
| -rw-r--r-- | templates/base/alert_old.tmpl | 2 | ||||
| -rw-r--r-- | templates/install.tmpl | 119 | ||||
| -rw-r--r-- | templates/install_old.tmpl | 155 | ||||
| -rw-r--r-- | templates/repo/issue/list.tmpl | 2 |
6 files changed, 121 insertions, 166 deletions
diff --git a/templates/.VERSION b/templates/.VERSION index 6c28e6eb22..4000791a9f 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.6.1.0707 Beta
\ No newline at end of file +0.6.1.0708 Beta
\ No newline at end of file diff --git a/templates/base/alert.tmpl b/templates/base/alert.tmpl index bb1eb6aab1..15eeb566bd 100644 --- a/templates/base/alert.tmpl +++ b/templates/base/alert.tmpl @@ -1,2 +1,5 @@ -{{if .Flash.ErrorMsg}}<div class="alert alert-danger form-error">{{.Flash.ErrorMsg}}</div>{{end}} -{{if .Flash.SuccessMsg}}<div class="alert alert-success">{{.Flash.SuccessMsg}}</div>{{end}}
\ No newline at end of file +{{if .Flash.ErrorMsg}} +<div class="ui negative message"> + <p>{{.Flash.ErrorMsg}}</p> +</div> +{{end}}
\ No newline at end of file diff --git a/templates/base/alert_old.tmpl b/templates/base/alert_old.tmpl new file mode 100644 index 0000000000..bb1eb6aab1 --- /dev/null +++ b/templates/base/alert_old.tmpl @@ -0,0 +1,2 @@ +{{if .Flash.ErrorMsg}}<div class="alert alert-danger form-error">{{.Flash.ErrorMsg}}</div>{{end}} +{{if .Flash.SuccessMsg}}<div class="alert alert-success">{{.Flash.SuccessMsg}}</div>{{end}}
\ No newline at end of file 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> diff --git a/templates/install_old.tmpl b/templates/install_old.tmpl deleted file mode 100644 index 3a7eb7877f..0000000000 --- a/templates/install_old.tmpl +++ /dev/null @@ -1,155 +0,0 @@ -{{template "ng/base/head" .}} -<div id="setting-wrapper" class="main-wrapper"> - <div class="container clear"> - <div class="setting-content"> - {{template "ng/base/alert" .}} - <div id="setting-content"> - <div class="panel panel-radius"> - <div class="panel-header"> - <strong>{{.i18n.Tr "install.title"}}</strong> - </div> - <form class="form form-align panel-body" id="install-form" action="{{AppSubUrl}}/install" method="post"> - {{.CsrfTokenHtml}} - <div class="text-center panel-desc">{{.i18n.Tr "install.requite_db_desc"}}</div> - <div class="field"> - <label class="req">{{.i18n.Tr "install.db_type"}}</label> - <select name="db_type" id="install-database" class="form-control"> - {{range .DbOptions}} - <option value="{{.}}"{{if eq $.CurDbOption .}}selected{{end}}>{{.}}</option> - {{end}} - </select> - </div> - - <div class="server-sql {{if eq .CurDbOption "SQLite3"}}hide{{end}}"> - <div class="field"> - <label class="req" for="db_host">{{.i18n.Tr "install.host"}}</label> - <input class="ipt ipt-large ipt-radius {{if .Err_DbHost}}ipt-error{{end}}" id="db_host" name="db_host" value="{{.db_host}}" /> - </div> - <div class="field"> - <label class="req" for="db_user">{{.i18n.Tr "install.user"}}</label> - <input class="ipt ipt-large ipt-radius {{if .Err_DbUser}}ipt-error{{end}}" id="db_user" name="db_user" value="{{.db_user}}" /> - </div> - <div class="field"> - <label class="req" for="db_passwd">{{.i18n.Tr "install.password"}}</label> - <input class="ipt ipt-large ipt-radius {{if .Err_DbPasswd}}ipt-error{{end}}" id="db_passwd" name="db_passwd" type="password" value="{{.db_passwd}}" /> - </div> - <div class="field"> - <label class="req" for="db_name">{{.i18n.Tr "install.db_name"}}</label> - <input class="ipt ipt-large ipt-radius {{if .Err_DbName}}ipt-error{{end}}" id="db_name" name="db_name" value="{{.db_name}}" /> - <label></label> - <span class="help">{{.i18n.Tr "install.db_helper"}}</span> - </div> - </div> - - <div class="field pgsql-setting {{if not (eq .CurDbOption "PostgreSQL")}}hide{{end}}"> - <label class="req">{{.i18n.Tr "install.ssl_mode"}}</label> - <select name="ssl_mode" class="form-control"> - <option value="disable">Disable</option> - <option value="require">Require</option> - <option value="verify-full">Verify Full</option> - </select> - </div> - - <div class="field sqlite-setting {{if not (eq .CurDbOption "SQLite3")}}hide{{end}}"> - <label class="req" for="db_path">{{.i18n.Tr "install.path"}}</label> - <input class="ipt ipt-large ipt-radius {{if .Err_DbPath}}ipt-error{{end}}" id="db_path" name="db_path" value="{{.db_path}}" /> - <label></label> - <span class="help">{{.i18n.Tr "install.sqlite_helper"}}</span> - </div> - - <hr> - - <div class="text-center panel-desc">{{.i18n.Tr "install.general_title"}}</div> - <div class="field"> - <label class="req" for="repo_root_path">{{.i18n.Tr "install.repo_path"}}</label> - <input class="ipt ipt-large ipt-radius {{if .Err_RepoRootPath}}ipt-error{{end}}" id="repo_root_path" name="repo_root_path" value="{{.repo_root_path}}" required /> - <label></label> - <span class="help">{{.i18n.Tr "install.repo_path_helper"}}</span> - </div> - <div class="field"> - <label class="req" for="run_user">{{.i18n.Tr "install.run_user"}}</label> - <input class="ipt ipt-large ipt-radius {{if .Err_RunUser}}ipt-error{{end}}" id="run_user" name="run_user" value="{{.run_user}}" required /> - <label></label> - <span class="help">{{.i18n.Tr "install.run_user_helper"}}</span> - </div> - <div class="field"> - <label class="req" for="domain">{{.i18n.Tr "install.domain"}}</label> - <input class="ipt ipt-large ipt-radius {{if .Err_Domain}}ipt-error{{end}}" id="domain" name="domain" value="{{.domain}}" required /> - <label></label> - <span class="help">{{.i18n.Tr "install.domain_helper"}}</span> - </div> - <div class="field"> - <label class="req" for="http_port">{{.i18n.Tr "install.http_port"}}</label> - <input class="ipt ipt-large ipt-radius {{if .Err_HttpPort}}ipt-error{{end}}" id="http_port" name="http_port" value="{{.http_port}}" required /> - <label></label> - <span class="help">{{.i18n.Tr "install.http_port_helper"}}</span> - </div> - <div class="field"> - <label class="req" for="app_url">{{.i18n.Tr "install.app_url"}}</label> - <input class="ipt ipt-large ipt-radius {{if .Err_AppUrl}}ipt-error{{end}}" id="app_url" name="app_url" value="{{.app_url}}" required /> - <label></label> - <span class="help">{{.i18n.Tr "install.app_url_helper"}}</span> - </div> - - <hr> - - <div class="text-center panel-desc">{{.i18n.Tr "install.email_title"}}</div> - <div class="field"> - <label for="smtp_host">{{.i18n.Tr "install.smtp_host"}}</label> - <input class="ipt ipt-large ipt-radius {{if .Err_SmtpHost}}ipt-error{{end}}" id="smtp_host" name="smtp_host" value="{{.smtp_host}}" /> - </div> - <div class="field"> - <label for="smtp_user">{{.i18n.Tr "install.mailer_user"}}</label> - <input class="ipt ipt-large ipt-radius {{if .Err_SMTPEmail}}ipt-error{{end}}" id="smtp_user" name="smtp_user" value="{{.smtp_user}}" /> - </div> - <div class="field"> - <label for="smtp_pwd">{{.i18n.Tr "install.mailer_password"}}</label> - <input class="ipt ipt-large ipt-radius {{if .Err_SMTPPasswd}}ipt-error{{end}}" id="smtp_pwd" name="smtp_pwd" type="password" value="{{.smtp_pwd}}" /> - </div> - - <hr> - - <div class="text-center panel-desc">{{.i18n.Tr "install.notify_title"}}</div> - <div class="field"> - <label></label> - <input name="register_confirm" type="checkbox" {{if .register_confirm}}checked{{end}}> - <strong>{{.i18n.Tr "install.register_confirm"}}</strong> - <br> - <label></label> - <input name="mail_notify" type="checkbox" {{if .mail_notify}}checked{{end}}> - <strong>{{.i18n.Tr "install.mail_notify"}}</strong> - </div> - - <hr> - - <div class="text-center panel-desc">{{.i18n.Tr "install.admin_title"}}</div> - <div class="field"> - <label class="req" for="admin_name">{{.i18n.Tr "install.admin_name"}}</label> - <input class="ipt ipt-large ipt-radius {{if .Err_AdminName}}ipt-error{{end}}" id="admin_name" name="admin_name" value="{{.admin_name}}" required /> - </div> - <div class="field"> - <label class="req" for="admin_passwd">{{.i18n.Tr "install.admin_password"}}</label> - <input class="ipt ipt-large ipt-radius {{if .Err_AdminPasswd}}ipt-error{{end}}" id="admin_passwd" name="admin_passwd" type="password" value="{{.admin_passwd}}" required /> - </div> - <div class="field"> - <label class="req" for="admin_confirm_passwd">{{.i18n.Tr "install.confirm_password"}}</label> - <input class="ipt ipt-large ipt-radius {{if .Err_AdminPasswd}}ipt-error{{end}}" id="admin_confirm_passwd" name="admin_confirm_passwd" type="password" required /> - </div> - <div class="field"> - <label class="req" for="admin_email">{{.i18n.Tr "install.admin_email"}}</label> - <input class="ipt ipt-large ipt-radius {{if .Err_AdminEmail}}ipt-error{{end}}" id="admin_email" name="admin_email" value="{{.admin_email}}" required /> - </div> - - <hr> - - <div class="field"> - <label></label> - <button class="btn btn-blue btn-large btn-radius">{{.i18n.Tr "install.install_gogs"}}</button> - </div> - </form> - </div> - </div> - </div> - </div> -</div> -{{template "ng/base/footer" .}} diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 0c817bc1d8..b165afa0fd 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -7,7 +7,7 @@ <div class="col-md-3 filters"> <div class="filter-list"> <ul class="list-unstyled"> - <li><a href="{{.RepoLink}}/issues?state={{.State}}"{{if eq .ViewType "all"}} class="active"{{end}}>All Issues <strong class="pull-right">{{..IssueStats.AllCount}}</strong></a></li> + <li><a href="{{.RepoLink}}/issues?state={{.State}}"{{if eq .ViewType "all"}} class="active"{{end}}>All Issues <strong class="pull-right">{{.IssueStats.AllCount}}</strong></a></li> <li><a href="{{.RepoLink}}/issues?type=assigned&state={{.State}}"{{if eq .ViewType "assigned"}} class="active"{{end}}>Assigned to you <strong class="pull-right">{{.IssueStats.AssignCount}}</strong></a></li> <li><a href="{{.RepoLink}}/issues?type=created_by&state={{.State}}"{{if eq .ViewType "created_by"}} class="active"{{end}}>Created by you <strong class="pull-right">{{.IssueStats.CreateCount}}</strong></a></li> <li><a href="{{.RepoLink}}/issues?type=mentioned&state={{.State}}"{{if eq .ViewType "mentioned"}} class="active"{{end}}>Mentioning you <strong class="pull-right">{{.IssueStats.MentionCount}}</strong></a></li> |