diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/.VERSION | 2 | ||||
| -rw-r--r-- | templates/admin/config.tmpl | 2 | ||||
| -rw-r--r-- | templates/admin/user/edit.tmpl | 4 | ||||
| -rw-r--r-- | templates/base/alert.tmpl | 7 | ||||
| -rw-r--r-- | templates/base/alert_old.tmpl | 2 | ||||
| -rw-r--r-- | templates/base/footer.tmpl | 2 | ||||
| -rw-r--r-- | templates/base/head.tmpl | 14 | ||||
| -rw-r--r-- | templates/base/head_old.tmpl | 4 | ||||
| -rw-r--r-- | templates/install.tmpl | 348 | ||||
| -rw-r--r-- | templates/repo/issue/list.tmpl | 4 | ||||
| -rw-r--r-- | templates/repo/view_file.tmpl | 5 |
11 files changed, 235 insertions, 159 deletions
diff --git a/templates/.VERSION b/templates/.VERSION index 30ea8dd8..e87964c1 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.6.1.0327 Beta
\ No newline at end of file +0.6.1.0719 Beta
\ No newline at end of file diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index 6c328353..b5357d20 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -121,6 +121,8 @@ <dd><i class="fa fa{{if .MailerEnabled}}-check{{end}}-square-o"></i></dd> {{if .MailerEnabled}}<dt>{{.i18n.Tr "admin.config.mailer_name"}}</dt> <dd>{{.Mailer.Name}}</dd> + <dt>{{.i18n.Tr "admin.config.mailer_disable_helo"}}</dt> + <dd><i class="fa fa{{if .Mailer.DisableHelo}}-check{{end}}-square-o"></i></dd> <dt>{{.i18n.Tr "admin.config.mailer_host"}}</dt> <dd>{{.Mailer.Host}}</dd> <dt>{{.i18n.Tr "admin.config.mailer_user"}}</dt> diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index bdc0e334..4f4cc727 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -33,6 +33,10 @@ <label class="text-left">{{.User.Name}}</label> </div> <div class="field"> + <label for="full-name">{{.i18n.Tr "settings.full_name"}}</label> + <input class="ipt ipt-large ipt-radius {{if .Err_FullName}}ipt-error{{end}}" id="full-name" name="fullname" type="text" value="{{.User.FullName}}" /> + </div> + <div class="field"> <label class="req" for="email">{{.i18n.Tr "email"}}</label> <input class="ipt ipt-large ipt-radius {{if .Err_Email}}ipt-error{{end}}" id="email" name="email" type="email" value="{{.User.Email}}" required/> </div> diff --git a/templates/base/alert.tmpl b/templates/base/alert.tmpl index bb1eb6aa..15eeb566 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 00000000..bb1eb6aa --- /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/base/footer.tmpl b/templates/base/footer.tmpl index ad629816..0f0f8442 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -11,7 +11,7 @@ <a target="_blank" href="https://plus.google.com/communities/115599856376145964459"><i class="fa fa-google-plus"></i><span class="sr-only">Google Plus</span></a> <a target="_blank" href="http://weibo.com/gogschina"><i class="fa fa-weibo"></i><span class="sr-only">Sina Weibo</span></a> {{end}} - <div class="ui language bottom pointing dropdown link item"> + <div class="ui language bottom pointing slide up dropdown link item"> <i class="world icon"></i> <div class="text">{{.LangName}}</div> <div class="menu"> diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index ef6ad56a..d0577544 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -14,26 +14,27 @@ <link rel="shortcut icon" href="{{AppSubUrl}}/img/favicon.png" /> {{if CdnMode}} - <script src="//code.jquery.com/jquery-1.11.2.min.js"></script> + <script src="//code.jquery.com/jquery-1.11.3.min.js"></script> <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css"> {{else}} - <script src="{{AppSubUrl}}/js/jquery-1.11.2.min.js"></script> + <script src="{{AppSubUrl}}/js/jquery-1.11.3.min.js"></script> <link rel="stylesheet" href="{{AppSubUrl}}/css/font-awesome.min.css"> {{end}} <!-- Stylesheet --> - <link rel="stylesheet" href="{{AppSubUrl}}/css/semantic.min.css"> - <link rel="stylesheet" href="{{AppSubUrl}}/css/gogs.min.css"> + <link rel="stylesheet" href="{{AppSubUrl}}/css/semantic.min.css?v={{AppVer}}"> + <link rel="stylesheet" href="{{AppSubUrl}}/css/gogs.min.css?v={{AppVer}}"> <!-- JavaScript --> - <script src="{{AppSubUrl}}/js/semantic.min.js"></script> - <script src="{{AppSubUrl}}/js/gogs.js"></script> + <script src="{{AppSubUrl}}/js/semantic.min.js?v={{AppVer}}"></script> + <script src="{{AppSubUrl}}/js/gogs.js?v={{AppVer}}"></script> <title>{{if .Title}}{{.Title}} - {{end}}{{AppName}}</title> </head> <body> <div class="full height"> <noscript>Please enable JavaScript in your browser!</noscript> + {{if not .PageIsInstall}} <div class="following bar light"> <div class="ui page grid"> <div class="column"> @@ -58,3 +59,4 @@ </div> </div> </div> + {{end}} diff --git a/templates/base/head_old.tmpl b/templates/base/head_old.tmpl index cb3951ea..e04fe2e1 100644 --- a/templates/base/head_old.tmpl +++ b/templates/base/head_old.tmpl @@ -16,13 +16,13 @@ <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css"> <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet"> - <script src="//code.jquery.com/jquery-1.11.0.min.js"></script> + <script src="//code.jquery.com/jquery-1.11.3.min.js"></script> <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script> {{else}} <link href="{{AppSubUrl}}/css/bootstrap.min.css" rel="stylesheet" /> <link href="{{AppSubUrl}}/css/font-awesome.min.css" rel="stylesheet" /> - <script src="{{AppSubUrl}}/js/jquery-1.10.1.min.js"></script> + <script src="{{AppSubUrl}}/js/jquery-1.11.3.min.js"></script> <script src="{{AppSubUrl}}/js/bootstrap.min.js"></script> {{end}} diff --git a/templates/install.tmpl b/templates/install.tmpl index 3a7eb787..df987376 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -1,155 +1,213 @@ -{{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> +{{template "base/head" .}} +<div class="install"> + <div class="ui middle very relaxed page grid"> + <div class="sixteen wide center aligned centered column"> + - <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> + <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}} - <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> + <!-- 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 {{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}}"> + <div class="default text">{{.CurDbOption}}</div> + <i class="dropdown icon"></i> + <div class="menu"> + {{range .DbOptions}} + <div class="item" data-value="{{.}}">{{.}}</div> + {{end}} + </div> + </div> + </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> + <div id="sql_settings" class="{{if eq .CurDbOption "SQLite3"}}hide{{end}}"> + <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 {{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 {{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 {{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> + </div> + </div> - <hr> + <div id="pgsql_settings" class="{{if not (eq .CurDbOption "PostgreSQL")}}hide{{end}}"> + <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="{{if .ssl_mode}}{{.ssl_mode}}{{else}}disable{{end}}"> + <div class="default text">disable</div> + <i class="dropdown icon"></i> + <div class="menu"> + <div class="item" data-value="disable">Disable</div> + <div class="item" data-value="require">Require</div> + <div class="item" data-value="verify-full">Verify Full</div> + </div> + </div> + </div> + </div> - <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> + <div id="sqlite_settings" class="{{if not (eq .CurDbOption "SQLite3")}}hide{{end}}"> + <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> + </div> + </div> - <hr> + <!-- General Settings --> + <h4 class="ui dividing header">{{.i18n.Tr "install.general_title"}}</h4> + <div class="inline required field {{if .Err_AppName}}error{{end}}"> + <label for="app_name">{{.i18n.Tr "install.app_name"}}</label> + <input id="app_name" name="app_name" value="{{.app_name}}" required> + <span class="help">{{.i18n.Tr "install.app_name_helper"}}</span> + </div> + <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> - <div class="field"> - <label></label> - <button class="btn btn-blue btn-large btn-radius">{{.i18n.Tr "install.install_gogs"}}</button> - </div> - </form> + <!-- 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_SMTPFrom}}error{{end}}"> + <label for="smtp_from">{{.i18n.Tr "install.smtp_from"}}</label> + <input id="smtp_from" name="smtp_from" value="{{.smtp_from}}"> + <span class="help">{{.i18n.Tr "install.smtp_from_helper"}}</span> + </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 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"> + <i class="icon dropdown"></i> + {{.i18n.Tr "install.server_service_title"}} + </div> + <div class="content"> + <div class="inline field"> + <div class="ui checkbox"> + <label class="poping up" data-content="{{.i18n.Tr "install.offline_mode_popup"}}"><strong>{{.i18n.Tr "install.offline_mode"}}</strong></label> + <input name="offline_mode" type="checkbox" {{if .offline_mode}}checked{{end}}> </div> + </div> + <div class="inline field"> + <div class="ui checkbox"> + <label class="poping up" data-content="{{.i18n.Tr "install.disable_registration_popup"}}"><strong>{{.i18n.Tr "install.disable_registration"}}</strong></label> + <input name="disable_registration" type="checkbox" {{if .disable_registration}}checked{{end}}> + </div> + </div> + <div class="inline field"> + <div class="ui checkbox"> + <label class="poping up" data-content="{{.i18n.Tr "install.require_sign_in_view_popup"}}"><strong>{{.i18n.Tr "install.require_sign_in_view"}}</strong></label> + <input name="require_sign_in_view" type="checkbox" {{if .require_sign_in_view}}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" type="password" 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> + </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> + </div> </div> -{{template "ng/base/footer" .}} +{{template "base/footer" .}} diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 0c817bc1..8c267382 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> @@ -96,7 +96,7 @@ </div> </div> </div> -<script src="/js/bootstrap-colorpicker.min.js"></script> +<script src="{{AppSubUrl}}/js/bootstrap-colorpicker.min.js"></script> <script> $(function(){ $('.label-color-picker').colorpicker({ diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index d33cc950..4d11170b 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -12,6 +12,11 @@ <strong class="file-name">{{.FileName}}</strong><span class="file-size">{{FileSize .FileSize}}</span> {{end}} {{if not .ReadmeInList}} + {{if not .IsCommit}} + <a class="right" href="{{.RepoLink}}/src/{{.CommitId}}/{{.TreeName}}"> + <button class="btn btn-medium btn-gray btn-right-radius btn-comb">{{.i18n.Tr "repo.file_permalink"}}</button> + </a> + {{end}} <a class="right" href="{{.RepoLink}}/commits/{{EscapePound .BranchName}}/{{.TreeName}}"> <button class="btn btn-medium btn-gray btn-right-radius btn-comb">{{.i18n.Tr "repo.file_history"}}</button> </a> |