Merge pull request #571 from hilarysk/hilarysk/issue-564-no-clear-ind…

…icator-in-the-header-re-what-page-youre-currently-viewing

Issue #564 - No clear indicator in the header re: what page you're currently viewing

app/assets/stylesheets/application.css

@@ -32,6 +32,23 @@ hr {
   margin: 5px 5px 25px 5px;
 }
 
+.flash {
+  font-weight: 500;
+  margin-top: 20px;
+  padding: 20px;
+}
+
+.flash.notice {
+  background-color: #DCF5F9;
+  border: 1px solid #147694; /* same color as the standard link color */
+
+}
+
+.flash.alert {
+  background-color: #FCEDE9;
+  border: 1px solid #9d3515; /* same color as the error color */
+}
+
 .button-add {
   margin-bottom: 30px;
 }
@@ -42,11 +59,11 @@ hr {
 
 .navigation {
   margin-top: 5%;
+  position: relative;
 }
 
 .navigation a {
-  color: #9b9b9b;
-  margin-left: 20px;
+  color: #757575;
 }
 
 .navigation a:hover {
@@ -81,6 +98,12 @@ li .heading {
 .navigation ul li {
   display: inline;
   font-size: 18px;
+  margin-left: 20px;
+  padding-bottom: 10px;
+}
+
+.navigation ul li.active {
+  border-bottom: 1px solid #757575;
 }
 
 .row {
@@ -141,9 +164,15 @@ fieldset.fieldset legend {
     margin-right: 0;
   }
 
+  .navigation ul li.active {
+    border-bottom: 0;
+    font-weight: 500;
+  }
+
   .navigation a {
     margin-left: 0px;
   }
+
   .navigation button {
     margin-left: 0px;
   }

app/controllers/submissions_controller.rb

@@ -12,6 +12,7 @@ def create
     else
       @proposal = @submission.proposal
       @events = Event.all.order('name ASC')
+
       render 'new'
     end
   end
@@ -24,10 +25,10 @@ def edit
   def update
     @submission = Submission.find(params[:id])
     @proposal = @submission.proposal
+
     if verify_recaptcha(model: @submission) && @submission.update(submission_params)
       redirect_to proposal_path(@proposal)
     else
-      flash[:alert] = 'Failed to update submission'
       render 'edit'
     end
   end

app/controllers/tags_controller.rb

@@ -5,6 +5,15 @@ def index
 
   def show
     @tag =  ActsAsTaggableOn::Tag.find_by(name: params[:id])
-    @proposals = Proposal.tagged_with(@tag.name)
+
+    if @tag.present?
+      @proposals = Proposal.tagged_with(@tag.name)
+    else
+      notice =
+        "We don't currently have a tag for \"#{params[:id]}\" - but
+        you can <a href='#{new_proposal_path}'>create a proposal and add it as a new tag.</a>"
+
+      redirect_to tags_path, notice: notice
+    end
   end
 end

app/helpers/navigation_helper.rb

@@ -0,0 +1,5 @@
+module NavigationHelper
+  def header_link_class(site_section_path)
+    return "active" if request.path.split("/").second == site_section_path
+  end
+end

app/views/layouts/application.html.erb

@@ -14,17 +14,17 @@
     <a href="https://github.com/nodunayo/speakerline" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="fill:#70B7FD; color:#fff; position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
     <div class="container">
       <% flash.each do |key, value| %>
-        <%= content_tag :div, value, class: "flash #{key}" %>
+        <%= content_tag :div, value.html_safe, class: "flash #{key}" %>
       <% end %>
 
       <div class="navigation">
         <ul>
           <li><%= link_to 'Speakerline', root_path, class: 'heading' %></li>
           <div class="inline align-right">
-            <li><%= link_to 'Speakers', speakers_path %></li>
-            <li><%= link_to 'Proposals', proposals_path %></li>
-            <li><%= link_to 'Events', events_path %></li>
-            <li><%= link_to 'Tags', tags_path %></li>
+            <li class="<%= header_link_class("speakers") %>"><%= link_to 'Speakers', speakers_path %></li>
+            <li class="<%= header_link_class("proposals") %>"><%= link_to 'Proposals', proposals_path %></li>
+            <li class="<%= header_link_class("events") %>"><%= link_to 'Events', events_path %></li>
+            <li class="<%= header_link_class("tags") %>"><%= link_to 'Tags', tags_path %></li>
           </div>
         </ul>
       </div>