From dd8a06a397e26c46639eba1313102560dfa49c95 Mon Sep 17 00:00:00 2001 From: Adam Strzelecki Date: Mon, 7 Dec 2015 21:20:54 +0100 Subject: [PATCH 1/2] LESS: Use tabs for indent in all files This does not change any content and generated gogs.css is still the same. --- public/less/_admin.less | 8 +- public/less/_base.less | 142 ++--- public/less/_dashboard.less | 36 +- public/less/_emojify.less | 8 +- public/less/_explore.less | 6 +- public/less/_form.less | 2 +- public/less/_home.less | 6 +- public/less/_install.less | 2 +- public/less/_markdown.less | 960 ++++++++++++++++----------------- public/less/_organization.less | 4 +- public/less/_repository.less | 502 ++++++++--------- public/less/_user.less | 2 +- public/less/gogs.less | 2 +- 13 files changed, 840 insertions(+), 840 deletions(-) diff --git a/public/less/_admin.less b/public/less/_admin.less index c69e50b6f2..096637b439 100644 --- a/public/less/_admin.less +++ b/public/less/_admin.less @@ -11,7 +11,7 @@ thead { th:last-child { - padding-right: 5px !important; + padding-right: 5px !important; } } } @@ -39,9 +39,9 @@ max-width: 200px; } } - - dl.admin-dl-horizontal { - padding: 20px; + + dl.admin-dl-horizontal { + padding: 20px; margin: 0; dd{ diff --git a/public/less/_base.less b/public/less/_base.less index e359363423..671c708879 100644 --- a/public/less/_base.less +++ b/public/less/_base.less @@ -1,5 +1,5 @@ @footer-margin: 40px; - + body { font-family: 'Helvetica Neue',Arial,Helvetica,sans-serif,'微软雅黑'; background-color: #FAFAFA; @@ -10,20 +10,20 @@ img { pre { font: 12px Consolas, "Liberation Mono", Menlo, Courier, monospace; &.raw { - padding: 7px 12px; - margin: 10px 0; - background-color: #f8f8f8; - border: 1px solid #ddd; - border-radius: 3px; - font-size: 13px; - line-height: 1.5; - overflow: auto; + padding: 7px 12px; + margin: 10px 0; + background-color: #f8f8f8; + border: 1px solid #ddd; + border-radius: 3px; + font-size: 13px; + line-height: 1.5; + overflow: auto; } } .full.height { padding: 0; - margin: 0 0 -@footer-margin*2 0; - min-height: 100%; + margin: 0 0 -@footer-margin*2 0; + min-height: 100%; } .following.bar { z-index: 900; @@ -65,24 +65,24 @@ pre { margin-right: 0; } .searchbox { - background-color: rgb(244, 244, 244) !important; - &:focus { - background-color: rgb(233, 233, 233) !important; - } + background-color: rgb(244, 244, 244) !important; + &:focus { + background-color: rgb(233, 233, 233) !important; + } } .text .octicon { - width: 16px; - text-align: center; - } - .right.menu { - .menu { - left: auto; - right: 0; - } + width: 16px; + text-align: center; + } + .right.menu { + .menu { + left: auto; + right: 0; + } .dropdown .menu { margin-top: 0; } - } + } } .ui { @@ -96,21 +96,21 @@ pre { .text { &.red { color: #d95c5c !important; - a { - color: #d95c5c !important; - &:hover { - color: #E67777 !important; - } - } + a { + color: #d95c5c !important; + &:hover { + color: #E67777 !important; + } + } } &.blue { color: #428bca !important; - a { - color: #15c !important; - &:hover { - color: #428bca !important; - } - } + a { + color: #15c !important; + &:hover { + color: #428bca !important; + } + } } &.black { color: #444; @@ -119,13 +119,13 @@ pre { } } &.grey { - color: #767676 !important; - a { - color: #444 !important; - &:hover { - color: #000 !important; - } - } + color: #767676 !important; + a { + color: #444 !important; + &:hover { + color: #000 !important; + } + } } &.light.grey { color: #888 !important; @@ -189,10 +189,10 @@ pre { .warning { &.header { background-color: #F9EDBE !important; - border-color: #F0C36D; + border-color: #F0C36D; } &.segment { - border-color: #F0C36D; + border-color: #F0C36D; } } .info { @@ -269,9 +269,9 @@ pre { font-weight: 700; } &:hover { - background: rgba(0,0,0,.05); - color: rgba(0,0,0,.8); - z-index: 13; + background: rgba(0,0,0,.05); + color: rgba(0,0,0,.8); + z-index: 13; } } } @@ -279,7 +279,7 @@ pre { .scrolling.menu { .item.selected { - font-weight: 700 !important; + font-weight: 700 !important; } } @@ -295,8 +295,8 @@ footer { padding-top: 10px; .fa { width: 16px; - text-align: center; - color: #428bca; + text-align: center; + color: #428bca; } .links >* { border-left: 1px solid #d6d6d6; @@ -318,11 +318,11 @@ footer { .generate-img(16); .generate-img(@n, @i: 1) when (@i =< @n) { - .img-@{i} { - width: (2px * @i) !important; - height: (2px * @i) !important; - } - .generate-img(@n, (@i + 1)); + .img-@{i} { + width: (2px * @i) !important; + height: (2px * @i) !important; + } + .generate-img(@n, (@i + 1)); } // ensure Semantic UI .icon font family and 14px size does not apply to .icon.octicon @@ -335,27 +335,27 @@ footer { // Accessibility .sr-only { - position: absolute; - width: 1px; - height: 1px; - padding: 0; - margin: -1px; - overflow: hidden; - clip: rect(0, 0, 0, 0); - border: 0; + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; } .sr-only-focusable:active, .sr-only-focusable:focus { - position: static; - width: auto; - height: auto; - margin: 0; - overflow: visible; - clip: auto; + position: static; + width: auto; + height: auto; + margin: 0; + overflow: visible; + clip: auto; } @media only screen and (max-width: 991px) and (min-width: 768px) { .ui.container { width: 95%; } -} \ No newline at end of file +} diff --git a/public/less/_dashboard.less b/public/less/_dashboard.less index e9b69daa6d..53d3352cbd 100644 --- a/public/less/_dashboard.less +++ b/public/less/_dashboard.less @@ -8,8 +8,8 @@ z-index: 101; min-width: 200px; .ui.header { - font-size: 1rem; - text-transform: none; + font-size: 1rem; + text-transform: none; } } .filter.menu { @@ -17,8 +17,8 @@ text-align: left; .text { height: 16px; - vertical-align: middle; - &.truncate { + vertical-align: middle; + &.truncate { width: 85%; } } @@ -32,7 +32,7 @@ // Sort .jump.item { margin: 1px; - padding-right: 0; + padding-right: 0; } .menu { max-height: 300px; @@ -96,24 +96,24 @@ padding-left: 0; li { - &:not(:last-child) { - border-bottom: 1px solid #EAEAEA; - } + &:not(:last-child) { + border-bottom: 1px solid #EAEAEA; + } &.private { background-color: #fcf8e9; } - - a { - padding: 6px 1.2em; - display: block; - .octicon { - margin-right: 6px; - color: #888; - } - } + a { + padding: 6px 1.2em; + display: block; + + .octicon { + margin-right: 6px; + color: #888; + } + } } } } -} \ No newline at end of file +} diff --git a/public/less/_emojify.less b/public/less/_emojify.less index 62fdaa6455..e9a49a04e2 100755 --- a/public/less/_emojify.less +++ b/public/less/_emojify.less @@ -1,6 +1,6 @@ .emoji { - width: 1.5em; - height: 1.5em; - display: inline-block; - background-size: contain; + width: 1.5em; + height: 1.5em; + display: inline-block; + background-size: contain; } diff --git a/public/less/_explore.less b/public/less/_explore.less index b510c71a10..53a6b5a46c 100644 --- a/public/less/_explore.less +++ b/public/less/_explore.less @@ -25,8 +25,8 @@ } } .time { - font-size: 12px; - color: #808080; + font-size: 12px; + color: #808080; } } -} \ No newline at end of file +} diff --git a/public/less/_form.less b/public/less/_form.less index f9ccfa9713..3dba34d7ec 100644 --- a/public/less/_form.less +++ b/public/less/_form.less @@ -110,4 +110,4 @@ padding-left: 40px; } } -} \ No newline at end of file +} diff --git a/public/less/_home.less b/public/less/_home.less index 2a105ceb1f..01165249c2 100644 --- a/public/less/_home.less +++ b/public/less/_home.less @@ -15,8 +15,8 @@ } .octicon { color: #d9453d; - font-size: 40px; - width: 50px; + font-size: 40px; + width: 50px; } &.header { font-size: 20px; @@ -36,4 +36,4 @@ .signup { padding-top: 15px; padding-bottom: @footer-margin * 2; -} \ No newline at end of file +} diff --git a/public/less/_install.less b/public/less/_install.less index 33c927fb10..7f11846341 100644 --- a/public/less/_install.less +++ b/public/less/_install.less @@ -28,4 +28,4 @@ } } } -} \ No newline at end of file +} diff --git a/public/less/_markdown.less b/public/less/_markdown.less index 561fa20b1b..7d433dc448 100644 --- a/public/less/_markdown.less +++ b/public/less/_markdown.less @@ -1,481 +1,481 @@ .markdown { - overflow: hidden; - font-family: "Helvetica Neue", Helvetica, "Segoe UI", Arial, freesans, sans-serif; - font-size: 16px; - line-height: 1.6 !important; - word-wrap: break-word; - - &.file-view { - padding: 5px 2em 2em !important; - } - - >*:first-child { - margin-top: 0 !important; - } - - >*:last-child { - margin-bottom: 0 !important; - } - - a:not([href]) { - color: inherit; - text-decoration: none; - } - - .absent { - color: #c00; - } - - .anchor { - position: absolute; - top: 0; - left: 0; - display: block; - padding-right: 6px; - padding-left: 30px; - margin-left: -30px; - } - - .anchor:focus { - outline: none; - } - - h1, - h2, - h3, - h4, - h5, - h6 { - position: relative; - margin-top: 1em; - margin-bottom: 16px; - font-weight: bold; - line-height: 1.4; - } - - h1 .octicon-link, - h2 .octicon-link, - h3 .octicon-link, - h4 .octicon-link, - h5 .octicon-link, - h6 .octicon-link { - display:none; - color:#000; - vertical-align:middle; - } - - h1:hover .anchor, - h2:hover .anchor, - h3:hover .anchor, - h4:hover .anchor, - h5:hover .anchor, - h6:hover .anchor { - padding-left:8px; - margin-left:-30px; - text-decoration:none; - } - - h1:hover .anchor .octicon-link, - h2:hover .anchor .octicon-link, - h3:hover .anchor .octicon-link, - h4:hover .anchor .octicon-link, - h5:hover .anchor .octicon-link, - h6:hover .anchor .octicon-link { - display:inline-block; - } - - h1 tt, - h1 code, - h2 tt, - h2 code, - h3 tt, - h3 code, - h4 tt, - h4 code, - h5 tt, - h5 code, - h6 tt, - h6 code { - font-size:inherit; - } - - h1 { - padding-bottom:0.3em; - font-size:2.25em; - line-height:1.2; - border-bottom:1px solid #eee; - } - - h1 .anchor { - line-height:1; - } - - h2 { - padding-bottom:0.3em; - font-size:1.75em; - line-height:1.225; - border-bottom:1px solid #eee; - } - - h2 .anchor { - line-height:1; - } - - h3 { - font-size:1.5em; - line-height:1.43; - } - - h3 .anchor { - line-height:1.2; - } - - h4 { - font-size:1.25em; - } - - h4 .anchor { - line-height:1.2; - } - - h5 { - font-size:1em; - } - - h5 .anchor { - line-height:1.1; - } - - h6 { - font-size:1em;color:#777; - } - - h6 .anchor { - line-height:1.1; - } - - p, - blockquote, - ul, - ol, - dl, - table, - pre { - margin-top: 0; - margin-bottom: 16px; - } - blockquote { - margin-left: 0; - } - - hr { - height:4px; - padding:0; - margin:16px 0; - background-color:#e7e7e7; - border:0 none; - } - - ul, - ol { - padding-left:2em; - } - - ul.no-list, - ol.no-list { - padding:0; - list-style-type:none; - } - - ul ul, - ul ol, - ol ol, - ol ul { - margin-top:0; - margin-bottom:0; - } - - ol ol, - ul ol { - list-style-type: lower-roman; - } - - li>p { - margin-top:16px; - } - - dl { - padding:0; - } - - dl dt { - padding:0; - margin-top:16px; - font-size:1em; - font-style:italic; - font-weight:bold; - } - - dl dd { - padding:0 16px; - margin-bottom:16px; - } - - blockquote { - padding:0 15px; - color:#777; - border-left:4px solid #ddd; - } - - blockquote>:first-child { - margin-top:0; - } - - blockquote>:last-child { - margin-bottom:0; - } - - table { - display:block; - width:100%; - overflow:auto; - word-break:normal; - word-break:keep-all; - } - - table th { - font-weight:bold; - } - - table th, - table td { - padding:6px 13px !important; - border:1px solid #ddd; - } - - table tr { - background-color:#fff; - border-top:1px solid #ccc; - } - - table tr:nth-child(2n) { - background-color:#f8f8f8; - } - - img { - max-width:100%; - box-sizing:border-box; - } - - .emoji { - max-width:none; - } - - span.frame { - display:block; - overflow:hidden; - } - - span.frame>span { - display:block; - float:left; - width:auto; - padding:7px; - margin:13px 0 0; - overflow:hidden; - border:1px solid #ddd; - } - - span.frame span img { - display:block; - float:left; - } - - span.frame span span { - display:block; - padding:5px 0 0; - clear:both; - color:#333; - } - - span.align-center { - display:block; - overflow:hidden; - clear:both; - } - - span.align-center>span { - display:block; - margin:13px auto 0; - overflow:hidden; - text-align:center; - } - - span.align-center span img { - margin:0 auto; - text-align:center; - } - - span.align-right { - display:block; - overflow:hidden; - clear:both; - } - - span.align-right>span { - display:block; - margin:13px 0 0; - overflow:hidden; - text-align:right; - } - - span.align-right span img { - margin:0; - text-align:right; - } - - span.float-left { - display:block; - float:left; - margin-right:13px; - overflow:hidden; - } - - span.float-left span { - margin:13px 0 0; - } - - span.float-right { - display:block; - float:right; - margin-left:13px; - overflow:hidden; - } - - span.float-right>span { - display:block; - margin:13px auto 0; - overflow:hidden; - text-align:right; - } - - code, - tt { - padding:0; - padding-top:0.2em; - padding-bottom:0.2em; - margin:0; - font-size:85%; - background-color:rgba(0,0,0,0.04); - border-radius:3px; - } - - code:before, - code:after, - tt:before, - tt:after { - letter-spacing:-0.2em; - content:"\00a0"; - } - - code br, - tt br { - display:none; - } - - del code { - text-decoration:inherit; - } - - pre>code { - padding:0; - margin:0; - font-size:100%; - word-break:normal; - white-space:pre; - background:transparent; - border:0; - } - - .highlight { - margin-bottom:16px; - } - - .highlight pre, - pre { - padding:16px; - overflow:auto; - font-size:85%; - line-height:1.45; - background-color:#f7f7f7; - border-radius:3px; - } - - .highlight pre { - margin-bottom:0; - word-break:normal; - } - - pre { - word-wrap:normal; - } - - pre code, - pre tt { - display:inline; - max-width:initial; - padding:0; - margin:0; - overflow:initial; - line-height:inherit; - word-wrap:normal; - background-color:transparent; - border:0; - } - - pre code:before, - pre code:after, - pre tt:before, - pre tt:after { - content:normal; - } - - kbd { - display:inline-block; - padding:3px 5px; - font-size:11px; - line-height:10px; - color:#555; - vertical-align:middle; - background-color:#fcfcfc; - border:solid 1px #ccc; - border-bottom-color:#bbb; - border-radius:3px; - box-shadow:inset 0 -1px 0 #bbb; - } - - .csv-data td, - .csv-data th { - padding:5px; - overflow:hidden; - font-size:12px; - line-height:1; - text-align:left; - white-space:nowrap; - } - - .csv-data .blob-num { - padding:10px 8px 9px; - text-align:right; - background:#fff;border:0; - } - - .csv-data tr { - border-top:0; - } - - .csv-data th { - font-weight:bold; - background:#f8f8f8;border-top:0; - } -} \ No newline at end of file + overflow: hidden; + font-family: "Helvetica Neue", Helvetica, "Segoe UI", Arial, freesans, sans-serif; + font-size: 16px; + line-height: 1.6 !important; + word-wrap: break-word; + + &.file-view { + padding: 5px 2em 2em !important; + } + + >*:first-child { + margin-top: 0 !important; + } + + >*:last-child { + margin-bottom: 0 !important; + } + + a:not([href]) { + color: inherit; + text-decoration: none; + } + + .absent { + color: #c00; + } + + .anchor { + position: absolute; + top: 0; + left: 0; + display: block; + padding-right: 6px; + padding-left: 30px; + margin-left: -30px; + } + + .anchor:focus { + outline: none; + } + + h1, + h2, + h3, + h4, + h5, + h6 { + position: relative; + margin-top: 1em; + margin-bottom: 16px; + font-weight: bold; + line-height: 1.4; + } + + h1 .octicon-link, + h2 .octicon-link, + h3 .octicon-link, + h4 .octicon-link, + h5 .octicon-link, + h6 .octicon-link { + display:none; + color:#000; + vertical-align:middle; + } + + h1:hover .anchor, + h2:hover .anchor, + h3:hover .anchor, + h4:hover .anchor, + h5:hover .anchor, + h6:hover .anchor { + padding-left:8px; + margin-left:-30px; + text-decoration:none; + } + + h1:hover .anchor .octicon-link, + h2:hover .anchor .octicon-link, + h3:hover .anchor .octicon-link, + h4:hover .anchor .octicon-link, + h5:hover .anchor .octicon-link, + h6:hover .anchor .octicon-link { + display:inline-block; + } + + h1 tt, + h1 code, + h2 tt, + h2 code, + h3 tt, + h3 code, + h4 tt, + h4 code, + h5 tt, + h5 code, + h6 tt, + h6 code { + font-size:inherit; + } + + h1 { + padding-bottom:0.3em; + font-size:2.25em; + line-height:1.2; + border-bottom:1px solid #eee; + } + + h1 .anchor { + line-height:1; + } + + h2 { + padding-bottom:0.3em; + font-size:1.75em; + line-height:1.225; + border-bottom:1px solid #eee; + } + + h2 .anchor { + line-height:1; + } + + h3 { + font-size:1.5em; + line-height:1.43; + } + + h3 .anchor { + line-height:1.2; + } + + h4 { + font-size:1.25em; + } + + h4 .anchor { + line-height:1.2; + } + + h5 { + font-size:1em; + } + + h5 .anchor { + line-height:1.1; + } + + h6 { + font-size:1em;color:#777; + } + + h6 .anchor { + line-height:1.1; + } + + p, + blockquote, + ul, + ol, + dl, + table, + pre { + margin-top: 0; + margin-bottom: 16px; + } + blockquote { + margin-left: 0; + } + + hr { + height:4px; + padding:0; + margin:16px 0; + background-color:#e7e7e7; + border:0 none; + } + + ul, + ol { + padding-left:2em; + } + + ul.no-list, + ol.no-list { + padding:0; + list-style-type:none; + } + + ul ul, + ul ol, + ol ol, + ol ul { + margin-top:0; + margin-bottom:0; + } + + ol ol, + ul ol { + list-style-type: lower-roman; + } + + li>p { + margin-top:16px; + } + + dl { + padding:0; + } + + dl dt { + padding:0; + margin-top:16px; + font-size:1em; + font-style:italic; + font-weight:bold; + } + + dl dd { + padding:0 16px; + margin-bottom:16px; + } + + blockquote { + padding:0 15px; + color:#777; + border-left:4px solid #ddd; + } + + blockquote>:first-child { + margin-top:0; + } + + blockquote>:last-child { + margin-bottom:0; + } + + table { + display:block; + width:100%; + overflow:auto; + word-break:normal; + word-break:keep-all; + } + + table th { + font-weight:bold; + } + + table th, + table td { + padding:6px 13px !important; + border:1px solid #ddd; + } + + table tr { + background-color:#fff; + border-top:1px solid #ccc; + } + + table tr:nth-child(2n) { + background-color:#f8f8f8; + } + + img { + max-width:100%; + box-sizing:border-box; + } + + .emoji { + max-width:none; + } + + span.frame { + display:block; + overflow:hidden; + } + + span.frame>span { + display:block; + float:left; + width:auto; + padding:7px; + margin:13px 0 0; + overflow:hidden; + border:1px solid #ddd; + } + + span.frame span img { + display:block; + float:left; + } + + span.frame span span { + display:block; + padding:5px 0 0; + clear:both; + color:#333; + } + + span.align-center { + display:block; + overflow:hidden; + clear:both; + } + + span.align-center>span { + display:block; + margin:13px auto 0; + overflow:hidden; + text-align:center; + } + + span.align-center span img { + margin:0 auto; + text-align:center; + } + + span.align-right { + display:block; + overflow:hidden; + clear:both; + } + + span.align-right>span { + display:block; + margin:13px 0 0; + overflow:hidden; + text-align:right; + } + + span.align-right span img { + margin:0; + text-align:right; + } + + span.float-left { + display:block; + float:left; + margin-right:13px; + overflow:hidden; + } + + span.float-left span { + margin:13px 0 0; + } + + span.float-right { + display:block; + float:right; + margin-left:13px; + overflow:hidden; + } + + span.float-right>span { + display:block; + margin:13px auto 0; + overflow:hidden; + text-align:right; + } + + code, + tt { + padding:0; + padding-top:0.2em; + padding-bottom:0.2em; + margin:0; + font-size:85%; + background-color:rgba(0,0,0,0.04); + border-radius:3px; + } + + code:before, + code:after, + tt:before, + tt:after { + letter-spacing:-0.2em; + content:"\00a0"; + } + + code br, + tt br { + display:none; + } + + del code { + text-decoration:inherit; + } + + pre>code { + padding:0; + margin:0; + font-size:100%; + word-break:normal; + white-space:pre; + background:transparent; + border:0; + } + + .highlight { + margin-bottom:16px; + } + + .highlight pre, + pre { + padding:16px; + overflow:auto; + font-size:85%; + line-height:1.45; + background-color:#f7f7f7; + border-radius:3px; + } + + .highlight pre { + margin-bottom:0; + word-break:normal; + } + + pre { + word-wrap:normal; + } + + pre code, + pre tt { + display:inline; + max-width:initial; + padding:0; + margin:0; + overflow:initial; + line-height:inherit; + word-wrap:normal; + background-color:transparent; + border:0; + } + + pre code:before, + pre code:after, + pre tt:before, + pre tt:after { + content:normal; + } + + kbd { + display:inline-block; + padding:3px 5px; + font-size:11px; + line-height:10px; + color:#555; + vertical-align:middle; + background-color:#fcfcfc; + border:solid 1px #ccc; + border-bottom-color:#bbb; + border-radius:3px; + box-shadow:inset 0 -1px 0 #bbb; + } + + .csv-data td, + .csv-data th { + padding:5px; + overflow:hidden; + font-size:12px; + line-height:1; + text-align:left; + white-space:nowrap; + } + + .csv-data .blob-num { + padding:10px 8px 9px; + text-align:right; + background:#fff;border:0; + } + + .csv-data tr { + border-top:0; + } + + .csv-data th { + font-weight:bold; + background:#f8f8f8;border-top:0; + } +} diff --git a/public/less/_organization.less b/public/less/_organization.less index 3fa54b6eb3..4ad3b1dad0 100644 --- a/public/less/_organization.less +++ b/public/less/_organization.less @@ -92,7 +92,7 @@ } .ui.button { margin-left: 5px; - margin-top: -3px; + margin-top: -3px; } } } @@ -154,4 +154,4 @@ } } } -} \ No newline at end of file +} diff --git a/public/less/_repository.less b/public/less/_repository.less index 0490bfa0af..06ce6414aa 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -47,7 +47,7 @@ .metas { .menu { max-height: 300px; - overflow-x: auto; + overflow-x: auto; } .ui.list { .hide { @@ -82,13 +82,13 @@ .menu { max-height: 300px; overflow-x: auto; - right: 0!important; - left: auto!important; - } - .dropdown.item { - margin: 1px; - padding-right: 0; - } + right: 0!important; + left: auto!important; + } + .dropdown.item { + margin: 1px; + padding-right: 0; + } } .ui.tabs { @@ -110,15 +110,15 @@ width: 100%; input { - border-radius: 0; - padding: 5px 10px; + border-radius: 0; + padding: 5px 10px; } .clone.button { font-size: 13px; padding: 0 5px; &:first-child { - border-radius: .28571429rem 0 0 .28571429rem; + border-radius: .28571429rem 0 0 .28571429rem; } } .icon.button { @@ -168,7 +168,7 @@ padding-bottom: 8px; } tr:hover { - background-color: #ffffEE; + background-color: #ffffEE; } } @@ -176,7 +176,7 @@ .header { .icon { font-size: 1em; - margin-top: -2px; + margin-top: -2px; } } .view-raw { @@ -199,26 +199,26 @@ width: 100%; } .lines-num { - vertical-align: top; - text-align: right; - color: #999; - background: #f5f5f5; - width: 1%; + vertical-align: top; + text-align: right; + color: #999; + background: #f5f5f5; + width: 1%; - span { - font-family: Monaco, Menlo, Consolas, "Courier New", monospace; - line-height: 20px; - padding: 0 10px; - cursor: pointer; - display: block; - } + span { + font-family: Monaco, Menlo, Consolas, "Courier New", monospace; + line-height: 20px; + padding: 0 10px; + cursor: pointer; + display: block; + } } .lines-num, .lines-code { padding: 0; - pre, + pre, ol, .hljs { background-color: white; @@ -227,7 +227,7 @@ li { padding-left: 5px; &.active { - background: #ffffdd; + background: #ffffdd; } } } @@ -243,7 +243,7 @@ } } } - + &.options { #interval { width: 100px!important; @@ -291,12 +291,12 @@ font-size: 3rem; margin-bottom: 5px; .ui.input { - font-size: 0.5em; + font-size: 0.5em; vertical-align: top; width: 50%; min-width: 600px; input { - font-size: 1.5em; + font-size: 1.5em; padding: 6px 10px; } } @@ -310,7 +310,7 @@ margin-right: 10px; } .edit-zone { - margin-top: 10px; + margin-top: 10px; } } .pull-desc { @@ -327,10 +327,10 @@ } &.tab.segment { border: none; - padding: 0; - padding-top: 10px; - box-shadow: none; - background-color: inherit; + padding: 0; + padding-top: 10px; + box-shadow: none; + background-color: inherit; } .merge.box { .avatar { @@ -345,7 +345,7 @@ content: ""; position: absolute; margin-top: 12px; - margin-bottom: 14px; + margin-bottom: 14px; top: 0; bottom: 0; left: 96px; @@ -357,13 +357,13 @@ .avatar { width: @comment-avatar-width; } - .tag { + .tag { color: #767676; margin-top: 3px; - padding: 2px 5px; - font-size: 12px; - border: 1px solid rgba(0,0,0,0.1); - border-radius: 3px; + padding: 2px 5px; + font-size: 12px; + border: 1px solid rgba(0,0,0,0.1); + border-radius: 3px; } .actions { .item { @@ -386,8 +386,8 @@ border-top-right-radius: 3px; .text { max-width: 78%; - padding-top: 10px; - padding-bottom: 10px; + padding-top: 10px; + padding-bottom: 10px; } } .markdown { @@ -411,8 +411,8 @@ } .tab.segment { border: none; - padding: 0; - padding-top: 10px; + padding: 0; + padding-top: 10px; } textarea { height: 200px; @@ -425,41 +425,41 @@ } .event { position: relative; - margin: 15px 0 15px 79px; - padding-left: 25px; - .octicon { - width: 30px; - float: left; - margin-left: -36px; - text-align: center; - &.octicon-circle-slash { - margin-top: 5px; - font-size: 20px; - color: #bd2c00; - } - &.octicon-primitive-dot { - font-size: 30px; - color: #6cc644; - } - &.octicon-bookmark { - margin-top: 3px; - font-size: 25px; - } - } - .detail { - font-size: 0.9rem; - margin-top: 5px; - margin-left: 35px; - .octicon { - &.octicon-git-commit { - margin-top: 2px; - } - } - } + margin: 15px 0 15px 79px; + padding-left: 25px; + .octicon { + width: 30px; + float: left; + margin-left: -36px; + text-align: center; + &.octicon-circle-slash { + margin-top: 5px; + font-size: 20px; + color: #bd2c00; + } + &.octicon-primitive-dot { + font-size: 30px; + color: #6cc644; + } + &.octicon-bookmark { + margin-top: 3px; + font-size: 25px; + } + } + .detail { + font-size: 0.9rem; + margin-top: 5px; + margin-left: 35px; + .octicon { + &.octicon-git-commit { + margin-top: 2px; + } + } + } } } .ui.segment.metas { - margin-top: -3px; + margin-top: -3px; } } .comment.form { @@ -473,8 +473,8 @@ } .tab.segment { border: none; - padding: 0; - padding-top: 10px; + padding: 0; + padding-top: 10px; } textarea { height: 200px; @@ -595,7 +595,7 @@ } .sha { font-size: 13px; - padding: 6px 40px 4px 35px; + padding: 6px 40px 4px 35px; } } &.ui.basic.striped.table tbody tr:nth-child(2n) { @@ -604,143 +604,143 @@ } .diff-detail-box { - margin: 15px 0; - line-height: 30px; - ol { - clear: both; - padding-left: 0; - margin-top: 5px; - margin-bottom: 28px; - li { - list-style: none; - padding-bottom: 4px; - margin-bottom: 4px; - border-bottom: 1px dashed #DDD; - padding-left: 6px; - } - } - span.status{ - display: inline-block; - width: 12px; - height: 12px; - margin-right: 8px; - vertical-align: middle; - &.modify { - background-color: #f0db88; - } - &.add { - background-color: #b4e2b4; - } - &.del { - background-color: #e9aeae; - } - &.rename { - background-color: #dad8ff; - } - } + margin: 15px 0; + line-height: 30px; + ol { + clear: both; + padding-left: 0; + margin-top: 5px; + margin-bottom: 28px; + li { + list-style: none; + padding-bottom: 4px; + margin-bottom: 4px; + border-bottom: 1px dashed #DDD; + padding-left: 6px; + } + } + span.status{ + display: inline-block; + width: 12px; + height: 12px; + margin-right: 8px; + vertical-align: middle; + &.modify { + background-color: #f0db88; + } + &.add { + background-color: #b4e2b4; + } + &.del { + background-color: #e9aeae; + } + &.rename { + background-color: #dad8ff; + } + } } .diff-box { - .count { - margin-right: 12px; - .bar { - background-color: #e75316; - height: 12px; - width: 40px; - display: inline-block; - margin: 2px 4px 0 4px; - vertical-align: text-top; - .add { - background-color: #77c64a; - height: 12px; - } - } - } - .file { - color: #888; - } + .count { + margin-right: 12px; + .bar { + background-color: #e75316; + height: 12px; + width: 40px; + display: inline-block; + margin: 2px 4px 0 4px; + vertical-align: text-top; + .add { + background-color: #77c64a; + height: 12px; + } + } + } + .file { + color: #888; + } } .diff-file-box { .header { border-bottom: 1px solid #d4d4d5!important; } - .file-body.file-code { - .lines-num { - text-align: right; - color: #999; - background: #fafafa; - width: 1%; - } - .lines-num-old { - border-right: 1px solid #DDD; - } - } - .code-diff { - font-size: 13px; - - td { - padding: 0; - border-top: none; - } - pre { - margin: 0; - font-size: 13px; - } - .lines-num { - border-right: 1px solid #d4d4d5; - padding: 0 5px; - } - tbody { - tr { - &.tag-code { - td, pre { - background-color: #E0E0E0 !important; - border-color: #ADADAD!important; - } - // td.selected-line, td.selected-line pre { - // background-color: #ffffdd !important; - // } - } - // &.same-code { - // td.selected-line, td.selected-line pre { - // background-color: #ffffdd !important; - // } - // } - &.del-code { - td, pre { - background-color: #ffe2dd !important; - border-color: #e9aeae !important; - } - // td.selected-line, td.selected-line pre { - // background-color: #ffffdd !important; - // } - } - &.add-code { - td, pre { - background-color: #d1ffd6 !important; - border-color: #b4e2b4 !important; - } - // td.selected-line, td.selected-line pre { - // background-color: #ffffdd !important; - // } - } - &:hover { - td { - background-color: #FFF8D2 !important; - border-color: #F0DB88 !important; - } - pre { - background-color: transparent !important; - } - } - } - } - } - &.file-content { - img { - max-width: 100%; - padding: 5px 5px 0 5px; - } - } + .file-body.file-code { + .lines-num { + text-align: right; + color: #999; + background: #fafafa; + width: 1%; + } + .lines-num-old { + border-right: 1px solid #DDD; + } + } + .code-diff { + font-size: 13px; + + td { + padding: 0; + border-top: none; + } + pre { + margin: 0; + font-size: 13px; + } + .lines-num { + border-right: 1px solid #d4d4d5; + padding: 0 5px; + } + tbody { + tr { + &.tag-code { + td, pre { + background-color: #E0E0E0 !important; + border-color: #ADADAD!important; + } + // td.selected-line, td.selected-line pre { + // background-color: #ffffdd !important; + // } + } + // &.same-code { + // td.selected-line, td.selected-line pre { + // background-color: #ffffdd !important; + // } + // } + &.del-code { + td, pre { + background-color: #ffe2dd !important; + border-color: #e9aeae !important; + } + // td.selected-line, td.selected-line pre { + // background-color: #ffffdd !important; + // } + } + &.add-code { + td, pre { + background-color: #d1ffd6 !important; + border-color: #b4e2b4 !important; + } + // td.selected-line, td.selected-line pre { + // background-color: #ffffdd !important; + // } + } + &:hover { + td { + background-color: #FFF8D2 !important; + border-color: #F0DB88 !important; + } + pre { + background-color: transparent !important; + } + } + } + } + } + &.file-content { + img { + max-width: 100%; + padding: 5px 5px 0 5px; + } + } } .code-view { overflow: auto; @@ -759,7 +759,7 @@ .clone.button:first-child { border-radius: .28571429rem 0 0 .28571429rem; } - .ui.action.small.input { + .ui.action.small.input { width: 100%; } #repo-clone-url { @@ -822,23 +822,23 @@ li { list-style: none; display: block; - padding-top: 8px; - padding-bottom: 8px; + padding-top: 8px; + padding-bottom: 8px; border-bottom: 1px solid #eee; } } } .dot { - width: 9px; - height: 9px; - background-color: #ccc; - z-index: 999; - position: absolute; - display: block; - left: -5px; - top: 40px; - border-radius: 6px; - border: 1px solid #FFF; + width: 9px; + height: 9px; + background-color: #ccc; + z-index: 999; + position: absolute; + display: block; + left: -5px; + top: 40px; + border-radius: 6px; + border: 1px solid #FFF; } } } @@ -847,7 +847,7 @@ &.new.release { .target { min-width: 500px; - + .at { margin-left: -5px; margin-right: 5px; @@ -858,7 +858,7 @@ } .selection.dropdown { padding-top: 10px; - padding-bottom: 10px; + padding-bottom: 10px; } } .prerelease.field { @@ -874,15 +874,15 @@ list-style: none; width: 32%; margin: 10px 10px 10px 0; - padding-bottom: 14px; - float: left; + padding-bottom: 14px; + float: left; .avatar { width: 48px; height: 48px; float: left; - display: block; - margin-right: 10px; + display: block; + margin-right: 10px; } .name { margin-top: 0; @@ -948,13 +948,13 @@ text-transform: none; } .markdown { - padding: 15px 30px; + padding: 15px 30px; - h1, h2, h3, h4, h5, h6 { - &:first-of-type { - margin-top: 0; - } - } + h1, h2, h3, h4, h5, h6 { + &:first-of-type { + margin-top: 0; + } + } } } } @@ -981,7 +981,7 @@ } .ui.button { margin-left: 5px; - margin-top: -3px; + margin-top: -3px; } } } @@ -1002,7 +1002,7 @@ &:hover { background: rgba(0,0,0,.05)!important; - color: rgba(0,0,0,.95)!important; + color: rgba(0,0,0,.95)!important; } img { margin-right: 8px; @@ -1055,7 +1055,7 @@ .ui.comments { .dropzone { - width: 100%; + width: 100%; margin-bottom: 10px; border: 2px dashed #0087F7; box-shadow: none!important; @@ -1081,10 +1081,10 @@ float: left; color: gray; padding-left: 10px; - padding-top: 10px; - &.active { - color: #6cc644; - } + padding-top: 10px; + &.active { + color: #6cc644; + } } .meta { padding-top: 5px; @@ -1129,19 +1129,19 @@ } .tab.segment { border: none; - padding: 0; - padding-top: 10px; - box-shadow: none; - > * { - color: #666; - } - pre { + padding: 0; + padding-top: 10px; + box-shadow: none; + > * { + color: #666; + } + pre { word-wrap: break-word; .hljs { padding: 0; background-color: inherit; } - } + } } } } @@ -1198,4 +1198,4 @@ .ui.message { width: 100%!important; } -} \ No newline at end of file +} diff --git a/public/less/_user.less b/public/less/_user.less index 171fccd082..3aa8e3b5be 100644 --- a/public/less/_user.less +++ b/public/less/_user.less @@ -47,4 +47,4 @@ margin-top: 25px; } } -} \ No newline at end of file +} diff --git a/public/less/gogs.less b/public/less/gogs.less index d690e3aee4..8aa408082a 100644 --- a/public/less/gogs.less +++ b/public/less/gogs.less @@ -10,4 +10,4 @@ @import "_user"; @import "_dashboard"; @import "_admin"; -@import "_explore"; \ No newline at end of file +@import "_explore"; From da2585c11e11023ffa7a8c69d21c6fecac520a8e Mon Sep 17 00:00:00 2001 From: Adam Strzelecki Date: Mon, 7 Dec 2015 23:30:52 +0100 Subject: [PATCH 2/2] Indent all templates with tabs This commit improves templates readability, since all of them use consistent indent with all template command blocks indented too. 1. Indents both HTML containers such as
,

and Go HTML template blocks such as {{if}} {{with}} 2. Cleans all trailing white-space 3. Adds trailing last line-break to each file --- templates/admin/auth/edit.tmpl | 304 +++++------ templates/admin/auth/list.tmpl | 82 +-- templates/admin/auth/new.tmpl | 296 +++++----- templates/admin/config.tmpl | 374 ++++++------- templates/admin/dashboard.tmpl | 234 ++++---- templates/admin/monitor.tmpl | 122 ++--- templates/admin/nav.tmpl | 28 +- templates/admin/navbar.tmpl | 50 +- templates/admin/notice.tmpl | 192 +++---- templates/admin/org/list.tmpl | 106 ++-- templates/admin/repo/list.tmpl | 94 ++-- templates/admin/user/edit.tmpl | 188 +++---- templates/admin/user/list.tmpl | 132 ++--- templates/admin/user/new.tmpl | 122 ++--- templates/base/alert.tmpl | 20 +- templates/base/delete_modal_actions.tmpl | 18 +- templates/base/footer.tmpl | 49 +- templates/base/head.tmpl | 201 +++---- templates/explore/navbar.tmpl | 2 +- templates/explore/repo_list.tmpl | 42 +- templates/explore/repos.tmpl | 40 +- templates/home.tmpl | 232 ++++---- templates/install.tmpl | 414 +++++++------- templates/mail/auth/activate.tmpl | 16 +- templates/mail/auth/activate_email.tmpl | 18 +- templates/mail/auth/register_notify.tmpl | 14 +- templates/mail/auth/reset_passwd.tmpl | 18 +- templates/mail/notify/collaborator.tmpl | 16 +- templates/mail/notify/mention.tmpl | 18 +- templates/org/create.tmpl | 52 +- templates/org/header.tmpl | 40 +- templates/org/home.tmpl | 154 +++--- templates/org/member/invite.tmpl | 30 +- templates/org/member/members.tmpl | 92 ++-- templates/org/settings/delete.tmpl | 74 +-- templates/org/settings/hook_new.tmpl | 48 +- templates/org/settings/hooks.tmpl | 14 +- templates/org/settings/navbar.tmpl | 18 +- templates/org/settings/options.tmpl | 104 ++-- templates/org/team/members.tmpl | 64 +-- templates/org/team/new.tmpl | 150 ++--- templates/org/team/repositories.tmpl | 62 +-- templates/org/team/sidebar.tmpl | 80 +-- templates/org/team/teams.tmpl | 56 +- templates/repo/bare.tmpl | 98 ++-- templates/repo/commits.tmpl | 8 +- templates/repo/commits_table.tmpl | 124 ++--- templates/repo/create.tmpl | 218 ++++---- templates/repo/diff.tmpl | 82 +-- templates/repo/diff_box.tmpl | 180 +++--- templates/repo/forks.tmpl | 36 +- templates/repo/header.tmpl | 162 +++--- templates/repo/home.tmpl | 216 ++++---- templates/repo/issue/comment_tab.tmpl | 26 +- templates/repo/issue/label_precolors.tmpl | 2 +- templates/repo/issue/labels.tmpl | 126 ++--- templates/repo/issue/list.tmpl | 164 +++--- templates/repo/issue/milestone_new.tmpl | 88 +-- templates/repo/issue/milestones.tmpl | 180 +++--- templates/repo/issue/navbar.tmpl | 6 +- templates/repo/issue/new.tmpl | 2 +- templates/repo/issue/new_form.tmpl | 118 ++-- templates/repo/issue/view.tmpl | 18 +- templates/repo/issue/view_content.tmpl | 516 +++++++++--------- templates/repo/issue/view_title.tmpl | 52 +- templates/repo/migrate.tmpl | 158 +++--- templates/repo/pulls/commits.tmpl | 6 +- templates/repo/pulls/compare.tmpl | 80 +-- templates/repo/pulls/files.tmpl | 6 +- templates/repo/pulls/fork.tmpl | 110 ++-- templates/repo/pulls/tab_menu.tmpl | 32 +- templates/repo/release/list.tmpl | 154 +++--- templates/repo/release/new.tmpl | 184 +++---- templates/repo/settings/collaboration.tmpl | 60 +- templates/repo/settings/deploy_keys.tmpl | 94 ++-- templates/repo/settings/githook_edit.tmpl | 40 +- templates/repo/settings/githooks.tmpl | 30 +- .../repo/settings/hook_delete_modal.tmpl | 36 +- templates/repo/settings/hook_gogs.tmpl | 52 +- templates/repo/settings/hook_history.tmpl | 128 ++--- templates/repo/settings/hook_list.tmpl | 74 +-- templates/repo/settings/hook_new.tmpl | 24 +- templates/repo/settings/hook_settings.tmpl | 102 ++-- templates/repo/settings/hook_slack.tmpl | 50 +- templates/repo/settings/hooks.tmpl | 4 +- templates/repo/settings/nav.tmpl | 26 +- templates/repo/settings/navbar.tmpl | 34 +- templates/repo/settings/options.tmpl | 300 +++++----- templates/repo/view_file.tmpl | 98 ++-- templates/repo/view_list.tmpl | 104 ++-- templates/repo/watchers.tmpl | 104 ++-- templates/repo/wiki/new.tmpl | 60 +- templates/repo/wiki/pages.tmpl | 44 +- templates/repo/wiki/start.tmpl | 20 +- templates/repo/wiki/view.tmpl | 128 ++--- templates/status/404.tmpl | 10 +- templates/status/500.tmpl | 10 +- templates/user/auth/activate.tmpl | 68 +-- templates/user/auth/forgot_passwd.tmpl | 60 +- templates/user/auth/reset_passwd.tmpl | 54 +- templates/user/auth/signin.tmpl | 78 +-- templates/user/auth/signup.tmpl | 104 ++-- templates/user/dashboard/dashboard.tmpl | 218 ++++---- templates/user/dashboard/feeds.tmpl | 136 ++--- templates/user/dashboard/issues.tmpl | 164 +++--- templates/user/dashboard/navbar.tmpl | 94 ++-- templates/user/profile.tmpl | 132 ++--- templates/user/settings/applications.tmpl | 158 +++--- templates/user/settings/delete.tmpl | 72 +-- templates/user/settings/email.tmpl | 128 ++--- templates/user/settings/navbar.tmpl | 36 +- templates/user/settings/password.tmpl | 64 +-- templates/user/settings/profile.tmpl | 126 ++--- templates/user/settings/sshkeys.tmpl | 154 +++--- 114 files changed, 5559 insertions(+), 5551 deletions(-) diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index e1d1d7660a..5c99af3a38 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -1,164 +1,164 @@ {{template "base/head" .}}

-
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.auths.edit"}} -

-
-
- {{.CsrfTokenHtml}} - -
- - - {{.Source.TypeName}} -
-
- - -
+
+
+ {{template "admin/navbar" .}} +
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.auths.edit"}} +

+
+ + {{.CsrfTokenHtml}} + +
+ + + {{.Source.TypeName}} +
+
+ + +
- - {{if or .Source.IsLDAP .Source.IsDLDAP}} - {{ $cfg:=.Source.LDAP }} -
- - -
-
- - -
- {{if .Source.IsLDAP}} -
- - -
- -
- - -

{{.i18n.Tr "admin.auths.bind_password_helper"}}

-
-
- - -
- {{end}} - {{if .Source.IsDLDAP}} -
- - -
- {{end}} -
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- {{end}} + + {{if or .Source.IsLDAP .Source.IsDLDAP}} + {{ $cfg:=.Source.LDAP }} +
+ + +
+
+ + +
+ {{if .Source.IsLDAP}} +
+ + +
+ +
+ + +

{{.i18n.Tr "admin.auths.bind_password_helper"}}

+
+
+ + +
+ {{end}} + {{if .Source.IsDLDAP}} +
+ + +
+ {{end}} +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ {{end}} - - {{if .Source.IsSMTP}} - {{ $cfg:=.Source.SMTP }} -
- -
- -
{{$cfg.Auth}}
- -
- {{range .SMTPAuths}} -
{{.}}
- {{end}} -
-
-
-
- - -
-
- - -
-
- - -

{{.i18n.Tr "admin.auths.allowed_domains_helper"}}

-
- {{end}} + + {{if .Source.IsSMTP}} + {{ $cfg:=.Source.SMTP }} +
+ +
+ +
{{$cfg.Auth}}
+ +
+ {{range .SMTPAuths}} +
{{.}}
+ {{end}} +
+
+
+
+ + +
+
+ + +
+
+ + +

{{.i18n.Tr "admin.auths.allowed_domains_helper"}}

+
+ {{end}} - - {{if .Source.IsPAM}} - {{ $cfg:=.Source.PAM }} -
- - -
- {{end}} + + {{if .Source.IsPAM}} + {{ $cfg:=.Source.PAM }} +
+ + +
+ {{end}} -
-
- - -
-
-
-
- - -
-
-
-
- - -
-
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
-
- -
{{.i18n.Tr "admin.auths.delete"}}
-
- -
-
-
-
+
+ +
{{.i18n.Tr "admin.auths.delete"}}
+
+ +
+
+
+
-
- - {{.i18n.Tr "admin.auths.delete_auth_title"}} -
-
-

{{.i18n.Tr "admin.auths.delete_auth_desc"}}

-
- {{template "base/delete_modal_actions" .}} +
+ + {{.i18n.Tr "admin.auths.delete_auth_title"}} +
+
+

{{.i18n.Tr "admin.auths.delete_auth_desc"}}

+
+ {{template "base/delete_modal_actions" .}}
{{template "base/footer" .}} diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl index 72e32c6f2b..58bdc66b2c 100644 --- a/templates/admin/auth/list.tmpl +++ b/templates/admin/auth/list.tmpl @@ -1,46 +1,46 @@ {{template "base/head" .}}
-
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.auths.auth_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}}) -
- {{.i18n.Tr "admin.auths.new"}} -
-

-
- - - - - - - - - - - - - - {{range .Sources}} - - - - - - - - - - {{end}} - -
ID{{.i18n.Tr "admin.auths.name"}}{{.i18n.Tr "admin.auths.type"}}{{.i18n.Tr "admin.auths.enabled"}}{{.i18n.Tr "admin.auths.updated"}}{{.i18n.Tr "admin.users.created"}}{{.i18n.Tr "admin.users.edit"}}
{{.ID}}{{.Name}}{{.TypeName}}{{DateFmtShort .Updated}}{{DateFmtShort .Created}}
+
+
+ {{template "admin/navbar" .}} +
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.auths.auth_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}}) +
+ {{.i18n.Tr "admin.auths.new"}} +
+

+
+ + + + + + + + + + + + + + {{range .Sources}} + + + + + + + + + + {{end}} + +
ID{{.i18n.Tr "admin.auths.name"}}{{.i18n.Tr "admin.auths.type"}}{{.i18n.Tr "admin.auths.enabled"}}{{.i18n.Tr "admin.auths.updated"}}{{.i18n.Tr "admin.users.created"}}{{.i18n.Tr "admin.users.edit"}}
{{.ID}}{{.Name}}{{.TypeName}}{{DateFmtShort .Updated}}{{DateFmtShort .Created}}
-
-
+
+
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl index 448a4ab64a..481d0c6829 100644 --- a/templates/admin/auth/new.tmpl +++ b/templates/admin/auth/new.tmpl @@ -1,159 +1,159 @@ {{template "base/head" .}}
-
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.auths.new"}} -

-
-
- {{.CsrfTokenHtml}} - -
- -
- -
{{.CurTypeName}}
- -
- {{range .AuthSources}} -
{{.Name}}
- {{end}} -
-
-
-
- - -
+
+
+ {{template "admin/navbar" .}} +
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.auths.new"}} +

+
+ + {{.CsrfTokenHtml}} + +
+ +
+ +
{{.CurTypeName}}
+ +
+ {{range .AuthSources}} +
{{.Name}}
+ {{end}} +
+
+
+
+ + +
- -
-
- - -
-
- - -
-
- - -
- -
- - -

{{.i18n.Tr "admin.auths.bind_password_helper"}}

-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
+ +
+
+ + +
+
+ + +
+
+ + +
+ +
+ + +

{{.i18n.Tr "admin.auths.bind_password_helper"}}

+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
- -
-
- -
- -
{{.smtp_auth}}
- -
- {{range .SMTPAuths}} -
{{.}}
- {{end}} -
-
-
-
- - -
-
- - -
-
- - -

{{.i18n.Tr "admin.auths.allowed_domains_helper"}}

-
-
+ +
+
+ +
+ +
{{.smtp_auth}}
+ +
+ {{range .SMTPAuths}} +
{{.}}
+ {{end}} +
+
+
+
+ + +
+
+ + +
+
+ + +

{{.i18n.Tr "admin.auths.allowed_domains_helper"}}

+
+
- -
- - -
+ +
+ + +
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
-
- -
- -
+
+ +
+ +
-

- {{.i18n.Tr "admin.auths.tips"}} -

-
-
GMail Setting:
-

Host: smtp.gmail.com, Post: 587, Enable TLS Encryption: true

-
-
-
+

+ {{.i18n.Tr "admin.auths.tips"}} +

+
+
GMail Setting:
+

Host: smtp.gmail.com, Post: 587, Enable TLS Encryption: true

+
+
+
{{template "base/footer" .}} diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index 1a4efa8f1c..0738f18b0c 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -1,190 +1,190 @@ {{template "base/head" .}}
-
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.config.server_config"}} -

-
-
-
{{.i18n.Tr "admin.config.app_name"}}
-
{{AppName}}
-
{{.i18n.Tr "admin.config.app_ver"}}
-
{{AppVer}}
-
{{.i18n.Tr "admin.config.app_url"}}
-
{{.AppUrl}}
-
{{.i18n.Tr "admin.config.domain"}}
-
{{.Domain}}
-
{{.i18n.Tr "admin.config.offline_mode"}}
-
-
{{.i18n.Tr "admin.config.disable_router_log"}}
-
-
-
{{.i18n.Tr "admin.config.run_user"}}
-
{{.RunUser}}
-
{{.i18n.Tr "admin.config.run_mode"}}
-
{{.RunMode}}
-
-
{{.i18n.Tr "admin.config.repo_root_path"}}
-
{{.RepoRootPath}}
-
{{.i18n.Tr "admin.config.static_file_root_path"}}
-
{{.StaticRootPath}}
-
{{.i18n.Tr "admin.config.log_file_root_path"}}
-
{{.LogRootPath}}
-
{{.i18n.Tr "admin.config.script_type"}}
-
{{.ScriptType}}
-
{{.i18n.Tr "admin.config.reverse_auth_user"}}
-
{{.ReverseProxyAuthUser}}
-
-
- -

- {{.i18n.Tr "admin.config.db_config"}} -

-
-
-
{{.i18n.Tr "admin.config.db_type"}}
-
{{.DbCfg.Type}}
-
{{.i18n.Tr "admin.config.db_host"}}
-
{{.DbCfg.Host}}
-
{{.i18n.Tr "admin.config.db_name"}}
-
{{.DbCfg.Name}}
-
{{.i18n.Tr "admin.config.db_user"}}
-
{{.DbCfg.User}}
-
{{.i18n.Tr "admin.config.db_ssl_mode"}}
-
{{.DbCfg.SSLMode}} {{.i18n.Tr "admin.config.db_ssl_mode_helper"}}
-
{{.i18n.Tr "admin.config.db_path"}}
-
{{.DbCfg.Path}} {{.i18n.Tr "admin.config.db_path_helper"}}
-
-
- -

- {{.i18n.Tr "admin.config.service_config"}} -

-
-
-
{{.i18n.Tr "admin.config.register_email_confirm"}}
-
-
{{.i18n.Tr "admin.config.disable_register"}}
-
-
{{.i18n.Tr "admin.config.show_registration_button"}}
-
-
{{.i18n.Tr "admin.config.require_sign_in_view"}}
-
-
{{.i18n.Tr "admin.config.enable_cache_avatar"}}
-
-
{{.i18n.Tr "admin.config.mail_notify"}}
-
-
{{.i18n.Tr "admin.config.disable_key_size_check"}}
-
-
{{.i18n.Tr "admin.config.enable_captcha"}}
-
-
-
{{.i18n.Tr "admin.config.active_code_lives"}}
-
{{.Service.ActiveCodeLives}} {{.i18n.Tr "tool.raw_minutes"}}
-
{{.i18n.Tr "admin.config.reset_password_code_lives"}}
-
{{.Service.ResetPwdCodeLives}} {{.i18n.Tr "tool.raw_minutes"}}
-
-
- -

- {{.i18n.Tr "admin.config.webhook_config"}} -

-
-
-
{{.i18n.Tr "admin.config.queue_length"}}
-
{{.Webhook.QueueLength}}
-
{{.i18n.Tr "admin.config.deliver_timeout"}}
-
{{.Webhook.DeliverTimeout}} {{.i18n.Tr "tool.raw_seconds"}}
-
{{.i18n.Tr "admin.config.skip_tls_verify"}}
-
-
-
- -

- {{.i18n.Tr "admin.config.mailer_config"}} -

-
-
-
{{.i18n.Tr "admin.config.mailer_enabled"}}
-
- {{if .MailerEnabled}}
{{.i18n.Tr "admin.config.mailer_name"}}
-
{{.Mailer.Name}}
-
{{.i18n.Tr "admin.config.mailer_disable_helo"}}
-
-
{{.i18n.Tr "admin.config.mailer_host"}}
-
{{.Mailer.Host}}
-
{{.i18n.Tr "admin.config.mailer_user"}}
-
{{.Mailer.User}}
{{end}} -
-
- -

- {{.i18n.Tr "admin.config.cache_config"}} -

-
-
-
{{.i18n.Tr "admin.config.cache_adapter"}}
-
{{.CacheAdapter}}
-
{{.i18n.Tr "admin.config.cache_interval"}}
-
{{.CacheInternal}} {{.i18n.Tr "tool.raw_seconds"}}
-
{{.i18n.Tr "admin.config.cache_conn"}}
- 
{{.CacheConn}}
-
-
- -

- {{.i18n.Tr "admin.config.session_config"}} -

-
-
-
{{.i18n.Tr "admin.config.session_provider"}}
-
{{.SessionConfig.Provider}}
-
{{.i18n.Tr "admin.config.provider_config"}}
- 
{{.SessionConfig.ProviderConfig}}
-
{{.i18n.Tr "admin.config.cookie_name"}}
-
{{.SessionConfig.CookieName}}
-
{{.i18n.Tr "admin.config.gc_interval_time"}}
-
{{.SessionConfig.Gclifetime}} {{.i18n.Tr "tool.raw_seconds"}}
-
{{.i18n.Tr "admin.config.session_life_time"}}
-
{{.SessionConfig.Maxlifetime}} {{.i18n.Tr "tool.raw_seconds"}}
-
{{.i18n.Tr "admin.config.https_only"}}
-
-
{{.i18n.Tr "admin.config.cookie_life_time"}}
-
{{.SessionConfig.CookieLifeTime}} {{.i18n.Tr "tool.raw_seconds"}}
-
-
- -

- {{.i18n.Tr "admin.config.picture_config"}} -

-
-
-
{{.i18n.Tr "admin.config.picture_service"}}
-
{{.PictureService}}
-
{{.i18n.Tr "admin.config.disable_gravatar"}}
-
-
-
- -

- {{.i18n.Tr "admin.config.log_config"}} -

-
-
- {{range .Loggers}} -
{{$.i18n.Tr "admin.config.log_mode"}}
-
{{.Mode}}
-
{{$.i18n.Tr "admin.config.log_config"}}
- 
{{.Config}}
- {{end}} -
-
-
-
-
+
+
+ {{template "admin/navbar" .}} +
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.config.server_config"}} +

+
+
+
{{.i18n.Tr "admin.config.app_name"}}
+
{{AppName}}
+
{{.i18n.Tr "admin.config.app_ver"}}
+
{{AppVer}}
+
{{.i18n.Tr "admin.config.app_url"}}
+
{{.AppUrl}}
+
{{.i18n.Tr "admin.config.domain"}}
+
{{.Domain}}
+
{{.i18n.Tr "admin.config.offline_mode"}}
+
+
{{.i18n.Tr "admin.config.disable_router_log"}}
+
+
+
{{.i18n.Tr "admin.config.run_user"}}
+
{{.RunUser}}
+
{{.i18n.Tr "admin.config.run_mode"}}
+
{{.RunMode}}
+
+
{{.i18n.Tr "admin.config.repo_root_path"}}
+
{{.RepoRootPath}}
+
{{.i18n.Tr "admin.config.static_file_root_path"}}
+
{{.StaticRootPath}}
+
{{.i18n.Tr "admin.config.log_file_root_path"}}
+
{{.LogRootPath}}
+
{{.i18n.Tr "admin.config.script_type"}}
+
{{.ScriptType}}
+
{{.i18n.Tr "admin.config.reverse_auth_user"}}
+
{{.ReverseProxyAuthUser}}
+
+
+ +

+ {{.i18n.Tr "admin.config.db_config"}} +

+
+
+
{{.i18n.Tr "admin.config.db_type"}}
+
{{.DbCfg.Type}}
+
{{.i18n.Tr "admin.config.db_host"}}
+
{{.DbCfg.Host}}
+
{{.i18n.Tr "admin.config.db_name"}}
+
{{.DbCfg.Name}}
+
{{.i18n.Tr "admin.config.db_user"}}
+
{{.DbCfg.User}}
+
{{.i18n.Tr "admin.config.db_ssl_mode"}}
+
{{.DbCfg.SSLMode}} {{.i18n.Tr "admin.config.db_ssl_mode_helper"}}
+
{{.i18n.Tr "admin.config.db_path"}}
+
{{.DbCfg.Path}} {{.i18n.Tr "admin.config.db_path_helper"}}
+
+
+ +

+ {{.i18n.Tr "admin.config.service_config"}} +

+
+
+
{{.i18n.Tr "admin.config.register_email_confirm"}}
+
+
{{.i18n.Tr "admin.config.disable_register"}}
+
+
{{.i18n.Tr "admin.config.show_registration_button"}}
+
+
{{.i18n.Tr "admin.config.require_sign_in_view"}}
+
+
{{.i18n.Tr "admin.config.enable_cache_avatar"}}
+
+
{{.i18n.Tr "admin.config.mail_notify"}}
+
+
{{.i18n.Tr "admin.config.disable_key_size_check"}}
+
+
{{.i18n.Tr "admin.config.enable_captcha"}}
+
+
+
{{.i18n.Tr "admin.config.active_code_lives"}}
+
{{.Service.ActiveCodeLives}} {{.i18n.Tr "tool.raw_minutes"}}
+
{{.i18n.Tr "admin.config.reset_password_code_lives"}}
+
{{.Service.ResetPwdCodeLives}} {{.i18n.Tr "tool.raw_minutes"}}
+
+
+ +

+ {{.i18n.Tr "admin.config.webhook_config"}} +

+
+
+
{{.i18n.Tr "admin.config.queue_length"}}
+
{{.Webhook.QueueLength}}
+
{{.i18n.Tr "admin.config.deliver_timeout"}}
+
{{.Webhook.DeliverTimeout}} {{.i18n.Tr "tool.raw_seconds"}}
+
{{.i18n.Tr "admin.config.skip_tls_verify"}}
+
+
+
+ +

+ {{.i18n.Tr "admin.config.mailer_config"}} +

+
+
+
{{.i18n.Tr "admin.config.mailer_enabled"}}
+
+ {{if .MailerEnabled}}
{{.i18n.Tr "admin.config.mailer_name"}}
+
{{.Mailer.Name}}
+
{{.i18n.Tr "admin.config.mailer_disable_helo"}}
+
+
{{.i18n.Tr "admin.config.mailer_host"}}
+
{{.Mailer.Host}}
+
{{.i18n.Tr "admin.config.mailer_user"}}
+
{{.Mailer.User}}
{{end}} +
+
+ +

+ {{.i18n.Tr "admin.config.cache_config"}} +

+
+
+
{{.i18n.Tr "admin.config.cache_adapter"}}
+
{{.CacheAdapter}}
+
{{.i18n.Tr "admin.config.cache_interval"}}
+
{{.CacheInternal}} {{.i18n.Tr "tool.raw_seconds"}}
+
{{.i18n.Tr "admin.config.cache_conn"}}
+ 
{{.CacheConn}}
+
+
+ +

+ {{.i18n.Tr "admin.config.session_config"}} +

+
+
+
{{.i18n.Tr "admin.config.session_provider"}}
+
{{.SessionConfig.Provider}}
+
{{.i18n.Tr "admin.config.provider_config"}}
+ 
{{.SessionConfig.ProviderConfig}}
+
{{.i18n.Tr "admin.config.cookie_name"}}
+
{{.SessionConfig.CookieName}}
+
{{.i18n.Tr "admin.config.gc_interval_time"}}
+
{{.SessionConfig.Gclifetime}} {{.i18n.Tr "tool.raw_seconds"}}
+
{{.i18n.Tr "admin.config.session_life_time"}}
+
{{.SessionConfig.Maxlifetime}} {{.i18n.Tr "tool.raw_seconds"}}
+
{{.i18n.Tr "admin.config.https_only"}}
+
+
{{.i18n.Tr "admin.config.cookie_life_time"}}
+
{{.SessionConfig.CookieLifeTime}} {{.i18n.Tr "tool.raw_seconds"}}
+
+
+ +

+ {{.i18n.Tr "admin.config.picture_config"}} +

+
+
+
{{.i18n.Tr "admin.config.picture_service"}}
+
{{.PictureService}}
+
{{.i18n.Tr "admin.config.disable_gravatar"}}
+
+
+
+ +

+ {{.i18n.Tr "admin.config.log_config"}} +

+
+
+ {{range .Loggers}} +
{{$.i18n.Tr "admin.config.log_mode"}}
+
{{.Mode}}
+
{{$.i18n.Tr "admin.config.log_config"}}
+ 
{{.Config}}
+ {{end}} +
+
+
+
+
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl index 769375ecb8..8a0eedc21c 100644 --- a/templates/admin/dashboard.tmpl +++ b/templates/admin/dashboard.tmpl @@ -1,121 +1,121 @@ {{template "base/head" .}}
-
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.dashboard.statistic"}} -

-
-

- {{.i18n.Tr "admin.dashboard.statistic_info" .Stats.Counter.User .Stats.Counter.Org .Stats.Counter.PublicKey .Stats.Counter.Repo .Stats.Counter.Watch .Stats.Counter.Star .Stats.Counter.Action .Stats.Counter.Access .Stats.Counter.Issue .Stats.Counter.Comment .Stats.Counter.Oauth .Stats.Counter.Follow .Stats.Counter.Mirror .Stats.Counter.Release .Stats.Counter.LoginSource .Stats.Counter.Webhook .Stats.Counter.Milestone .Stats.Counter.Label .Stats.Counter.HookTask .Stats.Counter.Team .Stats.Counter.UpdateTask .Stats.Counter.Attachment | Str2html}} -

-
-

- {{.i18n.Tr "admin.dashboard.operations"}} -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{.i18n.Tr "admin.dashboard.delete_inactivate_accounts"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
{{.i18n.Tr "admin.dashboard.delete_repo_archives"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
{{.i18n.Tr "admin.dashboard.delete_missing_repos"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
{{.i18n.Tr "admin.dashboard.git_gc_repos"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
{{.i18n.Tr "admin.dashboard.resync_all_sshkeys"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
{{.i18n.Tr "admin.dashboard.resync_all_update_hooks"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
-
+
+
+ {{template "admin/navbar" .}} +
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.dashboard.statistic"}} +

+
+

+ {{.i18n.Tr "admin.dashboard.statistic_info" .Stats.Counter.User .Stats.Counter.Org .Stats.Counter.PublicKey .Stats.Counter.Repo .Stats.Counter.Watch .Stats.Counter.Star .Stats.Counter.Action .Stats.Counter.Access .Stats.Counter.Issue .Stats.Counter.Comment .Stats.Counter.Oauth .Stats.Counter.Follow .Stats.Counter.Mirror .Stats.Counter.Release .Stats.Counter.LoginSource .Stats.Counter.Webhook .Stats.Counter.Milestone .Stats.Counter.Label .Stats.Counter.HookTask .Stats.Counter.Team .Stats.Counter.UpdateTask .Stats.Counter.Attachment | Str2html}} +

+
+

+ {{.i18n.Tr "admin.dashboard.operations"}} +

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{.i18n.Tr "admin.dashboard.delete_inactivate_accounts"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
{{.i18n.Tr "admin.dashboard.delete_repo_archives"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
{{.i18n.Tr "admin.dashboard.delete_missing_repos"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
{{.i18n.Tr "admin.dashboard.git_gc_repos"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
{{.i18n.Tr "admin.dashboard.resync_all_sshkeys"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
{{.i18n.Tr "admin.dashboard.resync_all_update_hooks"}} {{.i18n.Tr "admin.dashboard.operation_run"}}
+
-

- {{.i18n.Tr "admin.dashboard.system_status"}} -

-
-
-
{{.i18n.Tr "admin.dashboard.server_uptime"}}
-
{{.SysStatus.Uptime}}
-
{{.i18n.Tr "admin.dashboard.current_goroutine"}}
-
{{.SysStatus.NumGoroutine}}
-
-
{{.i18n.Tr "admin.dashboard.current_memory_usage"}}
-
{{.SysStatus.MemAllocated}}
-
{{.i18n.Tr "admin.dashboard.total_memory_allocated"}}
-
{{.SysStatus.MemTotal}}
-
{{.i18n.Tr "admin.dashboard.memory_obtained"}}
-
{{.SysStatus.MemSys}}
-
{{.i18n.Tr "admin.dashboard.pointer_lookup_times"}}
-
{{.SysStatus.Lookups}}
-
{{.i18n.Tr "admin.dashboard.memory_allocate_times"}}
-
{{.SysStatus.MemMallocs}}
-
{{.i18n.Tr "admin.dashboard.memory_free_times"}}
-
{{.SysStatus.MemFrees}}
-
-
{{.i18n.Tr "admin.dashboard.current_heap_usage"}}
-
{{.SysStatus.HeapAlloc}}
-
{{.i18n.Tr "admin.dashboard.heap_memory_obtained"}}
-
{{.SysStatus.HeapSys}}
-
{{.i18n.Tr "admin.dashboard.heap_memory_idle"}}
-
{{.SysStatus.HeapIdle}}
-
{{.i18n.Tr "admin.dashboard.heap_memory_in_use"}}
-
{{.SysStatus.HeapInuse}}
-
{{.i18n.Tr "admin.dashboard.heap_memory_released"}}
-
{{.SysStatus.HeapReleased}}
-
{{.i18n.Tr "admin.dashboard.heap_objects"}}
-
{{.SysStatus.HeapObjects}}
-
-
{{.i18n.Tr "admin.dashboard.bootstrap_stack_usage"}}
-
{{.SysStatus.StackInuse}}
-
{{.i18n.Tr "admin.dashboard.stack_memory_obtained"}}
-
{{.SysStatus.StackSys}}
-
{{.i18n.Tr "admin.dashboard.mspan_structures_usage"}}
-
{{.SysStatus.MSpanInuse}}
-
{{.i18n.Tr "admin.dashboard.mspan_structures_obtained"}}
-
{{.SysStatus.HeapSys}}
-
{{.i18n.Tr "admin.dashboard.mcache_structures_usage"}}
-
{{.SysStatus.MCacheInuse}}
-
{{.i18n.Tr "admin.dashboard.mcache_structures_obtained"}}
-
{{.SysStatus.MCacheSys}}
-
{{.i18n.Tr "admin.dashboard.profiling_bucket_hash_table_obtained"}}
-
{{.SysStatus.BuckHashSys}}
-
{{.i18n.Tr "admin.dashboard.gc_metadata_obtained"}}
-
{{.SysStatus.GCSys}}
-
{{.i18n.Tr "admin.dashboard.other_system_allocation_obtained"}}
-
{{.SysStatus.OtherSys}}
-
-
{{.i18n.Tr "admin.dashboard.next_gc_recycle"}}
-
{{.SysStatus.NextGC}}
-
{{.i18n.Tr "admin.dashboard.last_gc_time"}}
-
{{.SysStatus.LastGC}}
-
{{.i18n.Tr "admin.dashboard.total_gc_pause"}}
-
{{.SysStatus.PauseTotalNs}}
-
{{.i18n.Tr "admin.dashboard.last_gc_pause"}}
-
{{.SysStatus.PauseNs}}
-
{{.i18n.Tr "admin.dashboard.gc_times"}}
-
{{.SysStatus.NumGC}}
-
-
-
-
-
+

+ {{.i18n.Tr "admin.dashboard.system_status"}} +

+
+
+
{{.i18n.Tr "admin.dashboard.server_uptime"}}
+
{{.SysStatus.Uptime}}
+
{{.i18n.Tr "admin.dashboard.current_goroutine"}}
+
{{.SysStatus.NumGoroutine}}
+
+
{{.i18n.Tr "admin.dashboard.current_memory_usage"}}
+
{{.SysStatus.MemAllocated}}
+
{{.i18n.Tr "admin.dashboard.total_memory_allocated"}}
+
{{.SysStatus.MemTotal}}
+
{{.i18n.Tr "admin.dashboard.memory_obtained"}}
+
{{.SysStatus.MemSys}}
+
{{.i18n.Tr "admin.dashboard.pointer_lookup_times"}}
+
{{.SysStatus.Lookups}}
+
{{.i18n.Tr "admin.dashboard.memory_allocate_times"}}
+
{{.SysStatus.MemMallocs}}
+
{{.i18n.Tr "admin.dashboard.memory_free_times"}}
+
{{.SysStatus.MemFrees}}
+
+
{{.i18n.Tr "admin.dashboard.current_heap_usage"}}
+
{{.SysStatus.HeapAlloc}}
+
{{.i18n.Tr "admin.dashboard.heap_memory_obtained"}}
+
{{.SysStatus.HeapSys}}
+
{{.i18n.Tr "admin.dashboard.heap_memory_idle"}}
+
{{.SysStatus.HeapIdle}}
+
{{.i18n.Tr "admin.dashboard.heap_memory_in_use"}}
+
{{.SysStatus.HeapInuse}}
+
{{.i18n.Tr "admin.dashboard.heap_memory_released"}}
+
{{.SysStatus.HeapReleased}}
+
{{.i18n.Tr "admin.dashboard.heap_objects"}}
+
{{.SysStatus.HeapObjects}}
+
+
{{.i18n.Tr "admin.dashboard.bootstrap_stack_usage"}}
+
{{.SysStatus.StackInuse}}
+
{{.i18n.Tr "admin.dashboard.stack_memory_obtained"}}
+
{{.SysStatus.StackSys}}
+
{{.i18n.Tr "admin.dashboard.mspan_structures_usage"}}
+
{{.SysStatus.MSpanInuse}}
+
{{.i18n.Tr "admin.dashboard.mspan_structures_obtained"}}
+
{{.SysStatus.HeapSys}}
+
{{.i18n.Tr "admin.dashboard.mcache_structures_usage"}}
+
{{.SysStatus.MCacheInuse}}
+
{{.i18n.Tr "admin.dashboard.mcache_structures_obtained"}}
+
{{.SysStatus.MCacheSys}}
+
{{.i18n.Tr "admin.dashboard.profiling_bucket_hash_table_obtained"}}
+
{{.SysStatus.BuckHashSys}}
+
{{.i18n.Tr "admin.dashboard.gc_metadata_obtained"}}
+
{{.SysStatus.GCSys}}
+
{{.i18n.Tr "admin.dashboard.other_system_allocation_obtained"}}
+
{{.SysStatus.OtherSys}}
+
+
{{.i18n.Tr "admin.dashboard.next_gc_recycle"}}
+
{{.SysStatus.NextGC}}
+
{{.i18n.Tr "admin.dashboard.last_gc_time"}}
+
{{.SysStatus.LastGC}}
+
{{.i18n.Tr "admin.dashboard.total_gc_pause"}}
+
{{.SysStatus.PauseTotalNs}}
+
{{.i18n.Tr "admin.dashboard.last_gc_pause"}}
+
{{.SysStatus.PauseNs}}
+
{{.i18n.Tr "admin.dashboard.gc_times"}}
+
{{.SysStatus.NumGC}}
+
+
+
+
+
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl index 8092082563..fa87078cc3 100644 --- a/templates/admin/monitor.tmpl +++ b/templates/admin/monitor.tmpl @@ -1,65 +1,65 @@ {{template "base/head" .}}
-
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.monitor.cron"}} -

-
- - - - - - - - - - - - {{range .Entries}} - - - - - - - - {{end}} - -
{{.i18n.Tr "admin.monitor.name"}}{{.i18n.Tr "admin.monitor.schedule"}}{{.i18n.Tr "admin.monitor.next"}}{{.i18n.Tr "admin.monitor.previous"}}{{.i18n.Tr "admin.monitor.execute_times"}}
{{.Description}}{{.Spec}}{{DateFmtLong .Next}}{{if gt .Prev.Year 1 }}{{DateFmtLong .Prev}}{{else}}N/A{{end}}{{.ExecTimes}}
-
+
+
+ {{template "admin/navbar" .}} +
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.monitor.cron"}} +

+
+ + + + + + + + + + + + {{range .Entries}} + + + + + + + + {{end}} + +
{{.i18n.Tr "admin.monitor.name"}}{{.i18n.Tr "admin.monitor.schedule"}}{{.i18n.Tr "admin.monitor.next"}}{{.i18n.Tr "admin.monitor.previous"}}{{.i18n.Tr "admin.monitor.execute_times"}}
{{.Description}}{{.Spec}}{{DateFmtLong .Next}}{{if gt .Prev.Year 1 }}{{DateFmtLong .Prev}}{{else}}N/A{{end}}{{.ExecTimes}}
+
-

- {{.i18n.Tr "admin.monitor.process"}} -

-
- - - - - - - - - - - {{range .Processes}} - - - - - - - {{end}} - -
Pid{{.i18n.Tr "admin.monitor.desc"}}{{.i18n.Tr "admin.monitor.start"}}{{.i18n.Tr "admin.monitor.execute_time"}}
{{.Pid}}{{.Description}}{{DateFmtLong .Start}}{{TimeSince .Start $.Lang}}
-
-
-
-
+

+ {{.i18n.Tr "admin.monitor.process"}} +

+
+ + + + + + + + + + + {{range .Processes}} + + + + + + + {{end}} + +
Pid{{.i18n.Tr "admin.monitor.desc"}}{{.i18n.Tr "admin.monitor.start"}}{{.i18n.Tr "admin.monitor.execute_time"}}
{{.Pid}}{{.Description}}{{DateFmtLong .Start}}{{TimeSince .Start $.Lang}}
+
+
+
+
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/admin/nav.tmpl b/templates/admin/nav.tmpl index 49c4b72cf0..7129ee11ed 100644 --- a/templates/admin/nav.tmpl +++ b/templates/admin/nav.tmpl @@ -1,15 +1,15 @@ \ No newline at end of file +

{{.i18n.Tr "admin_panel"}}

+
+ +
+
diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index e85fa24fbf..9fa1721e46 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -1,29 +1,29 @@
{{.i18n.Tr "admin_panel"}}
- - {{.i18n.Tr "admin.dashboard"}} - - - {{.i18n.Tr "admin.users"}} - - - {{.i18n.Tr "admin.organizations"}} - - - {{.i18n.Tr "admin.repositories"}} - - - {{.i18n.Tr "admin.authentication"}} - - - {{.i18n.Tr "admin.config"}} - - - {{.i18n.Tr "admin.notices"}} - - - {{.i18n.Tr "admin.monitor"}} - + + {{.i18n.Tr "admin.dashboard"}} + + + {{.i18n.Tr "admin.users"}} + + + {{.i18n.Tr "admin.organizations"}} + + + {{.i18n.Tr "admin.repositories"}} + + + {{.i18n.Tr "admin.authentication"}} + + + {{.i18n.Tr "admin.config"}} + + + {{.i18n.Tr "admin.notices"}} + + + {{.i18n.Tr "admin.monitor"}} +
-
\ No newline at end of file +
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl index 3321dd1469..0af7713d30 100644 --- a/templates/admin/notice.tmpl +++ b/templates/admin/notice.tmpl @@ -1,104 +1,104 @@ {{template "base/head" .}}
-
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.notices.system_notice_list"}} ({{.i18n.Tr "admin.total" .Total}}) -

-
- - - - - - - - - - - - - {{range .Notices}} - - - - - - - - - {{end}} - - - - - - - -
ID{{.i18n.Tr "admin.notices.type"}}{{.i18n.Tr "admin.notices.desc"}}{{.i18n.Tr "admin.users.created"}}{{.i18n.Tr "admin.notices.op"}}
-
- -
- 		{{.ID}}{{$.i18n.Tr .TrStr}}{{SubStr .Description 0 120}}...{{DateFmtShort .Created}}
-
- {{.i18n.Tr "admin.notices.delete_all"}} -
-
- {{.i18n.Tr "admin.notices.actions"}} -
-
- {{.i18n.Tr "admin.notices.select_all"}} -
-
- {{.i18n.Tr "admin.notices.deselect_all"}} -
-
- {{.i18n.Tr "admin.notices.inverse_selection"}} -
-
-
-
- {{.i18n.Tr "admin.notices.delete_selected"}} -
-
-
+
+
+ {{template "admin/navbar" .}} +
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.notices.system_notice_list"}} ({{.i18n.Tr "admin.total" .Total}}) +

+
+ + + + + + + + + + + + + {{range .Notices}} + + + + + + + + + {{end}} + + + + + + + +
ID{{.i18n.Tr "admin.notices.type"}}{{.i18n.Tr "admin.notices.desc"}}{{.i18n.Tr "admin.users.created"}}{{.i18n.Tr "admin.notices.op"}}
+
+ +
+ 		{{.ID}}{{$.i18n.Tr .TrStr}}{{SubStr .Description 0 120}}...{{DateFmtShort .Created}}
+
+ {{.i18n.Tr "admin.notices.delete_all"}} +
+
+ {{.i18n.Tr "admin.notices.actions"}} +
+
+ {{.i18n.Tr "admin.notices.select_all"}} +
+
+ {{.i18n.Tr "admin.notices.deselect_all"}} +
+
+ {{.i18n.Tr "admin.notices.inverse_selection"}} +
+
+
+
+ {{.i18n.Tr "admin.notices.delete_selected"}} +
+
+
- {{with .Page}} - {{if gt .TotalPages 1}} -
- -
- {{end}} - {{end}} -
-
-
+ {{with .Page}} + {{if gt .TotalPages 1}} +
+ +
+ {{end}} + {{end}} +
+
+
{{template "base/footer" .}} diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index bc4610b6d6..890ceed3a2 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -1,65 +1,65 @@ {{template "base/head" .}}
-
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.orgs.org_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}}) -

-
- +
+
+ {{template "admin/navbar" .}} +
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.orgs.org_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}}) +

+
+
- - - - - - + + + + + + - + - {{range .Orgs}} - - - - - - - - - {{end}} + {{range .Orgs}} + + + + + + + + + {{end}} -
ID{{.i18n.Tr "admin.orgs.name"}}{{.i18n.Tr "admin.orgs.teams"}}{{.i18n.Tr "admin.orgs.members"}}{{.i18n.Tr "admin.users.repos"}}
ID{{.i18n.Tr "admin.orgs.name"}}{{.i18n.Tr "admin.orgs.teams"}}{{.i18n.Tr "admin.orgs.members"}}{{.i18n.Tr "admin.users.repos"}} {{.i18n.Tr "admin.users.created"}}
{{.Id}}{{.Name}}{{.NumTeams}}{{.NumMembers}}{{.NumRepos}}{{DateFmtShort .Created}}
{{.Id}}{{.Name}}{{.NumTeams}}{{.NumMembers}}{{.NumRepos}}{{DateFmtShort .Created}}
+
{{with .Page}} - {{if gt .TotalPages 1}} -
- -
- {{end}} + {{if gt .TotalPages 1}} +
+ +
+ {{end}} {{end}} -
-
-
+
+
+
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index f8ccecf66c..cbbc91f80e 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -6,7 +6,7 @@
{{template "base/alert" .}}

- {{.i18n.Tr "admin.repos.repo_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}}) + {{.i18n.Tr "admin.repos.repo_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})

@@ -20,49 +20,49 @@ - + {{range .Repos}} - - - - - - - - - - - + + + + + + + + + + + {{end}}
{{.i18n.Tr "admin.repos.stars"}} {{.i18n.Tr "admin.repos.issues"}} {{.i18n.Tr "admin.users.created"}}{{.i18n.Tr "admin.notices.op"}}{{.i18n.Tr "admin.notices.op"}}
{{.ID}}{{.Owner.Name}}{{.Name}}{{.NumWatches}}{{.NumStars}}{{.NumIssues}}{{DateFmtShort .Created}}
{{.ID}}{{.Owner.Name}}{{.Name}}{{.NumWatches}}{{.NumStars}}{{.NumIssues}}{{DateFmtShort .Created}}
{{with .Page}} - {{if gt .TotalPages 1}} -
- -
- {{end}} + {{if gt .TotalPages 1}} +
+ +
+ {{end}} {{end}}
@@ -70,17 +70,17 @@
-
- - {{.i18n.Tr "repo.settings.delete"}} -
-
-

{{.i18n.Tr "repo.settings.delete_desc"}}

-

{{.i18n.Tr "repo.settings.delete_notices_2"}}

-

{{.i18n.Tr "repo.settings.delete_notices_fork_1"}}

-

{{.i18n.Tr "repo.settings.delete_notices_fork_2"}}

-

{{.i18n.Tr "repo.settings.delete_notices_fork_3"}}

-
- {{template "base/delete_modal_actions" .}} +
+ + {{.i18n.Tr "repo.settings.delete"}} +
+
+

{{.i18n.Tr "repo.settings.delete_desc"}}

+

{{.i18n.Tr "repo.settings.delete_notices_2"}}

+

{{.i18n.Tr "repo.settings.delete_notices_fork_1"}}

+

{{.i18n.Tr "repo.settings.delete_notices_fork_2"}}

+

{{.i18n.Tr "repo.settings.delete_notices_fork_3"}}

+
+ {{template "base/delete_modal_actions" .}}
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index 6f30f05c9f..b7f95e36db 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -1,106 +1,106 @@ {{template "base/head" .}}
-
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.users.edit_account"}} -

-
-
- {{.CsrfTokenHtml}} -
- - {{.User.Name}} -
- -
- -
- -
{{.i18n.Tr "admin.users.local"}}
- -
-
{{.i18n.Tr "admin.users.local"}}
- {{range .Sources}} -
{{.Name}}
- {{end}} -
-
-
-
- - -
-
- - -
-
- - -
- -
- - -

{{.i18n.Tr "admin.users.password_helper"}}

-
-
- - -
-
- - -
+
+
+ {{template "admin/navbar" .}} +
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.users.edit_account"}} +

+
+ + {{.CsrfTokenHtml}} +
+ + {{.User.Name}} +
+ +
+ +
+ +
{{.i18n.Tr "admin.users.local"}}
+ +
+
{{.i18n.Tr "admin.users.local"}}
+ {{range .Sources}} +
{{.Name}}
+ {{end}} +
+
+
+
+ + +
+
+ + +
+
+ + +
+ +
+ + +

{{.i18n.Tr "admin.users.password_helper"}}

+
+
+ + +
+
+ + +
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
-
- -
{{.i18n.Tr "admin.users.delete_account"}}
-
- -
+
+ +
{{.i18n.Tr "admin.users.delete_account"}}
+
+ +
-
- - {{.i18n.Tr "settings.delete_account_title"}} -
-
-

{{.i18n.Tr "settings.delete_account_desc"}}

-
- {{template "base/delete_modal_actions" .}} +
+ + {{.i18n.Tr "settings.delete_account_title"}} +
+
+

{{.i18n.Tr "settings.delete_account_desc"}}

+
+ {{template "base/delete_modal_actions" .}}
{{template "base/footer" .}} diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index 2e23c9ec68..25ef4feac1 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -1,72 +1,72 @@ {{template "base/head" .}}
-
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.users.user_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}}) -
- {{.i18n.Tr "admin.users.new_account"}} -
-

-
- - - - - - - - - - - - - - - {{range .Users}} - - - - - - - - - - - {{end}} - -
ID{{.i18n.Tr "admin.users.name"}}{{.i18n.Tr "email"}}{{.i18n.Tr "admin.users.activated"}}{{.i18n.Tr "admin.users.admin"}}{{.i18n.Tr "admin.users.repos"}}{{.i18n.Tr "admin.users.created"}}{{.i18n.Tr "admin.users.edit"}}
{{.Id}}{{.Name}}{{.NumRepos}}{{DateFmtShort .Created }}
-
- - {{with .Page}} - {{if gt .TotalPages 1}} -
- +
+
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl index 34630ececa..9352eaaced 100644 --- a/templates/admin/user/new.tmpl +++ b/templates/admin/user/new.tmpl @@ -1,66 +1,66 @@ {{template "base/head" .}}
-
-
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "admin.users.new_account"}} -

-
-
- {{.CsrfTokenHtml}} - -
- -
- -
{{.i18n.Tr "admin.users.local"}}
- -
-
{{.i18n.Tr "admin.users.local"}}
- {{range .Sources}} -
{{.Name}}
- {{end}} -
-
-
-
- - -
-
- - -
-
- - -
- -
- - -
+
+
+ {{template "admin/navbar" .}} +
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "admin.users.new_account"}} +

+
+ + {{.CsrfTokenHtml}} + +
+ +
+ +
{{.i18n.Tr "admin.users.local"}}
+ +
+
{{.i18n.Tr "admin.users.local"}}
+ {{range .Sources}} +
{{.Name}}
+ {{end}} +
+
+
+
+ + +
+
+ + +
+
+ + +
+ +
+ + +
- - {{if .CanSendEmail}} -
-
- - -
-
- {{end}} + + {{if .CanSendEmail}} +
+
+ + +
+
+ {{end}} -
- -
- -
-
-
-
+
+ +
+ +
+
+
+
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/base/alert.tmpl b/templates/base/alert.tmpl index e71be803c5..60b7b588d7 100644 --- a/templates/base/alert.tmpl +++ b/templates/base/alert.tmpl @@ -1,15 +1,15 @@ {{if .Flash.ErrorMsg}} -
-

{{.Flash.ErrorMsg}}

-
+
+

{{.Flash.ErrorMsg}}

+
{{end}} {{if .Flash.SuccessMsg}} -
-

{{.Flash.SuccessMsg}}

-
+
+

{{.Flash.SuccessMsg}}

+
{{end}} {{if .Flash.InfoMsg}} -
-

{{.Flash.InfoMsg}}

-
-{{end}} \ No newline at end of file +
+

{{.Flash.InfoMsg}}

+
+{{end}} diff --git a/templates/base/delete_modal_actions.tmpl b/templates/base/delete_modal_actions.tmpl index 6e9e256cb9..a889c67e5a 100644 --- a/templates/base/delete_modal_actions.tmpl +++ b/templates/base/delete_modal_actions.tmpl @@ -1,10 +1,10 @@
-
- - {{.i18n.Tr "modal.no"}} -
-
- - {{.i18n.Tr "modal.yes"}} -
-
\ No newline at end of file +
+ + {{.i18n.Tr "modal.no"}} +
+
+ + {{.i18n.Tr "modal.yes"}} +
+
diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index a48c11d841..dd911fcd3e 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -1,3 +1,8 @@ +{{/* + + +
+*/}}
@@ -26,24 +31,24 @@ - - {{if .RequireHighlightJS}} + +{{if .RequireHighlightJS}} - {{end}} - {{if .RequireMinicolors}} +{{end}} +{{if .RequireMinicolors}} - {{end}} - {{if .RequireDatetimepicker}} +{{end}} +{{if .RequireDatetimepicker}} - {{end}} - {{if .RequireDropzone}} +{{end}} +{{if .RequireDropzone}} - {{end}} - - +{{end}} + + diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index b1d4283614..ba7c7ba048 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -10,8 +10,8 @@ {{if .GoGetImport}} - - + + {{end}} @@ -20,8 +20,8 @@ {{if .RequireSimpleMDE}} - - + + {{end}} @@ -39,110 +39,115 @@ {{if not .PageIsInstall}} -
-
-
-
-
- - - +
+
+
+
+
+ + + - {{if .IsSigned}} - {{.i18n.Tr "dashboard"}} - {{.i18n.Tr "issues"}} - {{.i18n.Tr "pull_requests"}} - {{else}} - {{.i18n.Tr "home"}} - {{end}} + {{if .IsSigned}} + {{.i18n.Tr "dashboard"}} + {{.i18n.Tr "issues"}} + {{.i18n.Tr "pull_requests"}} + {{else}} + {{.i18n.Tr "home"}} + {{end}} - {{.i18n.Tr "explore"}} - +
+
*/}} - {{if .IsSigned}} -
-
- - - - -
- - {{.i18n.Tr "new_repo"}} - - - {{.i18n.Tr "new_migrate"}} - - - {{.i18n.Tr "new_org"}} - -
-
+ {{if .IsSigned}} +
+
+ + + + +
+ + {{.i18n.Tr "new_repo"}} + + + {{.i18n.Tr "new_migrate"}} + + + {{.i18n.Tr "new_org"}} + +
+
-
- - - - -
-
- {{.i18n.Tr "signed_in_as"}} {{.SignedUser.Name}} -
+
+ + + + +
+
+ {{.i18n.Tr "signed_in_as"}} {{.SignedUser.Name}} +
-
- - - {{.i18n.Tr "your_profile"}} - - - - {{.i18n.Tr "your_settings"}} - - - - {{.i18n.Tr "help"}} - - {{if .IsAdmin}} -
+
+ + + {{.i18n.Tr "your_profile"}} + + + + {{.i18n.Tr "your_settings"}} + + + + {{.i18n.Tr "help"}} + + {{if .IsAdmin}} +
- - - {{.i18n.Tr "admin_panel"}} - + + + {{.i18n.Tr "admin_panel"}} + + {{end}} + +
+ + + {{.i18n.Tr "sign_out"}} + +
+
+
+ + {{else}} + + {{.i18n.Tr "help"}} +
+ {{if .ShowRegistrationButton}} + + {{.i18n.Tr "register"}} + {{end}} - -
- - - {{.i18n.Tr "sign_out"}} + + {{.i18n.Tr "sign_in"}} -
-
-
+
- {{else}} - - {{.i18n.Tr "help"}} -
- {{if .ShowRegistrationButton}} - - {{.i18n.Tr "register"}} - {{end}} - - {{.i18n.Tr "sign_in"}} - -
- - {{end}} -
-
-
-
-
+
+
+
+
+
{{end}} +{{/* +
+ + +*/}} diff --git a/templates/explore/navbar.tmpl b/templates/explore/navbar.tmpl index 374376bf77..2b6aa93f5c 100644 --- a/templates/explore/navbar.tmpl +++ b/templates/explore/navbar.tmpl @@ -5,4 +5,4 @@ {{.i18n.Tr "explore.repos"}} - \ No newline at end of file + diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index 5a459dedd8..a674bcc90a 100644 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -1,23 +1,23 @@
- {{range .Repos}} -
-
- {{if $.PageIsExplore}}{{.Owner.Name}} / {{end}}{{.Name}} - {{if .IsPrivate}} - - {{else if .IsFork}} - - {{else if .IsMirror}} - - {{end}} + {{range .Repos}} +
+
+ {{if $.PageIsExplore}}{{.Owner.Name}} / {{end}}{{.Name}} + {{if .IsPrivate}} + + {{else if .IsFork}} + + {{else if .IsMirror}} + + {{end}} -
- {{.NumStars}} - {{.NumForks}} -
-
- {{if .Description}}

{{.Description}}

{{end}} -

{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}

-
- {{end}} -
\ No newline at end of file +
+ {{.NumStars}} + {{.NumForks}} +
+
+ {{if .Description}}

{{.Description}}

{{end}} +

{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}

+
+ {{end}} + diff --git a/templates/explore/repos.tmpl b/templates/explore/repos.tmpl index 1d45a96ec5..5523295312 100644 --- a/templates/explore/repos.tmpl +++ b/templates/explore/repos.tmpl @@ -4,28 +4,28 @@
{{template "explore/navbar" .}}
- {{template "explore/repo_list" .}} + {{template "explore/repo_list" .}} {{with .Page}} - {{if gt .TotalPages 1}} -
- -
- {{end}} + {{if gt .TotalPages 1}} +
+ +
+ {{end}} {{end}}
diff --git a/templates/home.tmpl b/templates/home.tmpl index 77dcebeec3..f9c5070643 100644 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -3,127 +3,127 @@
- +
-

- Gogs - Go Git Service -

-

{{.i18n.Tr "app_desc"}}

+

+ Gogs - Go Git Service +

+

{{.i18n.Tr "app_desc"}}

-
+
{{if eq .Lang "de-DE"}} -
-
-

- Einfach zu installieren -

-

- Starte einfach die Anwendung für deine Plattform. Gogs gibt es auch für Docker, Vagrant oder als Installationspaket. -

-
-
-

- Plattformübergreifend -

-

- Gogs läuft überall. Go kompiliert für: Windows, Mac OS X, Linux, ARM, etc. Wähle dasjenige System, was dir am meisten gefällt! -

-
-
-
-
-

- Leichtgewicht -

-

- Gogs hat minimale Systemanforderungen und kann selbst auf einem günstigen und stromsparenden Raspberry Pi betrieben werden. -

-
-
-

- Quelloffen -

-

- Der komplette Code befindet sich auf GitHub! Unterstütze uns bei der Verbesserung dieses Projekts. Trau dich! -

-
-
+
+
+

+ Einfach zu installieren +

+

+ Starte einfach die Anwendung für deine Plattform. Gogs gibt es auch für Docker, Vagrant oder als Installationspaket. +

+
+
+

+ Plattformübergreifend +

+

+ Gogs läuft überall. Go kompiliert für: Windows, Mac OS X, Linux, ARM, etc. Wähle dasjenige System, was dir am meisten gefällt! +

+
+
+
+
+

+ Leichtgewicht +

+

+ Gogs hat minimale Systemanforderungen und kann selbst auf einem günstigen und stromsparenden Raspberry Pi betrieben werden. +

+
+
+

+ Quelloffen +

+

+ Der komplette Code befindet sich auf GitHub! Unterstütze uns bei der Verbesserung dieses Projekts. Trau dich! +

+
+
{{else if eq .Lang "zh-CN"}} -
-
-

- 易安装 -

-

- 您除了可以根据操作系统平台通过 二进制运行，还可以通过 Docker 或 Vagrant，以及 包管理 安装。 -

-
-
-

- 跨平台 -

-

- 任何 Go 语言 支持的平台都可以运行 Gogs，包括 Windows、Mac、Linux 以及 ARM。挑一个您喜欢的就行！ -

-
-
-
-
-

- 轻量级 -

-

- 一个廉价的树莓派的配置足以满足 Gogs 的最低系统硬件要求。最大程度上节省您的服务器资源！ -

-
-
-

- 开源化 -

-

- 所有的代码都开源在 GitHub 上，赶快加入我们来共同发展这个伟大的项目！还等什么？成为贡献者吧！ -

-
-
- {{else}} -
-
-

- Easy to install -

-

- Simply run the binary for your platform. Or ship Gogs with Docker or Vagrant, or get it packaged. -

-
-
-

- Cross-platform -

-

- Gogs runs anywhere Go can compile for: Windows, Mac OS X, Linux, ARM, etc. Choose the one you love! -

-
-
-
-
-

- Lightweight -

-

- Gogs has low minimal requirements and can run on an inexpensive Raspberry Pi. Save your machine energy! -

-
-
-

- Open Source -

-

- It's all on GitHub! Join us by contributing to make this project even better. Don't be shy to be a contributor! -

-
-
+
+
+

+ 易安装 +

+

+ 您除了可以根据操作系统平台通过 二进制运行，还可以通过 Docker 或 Vagrant，以及 包管理 安装。 +

+
+
+

+ 跨平台 +

+

+ 任何 Go 语言 支持的平台都可以运行 Gogs，包括 Windows、Mac、Linux 以及 ARM。挑一个您喜欢的就行！ +

+
+
+
+
+

+ 轻量级 +

+

+ 一个廉价的树莓派的配置足以满足 Gogs 的最低系统硬件要求。最大程度上节省您的服务器资源！ +

+
+
+

+ 开源化 +

+

+ 所有的代码都开源在 GitHub 上，赶快加入我们来共同发展这个伟大的项目！还等什么？成为贡献者吧！ +

+
+
+ {{else}} +
+
+

+ Easy to install +

+

+ Simply run the binary for your platform. Or ship Gogs with Docker or Vagrant, or get it packaged. +

+
+
+

+ Cross-platform +

+

+ Gogs runs anywhere Go can compile for: Windows, Mac OS X, Linux, ARM, etc. Choose the one you love! +

+
+
+
+
+

+ Lightweight +

+

+ Gogs has low minimal requirements and can run on an inexpensive Raspberry Pi. Save your machine energy! +

+
+
+

+ Open Source +

+

+ It's all on GitHub! Join us by contributing to make this project even better. Don't be shy to be a contributor! +

+
+
{{end}} -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/install.tmpl b/templates/install.tmpl index 65fb06cae8..29665424ef 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -3,228 +3,228 @@

- {{.i18n.Tr "install.title"}} + {{.i18n.Tr "install.title"}}

- {{template "base/alert" .}} + {{template "base/alert" .}} -

{{.i18n.Tr "install.docker_helper" "https://github.com/gogits/gogs/tree/master/docker" | Safe}}

+

{{.i18n.Tr "install.docker_helper" "https://github.com/gogits/gogs/tree/master/docker" | Safe}}

-
- -

{{.i18n.Tr "install.db_title"}}

-

{{.i18n.Tr "install.requite_db_desc"}}

-
- -
- -
{{.CurDbOption}}
- -
- {{range .DbOptions}} -
{{.}}
- {{end}} -
-
-
+ + +

{{.i18n.Tr "install.db_title"}}

+

{{.i18n.Tr "install.requite_db_desc"}}

+
+ +
+ +
{{.CurDbOption}}
+ +
+ {{range .DbOptions}} +
{{.}}
+ {{end}} +
+
+
-
-
- - -
-
- - -
-
- - -
-
- - - {{.i18n.Tr "install.db_helper"}} -
-
+
+
+ + +
+
+ + +
+
+ + +
+
+ + + {{.i18n.Tr "install.db_helper"}} +
+
-
-
- -
- -
disable
- -
-
Disable
-
Require
-
Verify Full
-
-
-
-
+
+
+ +
+ +
disable
+ +
+
Disable
+
Require
+
Verify Full
+
+
+
+
-
-
- - - {{.i18n.Tr "install.sqlite_helper"}} -
-
+
+
+ + + {{.i18n.Tr "install.sqlite_helper"}} +
+

{{.i18n.Tr "install.general_title"}}

-
- - - {{.i18n.Tr "install.app_name_helper"}} -
-
- - - {{.i18n.Tr "install.repo_path_helper"}} -
-
- - - {{.i18n.Tr "install.run_user_helper"}} -
-
- - - {{.i18n.Tr "install.domain_helper"}} -
-
- - - {{.i18n.Tr "install.ssh_port_helper"}} -
-
- - - {{.i18n.Tr "install.http_port_helper"}} -
-
- - - {{.i18n.Tr "install.app_url_helper"}} -
+
+ + + {{.i18n.Tr "install.app_name_helper"}} +
+
+ + + {{.i18n.Tr "install.repo_path_helper"}} +
+
+ + + {{.i18n.Tr "install.run_user_helper"}} +
+
+ + + {{.i18n.Tr "install.domain_helper"}} +
+
+ + + {{.i18n.Tr "install.ssh_port_helper"}} +
+
+ + + {{.i18n.Tr "install.http_port_helper"}} +
+
+ + + {{.i18n.Tr "install.app_url_helper"}} +
- -

{{.i18n.Tr "install.optional_title"}}

+ +

{{.i18n.Tr "install.optional_title"}}

- -
-
- - {{.i18n.Tr "install.email_title"}} -
-
-
- - -
-
- - - {{.i18n.Tr "install.smtp_from_helper"}} -
-
- - -
-
- - -
-
-
- - -
-
-
-
- - -
-
-
-
+ +
+
+ + {{.i18n.Tr "install.email_title"}} +
+
+
+ + +
+
+ + + {{.i18n.Tr "install.smtp_from_helper"}} +
+
+ + +
+
+ + +
+
+
+ + +
+
+
+
+ + +
+
+
+
- -
-
- - {{.i18n.Tr "install.server_service_title"}} -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
+ +
+
+ + {{.i18n.Tr "install.server_service_title"}} +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
- -
-
- - {{.i18n.Tr "install.admin_title"}} -
-
-

{{.i18n.Tr "install.admin_setting_desc"}}

-
- - -
-
- - -
-
- - -
-
- - -
-
-
+ +
+
+ + {{.i18n.Tr "install.admin_title"}} +
+
+

{{.i18n.Tr "install.admin_setting_desc"}}

+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
-
-
- - -
-
+
+
+ + +
+
diff --git a/templates/mail/auth/activate.tmpl b/templates/mail/auth/activate.tmpl index 5822770e1c..dfbc3ba86b 100644 --- a/templates/mail/auth/activate.tmpl +++ b/templates/mail/auth/activate.tmpl @@ -1,15 +1,15 @@ - + - - {{.User.Name}}, please activate your account + + {{.User.Name}}, please activate your account -

Hi {{.User.Name}}, thanks for registering at {{.AppName}}!

-

Please click the following link to verify your e-mail address within {{.ActiveCodeLives}} hours:

-

{{.AppUrl}}user/activate?code={{.Code}}

-

Not working? Try copying and pasting it to your browser.

-

© 2015 Gogs: Go Git Service

+

Hi {{.User.Name}}, thanks for registering at {{.AppName}}!

+

Please click the following link to verify your e-mail address within {{.ActiveCodeLives}} hours:

+

{{.AppUrl}}user/activate?code={{.Code}}

+

Not working? Try copying and pasting it to your browser.

+

© 2015 Gogs: Go Git Service

diff --git a/templates/mail/auth/activate_email.tmpl b/templates/mail/auth/activate_email.tmpl index 1a918fe223..73d7f616ef 100644 --- a/templates/mail/auth/activate_email.tmpl +++ b/templates/mail/auth/activate_email.tmpl @@ -1,15 +1,15 @@ - + - - {{.User.Name}}, please verify your e-mail address + + {{.User.Name}}, please verify your e-mail address -

Hi {{.User.Name}},

-

Please click the following link to verify your e-mail address within {{.ActiveCodeLives}} hours:

-

{{.AppUrl}}user/activate_email?code={{.Code}}&email={{.Email}}

-

Not working? Try copying and pasting it to your browser.

-

© 2015 Gogs: Go Git Service

+

Hi {{.User.Name}},

+

Please click the following link to verify your e-mail address within {{.ActiveCodeLives}} hours:

+

{{.AppUrl}}user/activate_email?code={{.Code}}&email={{.Email}}

+

Not working? Try copying and pasting it to your browser.

+

© 2015 Gogs: Go Git Service

- \ No newline at end of file + diff --git a/templates/mail/auth/register_notify.tmpl b/templates/mail/auth/register_notify.tmpl index 5fc450b501..864ed55acd 100644 --- a/templates/mail/auth/register_notify.tmpl +++ b/templates/mail/auth/register_notify.tmpl @@ -1,14 +1,14 @@ - + - - {{.User.Name}}, welcome to {{.AppName}} + + {{.User.Name}}, welcome to {{.AppName}} -

Hi {{.User.Name}}, this is your registration confirmation email for {{.AppName}}!

-

You can now login via username: {{.User.Name}}.

-

{{.AppUrl}}user/login

-

© 2015 Gogs: Go Git Service

+

Hi {{.User.Name}}, this is your registration confirmation email for {{.AppName}}!

+

You can now login via username: {{.User.Name}}.

+

{{.AppUrl}}user/login

+

© 2015 Gogs: Go Git Service

diff --git a/templates/mail/auth/reset_passwd.tmpl b/templates/mail/auth/reset_passwd.tmpl index 92ae9f328d..eb29477828 100644 --- a/templates/mail/auth/reset_passwd.tmpl +++ b/templates/mail/auth/reset_passwd.tmpl @@ -1,15 +1,15 @@ - + - - {{.User.Name}}, you have requested to reset your password + + {{.User.Name}}, you have requested to reset your password -

Hi {{.User.Name}},

-

Please click the following link to verify your e-mail address within {{.ActiveCodeLives}} hours:

-

{{.AppUrl}}user/reset_password?code={{.Code}}

-

Not working? Try copying and pasting it to your browser.

-

© 2015 Gogs: Go Git Service

+

Hi {{.User.Name}},

+

Please click the following link to verify your e-mail address within {{.ActiveCodeLives}} hours:

+

{{.AppUrl}}user/reset_password?code={{.Code}}

+

Not working? Try copying and pasting it to your browser.

+

© 2015 Gogs: Go Git Service

- \ No newline at end of file + diff --git a/templates/mail/notify/collaborator.tmpl b/templates/mail/notify/collaborator.tmpl index 9b7e76edb7..a4748093ad 100644 --- a/templates/mail/notify/collaborator.tmpl +++ b/templates/mail/notify/collaborator.tmpl @@ -1,16 +1,16 @@ - - {{.Subject}} + + {{.Subject}} -

You are now a collaborator of this repository.

-

- --- -
- View it on Gogs: {{.RepoLink}} -

+

You are now a collaborator of this repository.

+

+ --- +
+ View it on Gogs: {{.RepoLink}} +

diff --git a/templates/mail/notify/mention.tmpl b/templates/mail/notify/mention.tmpl index 6c6fba32c5..048a0c9c1c 100644 --- a/templates/mail/notify/mention.tmpl +++ b/templates/mail/notify/mention.tmpl @@ -1,17 +1,17 @@ - - {{.Subject}} + + {{.Subject}} -

@{{.ActUserName}} mentioned you:

-

{{.Content | Str2html}}

-

- --- -
- View it on Gogs. -

+

@{{.ActUserName}} mentioned you:

+

{{.Content | Str2html}}

+

+ --- +
+ View it on Gogs. +

diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl index debc1b6a93..765ef240e5 100644 --- a/templates/org/create.tmpl +++ b/templates/org/create.tmpl @@ -1,30 +1,30 @@ {{template "base/head" .}}
-
-
-
- {{.CsrfTokenHtml}} -

- {{.i18n.Tr "new_org"}} -

-
- {{template "base/alert" .}} -
- - - {{.i18n.Tr "org.org_name_helper"}} -
+
+
+ + {{.CsrfTokenHtml}} +

+ {{.i18n.Tr "new_org"}} +

+
+ {{template "base/alert" .}} +
+ + + {{.i18n.Tr "org.org_name_helper"}} +
-
- - - {{.i18n.Tr "cancel"}} -
-
- -
-
+
+ + + {{.i18n.Tr "cancel"}} +
+
+ +
+
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl index c30433d96b..8fa1c2b269 100644 --- a/templates/org/header.tmpl +++ b/templates/org/header.tmpl @@ -1,26 +1,26 @@ {{with .Org}} -
-
-
-
- - {{.DisplayName}} +
+
+
+
+ + {{.DisplayName}} -
-
- -  {{$.i18n.Tr "org.people"}} -
{{.NumMembers}}
- - -  {{$.i18n.Tr "org.teams"}} -
{{.NumTeams}}
- -
+
+
+ +  {{$.i18n.Tr "org.people"}} +
{{.NumMembers}}
+ + +  {{$.i18n.Tr "org.teams"}} +
{{.NumTeams}}
+ +
+
-
-
-{{end}} \ No newline at end of file +
+{{end}} diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index fdd494b19b..78caa3fe12 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -1,85 +1,85 @@ {{template "base/head" .}}
-
-
-
- -
-
- {{.Org.FullName}} - {{if .IsOrganizationOwner}}{{end}} -
- {{if .Org.Description}}

{{.Org.Description}}

{{end}} -
- {{if .Org.Location}}
{{.Org.Location}}
{{end}} - {{if .Org.Website}}
{{.Org.Website}}
{{end}} -
-
+
+
+
+ +
+
+ {{.Org.FullName}} + {{if .IsOrganizationOwner}}{{end}} +
+ {{if .Org.Description}}

{{.Org.Description}}

{{end}} +
+ {{if .Org.Location}}
{{.Org.Location}}
{{end}} + {{if .Org.Website}}
{{.Org.Website}}
{{end}} +
+
-
-
-
+
+
+
-
+
-
-
-
- {{if .IsOrganizationOwner}} -
- {{.i18n.Tr "new_repo"}} -
-
- {{end}} - {{template "explore/repo_list" .}} -
+
+
+
+ {{if .IsOrganizationOwner}} +
+ {{.i18n.Tr "new_repo"}} +
+
+ {{end}} + {{template "explore/repo_list" .}} +
-
-

- {{.i18n.Tr "org.people"}} - {{if .IsOrganizationMember}} -
- {{.Org.NumMembers}} -
- {{end}} -

-
- {{$isMember := .IsOrganizationMember}} - {{range .Members}} - {{if or $isMember (.IsPublicMember $.Org.Id)}} - - {{end}} - {{end}} -
- {{if .IsOrganizationOwner}} -
- {{.i18n.Tr "org.invite_someone"}} -
- {{end}} +
+

+ {{.i18n.Tr "org.people"}} + {{if .IsOrganizationMember}} +
+ {{.Org.NumMembers}} +
+ {{end}} +

+
+ {{$isMember := .IsOrganizationMember}} + {{range .Members}} + {{if or $isMember (.IsPublicMember $.Org.Id)}} + + {{end}} + {{end}} +
+ {{if .IsOrganizationOwner}} +
+ {{.i18n.Tr "org.invite_someone"}} +
+ {{end}} - {{if .IsOrganizationMember}} -
- {{.i18n.Tr "org.teams"}} -
- {{.Org.NumTeams}} -
-
-
- {{range .Teams}} -
- {{.Name}} -

{{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}

-
- {{end}} -
- {{if .IsOrganizationOwner}} -
- {{.i18n.Tr "org.create_new_team"}} -
- {{end}} - {{end}} -
-
-
+ {{if .IsOrganizationMember}} +
+ {{.i18n.Tr "org.teams"}} +
+ {{.Org.NumTeams}} +
+
+
+ {{range .Teams}} +
+ {{.Name}} +

{{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}

+
+ {{end}} +
+ {{if .IsOrganizationOwner}} +
+ {{.i18n.Tr "org.create_new_team"}} +
+ {{end}} + {{end}} +
+
+
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/org/member/invite.tmpl b/templates/org/member/invite.tmpl index d412dd30a3..29e7928f0c 100644 --- a/templates/org/member/invite.tmpl +++ b/templates/org/member/invite.tmpl @@ -1,23 +1,23 @@ {{template "base/head" .}}
{{template "org/header" .}} -
+
- {{template "base/alert" .}} + {{template "base/alert" .}}

{{.i18n.Tr "org.members.invite_desc" .Org.DisplayName}}

-
- {{.CsrfTokenHtml}} -
-
-
- -
-
-
-
- -
+
+ {{.CsrfTokenHtml}} +
+
+
+ +
+
+
+
+ +
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index 8399e044d2..ddd341af2e 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -1,60 +1,60 @@ {{template "base/head" .}}
{{template "org/header" .}} -
- {{template "base/alert" .}} +
+ {{template "base/alert" .}} {{if .IsOrganizationOwner}} -
- {{.i18n.Tr "org.invite_someone"}} -
-
+
+ {{.i18n.Tr "org.invite_someone"}} +
+
{{end}} - +
{{range .Members}} -
-
- -
-
-
{{.Name}}
-
{{.FullName}}
-
-
-
- {{$.i18n.Tr "org.members.membership_visibility"}} +
+
+
-
- {{ $isPublic := .IsPublicMember $.Org.Id}} - {{if $isPublic}} - {{$.i18n.Tr "org.members.public"}} - {{if or (eq $.SignedUser.Id .Id) $.IsOrganizationOwner}}({{$.i18n.Tr "org.members.public_helper"}}){{end}} - {{else}} - {{$.i18n.Tr "org.members.private"}} - {{if or (eq $.SignedUser.Id .Id) $.IsOrganizationOwner}}({{$.i18n.Tr "org.members.private_helper"}}){{end}} - {{end}} +
+
{{.Name}}
+
{{.FullName}}
+
+
+
+ {{$.i18n.Tr "org.members.membership_visibility"}} +
+
+ {{ $isPublic := .IsPublicMember $.Org.Id}} + {{if $isPublic}} + {{$.i18n.Tr "org.members.public"}} + {{if or (eq $.SignedUser.Id .Id) $.IsOrganizationOwner}}({{$.i18n.Tr "org.members.public_helper"}}){{end}} + {{else}} + {{$.i18n.Tr "org.members.private"}} + {{if or (eq $.SignedUser.Id .Id) $.IsOrganizationOwner}}({{$.i18n.Tr "org.members.private_helper"}}){{end}} + {{end}} +
+
+
+
+ {{$.i18n.Tr "org.members.member_role"}} +
+
+ {{if .IsUserOrgOwner $.Org.Id}} {{$.i18n.Tr "org.members.owner"}}{{else}}{{$.i18n.Tr "org.members.member"}}{{end}} +
+
+
+
+ {{if eq $.SignedUser.Id .Id}} + {{$.i18n.Tr "org.members.leave"}} + {{else if $.IsOrganizationOwner}} + {{$.i18n.Tr "org.members.remove"}} + {{end}} +
-
-
- {{$.i18n.Tr "org.members.member_role"}} -
-
- {{if .IsUserOrgOwner $.Org.Id}} {{$.i18n.Tr "org.members.owner"}}{{else}}{{$.i18n.Tr "org.members.member"}}{{end}} -
-
-
-
- {{if eq $.SignedUser.Id .Id}} - {{$.i18n.Tr "org.members.leave"}} - {{else if $.IsOrganizationOwner}} - {{$.i18n.Tr "org.members.remove"}} - {{end}} -
-
-
{{end}}
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl index 707d6f88b2..dc1858e5c4 100644 --- a/templates/org/settings/delete.tmpl +++ b/templates/org/settings/delete.tmpl @@ -1,43 +1,43 @@ {{template "base/head" .}}
- {{template "org/header" .}} -
-
- {{template "org/settings/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "org.settings.delete_account"}} -

-
-
-

{{.i18n.Tr "org.settings.delete_prompt" | Str2html}}

-
-
- {{.CsrfTokenHtml}} - -
- - -
-
- {{.i18n.Tr "org.settings.confirm_delete_account"}} -
-
-
-
-
-
+ {{template "org/header" .}} +
+
+ {{template "org/settings/navbar" .}} +
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "org.settings.delete_account"}} +

+
+
+

{{.i18n.Tr "org.settings.delete_prompt" | Str2html}}

+
+
+ {{.CsrfTokenHtml}} + +
+ + +
+
+ {{.i18n.Tr "org.settings.confirm_delete_account"}} +
+
+
+
+
+
-
- - {{.i18n.Tr "org.settings.delete_org_title"}} -
-
-

{{.i18n.Tr "org.settings.delete_org_desc"}}

-
- {{template "base/delete_modal_actions" .}} +
+ + {{.i18n.Tr "org.settings.delete_org_title"}} +
+
+

{{.i18n.Tr "org.settings.delete_org_desc"}}

+
+ {{template "base/delete_modal_actions" .}}
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl index d9a9b16928..2324788d33 100644 --- a/templates/org/settings/hook_new.tmpl +++ b/templates/org/settings/hook_new.tmpl @@ -1,29 +1,29 @@ {{template "base/head" .}}
- {{template "org/header" .}} -
-
- {{template "org/settings/navbar" .}} -
- {{template "base/alert" .}} -

- {{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}} -
- {{if eq .HookType "gogs"}} - - {{else if eq .HookType "slack"}} - - {{end}} -
-

-
- {{template "repo/settings/hook_gogs" .}} - {{template "repo/settings/hook_slack" .}} -
+ {{template "org/header" .}} +
+
+ {{template "org/settings/navbar" .}} +
+ {{template "base/alert" .}} +

+ {{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}} +
+ {{if eq .HookType "gogs"}} + + {{else if eq .HookType "slack"}} + + {{end}} +
+

+
+ {{template "repo/settings/hook_gogs" .}} + {{template "repo/settings/hook_slack" .}} +
- {{template "repo/settings/hook_history" .}} -
-
-
+ {{template "repo/settings/hook_history" .}} +
+
+
{{template "base/footer" .}} diff --git a/templates/org/settings/hooks.tmpl b/templates/org/settings/hooks.tmpl index 3b5bf4d9df..98b00f794c 100644 --- a/templates/org/settings/hooks.tmpl +++ b/templates/org/settings/hooks.tmpl @@ -1,11 +1,11 @@ {{template "base/head" .}}
- {{template "org/header" .}} -
-
- {{template "org/settings/navbar" .}} - {{template "repo/settings/hook_list" .}} -
-
+ {{template "org/header" .}} +
+
+ {{template "org/settings/navbar" .}} + {{template "repo/settings/hook_list" .}} +
+
{{template "base/footer" .}} diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index d6bfe04145..09fca5d7f6 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -1,14 +1,14 @@
{{.i18n.Tr "org.settings"}}
- - {{.i18n.Tr "org.settings.options"}} - - - {{.i18n.Tr "repo.settings.hooks"}} - - - {{.i18n.Tr "org.settings.delete"}} - + + {{.i18n.Tr "org.settings.options"}} + + + {{.i18n.Tr "repo.settings.hooks"}} + + + {{.i18n.Tr "org.settings.delete"}} +
diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl index 157ff97549..ce3610ae2f 100644 --- a/templates/org/settings/options.tmpl +++ b/templates/org/settings/options.tmpl @@ -1,59 +1,59 @@ {{template "base/head" .}}
- {{template "org/header" .}} -
-
- {{template "org/settings/navbar" .}} -
- {{template "base/alert" .}} -

- {{.i18n.Tr "org.settings.options"}} -

-
-
- {{.CsrfTokenHtml}} -
- - -
-
- - -
-
- - -
-
- - -
-
- - -
+ {{template "org/header" .}} +
+
+ {{template "org/settings/navbar" .}} +
+ {{template "base/alert" .}} +

+ {{.i18n.Tr "org.settings.options"}} +

+
+ + {{.CsrfTokenHtml}} +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
-
- -
- +
+ +
+ -
+
-
- {{.CsrfTokenHtml}} -
- - -
+ + {{.CsrfTokenHtml}} +
+ + +
-
- -
-
-
-
-
-
+
+ +
+ +
+
+
+
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index 83b832e107..3f070b7412 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -1,46 +1,46 @@ {{template "base/head" .}}
{{template "org/header" .}} -
- {{template "base/alert" .}} -
+
+ {{template "base/alert" .}} +
{{template "org/team/sidebar" .}}
{{.i18n.Tr "org.teams.members"}}
- {{range .Team.Members}} -
- {{if $.IsOrganizationOwner}} - {{$.i18n.Tr "org.members.remove"}} - {{end}} - - - {{.DisplayName}} - -
- {{end}} -
- {{if .IsOrganizationOwner}} -
-
- {{.CsrfTokenHtml}} - -
-
-
- -
-
-
-
- -
+ {{range .Team.Members}} +
+ {{if $.IsOrganizationOwner}} + {{$.i18n.Tr "org.members.remove"}} + {{end}} + + + {{.DisplayName}} + +
+ {{end}}
+ {{if .IsOrganizationOwner}} +
+
+ {{.CsrfTokenHtml}} + +
+
+
+ +
+
+
+
+ +
+
{{end}}
-
+
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index 8d09e2ac0f..6293efb62e 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -1,82 +1,82 @@ {{template "base/head" .}}
- {{template "org/header" .}} -
-
-
- {{.CsrfTokenHtml}} -

- {{if .PageIsOrgTeamsNew}}{{.i18n.Tr "org.create_new_team"}}{{else}}{{.i18n.Tr "org.teams.settings"}}{{end}} -

-
- {{template "base/alert" .}} -
- - {{if eq .Team.LowerName "owners"}} - - {{end}} - - {{.i18n.Tr "org.team_name_helper"}} -
-
- - - {{.i18n.Tr "org.team_desc_helper"}} -
- {{if not (eq .Team.LowerName "owners")}} -
- -
-
-
- - - {{.i18n.Tr "org.teams.read_access_helper"}} -
-
-
-
- - - {{.i18n.Tr "org.teams.write_access_helper"}} -
-
-
-
- - - {{.i18n.Tr "org.teams.admin_access_helper"}} -
-
-
-
- {{end}} + {{template "org/header" .}} +
+
+ + {{.CsrfTokenHtml}} +

+ {{if .PageIsOrgTeamsNew}}{{.i18n.Tr "org.create_new_team"}}{{else}}{{.i18n.Tr "org.teams.settings"}}{{end}} +

+
+ {{template "base/alert" .}} +
+ + {{if eq .Team.LowerName "owners"}} + + {{end}} + + {{.i18n.Tr "org.team_name_helper"}} +
+
+ + + {{.i18n.Tr "org.team_desc_helper"}} +
+ {{if not (eq .Team.LowerName "owners")}} +
+ +
+
+
+ + + {{.i18n.Tr "org.teams.read_access_helper"}} +
+
+
+
+ + + {{.i18n.Tr "org.teams.write_access_helper"}} +
+
+
+
+ + + {{.i18n.Tr "org.teams.admin_access_helper"}} +
+
+
+
+ {{end}} -
- {{if .PageIsOrgTeamsNew}} - - {{.i18n.Tr "cancel"}} - {{else}} - - {{if not (eq .Team.LowerName "owners")}} - - {{end}} - {{end}} -
-
- -
-
+
+ {{if .PageIsOrgTeamsNew}} + + {{.i18n.Tr "cancel"}} + {{else}} + + {{if not (eq .Team.LowerName "owners")}} + + {{end}} + {{end}} +
+
+ +
+
-
- - {{.i18n.Tr "org.teams.delete_team_title"}} -
-
-

{{.i18n.Tr "org.teams.delete_team_desc"}}

-
- {{template "base/delete_modal_actions" .}} +
+ + {{.i18n.Tr "org.teams.delete_team_title"}} +
+
+

{{.i18n.Tr "org.teams.delete_team_desc"}}

+
+ {{template "base/delete_modal_actions" .}}
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index 28126bef32..1f8d1a08f0 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -1,9 +1,9 @@ {{template "base/head" .}}
{{template "org/header" .}} -
- {{template "base/alert" .}} -
+
+ {{template "base/alert" .}} +
{{template "org/team/sidebar" .}}
@@ -11,36 +11,36 @@
{{$canAddRemove := and $.IsOrganizationOwner (not (eq $.Team.LowerName "owners"))}} - {{range .Team.Repos}} -
- {{if $canAddRemove}} - {{$.i18n.Tr "org.teams.remove_repo"}} - {{end}} - - - {{$.Org.Name}}/{{.Name}} - -
- {{end}} -
- {{if $canAddRemove}} -
-
- {{.CsrfTokenHtml}} -
-
-
- -
-
-
-
- -
-
+ {{range .Team.Repos}} +
+ {{if $canAddRemove}} + {{$.i18n.Tr "org.teams.remove_repo"}} + {{end}} + + + {{$.Org.Name}}/{{.Name}} + +
+ {{end}} +
+ {{if $canAddRemove}} +
+
+ {{.CsrfTokenHtml}} +
+
+
+ +
+
+
+
+ +
+
{{end}}
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/org/team/sidebar.tmpl b/templates/org/team/sidebar.tmpl index 5abf34be6c..d17261593d 100644 --- a/templates/org/team/sidebar.tmpl +++ b/templates/org/team/sidebar.tmpl @@ -1,41 +1,41 @@
-

- {{.Team.Name}} -
- {{if .Team.IsMember $.SignedUser.Id}} - {{$.i18n.Tr "org.teams.leave"}} - {{else if .IsOrganizationOwner}} - {{$.i18n.Tr "org.teams.join"}} - {{end}} -
-

-
-
- {{if .Team.Description}} - {{.Team.Description}} - {{else}} - {{.i18n.Tr "org.teams.no_desc"}} - {{end}} -
-
- {{.Team.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · - {{.Team.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}} -
-
- {{if eq .Team.LowerName "owners"}} - {{.i18n.Tr "org.teams.owners_permission_desc" | Str2html}} - {{else if (eq .Team.Authorize 1)}} - {{.i18n.Tr "org.teams.read_permission_desc" | Str2html}} - {{else if (eq .Team.Authorize 2)}} - {{.i18n.Tr "org.teams.write_permission_desc" | Str2html}} - {{else if (eq .Team.Authorize 3)}} - {{.i18n.Tr "org.teams.admin_permission_desc" | Str2html}} - {{end}} -
-
- {{if .IsOrganizationOwner}} -
- {{$.i18n.Tr "org.teams.settings"}} -
- {{end}} -
\ No newline at end of file +

+ {{.Team.Name}} +
+ {{if .Team.IsMember $.SignedUser.Id}} + {{$.i18n.Tr "org.teams.leave"}} + {{else if .IsOrganizationOwner}} + {{$.i18n.Tr "org.teams.join"}} + {{end}} +
+

+
+
+ {{if .Team.Description}} + {{.Team.Description}} + {{else}} + {{.i18n.Tr "org.teams.no_desc"}} + {{end}} +
+
+ {{.Team.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · + {{.Team.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}} +
+
+ {{if eq .Team.LowerName "owners"}} + {{.i18n.Tr "org.teams.owners_permission_desc" | Str2html}} + {{else if (eq .Team.Authorize 1)}} + {{.i18n.Tr "org.teams.read_permission_desc" | Str2html}} + {{else if (eq .Team.Authorize 2)}} + {{.i18n.Tr "org.teams.write_permission_desc" | Str2html}} + {{else if (eq .Team.Authorize 3)}} + {{.i18n.Tr "org.teams.admin_permission_desc" | Str2html}} + {{end}} +
+
+ {{if .IsOrganizationOwner}} +
+ {{$.i18n.Tr "org.teams.settings"}} +
+ {{end}} +
diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index 2289af123f..a5ad5d48c1 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -1,41 +1,41 @@ {{template "base/head" .}}
{{template "org/header" .}} -
- {{template "base/alert" .}} +
+ {{template "base/alert" .}} {{if .IsOrganizationOwner}} -
- {{.i18n.Tr "org.create_new_team"}} -
-
+
+ {{.i18n.Tr "org.create_new_team"}} +
+
{{end}}
{{range .Teams}} -
-
- {{.Name}} -
- {{if .IsMember $.SignedUser.Id}} - {{$.i18n.Tr "org.teams.leave"}} - {{else if $.IsOrganizationOwner}} - {{$.i18n.Tr "org.teams.join"}} - {{end}} -
+
+
+ {{.Name}} +
+ {{if .IsMember $.SignedUser.Id}} + {{$.i18n.Tr "org.teams.leave"}} + {{else if $.IsOrganizationOwner}} + {{$.i18n.Tr "org.teams.join"}} + {{end}} +
+
+
+ {{range .Members}} + + + + {{end}} +
+
+

{{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}

+
-
- {{range .Members}} - - - - {{end}} -
-
-

{{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}

-
-
{{end}}
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/bare.tmpl b/templates/repo/bare.tmpl index af839cbaf8..936ed859a6 100644 --- a/templates/repo/bare.tmpl +++ b/templates/repo/bare.tmpl @@ -1,61 +1,61 @@ {{template "base/head" .}}
- {{template "repo/header" .}} -
-
-
- {{template "base/alert" .}} - {{if .IsRepositoryAdmin}} -

- {{.i18n.Tr "repo.quick_guide"}} -
- {{.i18n.Tr "repo.settings"}} -
-

-
-
-

{{.i18n.Tr "repo.clone_this_repo"}} {{.i18n.Tr "repo.clone_helper" "http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository" | Str2html}}

-
- {{if not $.DisableSSH}} - - {{end}} - - - -
-
-
+ {{template "repo/header" .}} +
+
+
+ {{template "base/alert" .}} + {{if .IsRepositoryAdmin}} +

+ {{.i18n.Tr "repo.quick_guide"}} +
+ {{.i18n.Tr "repo.settings"}} +
+

+
+
+

{{.i18n.Tr "repo.clone_this_repo"}} {{.i18n.Tr "repo.clone_helper" "http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository" | Str2html}}

+
+ {{if not $.DisableSSH}} + + {{end}} + + + +
+
+
-
-

{{.i18n.Tr "repo.create_new_repo_command"}}

-
- 
touch README.md
+						

+							
{{.i18n.Tr "repo.create_new_repo_command"}}

+							

+								
touch README.md
 git init
 git add README.md
 git commit -m "first commit"
 git remote add origin {{if $.DisableSSH}}{{$.CloneLink.HTTPS}}{{else}}{{$.CloneLink.SSH}}{{end}}
 git push -u origin master

-            

-          

-          

+
+
+
-
-

{{.i18n.Tr "repo.push_exist_repo"}}

-
- 
git remote add origin {{if $.DisableSSH}}{{$.CloneLink.HTTPS}}{{else}}{{$.CloneLink.SSH}}{{end}}
+						

+							
{{.i18n.Tr "repo.push_exist_repo"}}

+							

+								
git remote add origin {{if $.DisableSSH}}{{$.CloneLink.HTTPS}}{{else}}{{$.CloneLink.SSH}}{{end}}
 git push -u origin master

-            

-          

-          {{end}}
-
-
-
-
+
+
+ {{end}} +
+
+
+
{{template "base/footer" .}} diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl index 07762606fa..879f762dfa 100644 --- a/templates/repo/commits.tmpl +++ b/templates/repo/commits.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}}
- {{template "repo/header" .}} -
- {{template "repo/commits_table" .}} -
+ {{template "repo/header" .}} +
+ {{template "repo/commits_table" .}} +
{{template "base/footer" .}} diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index 8bab2be00f..4ca25e8e1e 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -1,70 +1,70 @@

- {{.CommitCount}} {{.i18n.Tr "repo.commits.commits"}} {{if .Branch}}({{.Branch}}){{end}} - {{if .PageIsCommits}} -
-
-
- -
- -
-
- {{else if .IsDiffCompare}} - {{ShortSha .BeforeCommitID}} ... {{ShortSha .AfterCommitID}} - {{end}} + {{.CommitCount}} {{.i18n.Tr "repo.commits.commits"}} {{if .Branch}}({{.Branch}}){{end}} + {{if .PageIsCommits}} +
+
+
+ +
+ +
+
+ {{else if .IsDiffCompare}} + {{ShortSha .BeforeCommitID}} ... {{ShortSha .AfterCommitID}} + {{end}}

{{if .Commits}} -
- - - - - - - - - - {{ $r:= List .Commits}} - {{range $r}} - - - - - - {{end}} - -
{{.i18n.Tr "repo.commits.author"}}SHA1 {{.i18n.Tr "repo.commits.message"}}{{.i18n.Tr "repo.commits.date"}}
- {{if .User}} -   {{.Author.Name}} - {{else}} -   {{.Author.Name}} - {{end}} - - {{ShortSha .ID.String}} - {{RenderCommitMessage false .Summary $.RepoLink $.Repository.ComposeMetas}} - {{TimeSince .Author.When $.Lang}}
-
+
+ + + + + + + + + + {{ $r:= List .Commits}} + {{range $r}} + + + + + + {{end}} + +
{{.i18n.Tr "repo.commits.author"}}SHA1 {{.i18n.Tr "repo.commits.message"}}{{.i18n.Tr "repo.commits.date"}}
+ {{if .User}} +   {{.Author.Name}} + {{else}} +   {{.Author.Name}} + {{end}} + + {{ShortSha .ID.String}} + {{RenderCommitMessage false .Summary $.RepoLink $.Repository.ComposeMetas}} + {{TimeSince .Author.When $.Lang}}
+
{{end}} {{with .Page}} -{{if gt .TotalPages 1}} -
- -
+ {{if gt .TotalPages 1}} +
+ +
+ {{end}} {{end}} -{{end}} \ No newline at end of file diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 07a9c0919d..8cd466f3d1 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -1,116 +1,116 @@ {{template "base/head" .}}
-
-
-
- {{.CsrfTokenHtml}} -

- {{.i18n.Tr "new_repo"}} -

-
- {{template "base/alert" .}} -
- -
- - - - {{.ContextUser.ShortName 20}} - - -
-
- - {{.SignedUser.ShortName 20}} -
- {{range .Orgs}} -
- - {{.ShortName 20}} -
- {{end}} -
-
-
+
+
+ + {{.CsrfTokenHtml}} +

+ {{.i18n.Tr "new_repo"}} +

+
+ {{template "base/alert" .}} +
+ +
+ + + + {{.ContextUser.ShortName 20}} + + +
+
+ + {{.SignedUser.ShortName 20}} +
+ {{range .Orgs}} +
+ + {{.ShortName 20}} +
+ {{end}} +
+
+
-
- - - {{.i18n.Tr "repo.repo_name_helper" | Safe}} -
-
- -
- {{if .IsForcedPrivate}} - - - {{else}} - - - {{end}} -
-
-
- - -
- -
+
+ + + {{.i18n.Tr "repo.repo_name_helper" | Safe}} +
+
+ +
+ {{if .IsForcedPrivate}} + + + {{else}} + + + {{end}} +
+
+
+ + +
-
- -
- -
{{.i18n.Tr "repo.repo_lang_helper"}}
-
- {{range .Gitignores}} -
{{.}}
- {{end}} -
-
-
-
- -
- -
{{.i18n.Tr "repo.license_helper"}}
-
- {{range .Licenses}} -
{{.}}
- {{end}} -
-
-
+
-
- -
- -
{{.i18n.Tr "repo.readme_helper"}}
-
- {{range .Readmes}} -
{{.}}
- {{end}} -
-
-
-
-
- - -
-
+
+ +
+ +
{{.i18n.Tr "repo.repo_lang_helper"}}
+
+ {{range .Gitignores}} +
{{.}}
+ {{end}} +
+
+
+
+ +
+ +
{{.i18n.Tr "repo.license_helper"}}
+
+ {{range .Licenses}} +
{{.}}
+ {{end}} +
+
+
-
- - - {{.i18n.Tr "cancel"}} -
-
- -
-
+
+ +
+ +
{{.i18n.Tr "repo.readme_helper"}}
+
+ {{range .Readmes}} +
{{.}}
+ {{end}} +
+
+
+
+
+ + +
+
+ +
+ + + {{.i18n.Tr "cancel"}} +
+
+ +
+
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/diff.tmpl b/templates/repo/diff.tmpl index 18de976ebc..544e3b6030 100644 --- a/templates/repo/diff.tmpl +++ b/templates/repo/diff.tmpl @@ -1,45 +1,45 @@ {{template "base/head" .}}
- {{template "repo/header" .}} -
- {{if .IsDiffCompare }} - {{template "repo/commits_table" .}} - {{else}} -
- - {{.i18n.Tr "repo.diff.browse_source"}} - - {{RenderCommitMessage true .Commit.Message $.RepoLink $.Repository.ComposeMetas}} -
-
- {{if .Author}} - - {{.Commit.Author.Name}} - {{else}} - - {{.Commit.Author.Name}} - {{end}} - {{TimeSince .Commit.Author.When $.Lang}} -
-
- {{if .Parents}} -
- {{.i18n.Tr "repo.diff.parent"}} -
-
- {{range .Parents}} - {{ShortSha .}} - {{end}} -
- {{end}} -
{{.i18n.Tr "repo.diff.commit"}}
-
{{ShortSha .CommitID}}
-
-
-
- {{end}} - - {{template "repo/diff_box" .}} -
+ {{template "repo/header" .}} +
+ {{if .IsDiffCompare }} + {{template "repo/commits_table" .}} + {{else}} +
+ + {{.i18n.Tr "repo.diff.browse_source"}} + + {{RenderCommitMessage true .Commit.Message $.RepoLink $.Repository.ComposeMetas}} +
+
+ {{if .Author}} + + {{.Commit.Author.Name}} + {{else}} + + {{.Commit.Author.Name}} + {{end}} + {{TimeSince .Commit.Author.When $.Lang}} +
+
+ {{if .Parents}} +
+ {{.i18n.Tr "repo.diff.parent"}} +
+
+ {{range .Parents}} + {{ShortSha .}} + {{end}} +
+ {{end}} +
{{.i18n.Tr "repo.diff.commit"}}
+
{{ShortSha .CommitID}}
+
+
+
+ {{end}} + + {{template "repo/diff_box" .}} +
{{template "base/footer" .}} diff --git a/templates/repo/diff_box.tmpl b/templates/repo/diff_box.tmpl index a1d106b7f2..c0b106aff9 100644 --- a/templates/repo/diff_box.tmpl +++ b/templates/repo/diff_box.tmpl @@ -1,94 +1,94 @@ {{if .DiffNotAvailable}} -

{{.i18n.Tr "repo.diff.data_not_available"}}

+

{{.i18n.Tr "repo.diff.data_not_available"}}

{{else}} -
-
- - {{.i18n.Tr "repo.diff.stats_desc" .Diff.NumFiles .Diff.TotalAddition .Diff.TotalDeletion | Str2html}} -
- {{.i18n.Tr "repo.diff.show_diff_stats"}} -
-
-
    - {{range .Diff.Files}} -
  1. -
    - {{if not .IsBin}} - {{.Addition}} - - - - - {{.Deletion}} - {{else}} - {{$.i18n.Tr "repo.diff.bin"}} - {{end}} -
    - -   - {{.Name}} -
    2. - {{end}} -
-
+
+
+ + {{.i18n.Tr "repo.diff.stats_desc" .Diff.NumFiles .Diff.TotalAddition .Diff.TotalDeletion | Str2html}} +
+ {{.i18n.Tr "repo.diff.show_diff_stats"}} +
+
+
    + {{range .Diff.Files}} +
  1. +
    + {{if not .IsBin}} + {{.Addition}} + + + + + {{.Deletion}} + {{else}} + {{$.i18n.Tr "repo.diff.bin"}} + {{end}} +
    + +   + {{.Name}} +
    2. + {{end}} +
+
-{{range $i, $file := .Diff.Files}} -
-

-
- {{if $file.IsBin}} - {{$.i18n.Tr "repo.diff.bin"}} - {{else if not $file.IsRenamed}} - + {{.Addition}} - - - - - - {{.Deletion}} - {{end}} -
- {{if $file.IsRenamed}}{{$file.OldName}} → {{end}}{{$file.Name}} -
- {{if $file.IsDeleted}} - {{$.i18n.Tr "repo.diff.view_file"}} - {{else}} - {{$.i18n.Tr "repo.diff.view_file"}} - {{end}} -
-

-
- {{if not $file.IsRenamed}} - {{$isImage := (call $.IsImageFile $file.Name)}} - {{if and $isImage}} -
- -
- {{else}} -
- - - {{range .Sections}} - {{range $k, $line := .Lines}} - - - - - - {{end}} - {{end}} - -
- {{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}} - - {{if $line.RightIdx}}{{$line.RightIdx}}{{end}} - - 
{{$line.Content}}
-
-
- {{end}} - {{end}} -
-
-
+ {{range $i, $file := .Diff.Files}} +
+

+
+ {{if $file.IsBin}} + {{$.i18n.Tr "repo.diff.bin"}} + {{else if not $file.IsRenamed}} + + {{.Addition}} + + + + + - {{.Deletion}} + {{end}} +
+ {{if $file.IsRenamed}}{{$file.OldName}} → {{end}}{{$file.Name}} +
+ {{if $file.IsDeleted}} + {{$.i18n.Tr "repo.diff.view_file"}} + {{else}} + {{$.i18n.Tr "repo.diff.view_file"}} + {{end}} +
+

+
+ {{if not $file.IsRenamed}} + {{$isImage := (call $.IsImageFile $file.Name)}} + {{if and $isImage}} +
+ +
+ {{else}} +
+ + + {{range .Sections}} + {{range $k, $line := .Lines}} + + + + + + {{end}} + {{end}} + +
+ {{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}} + + {{if $line.RightIdx}}{{$line.RightIdx}}{{end}} + + 
{{$line.Content}}
+
+
+ {{end}} + {{end}} +
+
+
+ {{end}} {{end}} -{{end}} \ No newline at end of file diff --git a/templates/repo/forks.tmpl b/templates/repo/forks.tmpl index 91085b9d22..e8b57e1af3 100644 --- a/templates/repo/forks.tmpl +++ b/templates/repo/forks.tmpl @@ -1,22 +1,22 @@ {{template "base/head" .}}
- {{template "repo/header" .}} -
-

- {{.i18n.Tr "repo.forks"}} -

-
- {{range .Forks}} -
- -
- {{.Owner.Name}} - / - {{.Name}} -
-
- {{end}} -
-
+ {{template "repo/header" .}} +
+

+ {{.i18n.Tr "repo.forks"}} +

+
+ {{range .Forks}} +
+ +
+ {{.Owner.Name}} + / + {{.Name}} +
+
+ {{end}} +
+
{{template "base/footer" .}} diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index fb25b94bf0..74448ced04 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -1,87 +1,87 @@ {{with .Repository}} -
-
-
-
-
- - {{.Owner.Name}} -
/
- {{.Name}} - {{if .IsMirror}}
{{$.i18n.Tr "mirror"}}
{{end}} - {{if .IsFork}}
{{$.i18n.Tr "repo.forked_from"}} {{SubStr .BaseRepo.RepoLink 1 -1}}
{{end}} -
+
+
+
+
+
+ + {{.Owner.Name}} +
/
+ {{.Name}} + {{if .IsMirror}}
{{$.i18n.Tr "mirror"}}
{{end}} + {{if .IsFork}}
{{$.i18n.Tr "repo.forked_from"}} {{SubStr .BaseRepo.RepoLink 1 -1}}
{{end}} +
-
-
- - {{if $.IsWatchingRepo}}{{$.i18n.Tr "repo.unwatch"}}{{else}}{{$.i18n.Tr "repo.watch"}}{{end}} - - - {{.NumWatches}} - -
-
- - {{if $.IsStaringRepo}}{{$.i18n.Tr "repo.unstar"}}{{else}}{{$.i18n.Tr "repo.star"}}{{end}} - - - {{.NumStars}} - -
- {{if .CanBeForked}} -
- - {{$.i18n.Tr "repo.fork"}} - - - {{.NumForks}} - -
- {{end}} -
-
-
-
-
+
+
+ + {{if $.IsWatchingRepo}}{{$.i18n.Tr "repo.unwatch"}}{{else}}{{$.i18n.Tr "repo.watch"}}{{end}} + + + {{.NumWatches}} + +
+
+ + {{if $.IsStaringRepo}}{{$.i18n.Tr "repo.unstar"}}{{else}}{{$.i18n.Tr "repo.star"}}{{end}} + + + {{.NumStars}} + +
+ {{if .CanBeForked}} +
+ + {{$.i18n.Tr "repo.fork"}} + + + {{.NumForks}} + +
+ {{end}} +
+
+
+
+
{{end}} {{if not (or .IsBareRepo .IsDiffCompare)}} -
-
- - {{.i18n.Tr "repo.code"}} - - {{if .Repository.EnableIssues}} - - {{.i18n.Tr "repo.issues"}} {{.Repository.NumOpenIssues}} - - {{end}} - {{if .Repository.EnablePulls}} - - {{.i18n.Tr "repo.pulls"}} {{.Repository.NumOpenPulls}} - - {{end}} - - {{.i18n.Tr "repo.commits"}} {{.CommitsCount}} - - - {{.i18n.Tr "repo.releases"}} {{.Repository.NumTags}} - - {{if .Repository.EnableWiki}} - - {{.i18n.Tr "repo.wiki"}} - - {{end}} - {{if .IsRepositoryAdmin}} -
- - {{.i18n.Tr "repo.settings"}} - -
- {{end}} -
-
-
+
+
+ + {{.i18n.Tr "repo.code"}} + + {{if .Repository.EnableIssues}} + + {{.i18n.Tr "repo.issues"}} {{.Repository.NumOpenIssues}} + + {{end}} + {{if .Repository.EnablePulls}} + + {{.i18n.Tr "repo.pulls"}} {{.Repository.NumOpenPulls}} + + {{end}} + + {{.i18n.Tr "repo.commits"}} {{.CommitsCount}} + + + {{.i18n.Tr "repo.releases"}} {{.Repository.NumTags}} + + {{if .Repository.EnableWiki}} + + {{.i18n.Tr "repo.wiki"}} + + {{end}} + {{if .IsRepositoryAdmin}} +
+ + {{.i18n.Tr "repo.settings"}} + +
+ {{end}} +
+
+
{{else}} -
+
{{end}} diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 6a3d0f1295..12820e46b3 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -1,111 +1,111 @@ {{template "base/head" .}}
- {{template "repo/header" .}} -
-

- {{if .Repository.DescriptionHtml}}{{.Repository.DescriptionHtml}}{{else}}{{.i18n.Tr "repo.no_desc"}}{{end}} - {{.Repository.Website}} -

-
- {{if .CanPullRequest}} -
- {{ $baseRepo := .Repository.BaseRepo}} - - - -
- {{end}} -
-
-
- - - {{if .IsViewBranch}}{{.i18n.Tr "repo.branch"}}{{else}}{{.i18n.Tr "repo.tree"}}{{end}}: - {{if .IsViewBranch}}{{.BranchName}}{{else}}{{ShortSha .BranchName}}{{end}} - - -
-
-
- - -
-
-
-
- - - {{.i18n.Tr "repo.branches"}} - - - - - {{.i18n.Tr "repo.tags"}} - - -
-
-
- - -
-
-
-
-
- {{.Repository.Name}} - {{ $n := len .Treenames}} - {{ $l := Subtract $n 1}} - {{range $i, $v := .Treenames}} -
/
- {{if eq $i $l}} - {{$v}} - {{else}} - {{ $p := index $.Paths $i}} - {{$v}} - {{end}} - {{end}} -
-
- {{if eq $n 0}} -
-
- {{if not $.DisableSSH}} - - {{end}} - - - -
- -
- ZIP - TAR.GZ -
-
-
-
- {{end}} -
- {{if .IsFile}} - {{template "repo/view_file" .}} - {{else}} - {{template "repo/view_list" .}} - {{end}} -
+ {{template "repo/header" .}} +
+

+ {{if .Repository.DescriptionHtml}}{{.Repository.DescriptionHtml}}{{else}}{{.i18n.Tr "repo.no_desc"}}{{end}} + {{.Repository.Website}} +

+
+ {{if .CanPullRequest}} +
+ {{ $baseRepo := .Repository.BaseRepo}} + + + +
+ {{end}} +
+
+
+ + + {{if .IsViewBranch}}{{.i18n.Tr "repo.branch"}}{{else}}{{.i18n.Tr "repo.tree"}}{{end}}: + {{if .IsViewBranch}}{{.BranchName}}{{else}}{{ShortSha .BranchName}}{{end}} + + +
+
+
+ + +
+
+
+
+ + + {{.i18n.Tr "repo.branches"}} + + + + + {{.i18n.Tr "repo.tags"}} + + +
+
+
+ + +
+
+
+
+
+ {{.Repository.Name}} + {{ $n := len .Treenames}} + {{ $l := Subtract $n 1}} + {{range $i, $v := .Treenames}} +
/
+ {{if eq $i $l}} + {{$v}} + {{else}} + {{ $p := index $.Paths $i}} + {{$v}} + {{end}} + {{end}} +
+
+ {{if eq $n 0}} +
+
+ {{if not $.DisableSSH}} + + {{end}} + + + +
+ +
+ ZIP + TAR.GZ +
+
+
+
+ {{end}} +
+ {{if .IsFile}} + {{template "repo/view_file" .}} + {{else}} + {{template "repo/view_list" .}} + {{end}} +
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/issue/comment_tab.tmpl b/templates/repo/issue/comment_tab.tmpl index a3f80edfb5..8f6c8ca778 100644 --- a/templates/repo/issue/comment_tab.tmpl +++ b/templates/repo/issue/comment_tab.tmpl @@ -1,16 +1,16 @@
-
- {{.i18n.Tr "repo.release.write"}} - {{.i18n.Tr "repo.release.preview"}} -
-
- -
-
- {{.i18n.Tr "repo.release.loading"}} -
+
+ {{.i18n.Tr "repo.release.write"}} + {{.i18n.Tr "repo.release.preview"}} +
+
+ +
+
+ {{.i18n.Tr "repo.release.loading"}} +
{{if .IsAttachmentEnabled}} -
-
-{{end}} \ No newline at end of file +
+
+{{end}} diff --git a/templates/repo/issue/label_precolors.tmpl b/templates/repo/issue/label_precolors.tmpl index 378281b303..d0e165068d 100644 --- a/templates/repo/issue/label_precolors.tmpl +++ b/templates/repo/issue/label_precolors.tmpl @@ -13,4 +13,4 @@ - \ No newline at end of file + diff --git a/templates/repo/issue/labels.tmpl b/templates/repo/issue/labels.tmpl index dd84ce416c..d7f758ae65 100644 --- a/templates/repo/issue/labels.tmpl +++ b/templates/repo/issue/labels.tmpl @@ -5,9 +5,9 @@
{{template "repo/issue/navbar" .}} {{if .IsRepositoryAdmin}} -
-
{{.i18n.Tr "repo.issues.new_label"}}
-
+
+
{{.i18n.Tr "repo.issues.new_label"}}
+
{{end}}
@@ -16,11 +16,11 @@
- +
- +
{{template "repo/issue/label_precolors"}} @@ -38,72 +38,72 @@
{{range .Labels}} -
  • -
    {{.Name}}
    - {{if $.IsRepositoryAdmin}} - {{$.i18n.Tr "repo.issues.label_delete"}} - {{$.i18n.Tr "repo.issues.label_edit"}} - {{end}} - {{$.i18n.Tr "repo.issues.label_open_issues" .NumOpenIssues}} -
    • +
  • +
    {{.Name}}
    + {{if $.IsRepositoryAdmin}} + {{$.i18n.Tr "repo.issues.label_delete"}} + {{$.i18n.Tr "repo.issues.label_edit"}} + {{end}} + {{$.i18n.Tr "repo.issues.label_open_issues" .NumOpenIssues}} +
    • {{end}}
    {{if .IsRepositoryAdmin}} -
    -
    - - {{.i18n.Tr "repo.issues.label_deletion"}} -
    -
    -

    {{.i18n.Tr "repo.issues.label_deletion_desc"}}

    -
    -
    -
    - - {{.i18n.Tr "modal.no"}} -
    -
    - - {{.i18n.Tr "modal.yes"}} -
    -
    -
    +
    +
    + + {{.i18n.Tr "repo.issues.label_deletion"}} +
    +
    +

    {{.i18n.Tr "repo.issues.label_deletion_desc"}}

    +
    +
    +
    + + {{.i18n.Tr "modal.no"}} +
    +
    + + {{.i18n.Tr "modal.yes"}} +
    +
    +
    -
    -
    - {{.i18n.Tr "repo.issues.label_modify"}} -
    -
    -
    - {{.CsrfTokenHtml}} - -
    -
    -
    - +
    +
    + {{.i18n.Tr "repo.issues.label_modify"}} +
    +
    + + {{.CsrfTokenHtml}} + +
    +
    +
    + +
    +
    +
    + +
    +
    + {{template "repo/issue/label_precolors"}}
    -
    - -
    -
    - {{template "repo/issue/label_precolors"}} -
    + +
    +
    +
    + {{.i18n.Tr "modal.no"}}
    - -
    -
    -
    - {{.i18n.Tr "modal.no"}} -
    -
    - {{.i18n.Tr "modal.modify"}} - -
    -
    -
    +
    + {{.i18n.Tr "modal.modify"}} + +
    +
    +
    {{end}} -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 5b1ad1d026..66bd2ae298 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -6,22 +6,22 @@ {{template "repo/issue/navbar" .}}
    {{if .PageIsIssueList}} - {{.i18n.Tr "repo.issues.new"}} + {{.i18n.Tr "repo.issues.new"}} {{else}} - {{.i18n.Tr "repo.pulls.new"}} + {{.i18n.Tr "repo.pulls.new"}} {{end}}
    - - - {{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}} - - - - {{.i18n.Tr "repo.issues.close_tab" .IssueStats.ClosedCount}} - + + + {{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}} + + + + {{.i18n.Tr "repo.issues.close_tab" .IssueStats.ClosedCount}} +
    @@ -30,11 +30,11 @@ {{.i18n.Tr "repo.issues.filter_label"}} -
    - {{.i18n.Tr "repo.issues.filter_label_no_select"}} - {{range .Labels}} - {{.Name}} - {{end}} +
    + {{.i18n.Tr "repo.issues.filter_label_no_select"}} + {{range .Labels}} + {{.Name}} + {{end}}
    @@ -44,11 +44,11 @@ {{.i18n.Tr "repo.issues.filter_milestone"}} -
    - {{.i18n.Tr "repo.issues.filter_milestone_no_select"}} - {{range .Milestones}} - {{.Name}} - {{end}} +
    + {{.i18n.Tr "repo.issues.filter_milestone_no_select"}} + {{range .Milestones}} + {{.Name}} + {{end}}
    @@ -58,11 +58,11 @@ {{.i18n.Tr "repo.issues.filter_assignee"}} -
    - {{.i18n.Tr "repo.issues.filter_assginee_no_select"}} - {{range .Assignees}} - {{.Name}} - {{end}} +
    + {{.i18n.Tr "repo.issues.filter_assginee_no_select"}} + {{range .Assignees}} + {{.Name}} + {{end}}
    @@ -72,11 +72,11 @@ {{.i18n.Tr "repo.issues.filter_type"}} -
    - {{.i18n.Tr "repo.issues.filter_type.all_issues"}} - {{.i18n.Tr "repo.issues.filter_type.assigned_to_you"}} - {{.i18n.Tr "repo.issues.filter_type.created_by_you"}} - {{.i18n.Tr "repo.issues.filter_type.mentioning_you"}} +
    + {{.i18n.Tr "repo.issues.filter_type.all_issues"}} + {{.i18n.Tr "repo.issues.filter_type.assigned_to_you"}} + {{.i18n.Tr "repo.issues.filter_type.created_by_you"}} + {{.i18n.Tr "repo.issues.filter_type.mentioning_you"}}
    @@ -86,68 +86,68 @@ {{.i18n.Tr "repo.issues.filter_sort"}} -
    - {{.i18n.Tr "repo.issues.filter_sort.latest"}} - {{.i18n.Tr "repo.issues.filter_sort.oldest"}} - {{.i18n.Tr "repo.issues.filter_sort.recentupdate"}} - {{.i18n.Tr "repo.issues.filter_sort.leastupdate"}} - {{.i18n.Tr "repo.issues.filter_sort.mostcomment"}} - {{.i18n.Tr "repo.issues.filter_sort.leastcomment"}} +
    + {{.i18n.Tr "repo.issues.filter_sort.latest"}} + {{.i18n.Tr "repo.issues.filter_sort.oldest"}} + {{.i18n.Tr "repo.issues.filter_sort.recentupdate"}} + {{.i18n.Tr "repo.issues.filter_sort.leastupdate"}} + {{.i18n.Tr "repo.issues.filter_sort.mostcomment"}} + {{.i18n.Tr "repo.issues.filter_sort.leastcomment"}}
    {{range .Issues}} - {{ $timeStr:= TimeSince .Created $.Lang }} -
  • -
    #{{.Index}}
    - {{.Name}} + {{ $timeStr:= TimeSince .Created $.Lang }} +
  • +
    #{{.Index}}
    + {{.Name}} - {{range .Labels}} - {{.Name}} - {{end}} - - {{if .NumComments}} - {{.NumComments}} - {{end}} - -

    - {{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.HomeLink .Poster.Name | Safe}} - {{if .Milestone}} - - {{.Milestone.Name}} - - {{end}} - {{if .Assignee}} - - - - {{end}} -

    -
    • - {{end}} - - {{with .Page}} - {{if gt .TotalPages 1}} -
    - -
    + +

    + {{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.HomeLink .Poster.Name | Safe}} + {{if .Milestone}} + + {{.Milestone.Name}} + + {{end}} + {{if .Assignee}} + + + + {{end}} +

    + {{end}} + + {{with .Page}} + {{if gt .TotalPages 1}} +
    + +
    + {{end}} {{end}}
    diff --git a/templates/repo/issue/milestone_new.tmpl b/templates/repo/issue/milestone_new.tmpl index 383e54dd8f..88dc806b4e 100644 --- a/templates/repo/issue/milestone_new.tmpl +++ b/templates/repo/issue/milestone_new.tmpl @@ -5,64 +5,64 @@
    {{template "repo/issue/navbar" .}} {{if and .IsRepositoryAdmin .PageIsEditMilestone}} -
    - {{.i18n.Tr "repo.milestones.new"}} -
    +
    + {{.i18n.Tr "repo.milestones.new"}} +
    {{end}}
    -

    - {{if .PageIsEditMilestone}} - {{.i18n.Tr "repo.milestones.edit"}} -
    {{.i18n.Tr "repo.milestones.edit_subheader"}}
    - {{else}} - {{.i18n.Tr "repo.milestones.new"}} -
    {{.i18n.Tr "repo.milestones.new_subheader"}}
    - {{end}} -

    - {{template "base/alert" .}} -
    - {{.CsrfTokenHtml}} -
    -
    - - -
    -
    - - -
    +

    + {{if .PageIsEditMilestone}} + {{.i18n.Tr "repo.milestones.edit"}} +
    {{.i18n.Tr "repo.milestones.edit_subheader"}}
    + {{else}} + {{.i18n.Tr "repo.milestones.new"}} +
    {{.i18n.Tr "repo.milestones.new_subheader"}}
    + {{end}} +

    + {{template "base/alert" .}} + + {{.CsrfTokenHtml}} +
    +
    + +
    -
    -
    - - -
    -
    - -
    +
    + +
    -
    -
    -
    - {{if .PageIsEditMilestone}} +
    +
    +
    + + +
    +
    + +
    +
    +
    +
    +
    + {{if .PageIsEditMilestone}} {{.i18n.Tr "repo.milestones.cancel"}} - {{else}} + {{else}} - {{end}} -
    + {{end}}
    - +
    +
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 248b81e242..fe247d80c0 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -5,113 +5,113 @@
    {{template "repo/issue/navbar" .}} {{if .IsRepositoryAdmin}} -
    - {{.i18n.Tr "repo.milestones.new"}} -
    +
    + {{.i18n.Tr "repo.milestones.new"}} +
    {{end}}
    {{template "base/alert" .}}
    - - - {{.i18n.Tr "repo.milestones.open_tab" .OpenCount}} - - - - {{.i18n.Tr "repo.milestones.close_tab" .ClosedCount}} - + + + {{.i18n.Tr "repo.milestones.open_tab" .OpenCount}} + + + + {{.i18n.Tr "repo.milestones.close_tab" .ClosedCount}} +
    - +
    {{range .Milestones}} -
  • - {{.Name}} -
    -
    -
    -
    -
    -
    - {{ $closedDate:= TimeSince .ClosedDate $.Lang }} - {{if .IsClosed}} - {{$.i18n.Tr "repo.milestones.closed" $closedDate|Str2html}} - {{else}} - - {{if .DeadlineString}} - {{.DeadlineString}} +
  • + {{.Name}} +
    +
    +
    +
    +
    +
    + {{ $closedDate:= TimeSince .ClosedDate $.Lang }} + {{if .IsClosed}} + {{$.i18n.Tr "repo.milestones.closed" $closedDate|Str2html}} {{else}} - {{$.i18n.Tr "repo.milestones.no_due_date"}} + + {{if .DeadlineString}} + {{.DeadlineString}} + {{else}} + {{$.i18n.Tr "repo.milestones.no_due_date"}} + {{end}} + {{end}} + + {{$.i18n.Tr "repo.issues.open_tab" .NumOpenIssues}} + {{$.i18n.Tr "repo.issues.close_tab" .NumClosedIssues}} + +
    + {{if $.IsRepositoryAdmin}} +
    + {{$.i18n.Tr "repo.issues.label_edit"}} + {{if .IsClosed}} + {{$.i18n.Tr "repo.milestones.open"}} + {{else}} + {{$.i18n.Tr "repo.milestones.close"}} + {{end}} + {{$.i18n.Tr "repo.issues.label_delete"}} +
    + {{if .Content}} +
    + {{.RenderedContent|Str2html}} +
    {{end}} {{end}} - - {{$.i18n.Tr "repo.issues.open_tab" .NumOpenIssues}} - {{$.i18n.Tr "repo.issues.close_tab" .NumClosedIssues}} - -
    • - {{if $.IsRepositoryAdmin}} -
    - {{$.i18n.Tr "repo.issues.label_edit"}} - {{if .IsClosed}} - {{$.i18n.Tr "repo.milestones.open"}} - {{else}} - {{$.i18n.Tr "repo.milestones.close"}} - {{end}} - {{$.i18n.Tr "repo.issues.label_delete"}} -
    - {{if .Content}} -
    - {{.RenderedContent|Str2html}} -
    - {{end}} - {{end}} - + {{end}} - + {{with .Page}} - {{if gt .TotalPages 1}} -
    - -
    - {{end}} + {{if gt .TotalPages 1}} +
    + +
    + {{end}} {{end}}
    {{if .IsRepositoryAdmin}} -
    -
    - - {{.i18n.Tr "repo.milestones.deletion"}} -
    -
    -

    {{.i18n.Tr "repo.milestones.deletion_desc"}}

    -
    -
    -
    - - {{.i18n.Tr "modal.no"}} -
    -
    - - {{.i18n.Tr "modal.yes"}} -
    -
    -
    +
    +
    + + {{.i18n.Tr "repo.milestones.deletion"}} +
    +
    +

    {{.i18n.Tr "repo.milestones.deletion_desc"}}

    +
    +
    +
    + + {{.i18n.Tr "modal.no"}} +
    +
    + + {{.i18n.Tr "modal.yes"}} +
    +
    +
    {{end}} -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/issue/navbar.tmpl b/templates/repo/issue/navbar.tmpl index 3f76947c16..a3e9d2660d 100644 --- a/templates/repo/issue/navbar.tmpl +++ b/templates/repo/issue/navbar.tmpl @@ -1,4 +1,4 @@
    - {{.i18n.Tr "repo.labels"}} - {{.i18n.Tr "repo.milestones"}} -
    \ No newline at end of file + {{.i18n.Tr "repo.labels"}} + {{.i18n.Tr "repo.milestones"}} +
    diff --git a/templates/repo/issue/new.tmpl b/templates/repo/issue/new.tmpl index bb45c3b743..3c6bc05b10 100644 --- a/templates/repo/issue/new.tmpl +++ b/templates/repo/issue/new.tmpl @@ -9,4 +9,4 @@ {{template "repo/issue/new_form" .}}
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 8576d7db8d..c023643eb9 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -1,32 +1,32 @@
    - {{.CsrfTokenHtml}} - {{if .Flash}} -
    - {{template "base/alert" .}} -
    - {{end}} -
    + {{.CsrfTokenHtml}} + {{if .Flash}} +
    + {{template "base/alert" .}} +
    + {{end}} +
    -
    - - - -
    -
    - -
    +
    + + + +
    +
    + +
    {{template "repo/issue/comment_tab" .}} -
    +
    -
    -
    -
    +
    +
    +
    @@ -38,18 +38,18 @@ {{.i18n.Tr "repo.issues.new.labels"}} -
    -
    {{.i18n.Tr "repo.issues.new.clear_labels"}}
    - {{range .Labels}} - {{.Name}} - {{end}} +
    +
    {{.i18n.Tr "repo.issues.new.clear_labels"}}
    + {{range .Labels}} + {{.Name}} + {{end}}
    {{.i18n.Tr "repo.issues.new.no_label"}} - {{range .Labels}} - {{.Name}} - {{end}} + {{range .Labels}} + {{.Name}} + {{end}}
    @@ -60,35 +60,35 @@ {{.i18n.Tr "repo.issues.new.milestone"}} -
    -
    {{.i18n.Tr "repo.issues.new.clear_milestone"}}
    - {{if .OpenMilestones}} -
    -
    - - {{.i18n.Tr "repo.issues.new.open_milestone"}} -
    - {{range .OpenMilestones}} -
    {{.Name}}
    - {{end}} - {{end}} - {{if .ClosedMilestones}} -
    -
    - - {{.i18n.Tr "repo.issues.new.closed_milestone"}} -
    - {{range .ClosedMilestones}} - {{.Name}} - {{end}} - {{end}} +
    +
    {{.i18n.Tr "repo.issues.new.clear_milestone"}}
    + {{if .OpenMilestones}} +
    +
    + + {{.i18n.Tr "repo.issues.new.open_milestone"}} +
    + {{range .OpenMilestones}} +
    {{.Name}}
    + {{end}} + {{end}} + {{if .ClosedMilestones}} +
    +
    + + {{.i18n.Tr "repo.issues.new.closed_milestone"}} +
    + {{range .ClosedMilestones}} + {{.Name}} + {{end}} + {{end}}
    {{.i18n.Tr "repo.issues.new.no_milestone"}}
    {{if .Milestone}} - {{.Milestone.Name}} + {{.Milestone.Name}} {{end}}
    @@ -101,21 +101,21 @@ {{.i18n.Tr "repo.issues.new.assignee"}} -
    -
    {{.i18n.Tr "repo.issues.new.clear_assignee"}}
    - {{range .Assignees}} -
    {{.Name}}
    - {{end}} +
    +
    {{.i18n.Tr "repo.issues.new.clear_assignee"}}
    + {{range .Assignees}} +
    {{.Name}}
    + {{end}}
    {{.i18n.Tr "repo.issues.new.no_assignee"}}
    {{if .Assignee}} - {{.Assignee.Name}} + {{.Assignee.Name}} {{end}}
    - \ No newline at end of file + diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl index 506e4e3f04..1f25f1535b 100644 --- a/templates/repo/issue/view.tmpl +++ b/templates/repo/issue/view.tmpl @@ -6,22 +6,22 @@ {{template "repo/issue/navbar" .}}
    {{if .PageIsIssueList}} - {{.i18n.Tr "repo.issues.new"}} + {{.i18n.Tr "repo.issues.new"}} {{else}} - {{.i18n.Tr "repo.pulls.new"}} + {{.i18n.Tr "repo.pulls.new"}} {{end}}
    {{if .Issue.IsPull}} - {{template "repo/issue/view_title" .}} - {{template "repo/pulls/tab_menu" .}} -
    - {{template "repo/issue/view_content" .}} -
    + {{template "repo/issue/view_title" .}} + {{template "repo/pulls/tab_menu" .}} +
    + {{template "repo/issue/view_content" .}} +
    {{else}} - {{template "repo/issue/view_content" .}} + {{template "repo/issue/view_content" .}} {{end}}
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 0f4a6d07ed..c641d7a8ff 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -1,234 +1,232 @@
    {{if .Flash}} -
    - {{template "base/alert" .}} -
    - {{end}} - {{if not .Issue.IsPull}} - {{template "repo/issue/view_title" .}} - {{end}} - - {{ $createdStr:= TimeSince .Issue.Created $.Lang }} +
    + {{template "base/alert" .}} +
    + {{end}} + {{if not .Issue.IsPull}} + {{template "repo/issue/view_title" .}} + {{end}} + + {{ $createdStr:= TimeSince .Issue.Created $.Lang }}
    - -
    - - - -
    + +
    + + + +
    {{.Issue.Poster.Name}} {{.i18n.Tr "repo.issues.commented_at" .Issue.HashTag $createdStr | Safe}} -
    - {{if .IsIssueOwner}} - - {{end}} -
    -
    -
    -
    - {{if .Issue.RenderedContent}} - {{.Issue.RenderedContent|Str2html}} - {{else}} - {{.i18n.Tr "repo.issues.no_content"}} - {{end}} -
    -
    {{.Issue.Content}}
    -
    -
    - {{if .Issue.Attachments}} -
    -
    - {{range .Issue.Attachments}} - - {{end}} +
    + {{if .IsIssueOwner}} + + {{end}}
    - {{end}} -
    -
    - - {{range .Issue.Comments}} - {{ $createdStr:= TimeSince .Created $.Lang }} - - - {{if eq .Type 0}} -
    - - - -
    -
    - {{.Poster.Name}} {{$.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}} -
    - {{if gt .ShowTag 0}} -
    - {{if eq .ShowTag 1}} - {{$.i18n.Tr "repo.issues.poster"}} - {{else if eq .ShowTag 2}} - {{$.i18n.Tr "repo.issues.admin"}} - {{else if eq .ShowTag 3}} - {{$.i18n.Tr "repo.issues.owner"}} - {{end}} -
    - {{end}} - {{if or $.IsRepositoryAdmin (eq .Poster.Id $.SignedUserID)}} - - {{end}} -
    +
    +
    + {{if .Issue.RenderedContent}} + {{.Issue.RenderedContent|Str2html}} + {{else}} + {{.i18n.Tr "repo.issues.no_content"}} + {{end}} +
    +
    {{.Issue.Content}}
    +
    -
    -
    - {{if .RenderedContent}} - {{.RenderedContent|Str2html}} - {{else}} - {{$.i18n.Tr "repo.issues.no_content"}} - {{end}} -
    -
    {{.Content}}
    -
    -
    - {{if .Attachments}} -
    -
    - {{range .Attachments}} - - {{end}} + {{if .Issue.Attachments}} +
    +
    + {{range .Issue.Attachments}} + + {{end}} +
    +
    + {{end}} +
    +
    + + {{range .Issue.Comments}} + {{ $createdStr:= TimeSince .Created $.Lang }} + + + {{if eq .Type 0}} +
    + + + +
    +
    + {{.Poster.Name}} {{$.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}} +
    + {{if gt .ShowTag 0}} +
    + {{if eq .ShowTag 1}} + {{$.i18n.Tr "repo.issues.poster"}} + {{else if eq .ShowTag 2}} + {{$.i18n.Tr "repo.issues.admin"}} + {{else if eq .ShowTag 3}} + {{$.i18n.Tr "repo.issues.owner"}} + {{end}} +
    + {{end}} + {{if or $.IsRepositoryAdmin (eq .Poster.Id $.SignedUserID)}} + + {{end}} +
    +
    +
    +
    + {{if .RenderedContent}} + {{.RenderedContent|Str2html}} + {{else}} + {{$.i18n.Tr "repo.issues.no_content"}} + {{end}} +
    +
    {{.Content}}
    +
    +
    + {{if .Attachments}} +
    +
    + {{range .Attachments}} + + {{end}} +
    +
    + {{end}}
    - {{end}} -
    -
    - {{else if eq .Type 1}} -
    - - - - - {{.Poster.Name}} {{$.i18n.Tr "repo.issues.reopened_at" .EventTag $createdStr | Safe}} -
    - {{else if eq .Type 2}} -
    - - - - - {{.Poster.Name}} {{$.i18n.Tr "repo.issues.closed_at" .EventTag $createdStr | Safe}} -
    - {{else if eq .Type 4}} -
    - - - - - {{.Poster.Name}} {{$.i18n.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}} + {{else if eq .Type 1}} +
    + + + + + {{.Poster.Name}} {{$.i18n.Tr "repo.issues.reopened_at" .EventTag $createdStr | Safe}} +
    + {{else if eq .Type 2}} +
    + + + + + {{.Poster.Name}} {{$.i18n.Tr "repo.issues.closed_at" .EventTag $createdStr | Safe}} +
    + {{else if eq .Type 4}} +
    + + + + + {{.Poster.Name}} {{$.i18n.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}} + +
    + + {{.Content | Str2html}} +
    +
    + {{end}} -
    - - {{.Content | Str2html}} -
    -
    {{end}} - {{end}} - - {{if .Issue.IsPull}} -
    - - - -
    -
    - {{if .Issue.HasMerged}} -
    - {{$.i18n.Tr "repo.pulls.has_merged"}} -
    - {{else if .Issue.IsClosed}} -
    - {{$.i18n.Tr "repo.pulls.reopen_to_merge"}} -
    - {{else if .IsPullReuqestBroken}} -
    - - {{$.i18n.Tr "repo.pulls.data_broken"}} -
    - {{else if .Issue.IsChecking}} -
    - - {{$.i18n.Tr "repo.pulls.is_checking"}} -
    - {{else if .Issue.CanAutoMerge}} -
    - - {{$.i18n.Tr "repo.pulls.can_auto_merge_desc"}} -
    - {{if .IsRepositoryAdmin}} -
    -
    -
    - {{.CsrfTokenHtml}} - -
    -
    - {{end}} - {{else}} -
    - - {{$.i18n.Tr "repo.pulls.cannot_auto_merge_desc"}} -
    -
    - - {{$.i18n.Tr "repo.pulls.cannot_auto_merge_helper"}} -
    - {{end}} -
    -
    -
    - {{end}} + {{if .Issue.IsPull}} +
    + +
    +
    + {{if .Issue.HasMerged}} +
    + {{$.i18n.Tr "repo.pulls.has_merged"}} +
    + {{else if .Issue.IsClosed}} +
    + {{$.i18n.Tr "repo.pulls.reopen_to_merge"}} +
    + {{else if .IsPullReuqestBroken}} +
    + + {{$.i18n.Tr "repo.pulls.data_broken"}} +
    + {{else if .Issue.IsChecking}} +
    + + {{$.i18n.Tr "repo.pulls.is_checking"}} +
    + {{else if .Issue.CanAutoMerge}} +
    + + {{$.i18n.Tr "repo.pulls.can_auto_merge_desc"}} +
    + {{if .IsRepositoryAdmin}} +
    +
    +
    + {{.CsrfTokenHtml}} + +
    +
    + {{end}} + {{else}} +
    + + {{$.i18n.Tr "repo.pulls.cannot_auto_merge_desc"}} +
    +
    + + {{$.i18n.Tr "repo.pulls.cannot_auto_merge_helper"}} +
    + {{end}} +
    +
    +
    + {{end}} {{if .IsSigned}} -
    - - - -
    -
    - {{template "repo/issue/comment_tab" .}} - {{.CsrfTokenHtml}} - -
    - {{if and .IsIssueOwner (not .DisableStatusChange)}} - {{if .Issue.IsClosed}} -
    - {{.i18n.Tr "repo.issues.reopen_issue"}} -
    - {{else}} -
    - {{.i18n.Tr "repo.issues.close_issue"}} -
    +
    + + + +
    + + {{template "repo/issue/comment_tab" .}} + {{.CsrfTokenHtml}} + +
    + {{if and .IsIssueOwner (not .DisableStatusChange)}} + {{if .Issue.IsClosed}} +
    + {{.i18n.Tr "repo.issues.reopen_issue"}} +
    + {{else}} +
    + {{.i18n.Tr "repo.issues.close_issue"}} +
    + {{end}} {{end}} - {{end}} - -
    - -
    -
    - {{else}} -
    - {{.i18n.Tr "repo.issues.sign_up_for_free"}} - {{.i18n.Tr "repo.issues.sign_in_require_desc" .SignInLink | Safe}} -
    - {{end}} - + +
    + +
    +
    + {{else}} +
    + {{.i18n.Tr "repo.issues.sign_up_for_free"}} + {{.i18n.Tr "repo.issues.sign_in_require_desc" .SignInLink | Safe}} +
    + {{end}} +
    @@ -238,18 +236,18 @@ {{.i18n.Tr "repo.issues.new.labels"}} -
    -
    {{.i18n.Tr "repo.issues.new.clear_labels"}}
    - {{range .Labels}} - {{.Name}} - {{end}} +
    +
    {{.i18n.Tr "repo.issues.new.clear_labels"}}
    + {{range .Labels}} + {{.Name}} + {{end}}
    {{.i18n.Tr "repo.issues.new.no_label"}} - {{range .Labels}} - {{.Name}} - {{end}} + {{range .Labels}} + {{.Name}} + {{end}}
    @@ -259,35 +257,35 @@ {{.i18n.Tr "repo.issues.new.milestone"}} -
    -
    {{.i18n.Tr "repo.issues.new.clear_milestone"}}
    - {{if .OpenMilestones}} -
    -
    - - {{.i18n.Tr "repo.issues.new.open_milestone"}} -
    - {{range .OpenMilestones}} -
    {{.Name}}
    - {{end}} - {{end}} - {{if .ClosedMilestones}} -
    -
    - - {{.i18n.Tr "repo.issues.new.closed_milestone"}} -
    - {{range .ClosedMilestones}} - {{.Name}} - {{end}} - {{end}} +
    +
    {{.i18n.Tr "repo.issues.new.clear_milestone"}}
    + {{if .OpenMilestones}} +
    +
    + + {{.i18n.Tr "repo.issues.new.open_milestone"}} +
    + {{range .OpenMilestones}} +
    {{.Name}}
    + {{end}} + {{end}} + {{if .ClosedMilestones}} +
    +
    + + {{.i18n.Tr "repo.issues.new.closed_milestone"}} +
    + {{range .ClosedMilestones}} + {{.Name}} + {{end}} + {{end}}
    {{.i18n.Tr "repo.issues.new.no_milestone"}}
    {{if .Issue.Milestone}} - {{.Issue.Milestone.Name}} + {{.Issue.Milestone.Name}} {{end}}
    @@ -300,18 +298,18 @@ {{.i18n.Tr "repo.issues.new.assignee"}} -
    -
    {{.i18n.Tr "repo.issues.new.clear_assignee"}}
    - {{range .Assignees}} -
    {{.Name}}
    - {{end}} +
    +
    {{.i18n.Tr "repo.issues.new.clear_assignee"}}
    + {{range .Assignees}} +
    {{.Name}}
    + {{end}}
    {{.i18n.Tr "repo.issues.new.no_assignee"}}
    {{if .Issue.Assignee}} - {{.Issue.Assignee.Name}} + {{.Issue.Assignee.Name}} {{end}}
    @@ -322,22 +320,22 @@
    - {{$.i18n.Tr "repo.release.write"}} - {{$.i18n.Tr "repo.release.preview"}} + {{$.i18n.Tr "repo.release.write"}} + {{$.i18n.Tr "repo.release.preview"}}
    - +
    - {{$.i18n.Tr "repo.release.loading"}} + {{$.i18n.Tr "repo.release.loading"}}
    -
    +
    {{.i18n.Tr "repo.issues.cancel"}}
    {{.i18n.Tr "repo.issues.save"}}
    -
    +
    {{.i18n.Tr "repo.issues.no_content"}} -
    \ No newline at end of file +
    diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index ef6e4f8c1c..f8d93a0bc0 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -3,47 +3,47 @@

    #{{.Issue.Index}} {{.Issue.Name}}

    {{if .IsIssueOwner}} -
    -
    -
    {{.i18n.Tr "repo.issues.edit"}}
    - - +
    +
    +
    {{.i18n.Tr "repo.issues.edit"}}
    + + +
    -
    {{end}}
    {{if .HasMerged}} -
    {{.i18n.Tr "repo.pulls.merged"}}
    +
    {{.i18n.Tr "repo.pulls.merged"}}
    {{else if .Issue.IsClosed}} -
    {{.i18n.Tr "repo.issues.closed_title"}}
    +
    {{.i18n.Tr "repo.issues.closed_title"}}
    {{else}} -
    {{.i18n.Tr "repo.issues.open_title"}}
    +
    {{.i18n.Tr "repo.issues.open_title"}}
    {{end}} {{if .Issue.IsPull}} {{if .Issue.HasMerged}} - {{ $mergedStr:= TimeSince .Issue.Merged $.Lang }} - {{.Issue.Merger.Name}} - {{$.i18n.Tr "repo.pulls.merged_title_desc" .NumCommits .HeadTarget .BaseTarget $mergedStr | Safe}} + {{ $mergedStr:= TimeSince .Issue.Merged $.Lang }} + {{.Issue.Merger.Name}} + {{$.i18n.Tr "repo.pulls.merged_title_desc" .NumCommits .HeadTarget .BaseTarget $mergedStr | Safe}} {{else}} - {{.Issue.Poster.Name}} - {{$.i18n.Tr "repo.pulls.title_desc" .NumCommits .HeadTarget .BaseTarget | Str2html}} + {{.Issue.Poster.Name}} + {{$.i18n.Tr "repo.pulls.title_desc" .NumCommits .HeadTarget .BaseTarget | Str2html}} {{end}} {{else}} - {{ $createdStr:= TimeSince .Issue.Created $.Lang }} - - {{if gt .Issue.Poster.Id 0}} - {{$.i18n.Tr "repo.issues.opened_by" $createdStr .Issue.Poster.HomeLink .Issue.Poster.Name | Safe}} - {{else}} - {{$.i18n.Tr "repo.issues.opened_by_fake" $createdStr .Issue.Poster.Name | Safe}} - {{end}} - · - {{$.i18n.Tr "repo.issues.num_comments" .Issue.NumComments}} - + {{ $createdStr:= TimeSince .Issue.Created $.Lang }} + + {{if gt .Issue.Poster.Id 0}} + {{$.i18n.Tr "repo.issues.opened_by" $createdStr .Issue.Poster.HomeLink .Issue.Poster.Name | Safe}} + {{else}} + {{$.i18n.Tr "repo.issues.opened_by_fake" $createdStr .Issue.Poster.Name | Safe}} + {{end}} + · + {{$.i18n.Tr "repo.issues.num_comments" .Issue.NumComments}} + {{end}}
    -
    \ No newline at end of file +
    diff --git a/templates/repo/migrate.tmpl b/templates/repo/migrate.tmpl index 222b275006..7973d585f4 100644 --- a/templates/repo/migrate.tmpl +++ b/templates/repo/migrate.tmpl @@ -3,99 +3,99 @@
    - {{.CsrfTokenHtml}} + {{.CsrfTokenHtml}}

    - {{.i18n.Tr "new_migrate"}} + {{.i18n.Tr "new_migrate"}}

    {{template "base/alert" .}}
    - {{.i18n.Tr "repo.migrate.clone_address_desc"}} + {{.i18n.Tr "repo.migrate.clone_address_desc"}} +
    +
    +
    + + {{.i18n.Tr "repo.need_auth"}} +
    +
    +
    + + +
    + +
    + + +
    +
    -
    -
    - - {{.i18n.Tr "repo.need_auth"}} -
    -
    -
    - - -
    - -
    - - -
    -
    -
    -
    - -
    - - - - {{.ContextUser.ShortName 20}} - - -
    -
    - - {{.SignedUser.ShortName 20}} -
    - {{range .Orgs}} -
    - - {{.ShortName 20}} -
    - {{end}} -
    -
    -
    +
    + +
    + + + + {{.ContextUser.ShortName 20}} + + +
    +
    + + {{.SignedUser.ShortName 20}} +
    + {{range .Orgs}} +
    + + {{.ShortName 20}} +
    + {{end}} +
    +
    +
    -
    - - -
    -
    - -
    - {{if .IsForcedPrivate}} - - - {{else}} - - - {{end}} -
    -
    -
    - -
    - - -
    -
    -
    - - -
    +
    + + +
    +
    + +
    + {{if .IsForcedPrivate}} + + + {{else}} + + + {{end}} +
    +
    +
    + +
    + + +
    +
    +
    + + +
    -
    - - - {{.i18n.Tr "cancel"}} -
    -
    +
    + + + {{.i18n.Tr "cancel"}} +
    +
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/pulls/commits.tmpl b/templates/repo/pulls/commits.tmpl index 851880383e..5095009a9e 100644 --- a/templates/repo/pulls/commits.tmpl +++ b/templates/repo/pulls/commits.tmpl @@ -11,9 +11,9 @@
    {{template "repo/issue/view_title" .}} {{template "repo/pulls/tab_menu" .}} -
    +
    {{template "repo/commits_table" .}} -
    +
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/pulls/compare.tmpl b/templates/repo/pulls/compare.tmpl index c3851d8053..f1236c2ba6 100644 --- a/templates/repo/pulls/compare.tmpl +++ b/templates/repo/pulls/compare.tmpl @@ -4,63 +4,63 @@

    - {{.i18n.Tr "repo.pulls.compare_changes"}} -
    {{.i18n.Tr "repo.pulls.compare_changes_desc"}}
    + {{.i18n.Tr "repo.pulls.compare_changes"}} +
    {{.i18n.Tr "repo.pulls.compare_changes_desc"}}

    - {{.i18n.Tr "repo.pulls.compare_base"}}: {{$.BaseBranch}} - + {{.i18n.Tr "repo.pulls.compare_base"}}: {{$.BaseBranch}} +
    -
    -
    - - -
    -
    - {{range .Branches}} -
    {{.}}
    - {{end}} -
    +
    +
    + + +
    +
    + {{range .Branches}} +
    {{.}}
    + {{end}} +
    -
    - ... +
    + ...
    - {{.i18n.Tr "repo.pulls.compare_compare"}}: {{$.HeadBranch}} - + {{.i18n.Tr "repo.pulls.compare_compare"}}: {{$.HeadBranch}} +
    -
    -
    - - -
    -
    - {{range .HeadBranches}} -
    {{.}}
    - {{end}} -
    +
    +
    + + +
    +
    + {{range .HeadBranches}} +
    {{.}}
    + {{end}} +
    -
    +
    {{if .IsNothingToCompare}} -
    - {{.i18n.Tr "repo.pulls.nothing_to_compare"}} -
    +
    + {{.i18n.Tr "repo.pulls.nothing_to_compare"}} +
    {{else if .HasPullRequest}} -
    - {{.i18n.Tr "repo.pulls.has_pull_request" $.RepoLink $.RepoRelPath .PullRequest.Index | Safe}} -
    +
    + {{.i18n.Tr "repo.pulls.has_pull_request" $.RepoLink $.RepoRelPath .PullRequest.Index | Safe}} +
    {{else}} - {{template "repo/issue/new_form" .}} - {{template "repo/commits_table" .}} - {{template "repo/diff_box" .}} - {{end}} + {{template "repo/issue/new_form" .}} + {{template "repo/commits_table" .}} + {{template "repo/diff_box" .}} + {{end}}
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/pulls/files.tmpl b/templates/repo/pulls/files.tmpl index 1226944b41..9070112e53 100644 --- a/templates/repo/pulls/files.tmpl +++ b/templates/repo/pulls/files.tmpl @@ -11,9 +11,9 @@
    {{template "repo/issue/view_title" .}} {{template "repo/pulls/tab_menu" .}} -
    +
    {{template "repo/diff_box" .}} -
    +
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl index b2f857dac6..e02ee180f6 100644 --- a/templates/repo/pulls/fork.tmpl +++ b/templates/repo/pulls/fork.tmpl @@ -3,69 +3,69 @@
    - {{.CsrfTokenHtml}} + {{.CsrfTokenHtml}}

    - {{.i18n.Tr "new_fork"}} + {{.i18n.Tr "new_fork"}}

    {{template "base/alert" .}} -
    - -
    - - - - {{.ContextUser.ShortName 20}} - - -
    -
    - - {{.SignedUser.ShortName 20}} -
    - {{range .Orgs}} - {{if .IsOwnedBy $.SignedUser.Id}} -
    - - {{.ShortName 20}} -
    - {{end}} - {{end}} -
    -
    -
    +
    + +
    + + + + {{.ContextUser.ShortName 20}} + + +
    +
    + + {{.SignedUser.ShortName 20}} +
    + {{range .Orgs}} + {{if .IsOwnedBy $.SignedUser.Id}} +
    + + {{.ShortName 20}} +
    + {{end}} + {{end}} +
    +
    +
    -
    - +
    + {{.ForkFrom}} -
    -
    - - -
    -
    - -
    - - -
    - {{.i18n.Tr "repo.fork_visiblity_helper"}} -
    -
    - - -
    +
    +
    + + +
    +
    + +
    + + +
    + {{.i18n.Tr "repo.fork_visiblity_helper"}} +
    +
    + + +
    -
    - - - {{.i18n.Tr "cancel"}} -
    -
    +
    + + + {{.i18n.Tr "cancel"}} +
    +
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/pulls/tab_menu.tmpl b/templates/repo/pulls/tab_menu.tmpl index 0023cd29e4..d6a9920bff 100644 --- a/templates/repo/pulls/tab_menu.tmpl +++ b/templates/repo/pulls/tab_menu.tmpl @@ -1,17 +1,17 @@
    - - - {{$.i18n.Tr "repo.pulls.tab_conversation"}} - {{.Issue.NumComments}} - - - - {{$.i18n.Tr "repo.pulls.tab_commits"}} - {{if .NumCommits}}{{.NumCommits}}{{else}}N/A{{end}} - - - - {{$.i18n.Tr "repo.pulls.tab_files"}} - {{if .NumFiles}}{{.NumFiles}}{{else}}N/A{{end}} - -
    \ No newline at end of file + + + {{$.i18n.Tr "repo.pulls.tab_conversation"}} + {{.Issue.NumComments}} + + + + {{$.i18n.Tr "repo.pulls.tab_commits"}} + {{if .NumCommits}}{{.NumCommits}}{{else}}N/A{{end}} + + + + {{$.i18n.Tr "repo.pulls.tab_files"}} + {{if .NumFiles}}{{.NumFiles}}{{else}}N/A{{end}} + + diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 5970bda3d2..295ca0b3bd 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -1,80 +1,80 @@ {{template "base/head" .}}
    - {{template "repo/header" .}} -
    - {{template "base/alert" .}} -

    - {{.i18n.Tr "repo.release.releases"}} - {{if .IsRepositoryAdmin}} -
    - - {{.i18n.Tr "repo.release.new_release"}} - -
    - {{end}} -

    - -
    + {{template "repo/header" .}} +
    + {{template "base/alert" .}} +

    + {{.i18n.Tr "repo.release.releases"}} + {{if .IsRepositoryAdmin}} +
    + + {{.i18n.Tr "repo.release.new_release"}} + +
    + {{end}} +

    + +
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index 7129cf6b56..e334ee749e 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -1,98 +1,98 @@ {{template "base/head" .}}
    - {{template "repo/header" .}} -
    -

    - {{if .PageIsEditRelease}} - {{.i18n.Tr "repo.release.edit_release"}} -
    {{.i18n.Tr "repo.release.edit_subheader"}}
    - {{else}} - {{.i18n.Tr "repo.release.new_release"}} -
    {{.i18n.Tr "repo.release.new_subheader"}}
    - {{end}} -

    - {{template "base/alert" .}} -
    - {{.CsrfTokenHtml}} -
    -
    - {{if .PageIsEditRelease}} - {{.tag_name}}@{{.tag_target}} - {{else}} - - @ -
    - - -
    - {{.i18n.Tr "repo.release.target"}} : - {{.Repository.DefaultBranch}} -
    - -
    - {{range .Branches}} -
    {{.}}
    - {{end}} -
    -
    - {{.i18n.Tr "repo.release.tag_helper"}} - {{end}} -
    -
    -
    -
    - - -
    -
    - - -
    -
    -
    -
    -
    -
    -
    - - -
    -
    - {{.i18n.Tr "repo.release.prerelease_helper"}} -
    - {{if .PageIsEditRelease}} - - {{.i18n.Tr "repo.release.cancel"}} - - - - {{$.i18n.Tr "repo.release.delete_release"}} - - {{else}} - - - {{end}} -
    -
    -
    -
    -
    + {{template "repo/header" .}} +
    +

    + {{if .PageIsEditRelease}} + {{.i18n.Tr "repo.release.edit_release"}} +
    {{.i18n.Tr "repo.release.edit_subheader"}}
    + {{else}} + {{.i18n.Tr "repo.release.new_release"}} +
    {{.i18n.Tr "repo.release.new_subheader"}}
    + {{end}} +

    + {{template "base/alert" .}} +
    + {{.CsrfTokenHtml}} +
    +
    + {{if .PageIsEditRelease}} + {{.tag_name}}@{{.tag_target}} + {{else}} + + @ +
    + + +
    + {{.i18n.Tr "repo.release.target"}} : + {{.Repository.DefaultBranch}} +
    + +
    + {{range .Branches}} +
    {{.}}
    + {{end}} +
    +
    + {{.i18n.Tr "repo.release.tag_helper"}} + {{end}} +
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + + +
    +
    + {{.i18n.Tr "repo.release.prerelease_helper"}} +
    + {{if .PageIsEditRelease}} + + {{.i18n.Tr "repo.release.cancel"}} + + + + {{$.i18n.Tr "repo.release.delete_release"}} + + {{else}} + + + {{end}} +
    +
    +
    +
    +
    {{if .PageIsEditRelease}} -
    -
    - - {{.i18n.Tr "repo.release.deletion"}} -
    -
    -

    {{.i18n.Tr "repo.release.deletion_desc"}}

    -
    - {{template "base/delete_modal_actions" .}} -
    +
    +
    + + {{.i18n.Tr "repo.release.deletion"}} +
    +
    +

    {{.i18n.Tr "repo.release.deletion_desc"}}

    +
    + {{template "base/delete_modal_actions" .}} +
    {{end}} -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 651c453cd5..57b76fd8bf 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -7,37 +7,37 @@
    {{template "base/alert" .}}

    - {{.i18n.Tr "repo.settings.collaboration"}} + {{.i18n.Tr "repo.settings.collaboration"}}

    - {{range .Collaborators}} -
    - {{if not (eq .Id $.Owner.Id)}} - - {{end}} - - - {{.DisplayName}} - -
    - {{end}} -
    -
    -
    - {{.CsrfTokenHtml}} -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    - + {{range .Collaborators}} +
    + {{if not (eq .Id $.Owner.Id)}} + + {{end}} + + + {{.DisplayName}} + +
    + {{end}} + +
    +
    + {{.CsrfTokenHtml}} +
    +
    +
    + +
    +
    +
    +
    + +
    +
    + + -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index 5406d0433d..1f6b26a6da 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -7,41 +7,41 @@
    {{template "base/alert" .}}

    - {{.i18n.Tr "repo.settings.deploy_keys"}} -
    -
    {{.i18n.Tr "repo.settings.add_deploy_key"}}
    -
    + {{.i18n.Tr "repo.settings.deploy_keys"}} +
    +
    {{.i18n.Tr "repo.settings.add_deploy_key"}}
    +

    {{if .Deploykeys}} -
    - {{range .Deploykeys}} -
    -
    - -
    -
    - -
    -
    - {{.Name}} -
    - {{.Fingerprint}} +
    + {{range .Deploykeys}} +
    +
    + +
    +
    + +
    +
    + {{.Name}} +
    + {{.Fingerprint}} +
    +
    + {{$.i18n.Tr "settings.add_on"}} {{DateFmtShort .Created}} — {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} {{DateFmtShort .Updated}}{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}} +
    +
    +
    + +
    -
    - {{$.i18n.Tr "settings.add_on"}} {{DateFmtShort .Created}} — {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} {{DateFmtShort .Updated}}{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}} -
    -
    -
    - -
    + {{end}}
    - {{end}} -
    {{else}} - {{.i18n.Tr "repo.settings.no_deploy_keys"}} + {{.i18n.Tr "repo.settings.no_deploy_keys"}} {{end}}

    @@ -75,22 +75,22 @@
    -
    - - {{.i18n.Tr "repo.settings.deploy_key_deletion"}} -
    -
    -

    {{.i18n.Tr "repo.settings.deploy_key_deletion_desc"}}

    -
    -
    -
    - - {{.i18n.Tr "modal.no"}} -
    -
    - - {{.i18n.Tr "modal.yes"}} -
    -
    +
    + + {{.i18n.Tr "repo.settings.deploy_key_deletion"}} +
    +
    +

    {{.i18n.Tr "repo.settings.deploy_key_deletion_desc"}}

    +
    +
    +
    + + {{.i18n.Tr "modal.no"}} +
    +
    + + {{.i18n.Tr "modal.yes"}} +
    +
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/settings/githook_edit.tmpl b/templates/repo/settings/githook_edit.tmpl index b9b75a3aa6..22c278fe4f 100644 --- a/templates/repo/settings/githook_edit.tmpl +++ b/templates/repo/settings/githook_edit.tmpl @@ -7,30 +7,30 @@
    {{template "base/alert" .}}

    - {{.i18n.Tr "repo.settings.githooks"}} + {{.i18n.Tr "repo.settings.githooks"}}

    {{.i18n.Tr "repo.settings.githook_edit_desc"}}

    -
    - {{.CsrfTokenHtml}} - {{with .Hook}} -
    - - {{.Name}} -
    -
    - - -
    + + {{.CsrfTokenHtml}} + {{with .Hook}} +
    + + {{.Name}} +
    +
    + + +
    -
    - -
    - {{end}} -
    +
    + +
    + {{end}} +
    -
    -
    +
    + -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/settings/githooks.tmpl b/templates/repo/settings/githooks.tmpl index 8120b80e17..8d8923b475 100644 --- a/templates/repo/settings/githooks.tmpl +++ b/templates/repo/settings/githooks.tmpl @@ -7,24 +7,24 @@
    {{template "base/alert" .}}

    - {{.i18n.Tr "repo.settings.githooks"}} + {{.i18n.Tr "repo.settings.githooks"}}

    -
    -
    - {{.i18n.Tr "repo.settings.githooks_desc" | Str2html}} -
    - {{range .Hooks}} +
    - - {{.Name}} - + {{.i18n.Tr "repo.settings.githooks_desc" | Str2html}}
    - {{end}} -
    -
    -
    -
    + {{range .Hooks}} +
    + + {{.Name}} + +
    + {{end}} + + + + -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/settings/hook_delete_modal.tmpl b/templates/repo/settings/hook_delete_modal.tmpl index bafd1ce93c..2a2a7c8da2 100644 --- a/templates/repo/settings/hook_delete_modal.tmpl +++ b/templates/repo/settings/hook_delete_modal.tmpl @@ -1,19 +1,19 @@
    -
    - - {{.i18n.Tr "repo.settings.webhook_deletion"}} -
    -
    -

    {{.i18n.Tr "repo.settings.webhook_deletion_desc"}}

    -
    -
    -
    - - {{.i18n.Tr "modal.no"}} -
    -
    - - {{.i18n.Tr "modal.yes"}} -
    -
    -
    \ No newline at end of file +
    + + {{.i18n.Tr "repo.settings.webhook_deletion"}} +
    +
    +

    {{.i18n.Tr "repo.settings.webhook_deletion_desc"}}

    +
    +
    +
    + + {{.i18n.Tr "modal.no"}} +
    +
    + + {{.i18n.Tr "modal.yes"}} +
    +
    + diff --git a/templates/repo/settings/hook_gogs.tmpl b/templates/repo/settings/hook_gogs.tmpl index b0b3311a55..633577d8a9 100644 --- a/templates/repo/settings/hook_gogs.tmpl +++ b/templates/repo/settings/hook_gogs.tmpl @@ -1,28 +1,28 @@ {{if eq .HookType "gogs"}} -

    {{.i18n.Tr "repo.settings.add_webhook_desc" "http://gogs.io/docs/features/webhook.html" | Str2html}}

    -
    - {{.CsrfTokenHtml}} -
    - - -
    -
    - -
    - -
    - -
    -
    application/json
    -
    application/x-www-form-urlencoded
    -
    -
    -
    - -
    - - -
    - {{template "repo/settings/hook_settings" .}} -
    +

    {{.i18n.Tr "repo.settings.add_webhook_desc" "http://gogs.io/docs/features/webhook.html" | Str2html}}

    +
    + {{.CsrfTokenHtml}} +
    + + +
    +
    + +
    + +
    + +
    +
    application/json
    +
    application/x-www-form-urlencoded
    +
    +
    +
    + +
    + + +
    + {{template "repo/settings/hook_settings" .}} +
    {{end}} diff --git a/templates/repo/settings/hook_history.tmpl b/templates/repo/settings/hook_history.tmpl index 15957a6790..9ded6a7905 100644 --- a/templates/repo/settings/hook_history.tmpl +++ b/templates/repo/settings/hook_history.tmpl @@ -1,73 +1,73 @@ {{if .PageIsSettingsHooksEdit}} -

    - {{.i18n.Tr "repo.settings.recent_deliveries"}} - {{if .IsRepositoryAdmin}} -
    - -
    - {{end}} -

    -
    -
    - {{range .History}} -
    -
    - {{if .IsSucceed}} - - {{else}} - - {{end}} - {{.UUID}} -
    - - {{.DeliveredString}} - -
    +

    + {{.i18n.Tr "repo.settings.recent_deliveries"}} + {{if .IsRepositoryAdmin}} +
    +
    -

    +
    +
    + {{range .History}} +
    +
    + {{if .IsSucceed}} + + {{else}} + + {{end}} + {{.UUID}} +
    + + {{.DeliveredString}} + +
    +
    +
    +
    + {{$.i18n.Tr "repo.settings.webhook.request"}} + + {{$.i18n.Tr "repo.settings.webhook.response"}} + {{if .ResponseInfo}} + {{if .IsSucceed}} + {{.ResponseInfo.Status}} + {{else}} + {{.ResponseInfo.Status}} + {{end}} + {{else}} + N/A + {{end}} + +
    +
    + {{if .RequestInfo}} +
    {{$.i18n.Tr "repo.settings.webhook.headers"}}
    + 
    Request URL: {{.URL}}
 Request method: POST
 {{ range $key, $val := .RequestInfo.Headers }}{{$key}}: {{$val}}
 {{end}}
    -
    {{$.i18n.Tr "repo.settings.webhook.payload"}}
    - 
    {{.PayloadContent}}
    - {{else}} - N/A - {{end}} -
    -
    - {{if .ResponseInfo}} -
    {{$.i18n.Tr "repo.settings.webhook.headers"}}
    - 
    {{ range $key, $val := .ResponseInfo.Headers }}{{$key}}: {{$val}}
+								
    {{$.i18n.Tr "repo.settings.webhook.payload"}}
    
+								
    {{.PayloadContent}}
    
+							{{else}}
+								N/A
+							{{end}}
+
    +
    + {{if .ResponseInfo}} +
    {{$.i18n.Tr "repo.settings.webhook.headers"}}
    + 
    {{ range $key, $val := .ResponseInfo.Headers }}{{$key}}: {{$val}}
 {{end}}
    -
    {{$.i18n.Tr "repo.settings.webhook.body"}}
    - 
    {{.ResponseInfo.Body}}
    - {{else}} - N/A - {{end}} +
    {{$.i18n.Tr "repo.settings.webhook.body"}}
    + 
    {{.ResponseInfo.Body}}
    + {{else}} + N/A + {{end}} +
    +
    -
    + {{end}}
    - {{end}}
    -
    -{{end}} \ No newline at end of file +{{end}} diff --git a/templates/repo/settings/hook_list.tmpl b/templates/repo/settings/hook_list.tmpl index b5c086bb84..471d9f9bf1 100644 --- a/templates/repo/settings/hook_list.tmpl +++ b/templates/repo/settings/hook_list.tmpl @@ -1,44 +1,44 @@
    {{template "base/alert" .}}

    - {{.i18n.Tr "repo.settings.hooks"}} -
    -
    -
    {{.i18n.Tr "repo.settings.add_webhook"}}
    -
    - - Gogs - - - Slack - -
    -
    -
    -

    -
    -
    -
    - {{.Description | Str2html}} -
    - {{range .Webhooks}} -
    - {{if eq .LastStatus 1}} - - {{else if eq .LastStatus 2}} - - {{else}} - - {{end}} - {{.URL}} -
    - - + {{.i18n.Tr "repo.settings.hooks"}} +
    +
    +
    {{.i18n.Tr "repo.settings.add_webhook"}}
    +
    + + Gogs + + + Slack +
    - {{end}} -
    -
    +
    + +
    +
    +
    + {{.Description | Str2html}} +
    + {{range .Webhooks}} +
    + {{if eq .LastStatus 1}} + + {{else if eq .LastStatus 2}} + + {{else}} + + {{end}} + {{.URL}} +
    + + +
    +
    + {{end}} +
    +
    -{{template "repo/settings/hook_delete_modal" .}} \ No newline at end of file +{{template "repo/settings/hook_delete_modal" .}} diff --git a/templates/repo/settings/hook_new.tmpl b/templates/repo/settings/hook_new.tmpl index 7c9a5de1f0..96123525bb 100644 --- a/templates/repo/settings/hook_new.tmpl +++ b/templates/repo/settings/hook_new.tmpl @@ -7,22 +7,22 @@
    {{template "base/alert" .}}

    - {{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}} -
    - {{if eq .HookType "gogs"}} - - {{else if eq .HookType "slack"}} - - {{end}} -
    + {{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}} +
    + {{if eq .HookType "gogs"}} + + {{else if eq .HookType "slack"}} + + {{end}} +

    - {{template "repo/settings/hook_gogs" .}} - {{template "repo/settings/hook_slack" .}} -
    + {{template "repo/settings/hook_gogs" .}} + {{template "repo/settings/hook_slack" .}} +
    {{template "repo/settings/hook_history" .}} -
    +
    diff --git a/templates/repo/settings/hook_settings.tmpl b/templates/repo/settings/hook_settings.tmpl index 18a480e016..76d3ac2935 100644 --- a/templates/repo/settings/hook_settings.tmpl +++ b/templates/repo/settings/hook_settings.tmpl @@ -1,66 +1,66 @@
    -

    {{.i18n.Tr "repo.settings.event_desc"}}

    +

    {{.i18n.Tr "repo.settings.event_desc"}}

    -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    -
    - -
    -
    -
    - - - {{.i18n.Tr "repo.settings.event_create_desc"}} -
    -
    -
    - -
    -
    -
    - - - {{.i18n.Tr "repo.settings.event_push_desc"}} -
    -
    -
    -
    +
    + +
    +
    +
    + + + {{.i18n.Tr "repo.settings.event_create_desc"}} +
    +
    +
    + +
    +
    +
    + + + {{.i18n.Tr "repo.settings.event_push_desc"}} +
    +
    +
    +
    -
    - - - {{.i18n.Tr "repo.settings.active_helper"}} -
    +
    + + + {{.i18n.Tr "repo.settings.active_helper"}} +
    {{if .PageIsSettingsHooksNew}} - - {{else}} - - {{.i18n.Tr "repo.settings.delete_webhook"}} - {{end}} + + {{else}} + + {{.i18n.Tr "repo.settings.delete_webhook"}} + {{end}}
    {{template "repo/settings/hook_delete_modal" .}} diff --git a/templates/repo/settings/hook_slack.tmpl b/templates/repo/settings/hook_slack.tmpl index b0ebce9280..9333ae0c37 100644 --- a/templates/repo/settings/hook_slack.tmpl +++ b/templates/repo/settings/hook_slack.tmpl @@ -1,28 +1,28 @@ {{if eq .HookType "slack"}} -

    {{.i18n.Tr "repo.settings.add_slack_hook_desc" "http://slack.com" | Str2html}}

    -
    - {{.CsrfTokenHtml}} -
    - - -
    -
    - - -
    +

    {{.i18n.Tr "repo.settings.add_slack_hook_desc" "http://slack.com" | Str2html}}

    + + {{.CsrfTokenHtml}} +
    + + +
    +
    + + +
    -
    - - -
    -
    - - -
    -
    - - -
    - {{template "repo/settings/hook_settings" .}} -
    +
    + + +
    +
    + + +
    +
    + + +
    + {{template "repo/settings/hook_settings" .}} + {{end}} diff --git a/templates/repo/settings/hooks.tmpl b/templates/repo/settings/hooks.tmpl index e3f6f4ddae..a405b44698 100644 --- a/templates/repo/settings/hooks.tmpl +++ b/templates/repo/settings/hooks.tmpl @@ -5,7 +5,7 @@
    {{template "repo/settings/navbar" .}} {{template "repo/settings/hook_list" .}} -
    + -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/settings/nav.tmpl b/templates/repo/settings/nav.tmpl index 06bad9689d..97df429f2c 100644 --- a/templates/repo/settings/nav.tmpl +++ b/templates/repo/settings/nav.tmpl @@ -1,14 +1,14 @@ \ No newline at end of file +

    {{.i18n.Tr "repo.settings"}}

    +
    + +
    + diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index 512ee3002d..7ebf2886c9 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -1,22 +1,22 @@
    {{.i18n.Tr "repo.settings"}}
    - - {{.i18n.Tr "repo.settings.options"}} - - - {{.i18n.Tr "repo.settings.collaboration"}} - - - {{.i18n.Tr "repo.settings.hooks"}} - - {{if .SignedUser.CanEditGitHook}} - - {{.i18n.Tr "repo.settings.githooks"}} - - {{end}} - - {{.i18n.Tr "repo.settings.deploy_keys"}} - + + {{.i18n.Tr "repo.settings.options"}} + + + {{.i18n.Tr "repo.settings.collaboration"}} + + + {{.i18n.Tr "repo.settings.hooks"}} + + {{if .SignedUser.CanEditGitHook}} + + {{.i18n.Tr "repo.settings.githooks"}} + + {{end}} + + {{.i18n.Tr "repo.settings.deploy_keys"}} +
    diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index f3734557d9..767f164a03 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -7,121 +7,121 @@
    {{template "base/alert" .}}

    - {{.i18n.Tr "repo.settings.basic_settings"}} + {{.i18n.Tr "repo.settings.basic_settings"}}

    {{.CsrfTokenHtml}} - -
    - - -
    -
    - - -
    -
    - - -
    + +
    + + +
    +
    + + +
    +
    + + +
    - {{if not .Repository.IsBare}} -
    - -
    - -
    {{.Repository.DefaultBranch}}
    - -
    - {{range .Branches}} -
    {{.}}
    - {{end}} -
    -
    -
    - {{end}} - {{if not .Repository.IsFork}} -
    - -
    - - -
    -
    - {{end}} - {{if .Repository.IsMirror}} -
    - - -
    - {{end}} - -
    -
    - -
    + {{if not .Repository.IsBare}} +
    + +
    + +
    {{.Repository.DefaultBranch}}
    + +
    + {{range .Branches}} +
    {{.}}
    + {{end}} +
    +
    +
    + {{end}} + {{if not .Repository.IsFork}} +
    + +
    + + +
    +
    + {{end}} + {{if .Repository.IsMirror}} +
    + + +
    + {{end}} + +
    +
    + +
    -
    +
    -

    - {{.i18n.Tr "repo.settings.advanced_settings"}} -

    -
    -
    - {{.CsrfTokenHtml}} - +

    + {{.i18n.Tr "repo.settings.advanced_settings"}} +

    +
    + + {{.CsrfTokenHtml}} + -
    - -
    - - -
    -
    +
    + +
    + + +
    +
    -
    +
    -
    - -
    - - -
    -
    -
    -
    - - -
    -
    -
    - - -

    {{.i18n.Tr "repo.settings.tracker_url_format_desc" | Str2html}}

    -
    +
    + +
    + + +
    +
    +
    +
    + + +
    +
    +
    + + +

    {{.i18n.Tr "repo.settings.tracker_url_format_desc" | Str2html}}

    +
    -
    +
    -
    - -
    - - -
    -
    - -
    -
    - -
    - -
    +
    + +
    + + +
    +
    -

    - {{.i18n.Tr "repo.settings.danger_zone"}} -

    -
    +
    +
    + +
    + +
    + +

    + {{.i18n.Tr "repo.settings.danger_zone"}} +

    +
    @@ -131,7 +131,7 @@

    {{.i18n.Tr "repo.settings.transfer_desc"}}

    - +
    @@ -143,23 +143,23 @@

    {{.i18n.Tr "repo.settings.delete_desc"}}

    -
    - - - + + + + +{{template "base/footer" .}} diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 5751d2e3dd..cf6198195a 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -1,50 +1,50 @@
    -

    - {{if .ReadmeExist}} - - {{if .ReadmeInList}} - {{.FileName}} - {{else}} - {{.FileName}} {{FileSize .FileSize}} - {{end}} - {{else}} - - {{.FileName}} {{FileSize .FileSize}} - {{end}} - {{if not .ReadmeInList}} -
    -
    - {{if not .IsCommit}} - {{.i18n.Tr "repo.file_permalink"}} - {{end}} - {{.i18n.Tr "repo.file_history"}} - {{.i18n.Tr "repo.file_raw"}} -
    -
    - {{end}} -

    -
    -
    - {{if .ReadmeExist}} - {{if .FileContent}}{{.FileContent | Str2html}}{{end}} - {{else if not .IsFileText}} -
    - {{if .IsImageFile}} - - {{else}} - {{.i18n.Tr "repo.file_view_raw"}} - {{end}} -
    - {{else if .FileSize}} - - - - - - - - 
      {{.FileContent}}
    - {{end}} -
    -
    -
    \ No newline at end of file +

    + {{if .ReadmeExist}} + + {{if .ReadmeInList}} + {{.FileName}} + {{else}} + {{.FileName}} {{FileSize .FileSize}} + {{end}} + {{else}} + + {{.FileName}} {{FileSize .FileSize}} + {{end}} + {{if not .ReadmeInList}} +
    +
    + {{if not .IsCommit}} + {{.i18n.Tr "repo.file_permalink"}} + {{end}} + {{.i18n.Tr "repo.file_history"}} + {{.i18n.Tr "repo.file_raw"}} +
    +
    + {{end}} +

    +
    +
    + {{if .ReadmeExist}} + {{if .FileContent}}{{.FileContent | Str2html}}{{end}} + {{else if not .IsFileText}} +
    + {{if .IsImageFile}} + + {{else}} + {{.i18n.Tr "repo.file_view_raw"}} + {{end}} +
    + {{else if .FileSize}} + + + + + + + + 
      {{.FileContent}}
    + {{end}} +
    +
    + diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index 887ce8e251..d94dc96e25 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -1,56 +1,56 @@ - - - - - - - - - {{if .HasParentPath}} - - - - {{end}} - {{range $item := .Files}} - {{$entry := index $item 0}} - {{$commit := index $item 1}} - - {{if $entry.IsSubModule}} - - {{else}} - - {{end}} - - - - {{end}} - + + + + + + + + + {{if .HasParentPath}} + + + + {{end}} + {{range $item := .Files}} + {{$entry := index $item 0}} + {{$commit := index $item 1}} + + {{if $entry.IsSubModule}} + + {{else}} + + {{end}} + + + + {{end}} +
    - {{if .LastCommitUser}} - - {{.LastCommit.Author.Name}} - {{else}} - - {{.LastCommit.Author.Name}} - {{end}} - {{ShortSha .LastCommit.ID.String}} - {{RenderCommitMessage false .LastCommit.Summary .RepoLink $.Repository.ComposeMetas}} - - {{TimeSince .LastCommit.Author.When $.Lang}}
    ..
    - - {{if $commit.RefUrl}} - {{$entry.Name}} @ {{ShortSha $commit.RefId}} - {{else}} - {{$entry.Name}} @ {{ShortSha $commit.RefId}} - {{end}} - - - {{$entry.Name}} - - {{ShortSha $commit.ID.String}} - {{RenderCommitMessage false $commit.Summary $.RepoLink $.Repository.ComposeMetas}} - {{TimeSince $commit.Committer.When $.Lang}}
    + {{if .LastCommitUser}} + + {{.LastCommit.Author.Name}} + {{else}} + + {{.LastCommit.Author.Name}} + {{end}} + {{ShortSha .LastCommit.ID.String}} + {{RenderCommitMessage false .LastCommit.Summary .RepoLink $.Repository.ComposeMetas}} + + {{TimeSince .LastCommit.Author.When $.Lang}}
    ..
    + + {{if $commit.RefUrl}} + {{$entry.Name}} @ {{ShortSha $commit.RefId}} + {{else}} + {{$entry.Name}} @ {{ShortSha $commit.RefId}} + {{end}} + + + {{$entry.Name}} + + {{ShortSha $commit.ID.String}} + {{RenderCommitMessage false $commit.Summary $.RepoLink $.Repository.ComposeMetas}} + {{TimeSince $commit.Committer.When $.Lang}}
    {{if .ReadmeExist}} - {{template "repo/view_file" .}} + {{template "repo/view_file" .}} {{end}} diff --git a/templates/repo/watchers.tmpl b/templates/repo/watchers.tmpl index 7802cea324..d87d9b7a3c 100644 --- a/templates/repo/watchers.tmpl +++ b/templates/repo/watchers.tmpl @@ -1,56 +1,56 @@ {{template "base/head" .}}
    - {{template "repo/header" .}} -
    -

    - {{if .PageIsWatchers}} - {{.i18n.Tr "repo.watchers"}} - {{else}} - {{.i18n.Tr "repo.stargazers"}} - {{end}} -

    -
      - {{range .Watchers}} -
    • - - - -

      {{.DisplayName}}

      + {{template "repo/header" .}} +
      +

      + {{if .PageIsWatchers}} + {{.i18n.Tr "repo.watchers"}} + {{else}} + {{.i18n.Tr "repo.stargazers"}} + {{end}} +

      +
        + {{range .Watchers}} +
      • + + + +

        {{.DisplayName}}

        -
        - {{if .Website}} - {{.Website}} - {{else if .Location}} - {{.Location}} - {{else}} - {{$.i18n.Tr "user.join_on"}} {{DateFmtShort .Created}} - {{end}} -
        -
        • - {{end}} -
      - - {{with .Page}} - {{if gt .TotalPages 1}} -
      - -
      - {{end}} - {{end}} -
      +
      + {{if .Website}} + {{.Website}} + {{else if .Location}} + {{.Location}} + {{else}} + {{$.i18n.Tr "user.join_on"}} {{DateFmtShort .Created}} + {{end}} +
      +
      • + {{end}} +
    + + {{with .Page}} + {{if gt .TotalPages 1}} +
    + +
    + {{end}} + {{end}} +
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl index 09c33415ba..0e96f58bcc 100644 --- a/templates/repo/wiki/new.tmpl +++ b/templates/repo/wiki/new.tmpl @@ -1,34 +1,34 @@ {{template "base/head" .}}
    - {{template "repo/header" .}} -
    - {{template "base/alert" .}} -
    - {{.i18n.Tr "repo.wiki.new_page"}} - {{if .PageIsWikiEdit}} -
    - {{.i18n.Tr "repo.wiki.new_page_button"}} -
    - {{end}} -
    -
    - {{.CsrfTokenHtml}} - -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    + {{template "repo/header" .}} +
    + {{template "base/alert" .}} +
    + {{.i18n.Tr "repo.wiki.new_page"}} + {{if .PageIsWikiEdit}} +
    + {{.i18n.Tr "repo.wiki.new_page_button"}} +
    + {{end}} +
    +
    + {{.CsrfTokenHtml}} + +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl index 468357a63f..602a49cb74 100644 --- a/templates/repo/wiki/pages.tmpl +++ b/templates/repo/wiki/pages.tmpl @@ -1,27 +1,27 @@ {{template "base/head" .}}
    {{template "repo/header" .}} -
    -
    - {{.i18n.Tr "repo.wiki.pages"}} -
    - {{.i18n.Tr "repo.wiki.new_page_button"}} -
    -
    - - - {{range .Pages}} - - - {{$timeSince := TimeSince .Updated $.Lang}} - - - {{end}} - -
    - - {{.Name}} - {{$.i18n.Tr "repo.wiki.last_updated" $timeSince | Safe}}
    +
    +
    + {{.i18n.Tr "repo.wiki.pages"}} +
    + {{.i18n.Tr "repo.wiki.new_page_button"}} +
    +
    + + + {{range .Pages}} + + + {{$timeSince := TimeSince .Updated $.Lang}} + + + {{end}} + +
    + + {{.Name}} + {{$.i18n.Tr "repo.wiki.last_updated" $timeSince | Safe}}
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/wiki/start.tmpl b/templates/repo/wiki/start.tmpl index 8174323dcd..26d7fefdcc 100644 --- a/templates/repo/wiki/start.tmpl +++ b/templates/repo/wiki/start.tmpl @@ -1,15 +1,15 @@ {{template "base/head" .}}
    {{template "repo/header" .}} -
    -
    - -

    {{.i18n.Tr "repo.wiki.welcome"}}

    -

    {{.i18n.Tr "repo.wiki.welcome_desc"}}

    - {{if .IsRepositoryPusher}} - {{.i18n.Tr "repo.wiki.create_first_page"}} - {{end}} -
    +
    +
    + +

    {{.i18n.Tr "repo.wiki.welcome"}}

    +

    {{.i18n.Tr "repo.wiki.welcome_desc"}}

    + {{if .IsRepositoryPusher}} + {{.i18n.Tr "repo.wiki.create_first_page"}} + {{end}} +
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index c052bedb7d..cd7642bcc2 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -1,72 +1,72 @@ {{template "base/head" .}}
    {{template "repo/header" .}} -
    -
    -
    -
    -
    -
    - - {{.i18n.Tr "repo.wiki.page"}}: - {{.title}} - - -
    -
    -
    - - -
    -
    - {{range .Pages}} -
    {{.Name}}
    - {{end}} -
    -
    -
    -
    -
    -
    -
    - {{if not $.DisableSSH}} - - {{end}} - - - -
    - -
    - ZIP - TAR.GZ -
    -
    -
    -
    -
    -
    - {{.title}} - {{if .IsRepositoryPusher}} -
    - {{.i18n.Tr "repo.wiki.edit_page_button"}} - {{.i18n.Tr "repo.wiki.new_page_button"}} -
    - {{end}} -
    - {{$timeSince := TimeSince .Author.When $.Lang}} - {{.i18n.Tr "repo.wiki.last_commit_info" .Author.Name $timeSince | Safe}} -
    -
    +
    +
    +
    +
    +
    +
    + + {{.i18n.Tr "repo.wiki.page"}}: + {{.title}} + + +
    +
    +
    + + +
    +
    + {{range .Pages}} +
    {{.Name}}
    + {{end}} +
    +
    +
    +
    +
    +
    +
    + {{if not $.DisableSSH}} + + {{end}} + + + +
    + +
    + ZIP + TAR.GZ +
    +
    +
    +
    +
    +
    + {{.title}} + {{if .IsRepositoryPusher}} +
    + {{.i18n.Tr "repo.wiki.edit_page_button"}} + {{.i18n.Tr "repo.wiki.new_page_button"}} +
    + {{end}} +
    + {{$timeSince := TimeSince .Author.When $.Lang}} + {{.i18n.Tr "repo.wiki.last_commit_info" .Author.Name $timeSince | Safe}} +
    +
    {{.content | Str2html}}
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/status/404.tmpl b/templates/status/404.tmpl index a1b632df2a..776f4fb78e 100644 --- a/templates/status/404.tmpl +++ b/templates/status/404.tmpl @@ -1,9 +1,9 @@ {{template "base/head" .}}
    -

    404

    -
    -
    - {{if .ShowFooterVersion}}

    Application Version: {{AppVer}}

    {{end}} -

    If you think this is an error, please open an issue on GitHub.

    +

    404

    +
    +
    + {{if .ShowFooterVersion}}

    Application Version: {{AppVer}}

    {{end}} +

    If you think this is an error, please open an issue on GitHub.

    {{template "base/footer" .}} diff --git a/templates/status/500.tmpl b/templates/status/500.tmpl index 519a6f60f6..fba069eeb1 100644 --- a/templates/status/500.tmpl +++ b/templates/status/500.tmpl @@ -1,9 +1,9 @@ {{template "base/head" .}}
    -

    500

    -
    -
    - {{if .ErrorMsg}}

    An error has occurred : {{.ErrorMsg}}

    {{end}} - {{if .ShowFooterVersion}}

    Application Version: {{AppVer}}

    {{end}} +

    500

    +
    +
    + {{if .ErrorMsg}}

    An error has occurred : {{.ErrorMsg}}

    {{end}} + {{if .ShowFooterVersion}}

    Application Version: {{AppVer}}

    {{end}}
    {{template "base/footer" .}} diff --git a/templates/user/auth/activate.tmpl b/templates/user/auth/activate.tmpl index 49419dcf6b..8bff54aaf4 100644 --- a/templates/user/auth/activate.tmpl +++ b/templates/user/auth/activate.tmpl @@ -1,38 +1,38 @@ {{template "base/head" .}}
    -
    -
    -
    - {{.CsrfTokenHtml}} -

    - {{.i18n.Tr "auth.active_your_account"}} -

    -
    - {{template "base/alert" .}} - {{if .IsActivatePage}} - {{if .ServiceNotEnabled}} -

    {{.i18n.Tr "auth.disable_register_mail"}}

    - {{else if .ResendLimited}} -

    {{.i18n.Tr "auth.resent_limit_prompt"}}

    - {{else}} -

    {{.i18n.Tr "auth.confirmation_mail_sent_prompt" .SignedUser.Email .Hours | Str2html}}

    - {{end}} - {{else}} - {{if .IsSendRegisterMail}} -

    {{.i18n.Tr "auth.confirmation_mail_sent_prompt" .Email .Hours | Str2html}}

    - {{else if .IsActivateFailed}} -

    {{.i18n.Tr "auth.invalid_code"}}

    - {{else}} -

    {{.i18n.Tr "auth.has_unconfirmed_mail" .SignedUser.Name .SignedUser.Email | Str2html}}

    -
    -
    - -
    - {{end}} - {{end}} -
    -
    -
    -
    +
    +
    +
    + {{.CsrfTokenHtml}} +

    + {{.i18n.Tr "auth.active_your_account"}} +

    +
    + {{template "base/alert" .}} + {{if .IsActivatePage}} + {{if .ServiceNotEnabled}} +

    {{.i18n.Tr "auth.disable_register_mail"}}

    + {{else if .ResendLimited}} +

    {{.i18n.Tr "auth.resent_limit_prompt"}}

    + {{else}} +

    {{.i18n.Tr "auth.confirmation_mail_sent_prompt" .SignedUser.Email .Hours | Str2html}}

    + {{end}} + {{else}} + {{if .IsSendRegisterMail}} +

    {{.i18n.Tr "auth.confirmation_mail_sent_prompt" .Email .Hours | Str2html}}

    + {{else if .IsActivateFailed}} +

    {{.i18n.Tr "auth.invalid_code"}}

    + {{else}} +

    {{.i18n.Tr "auth.has_unconfirmed_mail" .SignedUser.Name .SignedUser.Email | Str2html}}

    +
    +
    + +
    + {{end}} + {{end}} +
    +
    +
    +
    {{template "base/footer" .}} diff --git a/templates/user/auth/forgot_passwd.tmpl b/templates/user/auth/forgot_passwd.tmpl index de141e67a3..f1c25df503 100644 --- a/templates/user/auth/forgot_passwd.tmpl +++ b/templates/user/auth/forgot_passwd.tmpl @@ -1,34 +1,34 @@ {{template "base/head" .}}
    -
    -
    -
    - {{.CsrfTokenHtml}} -

    - {{.i18n.Tr "auth.forgot_password"}} -

    -
    - {{template "base/alert" .}} - {{if .IsResetSent}} -

    {{.i18n.Tr "auth.confirmation_mail_sent_prompt" .Email .Hours | Str2html}}

    - {{else if .IsResetRequest}} -
    - - -
    -
    -
    - - -
    - {{else if .IsResetDisable}} -

    {{.i18n.Tr "auth.disable_register_mail"}}

    - {{else if .ResendLimited}} -

    {{.i18n.Tr "auth.resent_limit_prompt"}}

    - {{end}} -
    -
    -
    -
    +
    +
    +
    + {{.CsrfTokenHtml}} +

    + {{.i18n.Tr "auth.forgot_password"}} +

    +
    + {{template "base/alert" .}} + {{if .IsResetSent}} +

    {{.i18n.Tr "auth.confirmation_mail_sent_prompt" .Email .Hours | Str2html}}

    + {{else if .IsResetRequest}} +
    + + +
    +
    +
    + + +
    + {{else if .IsResetDisable}} +

    {{.i18n.Tr "auth.disable_register_mail"}}

    + {{else if .ResendLimited}} +

    {{.i18n.Tr "auth.resent_limit_prompt"}}

    + {{end}} +
    +
    +
    +
    {{template "base/footer" .}} diff --git a/templates/user/auth/reset_passwd.tmpl b/templates/user/auth/reset_passwd.tmpl index 5f06bd6494..cb124f5b25 100644 --- a/templates/user/auth/reset_passwd.tmpl +++ b/templates/user/auth/reset_passwd.tmpl @@ -1,31 +1,31 @@ {{template "base/head" .}}
    -
    -
    -
    - {{.CsrfTokenHtml}} - -

    - {{.i18n.Tr "auth.reset_password"}} -

    -
    - {{template "base/alert" .}} - {{if .IsResetForm}} -
    - - -
    -
    -
    - - -
    - {{else}} -

    {{.i18n.Tr "auth.invalid_code"}}

    - {{end}} -
    -
    -
    -
    +
    +
    +
    + {{.CsrfTokenHtml}} + +

    + {{.i18n.Tr "auth.reset_password"}} +

    +
    + {{template "base/alert" .}} + {{if .IsResetForm}} +
    + + +
    +
    +
    + + +
    + {{else}} +

    {{.i18n.Tr "auth.invalid_code"}}

    + {{end}} +
    +
    +
    +
    {{template "base/footer" .}} diff --git a/templates/user/auth/signin.tmpl b/templates/user/auth/signin.tmpl index a1e30e95cb..b928f2bdb5 100644 --- a/templates/user/auth/signin.tmpl +++ b/templates/user/auth/signin.tmpl @@ -1,44 +1,44 @@ {{template "base/head" .}} {{template "base/footer" .}} diff --git a/templates/user/auth/signup.tmpl b/templates/user/auth/signup.tmpl index c237a20d85..86c020d6bb 100644 --- a/templates/user/auth/signup.tmpl +++ b/templates/user/auth/signup.tmpl @@ -1,56 +1,56 @@ {{template "base/head" .}} -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl index 3bc6f9f6ca..eb7fa02fc1 100644 --- a/templates/user/dashboard/dashboard.tmpl +++ b/templates/user/dashboard/dashboard.tmpl @@ -1,115 +1,115 @@ {{template "base/head" .}}
    - {{template "user/dashboard/navbar" .}} -
    -
    -
    - {{template "user/dashboard/feeds" .}} -
    -
    -
    - {{.i18n.Tr "repository"}} - {{if not .ContextUser.IsOrganization}} - {{.i18n.Tr "organization"}} - {{end}} - {{.i18n.Tr "mirror"}} -
    -
    -

    - {{.i18n.Tr "home.my_repos"}} {{.ContextUser.NumRepos}} -
    - {{.i18n.Tr "new_repo"}} -
    -

    -
    - -
    + {{template "user/dashboard/navbar" .}} +
    +
    +
    + {{template "user/dashboard/feeds" .}} +
    +
    +
    + {{.i18n.Tr "repository"}} + {{if not .ContextUser.IsOrganization}} + {{.i18n.Tr "organization"}} + {{end}} + {{.i18n.Tr "mirror"}} +
    +
    +

    + {{.i18n.Tr "home.my_repos"}} {{.ContextUser.NumRepos}} +
    + {{.i18n.Tr "new_repo"}} +
    +

    +
    + +
    - {{if not .ContextUser.IsOrganization}} -

    - {{.i18n.Tr "home.collaborative_repos"}} {{.CollaborateCount}} -

    -
    - -
    - {{end}} -
    + {{if not .ContextUser.IsOrganization}} +

    + {{.i18n.Tr "home.collaborative_repos"}} {{.CollaborateCount}} +

    +
    + +
    + {{end}} +
    - {{if not .ContextUser.IsOrganization}} -
    -

    - {{.i18n.Tr "home.my_orgs"}} {{.ContextUser.GetOrganizationCount}} -
    - {{.i18n.Tr "new_org"}} -
    -

    -
    - -
    -
    - {{end}} + {{if not .ContextUser.IsOrganization}} +
    +

    + {{.i18n.Tr "home.my_orgs"}} {{.ContextUser.GetOrganizationCount}} +
    + {{.i18n.Tr "new_org"}} +
    +

    +
    + +
    +
    + {{end}} -
    -

    - {{.i18n.Tr "home.my_mirrors"}} {{.MirrorCount}} -
    - {{.i18n.Tr "new_migrate"}} -
    -

    -
    - -
    -
    -
    -
    -
    +
    +

    + {{.i18n.Tr "home.my_mirrors"}} {{.MirrorCount}} +
    + {{.i18n.Tr "new_migrate"}} +
    +

    +
    + +
    +
    +
    +
    +
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index fff1e16f60..e45fb4cfea 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -1,69 +1,69 @@ {{range .Feeds}} -
    -
    - -
    -
    -
    -
    -

    - {{.GetActUserName}} - {{if eq .GetOpType 1}} - {{$.i18n.Tr "action.create_repo" .GetRepoLink .GetRepoPath | Str2html}} - {{else if eq .GetOpType 2}} - {{$.i18n.Tr "action.rename_repo" .GetContent .GetRepoLink .GetRepoPath | Str2html}} - {{else if eq .GetOpType 5}} - {{ $branchLink := .GetBranch | EscapePound}} - {{$.i18n.Tr "action.commit_repo" .GetRepoLink $branchLink .GetBranch .GetRepoPath | Str2html}} - {{else if eq .GetOpType 6}} - {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.create_issue" .GetRepoLink $index .GetRepoPath | Str2html}} - {{else if eq .GetOpType 7}} - {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.create_pull_request" .GetRepoLink $index .GetRepoPath | Str2html}} - {{else if eq .GetOpType 8}} - {{$.i18n.Tr "action.transfer_repo" .GetContent .GetRepoLink .GetRepoPath | Str2html}} - {{else if eq .GetOpType 9}} - {{$.i18n.Tr "action.push_tag" .GetRepoLink .GetBranch .GetRepoPath | Str2html}} - {{else if eq .GetOpType 10}} - {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.comment_issue" .GetRepoLink $index .GetRepoPath | Str2html}} - {{else if eq .GetOpType 11}} - {{ $index := index .GetIssueInfos 0}} - {{$.i18n.Tr "action.merge_pull_request" .GetRepoLink $index .GetRepoPath | Str2html}} - {{end}} -

    - {{if eq .GetOpType 5}} -
    - -
    - {{else if eq .GetOpType 6}} - {{index .GetIssueInfos 1}} -

    {{.GetIssueContent}}

    - {{else if eq .GetOpType 7}} -

    {{index .GetIssueInfos 1}}

    - {{else if eq .GetOpType 10}} - {{.GetIssueTitle}} -

    {{index .GetIssueInfos 1}}

    - {{else if eq .GetOpType 11}} -

    {{index .GetIssueInfos 1}}

    - {{end}} -

    {{TimeSince .GetCreate $.i18n.Lang}}

    -
    -
    -
    - -
    -
    -
    -
    -{{end}} \ No newline at end of file +
    +
    + +
    +
    +
    +
    +

    + {{.GetActUserName}} + {{if eq .GetOpType 1}} + {{$.i18n.Tr "action.create_repo" .GetRepoLink .GetRepoPath | Str2html}} + {{else if eq .GetOpType 2}} + {{$.i18n.Tr "action.rename_repo" .GetContent .GetRepoLink .GetRepoPath | Str2html}} + {{else if eq .GetOpType 5}} + {{ $branchLink := .GetBranch | EscapePound}} + {{$.i18n.Tr "action.commit_repo" .GetRepoLink $branchLink .GetBranch .GetRepoPath | Str2html}} + {{else if eq .GetOpType 6}} + {{ $index := index .GetIssueInfos 0}} + {{$.i18n.Tr "action.create_issue" .GetRepoLink $index .GetRepoPath | Str2html}} + {{else if eq .GetOpType 7}} + {{ $index := index .GetIssueInfos 0}} + {{$.i18n.Tr "action.create_pull_request" .GetRepoLink $index .GetRepoPath | Str2html}} + {{else if eq .GetOpType 8}} + {{$.i18n.Tr "action.transfer_repo" .GetContent .GetRepoLink .GetRepoPath | Str2html}} + {{else if eq .GetOpType 9}} + {{$.i18n.Tr "action.push_tag" .GetRepoLink .GetBranch .GetRepoPath | Str2html}} + {{else if eq .GetOpType 10}} + {{ $index := index .GetIssueInfos 0}} + {{$.i18n.Tr "action.comment_issue" .GetRepoLink $index .GetRepoPath | Str2html}} + {{else if eq .GetOpType 11}} + {{ $index := index .GetIssueInfos 0}} + {{$.i18n.Tr "action.merge_pull_request" .GetRepoLink $index .GetRepoPath | Str2html}} + {{end}} +

    + {{if eq .GetOpType 5}} +
    + +
    + {{else if eq .GetOpType 6}} + {{index .GetIssueInfos 1}} +

    {{.GetIssueContent}}

    + {{else if eq .GetOpType 7}} +

    {{index .GetIssueInfos 1}}

    + {{else if eq .GetOpType 10}} + {{.GetIssueTitle}} +

    {{index .GetIssueInfos 1}}

    + {{else if eq .GetOpType 11}} +

    {{index .GetIssueInfos 1}}

    + {{end}} +

    {{TimeSince .GetCreate $.i18n.Lang}}

    +
    +
    +
    + +
    +
    +
    +
    +{{end}} diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 678dfecfc6..a99a478170 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -1,43 +1,43 @@ {{template "base/head" .}}
    - {{template "user/dashboard/navbar" .}} -
    -
    -
    -
    - - {{.i18n.Tr "home.issues.in_your_repos"}} - {{.IssueStats.AllCount}} - - {{if not .ContextUser.IsOrganization}} - - {{.i18n.Tr "repo.issues.filter_type.assigned_to_you"}} - {{.IssueStats.AssignCount}} - - - {{.i18n.Tr "repo.issues.filter_type.created_by_you"}} - {{.IssueStats.CreateCount}} - - {{end}} -
    - {{range .Repos}} - - {{$.ContextUser.Name}}/{{.Name}} -
    {{if $.IsShowClosed}}{{.NumClosedIssues}}{{else}}{{.NumOpenIssues}}{{end}}
    -     - {{end}} -
    -
    + {{template "user/dashboard/navbar" .}} +
    +
    +
    +
    + + {{.i18n.Tr "home.issues.in_your_repos"}} + {{.IssueStats.AllCount}} + + {{if not .ContextUser.IsOrganization}} + + {{.i18n.Tr "repo.issues.filter_type.assigned_to_you"}} + {{.IssueStats.AssignCount}} + + + {{.i18n.Tr "repo.issues.filter_type.created_by_you"}} + {{.IssueStats.CreateCount}} + + {{end}} +
    + {{range .Repos}} + + {{$.ContextUser.Name}}/{{.Name}} +
    {{if $.IsShowClosed}}{{.NumClosedIssues}}{{else}}{{.NumOpenIssues}}{{end}}
    +     + {{end}} +
    +
    - - - {{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}} - - - - {{.i18n.Tr "repo.issues.close_tab" .IssueStats.ClosedCount}} - + + + {{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}} + + + + {{.i18n.Tr "repo.issues.close_tab" .IssueStats.ClosedCount}} +
    @@ -46,63 +46,63 @@ {{.i18n.Tr "repo.issues.filter_sort"}} -
    - {{.i18n.Tr "repo.issues.filter_sort.latest"}} - {{.i18n.Tr "repo.issues.filter_sort.oldest"}} - {{.i18n.Tr "repo.issues.filter_sort.recentupdate"}} - {{.i18n.Tr "repo.issues.filter_sort.leastupdate"}} - {{.i18n.Tr "repo.issues.filter_sort.mostcomment"}} - {{.i18n.Tr "repo.issues.filter_sort.leastcomment"}} +
    + {{.i18n.Tr "repo.issues.filter_sort.latest"}} + {{.i18n.Tr "repo.issues.filter_sort.oldest"}} + {{.i18n.Tr "repo.issues.filter_sort.recentupdate"}} + {{.i18n.Tr "repo.issues.filter_sort.leastupdate"}} + {{.i18n.Tr "repo.issues.filter_sort.mostcomment"}} + {{.i18n.Tr "repo.issues.filter_sort.leastcomment"}}
    {{range .Issues}} - {{ $timeStr:= TimeSince .Created $.Lang }} -
  • -
    {{if not $.RepoID}}{{.Repo.Name}}{{end}}#{{.Index}}
    - {{.Name}} + {{ $timeStr:= TimeSince .Created $.Lang }} +
  • +
    {{if not $.RepoID}}{{.Repo.Name}}{{end}}#{{.Index}}
    + {{.Name}} - {{if .NumComments}} - {{.NumComments}} - {{end}} + {{if .NumComments}} + {{.NumComments}} + {{end}} -

    - {{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.HomeLink .Poster.Name | Safe}} - {{if .Assignee}} - - - - {{end}} -

    -
    • - {{end}} - - {{with .Page}} - {{if gt .TotalPages 1}} -
    - -
    +

    + {{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.HomeLink .Poster.Name | Safe}} + {{if .Assignee}} + + + + {{end}} +

    + {{end}} + + {{with .Page}} + {{if gt .TotalPages 1}} +
    + +
    + {{end}} {{end}}
    -
    -
    +
    +
    {{template "base/footer" .}} diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index eb74191702..c31f0b5542 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -1,53 +1,53 @@
    -
    - - - {{.ContextUser.ShortName 20}} - - -
    +
    + + + {{.ContextUser.ShortName 20}} + + +
    {{.i18n.Tr "home.switch_dashboard_context"}}
    -
    - - - {{.SignedUser.Name}} - - {{range .Orgs}} - - - {{.ShortName 20}} - - {{end}} -
    - -    {{.i18n.Tr "new_org"}} - -
    -
    +
    + + + {{.SignedUser.Name}} + + {{range .Orgs}} + + + {{.ShortName 20}} + + {{end}} +
    + +    {{.i18n.Tr "new_org"}} + +
    +
    - {{if .ContextUser.IsOrganization}} -
    -
    - -  {{.i18n.Tr "news_feed"}} - - -  {{.i18n.Tr "issues"}} - - -  {{.i18n.Tr "pull_requests"}} - -
    -
    - - {{.i18n.Tr "home.view_home" (.ContextUser.ShortName 10)}} - -
    -
    -
    -
    - {{end}} + {{if .ContextUser.IsOrganization}} +
    +
    + +  {{.i18n.Tr "news_feed"}} + + +  {{.i18n.Tr "issues"}} + + +  {{.i18n.Tr "pull_requests"}} + +
    +
    + + {{.i18n.Tr "home.view_home" (.ContextUser.ShortName 10)}} + +
    +
    +
    +
    + {{end}}
    -
    \ No newline at end of file +
    diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index a17261d138..f571f3a090 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -1,69 +1,69 @@ {{template "base/head" .}}
    -
    -
    -
    -
    - {{if and (.Owner.UseCustomAvatar) (eq .SignedUserName .Owner.Name)}} - - - - {{else if eq .SignedUserName .Owner.Name}} - - - - {{else}} - - - - {{end}} -
    - {{if .Owner.FullName}}{{.Owner.FullName}}{{end}} - {{.Owner.Name}} -
    -
    -
      - {{if .Owner.Location}} -
    • {{.Owner.Location}}
      • - {{end}} - {{if and .Owner.Email .IsSigned}} -
    • - - {{.Owner.Email}} -
      • - {{end}} - {{if .Owner.Website}} -
    • - - {{.Owner.Website}} -
      • - {{end}} -
    • {{.i18n.Tr "user.join_on"}} {{DateFmtShort .Owner.Created}}
      • -
    -
    -
    -
    -
    -
    - - {{.i18n.Tr "user.repositories"}} - - - - {{.i18n.Tr "user.activity"}} - - -
    - {{if ne .TabName "activity"}} - {{template "explore/repo_list" .}} - {{else}} -
    -
    - {{template "user/dashboard/feeds" .}} -
    - {{end}} -
    -
    -
    +
    +
    +
    +
    + {{if and (.Owner.UseCustomAvatar) (eq .SignedUserName .Owner.Name)}} + + + + {{else if eq .SignedUserName .Owner.Name}} + + + + {{else}} + + + + {{end}} +
    + {{if .Owner.FullName}}{{.Owner.FullName}}{{end}} + {{.Owner.Name}} +
    +
    +
      + {{if .Owner.Location}} +
    • {{.Owner.Location}}
      • + {{end}} + {{if and .Owner.Email .IsSigned}} +
    • + + {{.Owner.Email}} +
      • + {{end}} + {{if .Owner.Website}} +
    • + + {{.Owner.Website}} +
      • + {{end}} +
    • {{.i18n.Tr "user.join_on"}} {{DateFmtShort .Owner.Created}}
      • +
    +
    +
    +
    +
    +
    + + {{.i18n.Tr "user.repositories"}} + + + + {{.i18n.Tr "user.activity"}} + + +
    + {{if ne .TabName "activity"}} + {{template "explore/repo_list" .}} + {{else}} +
    +
    + {{template "user/dashboard/feeds" .}} +
    + {{end}} +
    +
    +
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl index 37de6d151f..b5bacf7765 100644 --- a/templates/user/settings/applications.tmpl +++ b/templates/user/settings/applications.tmpl @@ -1,85 +1,85 @@ {{template "base/head" .}}
    -
    -
    - {{template "user/settings/navbar" .}} -
    - {{template "base/alert" .}} -

    - {{.i18n.Tr "settings.manage_access_token"}} -
    -
    {{.i18n.Tr "settings.generate_new_token"}}
    -
    -

    -
    -
    -
    - {{.i18n.Tr "settings.tokens_desc"}} -
    - {{range .Tokens}} -
    -
    - -
    -
    - -
    -
    - {{.Name}} -
    - {{$.i18n.Tr "settings.add_on"}} {{DateFmtShort .Created}} — {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} {{DateFmtShort .Updated}}{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}} -
    -
    -
    - -
    -
    - {{end}} -
    -
    -
    -
    -

    - {{.i18n.Tr "settings.generate_new_token"}} -

    -
    -
    - {{.CsrfTokenHtml}} -

    {{.i18n.Tr "settings.new_token_desc"}}

    -
    - - -
    - -
    -
    -
    -
    -
    -
    +
    +
    + {{template "user/settings/navbar" .}} +
    + {{template "base/alert" .}} +

    + {{.i18n.Tr "settings.manage_access_token"}} +
    +
    {{.i18n.Tr "settings.generate_new_token"}}
    +
    +

    +
    +
    +
    + {{.i18n.Tr "settings.tokens_desc"}} +
    + {{range .Tokens}} +
    +
    + +
    +
    + +
    +
    + {{.Name}} +
    + {{$.i18n.Tr "settings.add_on"}} {{DateFmtShort .Created}} — {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} {{DateFmtShort .Updated}}{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}} +
    +
    +
    + +
    +
    + {{end}} +
    +
    +
    +
    +

    + {{.i18n.Tr "settings.generate_new_token"}} +

    +
    +
    + {{.CsrfTokenHtml}} +

    {{.i18n.Tr "settings.new_token_desc"}}

    +
    + + +
    + +
    +
    +
    +
    +
    +
    -
    - - {{.i18n.Tr "settings.access_token_deletion"}} -
    -
    -

    {{.i18n.Tr "settings.access_token_deletion_desc"}}

    -
    -
    -
    - - {{.i18n.Tr "modal.no"}} -
    -
    - - {{.i18n.Tr "modal.yes"}} -
    -
    +
    + + {{.i18n.Tr "settings.access_token_deletion"}} +
    +
    +

    {{.i18n.Tr "settings.access_token_deletion_desc"}}

    +
    +
    +
    + + {{.i18n.Tr "modal.no"}} +
    +
    + + {{.i18n.Tr "modal.yes"}} +
    +
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/user/settings/delete.tmpl b/templates/user/settings/delete.tmpl index 6b490ad291..b95eb2105f 100644 --- a/templates/user/settings/delete.tmpl +++ b/templates/user/settings/delete.tmpl @@ -1,42 +1,42 @@ {{template "base/head" .}}
    -
    -
    - {{template "user/settings/navbar" .}} -
    - {{template "base/alert" .}} -

    - {{.i18n.Tr "settings.delete_account"}} -

    -
    -
    -

    {{.i18n.Tr "settings.delete_prompt" | Str2html}}

    -
    -
    - {{.CsrfTokenHtml}} - -
    - - -
    -
    - {{.i18n.Tr "settings.confirm_delete_account"}} -
    -
    -
    -
    -
    -
    +
    +
    + {{template "user/settings/navbar" .}} +
    + {{template "base/alert" .}} +

    + {{.i18n.Tr "settings.delete_account"}} +

    +
    +
    +

    {{.i18n.Tr "settings.delete_prompt" | Str2html}}

    +
    +
    + {{.CsrfTokenHtml}} + +
    + + +
    +
    + {{.i18n.Tr "settings.confirm_delete_account"}} +
    +
    +
    +
    +
    +
    -
    - - {{.i18n.Tr "settings.delete_account_title"}} -
    -
    -

    {{.i18n.Tr "settings.delete_account_desc"}}

    -
    - {{template "base/delete_modal_actions" .}} +
    + + {{.i18n.Tr "settings.delete_account_title"}} +
    +
    +

    {{.i18n.Tr "settings.delete_account_desc"}}

    +
    + {{template "base/delete_modal_actions" .}}
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/user/settings/email.tmpl b/templates/user/settings/email.tmpl index a9667dde91..558145302f 100644 --- a/templates/user/settings/email.tmpl +++ b/templates/user/settings/email.tmpl @@ -1,70 +1,70 @@ {{template "base/head" .}}
    -
    -
    - {{template "user/settings/navbar" .}} -
    - {{template "base/alert" .}} -

    - {{.i18n.Tr "settings.manage_emails"}} -

    -
    - -
    -
    -
    - {{.CsrfTokenHtml}} -
    - - -
    - -
    -
    -
    -
    -
    +
    +
    + {{template "user/settings/navbar" .}} +
    + {{template "base/alert" .}} +

    + {{.i18n.Tr "settings.manage_emails"}} +

    +
    + +
    +
    +
    + {{.CsrfTokenHtml}} +
    + + +
    + +
    +
    +
    +
    +
    -
    - - {{.i18n.Tr "settings.email_deletion"}} -
    -
    -

    {{.i18n.Tr "settings.email_deletion_desc"}}

    -
    - {{template "base/delete_modal_actions" .}} +
    + + {{.i18n.Tr "settings.email_deletion"}} +
    +
    +

    {{.i18n.Tr "settings.email_deletion_desc"}}

    +
    + {{template "base/delete_modal_actions" .}}
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl index 5c8773a84b..87e24522b4 100644 --- a/templates/user/settings/navbar.tmpl +++ b/templates/user/settings/navbar.tmpl @@ -1,23 +1,23 @@
    {{.i18n.Tr "settings"}}
    - - {{.i18n.Tr "settings.profile"}} - - - {{.i18n.Tr "settings.password"}} - - - {{.i18n.Tr "settings.emails"}} - - - {{.i18n.Tr "settings.ssh_keys"}} - - - {{.i18n.Tr "settings.applications"}} - - - {{.i18n.Tr "settings.delete"}} - + + {{.i18n.Tr "settings.profile"}} + + + {{.i18n.Tr "settings.password"}} + + + {{.i18n.Tr "settings.emails"}} + + + {{.i18n.Tr "settings.ssh_keys"}} + + + {{.i18n.Tr "settings.applications"}} + + + {{.i18n.Tr "settings.delete"}} +
    diff --git a/templates/user/settings/password.tmpl b/templates/user/settings/password.tmpl index d56952b19f..e29e807e96 100644 --- a/templates/user/settings/password.tmpl +++ b/templates/user/settings/password.tmpl @@ -1,36 +1,36 @@ {{template "base/head" .}}
    -
    -
    - {{template "user/settings/navbar" .}} -
    - {{template "base/alert" .}} -

    - {{.i18n.Tr "settings.change_password"}} -

    -
    -
    - {{.CsrfTokenHtml}} -
    - - -
    -
    - - -
    -
    - - -
    +
    +
    + {{template "user/settings/navbar" .}} +
    + {{template "base/alert" .}} +

    + {{.i18n.Tr "settings.change_password"}} +

    +
    + + {{.CsrfTokenHtml}} +
    + + +
    +
    + + +
    +
    + + +
    -
    - -
    - -
    -
    -
    -
    +
    + +
    + +
    +
    +
    +
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl index d9bf7af09a..37d5683671 100644 --- a/templates/user/settings/profile.tmpl +++ b/templates/user/settings/profile.tmpl @@ -1,70 +1,70 @@ {{template "base/head" .}}
    -
    -
    - {{template "user/settings/navbar" .}} -
    - {{template "base/alert" .}} -

    - {{.i18n.Tr "settings.public_profile"}} -

    -
    -

    {{.i18n.Tr "settings.profile_desc"}}

    -
    - {{.CsrfTokenHtml}} -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    +
    +
    + {{template "user/settings/navbar" .}} +
    + {{template "base/alert" .}} +

    + {{.i18n.Tr "settings.public_profile"}} +

    +
    +

    {{.i18n.Tr "settings.profile_desc"}}

    + + {{.CsrfTokenHtml}} +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    -
    - -
    - +
    + +
    + -
    +
    -
    - {{.CsrfTokenHtml}} -
    - -
    - - -
    -
    -
    - - -
    + + {{.CsrfTokenHtml}} +
    + +
    + + +
    +
    +
    + + +
    -
    - -
    -
    -
    -
    -
    -
    +
    + +
    + +
    +
    +
    +
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/user/settings/sshkeys.tmpl b/templates/user/settings/sshkeys.tmpl index 4c2177278b..33426fdc56 100644 --- a/templates/user/settings/sshkeys.tmpl +++ b/templates/user/settings/sshkeys.tmpl @@ -1,83 +1,83 @@ {{template "base/head" .}}
    -
    -
    - {{template "user/settings/navbar" .}} -
    - {{template "base/alert" .}} -

    - {{.i18n.Tr "settings.manage_ssh_keys"}} -
    -
    {{.i18n.Tr "settings.add_key"}}
    -
    -

    -
    -
    -
    - {{.i18n.Tr "settings.ssh_desc"}} -
    - {{range .Keys}} -
    -
    - -
    -
    - -
    -
    - {{.Name}} -
    - {{.Fingerprint}} -
    -
    - {{$.i18n.Tr "settings.add_on"}} {{DateFmtShort .Created}} — {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} {{DateFmtShort .Updated}}{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}} -
    -
    -
    - -
    -
    - {{end}} -
    -
    -
    -

    {{.i18n.Tr "settings.ssh_helper" "https://help.github.com/articles/generating-ssh-keys" "https://help.github.com/ssh-issues/" | Str2html}}

    -
    -

    - {{.i18n.Tr "settings.add_new_key"}} -

    -
    -
    - {{.CsrfTokenHtml}} -
    - - -
    -
    - - -
    - -
    -
    -
    -
    -
    -
    +
    +
    + {{template "user/settings/navbar" .}} +
    + {{template "base/alert" .}} +

    + {{.i18n.Tr "settings.manage_ssh_keys"}} +
    +
    {{.i18n.Tr "settings.add_key"}}
    +
    +

    +
    +
    +
    + {{.i18n.Tr "settings.ssh_desc"}} +
    + {{range .Keys}} +
    +
    + +
    +
    + +
    +
    + {{.Name}} +
    + {{.Fingerprint}} +
    +
    + {{$.i18n.Tr "settings.add_on"}} {{DateFmtShort .Created}} — {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} {{DateFmtShort .Updated}}{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}} +
    +
    +
    + +
    +
    + {{end}} +
    +
    +
    +

    {{.i18n.Tr "settings.ssh_helper" "https://help.github.com/articles/generating-ssh-keys" "https://help.github.com/ssh-issues/" | Str2html}}

    +
    +

    + {{.i18n.Tr "settings.add_new_key"}} +

    +
    +
    + {{.CsrfTokenHtml}} +
    + + +
    +
    + + +
    + +
    +
    +
    +
    +
    +
    -
    - - {{.i18n.Tr "settings.ssh_key_deletion"}} -
    -
    -

    {{.i18n.Tr "settings.ssh_key_deletion_desc"}}

    -
    - {{template "base/delete_modal_actions" .}} +
    + + {{.i18n.Tr "settings.ssh_key_deletion"}} +
    +
    +

    {{.i18n.Tr "settings.ssh_key_deletion_desc"}}

    +
    + {{template "base/delete_modal_actions" .}}
    -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}}