Merge pull request #105 from broadinstitute/development

Branding group fixes

Author: bistline

app/assets/stylesheets/application.css.scss

@@ -590,3 +590,6 @@ h4, .h4, h5, .h5, h6, .h6 {
   border-radius: 10px;
 }
 
+.table-striped {
+  background-color: white !important;
+}

app/helpers/application_helper.rb

@@ -4,13 +4,13 @@ module ApplicationHelper
 	def scp_link_to(name, url, html_options={}, &block)
 		if url.start_with?('https') || url.start_with?('/')
 			current_url = request.fullpath
-			if current_url.include?('brand=')
+			if current_url.include?('scpbr=')
 				current_params = current_url.split('?').last.split('&')
-				current_project = current_params.detect {|p| p =~ /brand=/}.gsub(/brand=/, '')
+				current_project = current_params.detect {|p| p =~ /scpbr=/}.gsub(/scpbr=/, '')
 				if !url.include?('?')
-					url += "?brand=#{current_project}"
+					url += "?scpbr=#{current_project}"
 				else
-					url += "&brand=#{current_project}"
+					url += "&scpbr=#{current_project}"
 				end
 			end
 		end

app/views/layouts/_nav.html.erb

@@ -43,7 +43,7 @@
               <li role="separator" class="divider"></li>
               <li class="dropdown-header">My Brands</li>
               <% current_user.available_branding_groups.each do |branding_group| %>
-                <li id="<%= branding_group.name_as_id %>-nav"><%= link_to "<i class='fa fa-copyright fa-fw'></i> #{branding_group.name}".html_safe, site_path(brand: branding_group.name_as_id) %></li>
+                <li id="<%= branding_group.name_as_id %>-nav"><%= link_to "<i class='fa fa-copyright fa-fw'></i> #{branding_group.name}".html_safe, site_path(scpbr: branding_group.name_as_id) %></li>
               <% end %>
             <% end %>
             <% if @selected_branding_group.present? %>