Merge ceff7a9 into 08acb69

mikevallano · May 16, 2021 · 164c3b3 · 164c3b3
2 parents 08acb69 + ceff7a9
commit 164c3b3
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 45 deletions.
diff --git a/app/assets/javascripts/z.js b/app/assets/javascripts/z.js
@@ -15,8 +15,7 @@ $(document).ready(function(){
 
   $('#header-movie-search, ul.ui-autocomplete').css({
     'position': 'relative',
-    'max-width': '455px',
-    'z-index': 1100
+    'max-width': '455px'
   });
 
   // Generic selector to trigger autocomplete on the movie show page

diff --git a/app/assets/stylesheets/layouts.scss b/app/assets/stylesheets/layouts.scss
@@ -2,14 +2,7 @@
 @import "fonts";
 
 
-.row {
-  margin: 10px 0px;
-  // clear: both;
-} /* .row */
-
-.shover {
-  height: 50px;
-} /* .shover */
+.row { margin: 10px 0px; }
 
 .navbar-brand {
   font-family: $header-family;

diff --git a/app/views/layouts/_environment_banner.html.erb b/app/views/layouts/_environment_banner.html.erb
@@ -0,0 +1,16 @@
+<% unless Rails.env.production? %>
+  <div style='background-color: darkcyan;
+              color: white;
+              font-family: monospace;
+              font-size: 1.25em;
+              height: 45px;
+              padding: .75em;
+              position: fixed;
+              text-align: center;
+              width: 100%;
+              z-index: 100;
+  '>
+    🐈 😃 👍 <%= Rails.env.upcase %>: <%= "#{EnvironmentBanner.current_branch}" %> 👍 😃 🐈
+  </div>
+  <div style='height: 45px;'></div>
+<% end %>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
@@ -1,4 +1,4 @@
-<nav class="navbar navbar-default navbar-fixed-top navbar-inverse">
+<nav class="navbar navbar-default navbar-inverse">
   <div class="container-fluid">
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -1,37 +1,31 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title><%= raw page_title %></title>
-  <link href='https://fonts.googleapis.com/css?family=Nixie+One|Open+Sans:400,600,700' rel='stylesheet' type='text/css'>
-  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css">
-
-  <%= stylesheet_link_tag    'application', media: 'all'%>
-  <%= javascript_include_tag 'application'%>
-  <%= csrf_meta_tags %>
-
-  <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.2/js/bootstrap.min.js"></script>
-  <script src="//use.fontawesome.com/16a020f0b8.js"></script>
-
-  <!-- Check device width for responsive media queries -->
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-
-  <%= favicon_link_tag "favicon.png" %>
-
-</head>
-<body>
-<div class="container">
-  <div class="shover"></div> <!-- shover -->
-
-  <p id="notice"><%= notice %></p>
-  <p id="alert"><%= alert %></p>
-
-  <%= render "layouts/header" %>
-
-  <%= render "shared/overlay_modal" %>
-
-  <%= yield %>
-
-</div> <!-- container -->
-
-</body>
+  <head>
+    <title><%= raw page_title %></title>
+    <link href='https://fonts.googleapis.com/css?family=Nixie+One|Open+Sans:400,600,700' rel='stylesheet' type='text/css'>
+    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css">
+
+    <%= stylesheet_link_tag    'application', media: 'all'%>
+    <%= javascript_include_tag 'application'%>
+    <%= csrf_meta_tags %>
+
+    <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.2/js/bootstrap.min.js"></script>
+    <script src="//use.fontawesome.com/16a020f0b8.js"></script>
+
+    <!-- Check device width for responsive media queries -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
+    <%= favicon_link_tag "favicon.png" %>
+
+  </head>
+  <body>
+    <%= render "layouts/environment_banner" %>
+    <%= render "layouts/header" %>
+    <div class="container">
+      <p id="notice"><%= notice %></p>
+      <p id="alert"><%= alert %></p>
+      <%= render "shared/overlay_modal" %>
+      <%= yield %>
+    </div>
+  </body>
 </html>
diff --git a/lib/environment_banner.rb b/lib/environment_banner.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module EnvironmentBanner
+  class << self
+    def current_branch
+      if git_available?
+        `git rev-parse --abbrev-ref HEAD`.chomp
+      else
+        ENV.fetch('CURRENT_BRANCH', '--branch-not-found--')
+      end
+    end
+
+    def current_sha
+      if git_available?
+        `git log --oneline -1`
+      else
+        ENV.fetch('CURRENT_SHA', '--sha-not-found--')
+      end
+    end
+
+    def git_available?
+      to_dev_null = '> /dev/null 2>&1'
+      system("which git #{to_dev_null} && git rev-parse --git-dir #{to_dev_null}")
+    end
+  end
+end