diff options
author | Ethan Koenig <ethantkoenig@gmail.com> | 2017-11-20 21:43:00 -0800 |
---|---|---|
committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-11-21 13:43:00 +0800 |
commit | ea78a6db5710c630fc3bd2d1d6c9551ea82b39f9 (patch) | |
tree | 3dfa65d7e9472c705d671ef4a2fee82bec7257cc /templates | |
parent | 0f6dc411dfc2bf85511b533c4055aa0c95bf54b1 (diff) | |
download | gitea-ea78a6db5710c630fc3bd2d1d6c9551ea82b39f9.tar.gz gitea-ea78a6db5710c630fc3bd2d1d6c9551ea82b39f9.zip |
Spaces to tabs in templates (#2953)
Diffstat (limited to 'templates')
-rw-r--r-- | templates/home.tmpl | 8 | ||||
-rw-r--r-- | templates/install.tmpl | 8 | ||||
-rw-r--r-- | templates/repo/commit_status.tmpl | 10 | ||||
-rw-r--r-- | templates/swagger.tmpl | 97 | ||||
-rw-r--r-- | templates/user/settings/keys_gpg.tmpl | 96 | ||||
-rw-r--r-- | templates/user/settings/keys_ssh.tmpl | 104 | ||||
-rw-r--r-- | templates/user/settings/security.tmpl | 46 |
7 files changed, 184 insertions, 185 deletions
diff --git a/templates/home.tmpl b/templates/home.tmpl index 64669afb4c..063fa8eaf2 100644 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -131,10 +131,10 @@ <i class="octicon octicon-flame"></i> Facile à installer </h1> <p class="large"> - Il suffit de <a target="_blank" rel="noopener" href="https://docs.gitea.io/en-us/install-from-binary/">lancer l'exécutable</a> correspondant à votre système. - Ou d'utiliser Gitea avec <a target="_blank" rel="noopener" href="https://github.com/go-gitea/gitea/tree/master/docker">Docker</a> ou - <a target="_blank" rel="noopener" href="https://github.com/alvaroaleman/ansible-gitea/blob/master/Vagrantfile">Vagrant</a> - ou en l'installant depuis un <a target="_blank" rel="noopener" href="https://docs.gitea.io/en-us/install-from-package/">package</a>. + Il suffit de <a target="_blank" rel="noopener" href="https://docs.gitea.io/en-us/install-from-binary/">lancer l'exécutable</a> correspondant à votre système. + Ou d'utiliser Gitea avec <a target="_blank" rel="noopener" href="https://github.com/go-gitea/gitea/tree/master/docker">Docker</a> ou + <a target="_blank" rel="noopener" href="https://github.com/alvaroaleman/ansible-gitea/blob/master/Vagrantfile">Vagrant</a> + ou en l'installant depuis un <a target="_blank" rel="noopener" href="https://docs.gitea.io/en-us/install-from-package/">package</a>. </p> </div> <div class="eight wide center column"> diff --git a/templates/install.tmpl b/templates/install.tmpl index 924eb2837c..bd79b3a068 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -85,10 +85,10 @@ <span class="help">{{.i18n.Tr "install.repo_path_helper"}}</span> </div> <div class="inline field {{if .Err_LFSRootPath}}error{{end}}"> - <label for="lfs_root_path">{{.i18n.Tr "install.lfs_path"}}</label> - <input id="lfs_root_path" name="lfs_root_path" value="{{.lfs_root_path}}"> - <span class="help">{{.i18n.Tr "install.lfs_path_helper"}}</span> - </div> + <label for="lfs_root_path">{{.i18n.Tr "install.lfs_path"}}</label> + <input id="lfs_root_path" name="lfs_root_path" value="{{.lfs_root_path}}"> + <span class="help">{{.i18n.Tr "install.lfs_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> diff --git a/templates/repo/commit_status.tmpl b/templates/repo/commit_status.tmpl index 752fd762e3..d5f75c132a 100644 --- a/templates/repo/commit_status.tmpl +++ b/templates/repo/commit_status.tmpl @@ -1,15 +1,15 @@ {{if eq .State "pending"}} - <a href="{{.TargetURL}}" target=_blank><i class="commit-status circle icon yellow"></i></a> + <a href="{{.TargetURL}}" target=_blank><i class="commit-status circle icon yellow"></i></a> {{end}} {{if eq .State "success"}} - <a href="{{.TargetURL}}" target=_blank><i class="commit-status check icon green"></i></a> + <a href="{{.TargetURL}}" target=_blank><i class="commit-status check icon green"></i></a> {{end}} {{if eq .State "error"}} - <a href="{{.TargetURL}}" target=_blank><i class="commit-status warning icon red"></i></a> + <a href="{{.TargetURL}}" target=_blank><i class="commit-status warning icon red"></i></a> {{end}} {{if eq .State "failure"}} - <a href="{{.TargetURL}}" target=_blank><i class="commit-status remove icon red"></i></a> + <a href="{{.TargetURL}}" target=_blank><i class="commit-status remove icon red"></i></a> {{end}} {{if eq .State "warning"}} - <a href="{{.TargetURL}}" target=_blank><i class="commit-status warning sign icon yellow"></i></a> + <a href="{{.TargetURL}}" target=_blank><i class="commit-status warning sign icon yellow"></i></a> {{end}}
\ No newline at end of file diff --git a/templates/swagger.tmpl b/templates/swagger.tmpl index 9d154b2898..d3ef2beb23 100644 --- a/templates/swagger.tmpl +++ b/templates/swagger.tmpl @@ -2,67 +2,66 @@ <!DOCTYPE html> <html lang="en"> <head> - <meta charset="UTF-8"> - <title>Swagger UI</title> - <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet"> - <link rel="stylesheet" type="text/css" href="{{AppSubUrl}}/vendor/assets/swagger-ui/swagger-ui.css" > - <link rel="icon" type="image/png" href="{{AppSubUrl}}/vendor/assets/swagger-ui/favicon-32x32.png" sizes="32x32" /> - <link rel="icon" type="image/png" href="{{AppSubUrl}}/vendor/assets/swagger-ui/favicon-16x16.png" sizes="16x16" /> - <style> - html - { - box-sizing: border-box; - overflow: -moz-scrollbars-vertical; - overflow-y: scroll; - } - *, - *:before, - *:after - { - box-sizing: inherit; - } - - body { - margin:0; - background: #fafafa; - } - </style> + <meta charset="UTF-8"> + <title>Swagger UI</title> + <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet"> + <link rel="stylesheet" type="text/css" href="{{AppSubUrl}}/vendor/assets/swagger-ui/swagger-ui.css" > + <link rel="icon" type="image/png" href="{{AppSubUrl}}/vendor/assets/swagger-ui/favicon-32x32.png" sizes="32x32" /> + <link rel="icon" type="image/png" href="{{AppSubUrl}}/vendor/assets/swagger-ui/favicon-16x16.png" sizes="16x16" /> + <style> + html + { + box-sizing: border-box; + overflow: -moz-scrollbars-vertical; + overflow-y: scroll; + } + *, + *:before, + *:after + { + box-sizing: inherit; + } + + body { + margin:0; + background: #fafafa; + } + </style> </head> <body> <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0"> - <defs> - <symbol viewBox="0 0 20 20" id="unlocked"> - <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path> - </symbol> - - <symbol viewBox="0 0 20 20" id="locked"> - <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z"/> - </symbol> + <defs> + <symbol viewBox="0 0 20 20" id="unlocked"> + <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path> + </symbol> - <symbol viewBox="0 0 20 20" id="close"> - <path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z"/> - </symbol> + <symbol viewBox="0 0 20 20" id="locked"> + <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z"/> + </symbol> - <symbol viewBox="0 0 20 20" id="large-arrow"> - <path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z"/> - </symbol> + <symbol viewBox="0 0 20 20" id="close"> + <path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z"/> + </symbol> - <symbol viewBox="0 0 20 20" id="large-arrow-down"> - <path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z"/> - </symbol> + <symbol viewBox="0 0 20 20" id="large-arrow"> + <path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z"/> + </symbol> + <symbol viewBox="0 0 20 20" id="large-arrow-down"> + <path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z"/> + </symbol> - <symbol viewBox="0 0 24 24" id="jump-to"> - <path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z"/> - </symbol> - <symbol viewBox="0 0 24 24" id="expand"> - <path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"/> - </symbol> + <symbol viewBox="0 0 24 24" id="jump-to"> + <path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z"/> + </symbol> - </defs> + <symbol viewBox="0 0 24 24" id="expand"> + <path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"/> + </symbol> + </defs> </svg> <div id="swagger-ui"></div> diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index 6d30bc7331..80b2b27523 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -1,58 +1,58 @@ <h4 class="ui top attached header"> - {{.i18n.Tr "settings.manage_gpg_keys"}} - <div class="ui right"> - <div class="ui blue tiny show-panel button" data-panel="#add-gpg-key-panel">{{.i18n.Tr "settings.add_key"}}</div> - </div> + {{.i18n.Tr "settings.manage_gpg_keys"}} + <div class="ui right"> + <div class="ui blue tiny show-panel button" data-panel="#add-gpg-key-panel">{{.i18n.Tr "settings.add_key"}}</div> + </div> </h4> <div class="ui attached segment"> - <div class="ui key list"> - <div class="item"> - {{.i18n.Tr "settings.gpg_desc"}} - </div> - {{range .GPGKeys}} - <div class="item"> - <div class="right floated content"> - <button class="ui red tiny button delete-button" id="delete-gpg" data-url="{{$.Link}}/delete?type=gpg" data-id="{{.ID}}"> - {{$.i18n.Tr "settings.delete_key"}} - </button> - </div> - <i class="mega-octicon octicon-key {{if or .Expired.IsZero (.Expired.After $.PageStartTime)}}green{{end}}"></i> - <div class="content"> - {{range .Emails}}<strong>{{.Email}} </strong>{{end}} - <div class="print meta"> - <b>{{$.i18n.Tr "settings.key_id"}}:</b> {{.KeyID}} - <b>{{$.i18n.Tr "settings.subkeys"}}:</b> {{range .SubsKey}} {{.KeyID}} {{end}} - </div> - <div class="activity meta"> - <i>{{$.i18n.Tr "settings.add_on"}} <span>{{DateFmtShort .Added}}</span></i> - - - <i>{{if not .Expired.IsZero }}{{$.i18n.Tr "settings.valid_until"}} <span>{{DateFmtShort .Expired}}</span>{{else}}{{$.i18n.Tr "settings.valid_forever"}}{{end}}</i> - </div> - </div> - </div> - {{end}} - </div> + <div class="ui key list"> + <div class="item"> + {{.i18n.Tr "settings.gpg_desc"}} + </div> + {{range .GPGKeys}} + <div class="item"> + <div class="right floated content"> + <button class="ui red tiny button delete-button" id="delete-gpg" data-url="{{$.Link}}/delete?type=gpg" data-id="{{.ID}}"> + {{$.i18n.Tr "settings.delete_key"}} + </button> + </div> + <i class="mega-octicon octicon-key {{if or .Expired.IsZero (.Expired.After $.PageStartTime)}}green{{end}}"></i> + <div class="content"> + {{range .Emails}}<strong>{{.Email}} </strong>{{end}} + <div class="print meta"> + <b>{{$.i18n.Tr "settings.key_id"}}:</b> {{.KeyID}} + <b>{{$.i18n.Tr "settings.subkeys"}}:</b> {{range .SubsKey}} {{.KeyID}} {{end}} + </div> + <div class="activity meta"> + <i>{{$.i18n.Tr "settings.add_on"}} <span>{{DateFmtShort .Added}}</span></i> + - + <i>{{if not .Expired.IsZero }}{{$.i18n.Tr "settings.valid_until"}} <span>{{DateFmtShort .Expired}}</span>{{else}}{{$.i18n.Tr "settings.valid_forever"}}{{end}}</i> + </div> + </div> + </div> + {{end}} + </div> </div> <br> <p>{{.i18n.Tr "settings.gpg_helper" "https://help.github.com/articles/about-gpg/" | Str2html}}</p> <div {{if not .HasGPGError}}class="hide"{{end}} id="add-gpg-key-panel"> - <h4 class="ui top attached header"> - {{.i18n.Tr "settings.add_new_gpg_key"}} - </h4> - <div class="ui attached segment"> - <form class="ui form" action="{{.Link}}" method="post"> - {{.CsrfTokenHtml}} - <input type="hidden" name="title" value="none"> - <div class="field {{if .Err_Content}}error{{end}}"> - <label for="content">{{.i18n.Tr "settings.key_content"}}</label> - <textarea id="gpg-key-content" name="content" required>{{.content}}</textarea> - </div> - <input name="type" type="hidden" value="gpg"> - <button class="ui green button"> - {{.i18n.Tr "settings.add_key"}} - </button> - </form> - </div> + <h4 class="ui top attached header"> + {{.i18n.Tr "settings.add_new_gpg_key"}} + </h4> + <div class="ui attached segment"> + <form class="ui form" action="{{.Link}}" method="post"> + {{.CsrfTokenHtml}} + <input type="hidden" name="title" value="none"> + <div class="field {{if .Err_Content}}error{{end}}"> + <label for="content">{{.i18n.Tr "settings.key_content"}}</label> + <textarea id="gpg-key-content" name="content" required>{{.content}}</textarea> + </div> + <input name="type" type="hidden" value="gpg"> + <button class="ui green button"> + {{.i18n.Tr "settings.add_key"}} + </button> + </form> + </div> </div> <div class="ui small basic delete modal" id="delete-gpg"> diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index 18fd918012..bc93d3e4ef 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -1,62 +1,62 @@ <h4 class="ui top attached header"> - {{.i18n.Tr "settings.manage_ssh_keys"}} - <div class="ui right"> - {{if not .DisableSSH}} - <div class="ui blue tiny show-panel button" data-panel="#add-ssh-key-panel">{{.i18n.Tr "settings.add_key"}}</div> - {{else}} - <div class="ui blue tiny button disabled">{{.i18n.Tr "settings.ssh_disabled"}}</div> - {{end}} - </div> + {{.i18n.Tr "settings.manage_ssh_keys"}} + <div class="ui right"> + {{if not .DisableSSH}} + <div class="ui blue tiny show-panel button" data-panel="#add-ssh-key-panel">{{.i18n.Tr "settings.add_key"}}</div> + {{else}} + <div class="ui blue tiny button disabled">{{.i18n.Tr "settings.ssh_disabled"}}</div> + {{end}} + </div> </h4> <div class="ui attached segment"> - <div class="ui key list"> - <div class="item"> - {{.i18n.Tr "settings.ssh_desc"}} - </div> - {{range .Keys}} - <div class="item"> - <div class="right floated content"> - <button class="ui red tiny button delete-button" id="delete-ssh" data-url="{{$.Link}}/delete?type=ssh" data-id="{{.ID}}"> - {{$.i18n.Tr "settings.delete_key"}} - </button> - </div> - <i class="mega-octicon octicon-key {{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-content="{{$.i18n.Tr "settings.key_state_desc"}}" data-variation="inverted tiny"{{end}}></i> - <div class="content"> - <strong>{{.Name}}</strong> - <div class="print meta"> - {{.Fingerprint}} - </div> - <div class="activity meta"> - <i>{{$.i18n.Tr "settings.add_on"}} <span>{{DateFmtShort .Created}}</span> — <i class="octicon octicon-info"></i> {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{DateFmtShort .Updated}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i> - </div> - </div> - </div> - {{end}} - </div> + <div class="ui key list"> + <div class="item"> + {{.i18n.Tr "settings.ssh_desc"}} + </div> + {{range .Keys}} + <div class="item"> + <div class="right floated content"> + <button class="ui red tiny button delete-button" id="delete-ssh" data-url="{{$.Link}}/delete?type=ssh" data-id="{{.ID}}"> + {{$.i18n.Tr "settings.delete_key"}} + </button> + </div> + <i class="mega-octicon octicon-key {{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-content="{{$.i18n.Tr "settings.key_state_desc"}}" data-variation="inverted tiny"{{end}}></i> + <div class="content"> + <strong>{{.Name}}</strong> + <div class="print meta"> + {{.Fingerprint}} + </div> + <div class="activity meta"> + <i>{{$.i18n.Tr "settings.add_on"}} <span>{{DateFmtShort .Created}}</span> — <i class="octicon octicon-info"></i> {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{DateFmtShort .Updated}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i> + </div> + </div> + </div> + {{end}} + </div> </div> <br> <p>{{.i18n.Tr "settings.ssh_helper" "https://help.github.com/articles/generating-ssh-keys" "https://help.github.com/ssh-issues/" | Str2html}}</p> <div {{if not .HasSSHError}}class="hide"{{end}} id="add-ssh-key-panel"> - <h4 class="ui top attached header"> - {{.i18n.Tr "settings.add_new_key"}} - </h4> - <div class="ui attached segment"> - <form class="ui form" action="{{.Link}}" method="post"> - {{.CsrfTokenHtml}} - <div class="field {{if .Err_Title}}error{{end}}"> - <label for="title">{{.i18n.Tr "settings.key_name"}}</label> - <input id="ssh-key-title" name="title" value="{{.title}}" autofocus required> - </div> - <div class="field {{if .Err_Content}}error{{end}}"> - <label for="content">{{.i18n.Tr "settings.key_content"}}</label> - <textarea id="ssh-key-content" name="content" required>{{.content}}</textarea> - </div> - <input name="type" type="hidden" value="ssh"> - <button class="ui green button"> - {{.i18n.Tr "settings.add_key"}} - </button> - </form> - </div> + <h4 class="ui top attached header"> + {{.i18n.Tr "settings.add_new_key"}} + </h4> + <div class="ui attached segment"> + <form class="ui form" action="{{.Link}}" method="post"> + {{.CsrfTokenHtml}} + <div class="field {{if .Err_Title}}error{{end}}"> + <label for="title">{{.i18n.Tr "settings.key_name"}}</label> + <input id="ssh-key-title" name="title" value="{{.title}}" autofocus required> + </div> + <div class="field {{if .Err_Content}}error{{end}}"> + <label for="content">{{.i18n.Tr "settings.key_content"}}</label> + <textarea id="ssh-key-content" name="content" required>{{.content}}</textarea> + </div> + <input name="type" type="hidden" value="ssh"> + <button class="ui green button"> + {{.i18n.Tr "settings.add_key"}} + </button> + </form> + </div> </div> <div class="ui small basic delete modal" id="delete-ssh"> diff --git a/templates/user/settings/security.tmpl b/templates/user/settings/security.tmpl index a956a3fcb3..b7cd222b30 100644 --- a/templates/user/settings/security.tmpl +++ b/templates/user/settings/security.tmpl @@ -36,32 +36,32 @@ </div> {{end}} </div> - <br/> + <br/> - <h4 class="ui top attached header"> + <h4 class="ui top attached header"> {{.i18n.Tr "settings.twofa"}} </h4> - <div class="ui attached segment"> - <p>{{.i18n.Tr "settings.twofa_desc"}}</p> - {{if .TwofaEnrolled}} - <p>{{$.i18n.Tr "settings.twofa_is_enrolled" | Str2html }}</p> - <form class="ui form" action="{{.Link}}/two_factor/regenerate_scratch" method="post" enctype="multipart/form-data"> - {{.CsrfTokenHtml}} - <p>{{.i18n.Tr "settings.regenerate_scratch_token_desc"}}</p> - <button class="ui blue button">{{$.i18n.Tr "settings.twofa_scratch_token_regenerate"}}</button> - </form> - <form class="ui form" action="{{.Link}}/two_factor/disable" method="post" enctype="multipart/form-data" id="disable-form"> - {{.CsrfTokenHtml}} - <p>{{.i18n.Tr "settings.twofa_disable_note"}}</p> - <div class="ui red button delete-button" data-type="form" data-form="#disable-form">{{$.i18n.Tr "settings.twofa_disable"}}</div> - </form> - {{else}} - <p>{{.i18n.Tr "settings.twofa_not_enrolled"}}</p> - <div class="inline field"> - <a class="ui green button" href="{{.Link}}/two_factor/enroll">{{$.i18n.Tr "settings.twofa_enroll"}}</a> - </div> - {{end}} - </div> + <div class="ui attached segment"> + <p>{{.i18n.Tr "settings.twofa_desc"}}</p> + {{if .TwofaEnrolled}} + <p>{{$.i18n.Tr "settings.twofa_is_enrolled" | Str2html }}</p> + <form class="ui form" action="{{.Link}}/two_factor/regenerate_scratch" method="post" enctype="multipart/form-data"> + {{.CsrfTokenHtml}} + <p>{{.i18n.Tr "settings.regenerate_scratch_token_desc"}}</p> + <button class="ui blue button">{{$.i18n.Tr "settings.twofa_scratch_token_regenerate"}}</button> + </form> + <form class="ui form" action="{{.Link}}/two_factor/disable" method="post" enctype="multipart/form-data" id="disable-form"> + {{.CsrfTokenHtml}} + <p>{{.i18n.Tr "settings.twofa_disable_note"}}</p> + <div class="ui red button delete-button" data-type="form" data-form="#disable-form">{{$.i18n.Tr "settings.twofa_disable"}}</div> + </form> + {{else}} + <p>{{.i18n.Tr "settings.twofa_not_enrolled"}}</p> + <div class="inline field"> + <a class="ui green button" href="{{.Link}}/two_factor/enroll">{{$.i18n.Tr "settings.twofa_enroll"}}</a> + </div> + {{end}} + </div> </div> </div> |