From 5441182e2f7d73a10771a7c960da12ea6b4e014e Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 18 Jul 2019 19:05:26 +0200 Subject: [PATCH 01/30] add download butons (template from home.tmpl) maybe use a template vor all download butons in future? --- templates/repo/branch/list.tmpl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 7963f8877ff7..fdd46aba96d9 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -23,6 +23,15 @@ {{end}} {{end}} + +
+ +
+ ZIP + TAR.GZ +
+
+ @@ -96,10 +105,24 @@ {{if .IsProtected}} +
+ +
+ ZIP + TAR.GZ +
+
{{else if .IsDeleted}} {{else}} +
+ +
+ ZIP + TAR.GZ +
+
{{end}} {{end}} From d9fc4a280843ef9c6a334ebc09e74b7929589170 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 18 Jul 2019 20:44:10 +0200 Subject: [PATCH 02/30] add $ --- templates/repo/branch/list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index fdd46aba96d9..66351c67fcaf 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -24,7 +24,7 @@ {{end}} -
+
ZIP From b6b22d9b083855d13a5f116d2f90204416475f9b Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 18 Jul 2019 20:44:45 +0200 Subject: [PATCH 03/30] add download buton, when no user logon --- templates/repo/branch/list.tmpl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 66351c67fcaf..7fd82540cb79 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -125,6 +125,16 @@
{{end}} + {{else}} + +
+ +
+ ZIP + TAR.GZ +
+
+ {{end}} {{end}} From bce9f3a47c3da71a6adc1b84c5bbb07fd0db41bd Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 19 Jul 2019 16:20:58 +0200 Subject: [PATCH 04/30] fix download menue of default branch --- templates/repo/branch/list.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 7fd82540cb79..80383c9ac787 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -24,9 +24,9 @@ {{end}} -
+
-
+
ZIP TAR.GZ
From f524cd885cdcbb1273797d5c5224ab13930070fa Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 19 Jul 2019 16:34:06 +0200 Subject: [PATCH 05/30] fix download menue (dont fly away) --- templates/repo/branch/list.tmpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 80383c9ac787..ecb28f6b58eb 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -105,9 +105,9 @@ {{if .IsProtected}} -
+
-
+
ZIP TAR.GZ
@@ -116,9 +116,9 @@ {{else}} -
+
-
+
ZIP TAR.GZ
From 0e92e5fb8d9874b6b7551a7174dd85481ec59abb Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 19 Jul 2019 19:14:13 +0200 Subject: [PATCH 06/30] mv download buton in extra colum --- templates/repo/branch/list.tmpl | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index ecb28f6b58eb..be2b9401fe92 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -51,6 +51,7 @@ {{if and $.IsWriter (not $.IsMirror)}} {{.i18n.Tr "repo.branch.delete_head"}} {{end}} + @@ -105,24 +106,10 @@ {{if .IsProtected}} -
- -
- ZIP - TAR.GZ -
-
{{else if .IsDeleted}} {{else}} -
- -
- ZIP - TAR.GZ -
-
{{end}} {{else}} From 27880b053a80f05bd8bb55026f48f12100427b80 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 19 Jul 2019 19:16:05 +0200 Subject: [PATCH 07/30] commit x/y diagram doesnt break --- templates/repo/branch/list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index be2b9401fe92..b90a9e64fd2a 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -46,7 +46,7 @@ {{.i18n.Tr "repo.branch.name"}} - + {{if and $.IsWriter (not $.IsMirror)}} {{.i18n.Tr "repo.branch.delete_head"}} From c9d98c843562f7a2464953f9f51c0fa0ac6b72ef Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 19 Jul 2019 19:17:26 +0200 Subject: [PATCH 08/30] show protected symbol onece --- templates/repo/branch/list.tmpl | 3 --- 1 file changed, 3 deletions(-) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index b90a9e64fd2a..bc4aefdd73d7 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -63,9 +63,6 @@ {{.Name}}

{{$.i18n.Tr "repo.branch.deleted_by" .DeletedBranch.DeletedBy.Name}} {{TimeSinceUnix .DeletedBranch.DeletedUnix $.i18n.Lang}}

{{else}} - {{if .IsProtected}} - - {{end}} {{.Name}}

{{ShortSha .Commit.ID.String}} · {{RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}} · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}

{{end}} From d75e2b477dbb0fd021207a23fb82bfdf6f24b833 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 19 Jul 2019 19:19:23 +0200 Subject: [PATCH 09/30] add download colum --- templates/repo/branch/list.tmpl | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index bc4aefdd73d7..c0756dd8b3db 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -109,17 +109,18 @@ {{end}} - {{else}} - -
+ {{end}} + + {{if not .IsDeleted}} +
-
- ZIP - TAR.GZ +
+ ZIP + TAR.GZ
- - {{end}} + {{end}} + {{end}} {{end}} From 8fba69707079d8bbd3d0234c47a1ea79057a6fc1 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 19 Jul 2019 20:31:58 +0200 Subject: [PATCH 10/30] correct placement --- templates/repo/branch/list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index c0756dd8b3db..cd1b746a46ac 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -76,7 +76,7 @@
{{.CommitsAhead}}
-
+
{{end}} From 05463ca2ab760d4fe6bbc37cdd34ffec93742559 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 19 Jul 2019 20:47:14 +0200 Subject: [PATCH 11/30] switch colum download <-> delete --- templates/repo/branch/list.tmpl | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index cd1b746a46ac..e906e2a695d4 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -48,10 +48,10 @@ {{.i18n.Tr "repo.branch.name"}} + {{if and $.IsWriter (not $.IsMirror)}} - {{.i18n.Tr "repo.branch.delete_head"}} + {{.i18n.Tr "repo.branch.delete_head"}} {{end}} - @@ -99,17 +99,6 @@ {{end}} {{end}} - {{if and $.IsWriter (not $.IsMirror)}} - - {{if .IsProtected}} - - {{else if .IsDeleted}} - - {{else}} - - {{end}} - - {{end}} {{if not .IsDeleted}}
@@ -121,6 +110,17 @@
{{end}} + {{if and $.IsWriter (not $.IsMirror)}} + + {{if .IsProtected}} + + {{else if .IsDeleted}} + + {{else}} + + {{end}} + + {{end}} {{end}} {{end}} From 1b9918f656a4265a5e1d40c9e2d86609ae25112b Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 19 Jul 2019 21:03:29 +0200 Subject: [PATCH 12/30] found css style wich position the menue --- templates/repo/branch/list.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index e906e2a695d4..96f386e68857 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -24,7 +24,7 @@ {{end}} -
+
ZIP @@ -101,9 +101,9 @@ {{if not .IsDeleted}} -
+
-
+
ZIP TAR.GZ
From 0e1405cd15be88235fefbd8492a4d14bdb6f050a Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 19 Jul 2019 22:46:34 +0200 Subject: [PATCH 13/30] del useless inline css --- templates/repo/branch/list.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 96f386e68857..bc2ae89dca4b 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -26,7 +26,7 @@
-
+
ZIP TAR.GZ
@@ -103,7 +103,7 @@ {{if not .IsDeleted}}
-
+
ZIP TAR.GZ
From 63a714fcd1f894f71cc693759e553b69b6320f99 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 20 Jul 2019 00:42:44 +0200 Subject: [PATCH 14/30] add needet css to less file --- public/less/_repository.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/less/_repository.less b/public/less/_repository.less index 21aeea81e767..d5ac9b7ae466 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -1233,6 +1233,10 @@ } } } + .dlmenu { + position: absolute; + margin-left: -20px; + } } &.commits { From cae8ab56f86fee6c5846d45493ab186477d6ea43 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 20 Jul 2019 00:43:43 +0200 Subject: [PATCH 15/30] update css with "make css" --- public/css/index.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/css/index.css b/public/css/index.css index 4a7dfb2824bf..0fbb72be8315 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -626,6 +626,7 @@ footer .ui.left,footer .ui.right{line-height:40px} .repository.branches .commit-divergence .bar{height:4px;position:absolute;background-color:#d4d4d5} .repository.branches .commit-divergence .bar.bar-behind{right:0} .repository.branches .commit-divergence .bar.bar-ahead{left:0} +.repository.branches .dlmenu{position:absolute;margin-left:-20px} .repository.commits .header .search input{font-weight:400;padding:5px 10px} .repository #commits-table thead th:first-of-type{padding-left:15px} .repository #commits-table thead .sha{width:140px} From 2337499e17de28bbf7727da6a32f45f48c881233 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 20 Jul 2019 00:44:26 +0200 Subject: [PATCH 16/30] template: switch from inline css to less --- templates/repo/branch/list.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index bc2ae89dca4b..5ee06b0723f0 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -24,7 +24,7 @@ {{end}} -
+
ZIP @@ -101,7 +101,7 @@ {{if not .IsDeleted}} -
+
ZIP From f5fb8c91db4c43618fafae3c92c1ba6a08f90c0b Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 20 Jul 2019 00:50:03 +0200 Subject: [PATCH 17/30] use wrong values because of browser caching --- public/css/index.css | 2 +- public/less/_repository.less | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public/css/index.css b/public/css/index.css index 0fbb72be8315..b7e2461a3c1f 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -626,7 +626,7 @@ footer .ui.left,footer .ui.right{line-height:40px} .repository.branches .commit-divergence .bar{height:4px;position:absolute;background-color:#d4d4d5} .repository.branches .commit-divergence .bar.bar-behind{right:0} .repository.branches .commit-divergence .bar.bar-ahead{left:0} -.repository.branches .dlmenu{position:absolute;margin-left:-20px} +.repository.branches .dlmenu{position:absolute;margin-left:-38px;margin-top:-18px} .repository.commits .header .search input{font-weight:400;padding:5px 10px} .repository #commits-table thead th:first-of-type{padding-left:15px} .repository #commits-table thead .sha{width:140px} diff --git a/public/less/_repository.less b/public/less/_repository.less index d5ac9b7ae466..fd05e9447aab 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -1235,7 +1235,8 @@ } .dlmenu { position: absolute; - margin-left: -20px; + margin-left: -38px; + margin-top: -18px; } } From fa1521e10461198cd56e3b29a4440d42a3c76cef Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 22 Jul 2019 20:15:03 +0200 Subject: [PATCH 18/30] all buttons with border --- templates/repo/branch/list.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 5ee06b0723f0..23b99801c9ae 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -115,9 +115,9 @@ {{if .IsProtected}} {{else if .IsDeleted}} - + {{else}} - + {{end}} {{end}} From f31cb051e61ddcac408364febd7f427047e8665a Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 22 Jul 2019 20:16:25 +0200 Subject: [PATCH 19/30] add Translation for button Messages --- options/locale/locale_de-DE.ini | 2 ++ options/locale/locale_en-US.ini | 2 ++ 2 files changed, 4 insertions(+) diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index d6ee0d212635..bc350ce32724 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -1400,6 +1400,8 @@ branch.deleted_by=Von %s gelöscht branch.restore_success=Branch „%s“ wurde wiederhergestellt. branch.restore_failed=Wiederherstellung des Branches „%s“ fehlgeschlagen. branch.protected_deletion_failed=Branch „%s“ ist geschützt und kann nicht gelöscht werden. +branch.download=Branch „%s“ herunterladen +branch.restored=Branch „%s“ wiederherstellen topic.manage_topics=Themen verwalten topic.done=Fertig diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 969a0953a289..beaf24e5e062 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1407,6 +1407,8 @@ branch.deleted_by = Deleted by %s branch.restore_success = Branch '%s' has been restored. branch.restore_failed = Failed to restore branch '%s'. branch.protected_deletion_failed = Branch '%s' is protected. It cannot be deleted. +branch.download=Download Branch „%s“ +branch.restored=Restore Branch „%s“ topic.manage_topics = Manage Topics topic.done = Done From b9343037f885b4c9c53df0c1bc682649067e9852 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 22 Jul 2019 20:19:13 +0200 Subject: [PATCH 20/30] Add Message to Button --- templates/repo/branch/list.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 23b99801c9ae..80146340d869 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -101,7 +101,7 @@ {{if not .IsDeleted}} -
+
ZIP @@ -115,9 +115,9 @@ {{if .IsProtected}} {{else if .IsDeleted}} - + {{else}} - + {{end}} {{end}} From dad98cf52d79667285bfe44f3943b153c24e3ad9 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 22 Jul 2019 20:42:33 +0200 Subject: [PATCH 21/30] delete table header because of overhead * Branche Name is inder Branches * Delete colum is not general enouth -> action ... but buttons describe itself so .. --- templates/repo/branch/list.tmpl | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 80146340d869..0096a36906c9 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -43,22 +43,11 @@
- - - - - - - {{if and $.IsWriter (not $.IsMirror)}} - - {{end}} - - {{range $branch := .Branches}} {{if ne .Name $.DefaultBranch}} - - - - {{if and $.IsWriter (not $.IsMirror)}} - - - - -
{{.i18n.Tr "repo.branch.name"}}{{.i18n.Tr "repo.branch.delete_head"}}
+ {{if .IsDeleted}} {{.Name}}

{{$.i18n.Tr "repo.branch.deleted_by" .DeletedBranch.DeletedBy.Name}} {{TimeSinceUnix .DeletedBranch.DeletedUnix $.i18n.Lang}}

@@ -67,7 +56,7 @@

{{ShortSha .Commit.ID.String}} · {{RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}} · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}

{{end}} 		+ {{if not .IsDeleted}}
@@ -81,7 +70,7 @@
{{end}}
+ {{if not .LatestPullRequest}} {{if and (not .IsDeleted) $.AllowsPulls}} @@ -99,7 +88,7 @@ {{end}} {{end}} + {{if not .IsDeleted}}
@@ -111,7 +100,7 @@ {{end}}
+ {{if .IsProtected}} {{else if .IsDeleted}} From bcaea3733a0ce2a31792dc92980e506dc5d68597 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 22 Jul 2019 23:09:15 +0200 Subject: [PATCH 22/30] dont ned position absolute for download anymore ( table hast property "overflow: hidden;" wich hiddes the menue ) solution -> instead of set button lot of css - change table property --- templates/repo/branch/list.tmpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 0096a36906c9..379308a4cbb8 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -23,8 +23,8 @@ {{end}} {{end}} -
+
+
ZIP @@ -88,9 +88,9 @@ {{end}} {{end}}
+ {{if not .IsDeleted}} -
+
ZIP From ce87533532d15ca1a5224c05f05f70f821b7985b Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 22 Jul 2019 23:29:33 +0200 Subject: [PATCH 23/30] rm ugly css --- public/css/index.css | 1 - public/less/_repository.less | 5 ----- 2 files changed, 6 deletions(-) diff --git a/public/css/index.css b/public/css/index.css index b7e2461a3c1f..4a7dfb2824bf 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -626,7 +626,6 @@ footer .ui.left,footer .ui.right{line-height:40px} .repository.branches .commit-divergence .bar{height:4px;position:absolute;background-color:#d4d4d5} .repository.branches .commit-divergence .bar.bar-behind{right:0} .repository.branches .commit-divergence .bar.bar-ahead{left:0} -.repository.branches .dlmenu{position:absolute;margin-left:-38px;margin-top:-18px} .repository.commits .header .search input{font-weight:400;padding:5px 10px} .repository #commits-table thead th:first-of-type{padding-left:15px} .repository #commits-table thead .sha{width:140px} diff --git a/public/less/_repository.less b/public/less/_repository.less index fd05e9447aab..21aeea81e767 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -1233,11 +1233,6 @@ } } } - .dlmenu { - position: absolute; - margin-left: -38px; - margin-top: -18px; - } } &.commits { From 81a7a016580c24678da073a828b3cc368ab4478c Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Tue, 23 Jul 2019 00:41:12 +0200 Subject: [PATCH 24/30] add css class download-column --- public/css/index.css | 1 + public/less/_explore.less | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/public/css/index.css b/public/css/index.css index 4a7dfb2824bf..1c9dd3927c40 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -984,6 +984,7 @@ tbody.commit-list{vertical-align:baseline} .ui.repository.list .item .ui.avatar.image{width:24px;height:24px} .ui.repository.branches .info{font-size:12px;color:grey;display:flex;white-space:pre} .ui.repository.branches .info .commit-message{max-width:72em;overflow:hidden;text-overflow:ellipsis} +.ui.repository.branches .download-column{overflow:visible;text-align:right} .ui.user.list .item{padding-bottom:25px} .ui.user.list .item:not(:first-child){border-top:1px solid #eee;padding-top:25px} .ui.user.list .item .ui.avatar.image{width:40px;height:40px} diff --git a/public/less/_explore.less b/public/less/_explore.less index 11dacb7285b9..8534146314d0 100644 --- a/public/less/_explore.less +++ b/public/less/_explore.less @@ -73,6 +73,10 @@ text-overflow: ellipsis; } } + .download-column { + overflow: visible; + text-align: right; + } } .ui.user.list { From 15eead7936cd7ae43b3b699217fc11bd3a82f238 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Tue, 23 Jul 2019 00:41:35 +0200 Subject: [PATCH 25/30] use css class download-column --- templates/repo/branch/list.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 379308a4cbb8..a800dd3f1580 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -23,7 +23,7 @@ {{end}} {{end}}
+
@@ -88,7 +88,7 @@ {{end}} {{end}}
+ {{if not .IsDeleted}}
From 33d54e1bd06d6179c4eef48ea657517a3155264a Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Tue, 23 Jul 2019 01:05:40 +0200 Subject: [PATCH 26/30] follow Contirb guidlines sory missed that --- options/locale/locale_de-DE.ini | 2 -- 1 file changed, 2 deletions(-) diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index bc350ce32724..d6ee0d212635 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -1400,8 +1400,6 @@ branch.deleted_by=Von %s gelöscht branch.restore_success=Branch „%s“ wurde wiederhergestellt. branch.restore_failed=Wiederherstellung des Branches „%s“ fehlgeschlagen. branch.protected_deletion_failed=Branch „%s“ ist geschützt und kann nicht gelöscht werden. -branch.download=Branch „%s“ herunterladen -branch.restored=Branch „%s“ wiederherstellen topic.manage_topics=Themen verwalten topic.done=Fertig From e8c42177fee04da6d7f2c48a659a4f34d2bc2857 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Tue, 23 Jul 2019 01:08:10 +0200 Subject: [PATCH 27/30] name things corectly --- options/locale/locale_en-US.ini | 2 +- templates/repo/branch/list.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index beaf24e5e062..6c35a772bfbc 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1408,7 +1408,7 @@ branch.restore_success = Branch '%s' has been restored. branch.restore_failed = Failed to restore branch '%s'. branch.protected_deletion_failed = Branch '%s' is protected. It cannot be deleted. branch.download=Download Branch „%s“ -branch.restored=Restore Branch „%s“ +branch.restore=Restore Branch „%s“ topic.manage_topics = Manage Topics topic.done = Done diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index a800dd3f1580..a94b235c86af 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -104,7 +104,7 @@ {{if .IsProtected}} {{else if .IsDeleted}} - + {{else}} {{end}} From eac8103ab44af88e5e28e68c01b18e72d1a32f7b Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Tue, 23 Jul 2019 02:00:49 +0200 Subject: [PATCH 28/30] also change info message on default branch --- templates/repo/branch/list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index a94b235c86af..7fee444a88d2 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -24,7 +24,7 @@ {{end}}
-
+
ZIP From 1d98e88cadc6340a3d5181c3174ffbed283ec223 Mon Sep 17 00:00:00 2001 From: 6543 <24977596+6543@users.noreply.github.com> Date: Tue, 23 Jul 2019 04:45:26 +0200 Subject: [PATCH 29/30] Apply suggestions from code review thx @gary-kim Co-Authored-By: Gary Kim --- options/locale/locale_en-US.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 6c35a772bfbc..18c3ffe606e4 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1407,8 +1407,8 @@ branch.deleted_by = Deleted by %s branch.restore_success = Branch '%s' has been restored. branch.restore_failed = Failed to restore branch '%s'. branch.protected_deletion_failed = Branch '%s' is protected. It cannot be deleted. -branch.download=Download Branch „%s“ -branch.restore=Restore Branch „%s“ +branch.download = Download Branch '%s' +branch.restore = Restore Branch '%s' topic.manage_topics = Manage Topics topic.done = Done From 99470a81e4d0744afad9251d0d0af19e267c6465 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Wed, 24 Jul 2019 18:47:11 +0200 Subject: [PATCH 30/30] remove diff for merge shuld be seperat handel (https://github.com/go-gitea/gitea/pull/7530) was first step ... to #7454 (duble protection symbole ...) --- templates/repo/branch/list.tmpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 7fee444a88d2..225e89ec7cf9 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -52,6 +52,9 @@ {{.Name}}

{{$.i18n.Tr "repo.branch.deleted_by" .DeletedBranch.DeletedBy.Name}} {{TimeSinceUnix .DeletedBranch.DeletedUnix $.i18n.Lang}}

{{else}} + {{if .IsProtected}} + + {{end}} {{.Name}}

{{ShortSha .Commit.ID.String}} · {{RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}} · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}

{{end}}