Skip to content

Commit 47eb429

Browse files
committed
Split template
1 parent 6801a41 commit 47eb429

File tree

3 files changed

+136
-134
lines changed

3 files changed

+136
-134
lines changed

templates/user/settings/keys.tmpl

Lines changed: 2 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -3,142 +3,10 @@
33
{{template "user/settings/navbar" .}}
44
<div class="ui container">
55
{{template "base/alert" .}}
6-
<h4 class="ui top attached header">
7-
{{.i18n.Tr "settings.manage_ssh_keys"}}
8-
<div class="ui right">
9-
<div class="ui blue tiny show-panel button" data-panel="#add-ssh-key-panel">{{.i18n.Tr "settings.add_key"}}</div>
10-
</div>
11-
</h4>
12-
<div class="ui attached segment">
13-
<div class="ui key list">
14-
<div class="item">
15-
{{.i18n.Tr "settings.ssh_desc"}}
16-
</div>
17-
{{range .Keys}}
18-
<div class="item">
19-
<div class="right floated content">
20-
<button class="ui red tiny button delete-button" id="delete-ssh" data-url="{{$.Link}}/delete?type=ssh" data-id="{{.ID}}">
21-
{{$.i18n.Tr "settings.delete_key"}}
22-
</button>
23-
</div>
24-
<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>
25-
<div class="content">
26-
<strong>{{.Name}}</strong>
27-
<div class="print meta">
28-
{{.Fingerprint}}
29-
</div>
30-
<div class="activity meta">
31-
<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>
32-
</div>
33-
</div>
34-
</div>
35-
{{end}}
36-
</div>
37-
</div>
6+
{{template "user/settings/keys_ssh" .}}
387
<br>
39-
<p>{{.i18n.Tr "settings.ssh_helper" "https://help.github.com/articles/generating-ssh-keys" "https://help.github.com/ssh-issues/" | Str2html}}</p>
40-
<div {{if not .HasSSHError}}class="hide"{{end}} id="add-ssh-key-panel">
41-
<h4 class="ui top attached header">
42-
{{.i18n.Tr "settings.add_new_key"}}
43-
</h4>
44-
<div class="ui attached segment">
45-
<form class="ui form" action="{{.Link}}" method="post">
46-
{{.CsrfTokenHtml}}
47-
<div class="field {{if .Err_Title}}error{{end}}">
48-
<label for="title">{{.i18n.Tr "settings.key_name"}}</label>
49-
<input id="ssh-key-title" name="title" value="{{.title}}" autofocus required>
50-
</div>
51-
<div class="field {{if .Err_Content}}error{{end}}">
52-
<label for="content">{{.i18n.Tr "settings.key_content"}}</label>
53-
<textarea id="ssh-key-content" name="content" required>{{.content}}</textarea>
54-
</div>
55-
<input name="type" type="hidden" value="ssh">
56-
<button class="ui green button">
57-
{{.i18n.Tr "settings.add_key"}}
58-
</button>
59-
</form>
60-
</div>
61-
</div>
62-
<br>
63-
<h4 class="ui top attached header">
64-
{{.i18n.Tr "settings.manage_gpg_keys"}}
65-
<div class="ui right">
66-
<div class="ui blue tiny show-panel button" data-panel="#add-gpg-key-panel">{{.i18n.Tr "settings.add_key"}}</div>
67-
</div>
68-
</h4>
69-
<div class="ui attached segment">
70-
<div class="ui key list">
71-
<div class="item">
72-
{{.i18n.Tr "settings.gpg_desc"}}
73-
</div>
74-
{{range .GPGKeys}}
75-
<div class="item">
76-
<div class="right floated content">
77-
<button class="ui red tiny button delete-button" id="delete-gpg" data-url="{{$.Link}}/delete?type=gpg" data-id="{{.ID}}">
78-
{{$.i18n.Tr "settings.delete_key"}}
79-
</button>
80-
</div>
81-
<i class="mega-octicon octicon-key {{if .Expired.After $.PageStartTime}}green{{end}}"></i>
82-
<div class="content">
83-
{{range .Emails}}<strong>{{.Email}} </strong>{{end}}
84-
<div class="print meta">
85-
<b>{{$.i18n.Tr "settings.key_id"}}:</b> {{.KeyID}}
86-
<b>{{$.i18n.Tr "settings.subkeys"}}:</b> {{range .SubsKey}} {{.KeyID}} {{end}}
87-
</div>
88-
<div class="activity meta">
89-
<i>{{$.i18n.Tr "settings.add_on"}} <span>{{DateFmtShort .Added}}</span></i>
90-
-
91-
<i>{{$.i18n.Tr "settings.valid_until"}} <span>{{DateFmtShort .Expired}}</span></i>
92-
</div>
93-
</div>
94-
</div>
95-
{{end}}
96-
</div>
97-
</div>
98-
<br>
99-
<p>{{.i18n.Tr "settings.gpg_helper" "https://help.github.com/articles/about-gpg/" | Str2html}}</p>
100-
<div {{if not .HasGPGError}}class="hide"{{end}} id="add-gpg-key-panel">
101-
<h4 class="ui top attached header">
102-
{{.i18n.Tr "settings.add_new_gpg_key"}}
103-
</h4>
104-
<div class="ui attached segment">
105-
<form class="ui form" action="{{.Link}}" method="post">
106-
{{.CsrfTokenHtml}}
107-
<input type="hidden" name="title" value="none">
108-
<div class="field {{if .Err_Content}}error{{end}}">
109-
<label for="content">{{.i18n.Tr "settings.key_content"}}</label>
110-
<textarea id="gpg-key-content" name="content" required>{{.content}}</textarea>
111-
</div>
112-
<input name="type" type="hidden" value="gpg">
113-
<button class="ui green button">
114-
{{.i18n.Tr "settings.add_key"}}
115-
</button>
116-
</form>
117-
</div>
118-
</div>
119-
</div>
120-
</div>
121-
122-
<div class="ui small basic delete modal" id="delete-ssh">
123-
<div class="ui icon header">
124-
<i class="trash icon"></i>
125-
{{.i18n.Tr "settings.ssh_key_deletion"}}
126-
</div>
127-
<div class="content">
128-
<p>{{.i18n.Tr "settings.ssh_key_deletion_desc"}}</p>
129-
</div>
130-
{{template "base/delete_modal_actions" .}}
131-
</div>
132-
133-
<div class="ui small basic delete modal" id="delete-gpg">
134-
<div class="ui icon header">
135-
<i class="trash icon"></i>
136-
{{.i18n.Tr "settings.gpg_key_deletion"}}
137-
</div>
138-
<div class="content">
139-
<p>{{.i18n.Tr "settings.gpg_key_deletion_desc"}}</p>
8+
{{template "user/settings/keys_gpg" .}}
1409
</div>
141-
{{template "base/delete_modal_actions" .}}
14210
</div>
14311

14412
{{template "base/footer" .}}

templates/user/settings/keys_gpg.tmpl

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<h4 class="ui top attached header">
2+
{{.i18n.Tr "settings.manage_gpg_keys"}}
3+
<div class="ui right">
4+
<div class="ui blue tiny show-panel button" data-panel="#add-gpg-key-panel">{{.i18n.Tr "settings.add_key"}}</div>
5+
</div>
6+
</h4>
7+
<div class="ui attached segment">
8+
<div class="ui key list">
9+
<div class="item">
10+
{{.i18n.Tr "settings.gpg_desc"}}
11+
</div>
12+
{{range .GPGKeys}}
13+
<div class="item">
14+
<div class="right floated content">
15+
<button class="ui red tiny button delete-button" id="delete-gpg" data-url="{{$.Link}}/delete?type=gpg" data-id="{{.ID}}">
16+
{{$.i18n.Tr "settings.delete_key"}}
17+
</button>
18+
</div>
19+
<i class="mega-octicon octicon-key {{if .Expired.After $.PageStartTime}}green{{end}}"></i>
20+
<div class="content">
21+
{{range .Emails}}<strong>{{.Email}} </strong>{{end}}
22+
<div class="print meta">
23+
<b>{{$.i18n.Tr "settings.key_id"}}:</b> {{.KeyID}}
24+
<b>{{$.i18n.Tr "settings.subkeys"}}:</b> {{range .SubsKey}} {{.KeyID}} {{end}}
25+
</div>
26+
<div class="activity meta">
27+
<i>{{$.i18n.Tr "settings.add_on"}} <span>{{DateFmtShort .Added}}</span></i>
28+
-
29+
<i>{{$.i18n.Tr "settings.valid_until"}} <span>{{DateFmtShort .Expired}}</span></i>
30+
</div>
31+
</div>
32+
</div>
33+
{{end}}
34+
</div>
35+
</div>
36+
<br>
37+
<p>{{.i18n.Tr "settings.gpg_helper" "https://help.github.com/articles/about-gpg/" | Str2html}}</p>
38+
<div {{if not .HasGPGError}}class="hide"{{end}} id="add-gpg-key-panel">
39+
<h4 class="ui top attached header">
40+
{{.i18n.Tr "settings.add_new_gpg_key"}}
41+
</h4>
42+
<div class="ui attached segment">
43+
<form class="ui form" action="{{.Link}}" method="post">
44+
{{.CsrfTokenHtml}}
45+
<input type="hidden" name="title" value="none">
46+
<div class="field {{if .Err_Content}}error{{end}}">
47+
<label for="content">{{.i18n.Tr "settings.key_content"}}</label>
48+
<textarea id="gpg-key-content" name="content" required>{{.content}}</textarea>
49+
</div>
50+
<input name="type" type="hidden" value="gpg">
51+
<button class="ui green button">
52+
{{.i18n.Tr "settings.add_key"}}
53+
</button>
54+
</form>
55+
</div>
56+
</div>
57+
58+
<div class="ui small basic delete modal" id="delete-gpg">
59+
<div class="ui icon header">
60+
<i class="trash icon"></i>
61+
{{.i18n.Tr "settings.gpg_key_deletion"}}
62+
</div>
63+
<div class="content">
64+
<p>{{.i18n.Tr "settings.gpg_key_deletion_desc"}}</p>
65+
</div>
66+
{{template "base/delete_modal_actions" .}}
67+
</div>

templates/user/settings/keys_ssh.tmpl

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<h4 class="ui top attached header">
2+
{{.i18n.Tr "settings.manage_ssh_keys"}}
3+
<div class="ui right">
4+
<div class="ui blue tiny show-panel button" data-panel="#add-ssh-key-panel">{{.i18n.Tr "settings.add_key"}}</div>
5+
</div>
6+
</h4>
7+
<div class="ui attached segment">
8+
<div class="ui key list">
9+
<div class="item">
10+
{{.i18n.Tr "settings.ssh_desc"}}
11+
</div>
12+
{{range .Keys}}
13+
<div class="item">
14+
<div class="right floated content">
15+
<button class="ui red tiny button delete-button" id="delete-ssh" data-url="{{$.Link}}/delete?type=ssh" data-id="{{.ID}}">
16+
{{$.i18n.Tr "settings.delete_key"}}
17+
</button>
18+
</div>
19+
<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>
20+
<div class="content">
21+
<strong>{{.Name}}</strong>
22+
<div class="print meta">
23+
{{.Fingerprint}}
24+
</div>
25+
<div class="activity meta">
26+
<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>
27+
</div>
28+
</div>
29+
</div>
30+
{{end}}
31+
</div>
32+
</div>
33+
<br>
34+
<p>{{.i18n.Tr "settings.ssh_helper" "https://help.github.com/articles/generating-ssh-keys" "https://help.github.com/ssh-issues/" | Str2html}}</p>
35+
<div {{if not .HasSSHError}}class="hide"{{end}} id="add-ssh-key-panel">
36+
<h4 class="ui top attached header">
37+
{{.i18n.Tr "settings.add_new_key"}}
38+
</h4>
39+
<div class="ui attached segment">
40+
<form class="ui form" action="{{.Link}}" method="post">
41+
{{.CsrfTokenHtml}}
42+
<div class="field {{if .Err_Title}}error{{end}}">
43+
<label for="title">{{.i18n.Tr "settings.key_name"}}</label>
44+
<input id="ssh-key-title" name="title" value="{{.title}}" autofocus required>
45+
</div>
46+
<div class="field {{if .Err_Content}}error{{end}}">
47+
<label for="content">{{.i18n.Tr "settings.key_content"}}</label>
48+
<textarea id="ssh-key-content" name="content" required>{{.content}}</textarea>
49+
</div>
50+
<input name="type" type="hidden" value="ssh">
51+
<button class="ui green button">
52+
{{.i18n.Tr "settings.add_key"}}
53+
</button>
54+
</form>
55+
</div>
56+
</div>
57+
58+
<div class="ui small basic delete modal" id="delete-ssh">
59+
<div class="ui icon header">
60+
<i class="trash icon"></i>
61+
{{.i18n.Tr "settings.ssh_key_deletion"}}
62+
</div>
63+
<div class="content">
64+
<p>{{.i18n.Tr "settings.ssh_key_deletion_desc"}}</p>
65+
</div>
66+
{{template "base/delete_modal_actions" .}}
67+
</div>

0 commit comments

Comments
 (0)