Use the same code for gitter links everywhere

content/_layouts/project.html.haml

@@ -38,15 +38,16 @@ layout: default
 
         = document.converter.convert document, 'outline'
 
-      - if page.gitter
+      - if page.links
         %div
           %h4
             Connect
 
-          %ul.list-unstyled
-            %li
-              %a{:src => "https://gitter.im/#{page.gitter}"}
-                %img{:src => "https://badges.gitter.im/#{page.gitter}.svg", :title => 'Join our Gitter chat'}/
+          %ul
+            - if page.links.gitter
+              %li
+                %a{:href => "https://gitter.im/#{page.links.gitter}", :target => "_blank"}
+                  %img{:title => "Gitter", :src => "https://badges.gitter.im/#{page.links.gitter}.svg"}
 
         %div
           - # Only render articles if we have them

content/projects/blueocean/index.html.haml

@@ -7,6 +7,10 @@ css:
   - '/css/blueocean-style.css'
 opengraph:
   image: 'projects/blueocean/img/blueocean.gif'
+
+links:
+  gitter: 'jenkinsci/blueocean-plugin'
+
 ---
 
 %header#header.header

content/projects/evergreen/index.adoc

@@ -5,7 +5,9 @@ section: projects
 tags:
 - evergreen
 - essentials
-gitter: 'jenkins-infra/evergreen'
+
+links:
+  gitter: 'jenkins-infra/evergreen'
 ---
 
 image:/images/evergreen/magician_256.png[Jenkins Evergreen, role=center, float=right]
@@ -125,7 +127,7 @@ link:https://issues.jenkins-ci.org[Jira].
 Issues should be reported for the "JENKINS" Project, and use the "evergreen"
 Component.
 
-A list of the outstanding issues can be found in our 
+A list of the outstanding issues can be found in our
 link:https://issues.jenkins-ci.org/secure/RapidBoard.jspa?rapidView=406[*Jira board*]
 
 === The Four Opens

content/projects/gsoc/index.adoc

@@ -4,6 +4,10 @@ title: "Google Summer of Code"
 section: projects
 tags:
 - gsoc
+
+links:
+  gitter: 'jenkinsci/gsoc-sig'
+
 ---
 
 image:/images/gsoc/jenkins-gsoc-logo_small.png[Jenkins GSoC, role=center, float=right]
@@ -11,11 +15,11 @@ image:/images/gsoc/jenkins-gsoc-logo_small.png[Jenkins GSoC, role=center, float=
 link:https://developers.google.com/open-source/gsoc/[Google Summer of Code]
 (GSoC) is an annual, international, program which encourages
 college-aged students to participate with open source projects during the summer
-break between classes. 
+break between classes.
 
 Students accepted into the program receive a stipend,
 paid by Google, to work well-defined projects to improve or enhance the Jenkins
-project. 
+project.
 In exchange, numerous Jenkins community members volunteer as "mentors"
 for students to help integrate them into the open source community and succeed
 in completing their summer projects.

content/projects/jcasc/index.adoc

@@ -5,6 +5,10 @@ section: projects
 tags:
 - jenkins-configuration-as-code
 - jcasc
+links:
+  gitter: 'jenkinsci/configuration-as-code-plugin'
+
+
 
 ---
 
@@ -12,15 +16,15 @@ The ‘as code’ paradigm is about being able to reproduce and/or restore a ful
 
 == Manage configuration as human-readable config file(s)
 
-Setting up Jenkins is a complex process, as both Jenkins and its plugins require some tuning and configuration, 
+Setting up Jenkins is a complex process, as both Jenkins and its plugins require some tuning and configuration,
 with dozens of parameters to set within the web UI manage section.
 
 Jenkins Configuration as Code allows to define this whole configuration as a simple, human-friendly, plain text yaml syntax. Without any manual step this configuration can be validated and applied to a Jenkins master in fully a reproducible way. With JCasC setting up a new Jenkins master will become a no-brainer event.
 
-== Configure ALL jenkins initial setup 
+== Configure ALL jenkins initial setup
 
 Fully working Jenkins master with:
-  
+
 * **no hands** on keyboard
 * **no click** on UI
 
@@ -32,7 +36,7 @@ Fully working Jenkins master with:
 
 == Getting started
 
-* link:https://github.com/jenkinsci/configuration-as-code-plugin/blob/master/README.md[*Documentation and getting started*] 
+* link:https://github.com/jenkinsci/configuration-as-code-plugin/blob/master/README.md[*Documentation and getting started*]
 * You can ask questions about it on the regular Jenkins Developer mailling list (just prefix with [JCasC]).
 * The link:https://github.com/jenkinsci/configuration-as-code-plugin[source code]
 * Feature requests, bugs and so on are currently tracked via the github link:https://github.com/jenkinsci/configuration-as-code-plugin/issues[issue tracker]

content/sigs/index.html.haml

@@ -29,7 +29,7 @@ title: Jenkins Special Interest Groups
                 Mailing List
           - if item.links.gitter
             %li
-              %a{:href => "https://gitter.im/#{item.links.gitter}?utm_source=share-link&utm_medium=link&utm_campaign=share-link", :target => "_blank"}
+              %a{:href => "https://gitter.im/#{item.links.gitter}", :target => "_blank"}
                 %img{:title => "Gitter", :src => "https://badges.gitter.im/#{item.links.gitter}.svg"}
         %p
           %a{:href => item.url}