From 8161d21f9837c0a8f3f2cffcb475c02987fb8bb2 Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Mon, 7 Oct 2019 23:01:30 +0300 Subject: [PATCH 1/4] clickable commit hash link --- app/views/layouts/admin/base.haml | 2 +- app/views/layouts/registrant/application.html.erb | 2 +- app/views/layouts/registrar/base.html.erb | 2 +- app/views/layouts/registrar/sessions.html.erb | 2 +- config/initializers/current_commit_hash.rb | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/admin/base.haml b/app/views/layouts/admin/base.haml index 792a8cc0b..b5194892d 100644 --- a/app/views/layouts/admin/base.haml +++ b/app/views/layouts/admin/base.haml @@ -32,5 +32,5 @@ .footer.text-right Version - = CURRENT_COMMIT_HASH + = link_to "#{CURRENT_COMMIT_HASH}", "#{CURRENT_COMMIT_REPO}/commits/#{CURRENT_COMMIT_HASH}" = javascript_include_tag 'admin-manifest', async: true diff --git a/app/views/layouts/registrant/application.html.erb b/app/views/layouts/registrant/application.html.erb index 66fdf3e16..a3b69a78a 100644 --- a/app/views/layouts/registrant/application.html.erb +++ b/app/views/layouts/registrant/application.html.erb @@ -76,7 +76,7 @@
Version - <%= CURRENT_COMMIT_HASH %> + <%= link_to(CURRENT_COMMIT_HASH, CURRENT_COMMIT_REPO/commits/CURRENT_COMMIT_HASH) %>
diff --git a/app/views/layouts/registrar/base.html.erb b/app/views/layouts/registrar/base.html.erb index 4d4f1b972..57fab3336 100644 --- a/app/views/layouts/registrar/base.html.erb +++ b/app/views/layouts/registrar/base.html.erb @@ -54,7 +54,7 @@
Version - <%= CURRENT_COMMIT_HASH %> + <%= link_to(CURRENT_COMMIT_HASH, CURRENT_COMMIT_REPO/commits/CURRENT_COMMIT_HASH) %>
diff --git a/app/views/layouts/registrar/sessions.html.erb b/app/views/layouts/registrar/sessions.html.erb index 3cb345ef9..004689ded 100644 --- a/app/views/layouts/registrar/sessions.html.erb +++ b/app/views/layouts/registrar/sessions.html.erb @@ -44,7 +44,7 @@
Version - <%= CURRENT_COMMIT_HASH %> + <%= link_to(CURRENT_COMMIT_HASH, CURRENT_COMMIT_REPO/commits/CURRENT_COMMIT_HASH) %>
diff --git a/config/initializers/current_commit_hash.rb b/config/initializers/current_commit_hash.rb index b018b46fd..3038fa33b 100644 --- a/config/initializers/current_commit_hash.rb +++ b/config/initializers/current_commit_hash.rb @@ -1 +1,2 @@ CURRENT_COMMIT_HASH = `git rev-parse --short HEAD` +CURRENT_COMMIT_REPO = `git remote get-url origin` \ No newline at end of file From 700967b58dd79d6e47f070d246f38efb9a16189d Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Mon, 7 Oct 2019 23:41:07 +0300 Subject: [PATCH 2/4] fix strings, use better colours --- app/views/layouts/admin/base.haml | 2 +- app/views/layouts/registrant/application.html.erb | 2 +- app/views/layouts/registrar/base.html.erb | 2 +- app/views/layouts/registrar/sessions.html.erb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/admin/base.haml b/app/views/layouts/admin/base.haml index b5194892d..d893da853 100644 --- a/app/views/layouts/admin/base.haml +++ b/app/views/layouts/admin/base.haml @@ -32,5 +32,5 @@ .footer.text-right Version - = link_to "#{CURRENT_COMMIT_HASH}", "#{CURRENT_COMMIT_REPO}/commits/#{CURRENT_COMMIT_HASH}" + = link_to "#{CURRENT_COMMIT_HASH}", "#{CURRENT_COMMIT_REPO}/commits/#{CURRENT_COMMIT_HASH}", style: 'color:#000000;' = javascript_include_tag 'admin-manifest', async: true diff --git a/app/views/layouts/registrant/application.html.erb b/app/views/layouts/registrant/application.html.erb index a3b69a78a..5e6820246 100644 --- a/app/views/layouts/registrant/application.html.erb +++ b/app/views/layouts/registrant/application.html.erb @@ -76,7 +76,7 @@
Version - <%= link_to(CURRENT_COMMIT_HASH, CURRENT_COMMIT_REPO/commits/CURRENT_COMMIT_HASH) %> + <%= link_to(CURRENT_COMMIT_HASH, "#{CURRENT_COMMIT_REPO}/commits/#{CURRENT_COMMIT_HASH}", style: 'color:#FFFFFF;') %>
diff --git a/app/views/layouts/registrar/base.html.erb b/app/views/layouts/registrar/base.html.erb index 57fab3336..88d20c319 100644 --- a/app/views/layouts/registrar/base.html.erb +++ b/app/views/layouts/registrar/base.html.erb @@ -54,7 +54,7 @@
Version - <%= link_to(CURRENT_COMMIT_HASH, CURRENT_COMMIT_REPO/commits/CURRENT_COMMIT_HASH) %> + <%= link_to(CURRENT_COMMIT_HASH, "#{CURRENT_COMMIT_REPO}/commits/#{CURRENT_COMMIT_HASH}", style: 'color:#FFFFFF;') %>
diff --git a/app/views/layouts/registrar/sessions.html.erb b/app/views/layouts/registrar/sessions.html.erb index 004689ded..ca5059ab4 100644 --- a/app/views/layouts/registrar/sessions.html.erb +++ b/app/views/layouts/registrar/sessions.html.erb @@ -44,7 +44,7 @@
Version - <%= link_to(CURRENT_COMMIT_HASH, CURRENT_COMMIT_REPO/commits/CURRENT_COMMIT_HASH) %> + <%= link_to(CURRENT_COMMIT_HASH, "#{CURRENT_COMMIT_REPO}/commits/#{CURRENT_COMMIT_HASH}", style: 'color:#FFFFFF;') %>
From 1fabdb6a7266eb3151d9f4fb491de577e086a193 Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Wed, 16 Oct 2019 21:17:09 +0300 Subject: [PATCH 3/4] Address review comments: https://github.com/internetee/registry/pull/1345#discussion_r333904209 --- app/assets/stylesheets/shared/general.sass | 3 +++ app/views/layouts/admin/base.haml | 2 +- app/views/layouts/registrant/application.html.erb | 2 +- app/views/layouts/registrar/base.html.erb | 2 +- app/views/layouts/registrar/sessions.html.erb | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/shared/general.sass b/app/assets/stylesheets/shared/general.sass index 07b92cdbe..6d1c4956d 100644 --- a/app/assets/stylesheets/shared/general.sass +++ b/app/assets/stylesheets/shared/general.sass @@ -15,6 +15,9 @@ body > .container padding-top: 15px font-size: 10px +a.footer-version-link + color: black + .nowrap white-space: nowrap diff --git a/app/views/layouts/admin/base.haml b/app/views/layouts/admin/base.haml index d893da853..1ea29753d 100644 --- a/app/views/layouts/admin/base.haml +++ b/app/views/layouts/admin/base.haml @@ -32,5 +32,5 @@ .footer.text-right Version - = link_to "#{CURRENT_COMMIT_HASH}", "#{CURRENT_COMMIT_REPO}/commits/#{CURRENT_COMMIT_HASH}", style: 'color:#000000;' + = link_to "#{CURRENT_COMMIT_HASH}", "#{CURRENT_COMMIT_REPO}/commits/#{CURRENT_COMMIT_HASH}", class: 'footer-version-link' = javascript_include_tag 'admin-manifest', async: true diff --git a/app/views/layouts/registrant/application.html.erb b/app/views/layouts/registrant/application.html.erb index 5e6820246..9c3341bd3 100644 --- a/app/views/layouts/registrant/application.html.erb +++ b/app/views/layouts/registrant/application.html.erb @@ -76,7 +76,7 @@
Version - <%= link_to(CURRENT_COMMIT_HASH, "#{CURRENT_COMMIT_REPO}/commits/#{CURRENT_COMMIT_HASH}", style: 'color:#FFFFFF;') %> + <%= link_to(CURRENT_COMMIT_HASH, "#{CURRENT_COMMIT_REPO}/commits/#{CURRENT_COMMIT_HASH}", class: 'footer-version-link') %>
diff --git a/app/views/layouts/registrar/base.html.erb b/app/views/layouts/registrar/base.html.erb index 88d20c319..2fc4cf4a2 100644 --- a/app/views/layouts/registrar/base.html.erb +++ b/app/views/layouts/registrar/base.html.erb @@ -54,7 +54,7 @@
Version - <%= link_to(CURRENT_COMMIT_HASH, "#{CURRENT_COMMIT_REPO}/commits/#{CURRENT_COMMIT_HASH}", style: 'color:#FFFFFF;') %> + <%= link_to(CURRENT_COMMIT_HASH, "#{CURRENT_COMMIT_REPO}/commits/#{CURRENT_COMMIT_HASH}", class: 'footer-version-link') %>
diff --git a/app/views/layouts/registrar/sessions.html.erb b/app/views/layouts/registrar/sessions.html.erb index ca5059ab4..88662a008 100644 --- a/app/views/layouts/registrar/sessions.html.erb +++ b/app/views/layouts/registrar/sessions.html.erb @@ -44,7 +44,7 @@
Version - <%= link_to(CURRENT_COMMIT_HASH, "#{CURRENT_COMMIT_REPO}/commits/#{CURRENT_COMMIT_HASH}", style: 'color:#FFFFFF;') %> + <%= link_to(CURRENT_COMMIT_HASH, "#{CURRENT_COMMIT_REPO}/commits/#{CURRENT_COMMIT_HASH}", class: 'footer-version-link') %>
From 197d19921561ad08e66cc82ee5e6dc8ff40ce6be Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Thu, 16 Apr 2020 16:01:34 +0500 Subject: [PATCH 4/4] Move url generation to helper, made it reliable with ssh git checkout --- app/helpers/application_helper.rb | 11 ++++++++++- app/views/layouts/admin/base.haml | 2 +- app/views/layouts/registrant/application.html.erb | 2 +- app/views/layouts/registrar/base.html.erb | 2 +- app/views/layouts/registrar/sessions.html.erb | 2 +- config/initializers/current_commit_hash.rb | 2 +- 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a4a8e4912..608ddded7 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -33,6 +33,15 @@ module ApplicationHelper end end + def current_commit_link + hash = CURRENT_COMMIT_HASH + current_repo = CURRENT_COMMIT_REPO.gsub('com:', 'com/') + .gsub('git@', 'https://') + .gsub('.git', '') + + link_to hash.to_s, "#{current_repo}/commit/#{hash}", class: 'footer-version-link' + end + def creator_link(model) return 'not present' if model.blank? return 'unknown' if model.creator.blank? @@ -96,4 +105,4 @@ module ApplicationHelper def body_css_class [controller_path.split('/').map!(&:dasherize), action_name.dasherize, 'page'].join('-') end -end \ No newline at end of file +end diff --git a/app/views/layouts/admin/base.haml b/app/views/layouts/admin/base.haml index 1ea29753d..928629ce6 100644 --- a/app/views/layouts/admin/base.haml +++ b/app/views/layouts/admin/base.haml @@ -32,5 +32,5 @@ .footer.text-right Version - = link_to "#{CURRENT_COMMIT_HASH}", "#{CURRENT_COMMIT_REPO}/commits/#{CURRENT_COMMIT_HASH}", class: 'footer-version-link' + = current_commit_link = javascript_include_tag 'admin-manifest', async: true diff --git a/app/views/layouts/registrant/application.html.erb b/app/views/layouts/registrant/application.html.erb index 9c3341bd3..c5290b70f 100644 --- a/app/views/layouts/registrant/application.html.erb +++ b/app/views/layouts/registrant/application.html.erb @@ -76,7 +76,7 @@
Version - <%= link_to(CURRENT_COMMIT_HASH, "#{CURRENT_COMMIT_REPO}/commits/#{CURRENT_COMMIT_HASH}", class: 'footer-version-link') %> + <%= current_commit_link %>
diff --git a/app/views/layouts/registrar/base.html.erb b/app/views/layouts/registrar/base.html.erb index 2fc4cf4a2..5881dd400 100644 --- a/app/views/layouts/registrar/base.html.erb +++ b/app/views/layouts/registrar/base.html.erb @@ -54,7 +54,7 @@
Version - <%= link_to(CURRENT_COMMIT_HASH, "#{CURRENT_COMMIT_REPO}/commits/#{CURRENT_COMMIT_HASH}", class: 'footer-version-link') %> + <%= current_commit_link %>
diff --git a/app/views/layouts/registrar/sessions.html.erb b/app/views/layouts/registrar/sessions.html.erb index 88662a008..ace645199 100644 --- a/app/views/layouts/registrar/sessions.html.erb +++ b/app/views/layouts/registrar/sessions.html.erb @@ -44,7 +44,7 @@
Version - <%= link_to(CURRENT_COMMIT_HASH, "#{CURRENT_COMMIT_REPO}/commits/#{CURRENT_COMMIT_HASH}", class: 'footer-version-link') %> + <%= current_commit_link %>
diff --git a/config/initializers/current_commit_hash.rb b/config/initializers/current_commit_hash.rb index 3038fa33b..edba19a42 100644 --- a/config/initializers/current_commit_hash.rb +++ b/config/initializers/current_commit_hash.rb @@ -1,2 +1,2 @@ CURRENT_COMMIT_HASH = `git rev-parse --short HEAD` -CURRENT_COMMIT_REPO = `git remote get-url origin` \ No newline at end of file +CURRENT_COMMIT_REPO = `git remote get-url origin`