Add meetup logos & social media links + reference Gitter

jenkins-ru · Jul 29, 2018 · 703af26 · 703af26
1 parent 3f65853
commit 703af26
Show file tree

Hide file tree

Showing 10 changed files with 95 additions and 56 deletions.
diff --git a/_config.yml b/_config.yml
@@ -36,21 +36,11 @@ disqus:
 #facebook: myfacebook
 twitter: jenkins_ru
 # google: mygoogle
-# instagram: myinstagram
-# pinterest: mypinterest
-#linkedin: onenashev
 youtube: jenkinsru
 # spotify: myspotify
-#github: oleg-nenashev
-# lastfm: mylastfm
-# stackoverflow: 7044681/mystackoverflow
-# quora: userquora
-# reddit: username
-# vimeo: myvimeo
-# lanyrd: mylanyrd
+#github: oleg-nenashexwv
 email: [email protected]
-#speakerdeck: onenashev
-#slideshare: OlegNenashev
+gitter: jenkinsci-ru/public
 
 authors:
   oleg_nenashev:

diff --git a/_data/meetups.yml b/_data/meetups.yml
@@ -1,12 +1,21 @@
 - id: jenkins_spb
   city: "Санкт-Петербург"
   externalLink: "https://www.meetup.com/St-Petersburg-Jenkins-Meetup/"
+  logo: /assets/images/meetups/jenkins_spb/logo.png
+  meetup: St-Petersburg-Jenkins-Meetup
+  twitter: jenkins_spb
+  telegram: HbH7fhI8FI4zCSDpxD09VA
 - id: jenkins_msk
   city: "Москва"
   externalLink: "https://www.meetup.com/Moscow-Jenkins-Meetup"
+  meetup: Moscow-Jenkins-Meetup
 - id: jenkins_yaroslavl
   city: "Ярославль"
   externalLink: "https://www.meetup.com/Yaroslavl-Jenkins-Meetup/"
+  logo: /assets/images/meetups/jenkins_yaroslavl/logo.png
+  meetup: Yaroslavl-Jenkins-Meetup
 - id: jenkins_by
   city: "Беларусь"
   externalLink: "https://www.meetup.com/Belarus-Jenkins-Meetup"
+  logo: /assets/images/meetups/jenkins_by/logo.png
+  meetup: Belarus-Jenkins-Meetup
diff --git a/_includes/header.html b/_includes/header.html
@@ -17,7 +17,7 @@
         <h1 class="title">{{ site.name }}</h1>
         <h2 class="description">{{ site.bio }}</h2>
 
-        {% include social-links.html %}
+        {% include social-links.html data=site %}
     </header>
 {% endif %}
 

diff --git a/_includes/icons.html b/_includes/icons.html
@@ -16,6 +16,21 @@
 <path class="path1" d="M886.579 319.795c0.41 8.294 0.563 16.691 0.563 24.986 0 255.488-194.406 549.99-549.888 549.99-109.21 0-210.739-32-296.294-86.886 15.155 1.792 30.515 2.714 46.080 2.714 90.624 0 173.926-30.925 240.026-82.688-84.531-1.587-155.955-57.395-180.531-134.195 11.776 2.202 23.91 3.379 36.352 3.379 17.664 0 34.765-2.304 50.944-6.707-88.422-17.818-155.034-95.898-155.034-189.594 0-0.819 0-1.587 0-2.406 26.061 14.49 55.91 23.194 87.552 24.218-51.866-34.714-86.016-93.798-86.016-160.922 0-35.379 9.523-68.608 26.214-97.178 95.283 116.992 237.773 193.894 398.387 201.984-3.277-14.182-4.966-28.877-4.966-44.083 0-106.701 86.477-193.178 193.229-193.178 55.603 0 105.83 23.398 141.107 60.979 43.981-8.704 85.35-24.781 122.726-46.899-14.438 45.107-45.107 82.995-84.992 106.906 39.117-4.71 76.288-15.002 111.002-30.413-25.907 38.81-58.675 72.806-96.461 99.994z"></path>
 </symbol>
 
+<symbol id="icon-meetup" viewBox="0 0 512 512">
+<title>meetup</title>
+<path class="path1" d="M99 414.3c1.1 5.7-2.3 11.1-8 12.3-5.4 1.1-10.9-2.3-12-8-1.1-5.4 2.3-11.1 7.7-12.3 5.4-1.2 11.1 2.3 12.3 8zm143.1 71.4c-6.3 4.6-8 13.4-3.7 20 4.6 6.6 13.4 8.3 20 3.7 6.3-4.6 8-13.4 3.4-20-4.2-6.5-13.1-8.3-19.7-3.7zm-86-462.3c6.3-1.4 10.3-7.7 8.9-14-1.1-6.6-7.4-10.6-13.7-9.1-6.3 1.4-10.3 7.7-9.1 14 1.4 6.6 7.6 10.6 13.9 9.1zM34.4 226.3c-10-6.9-23.7-4.3-30.6 6-6.9 10-4.3 24 5.7 30.9 10 7.1 23.7 4.6 30.6-5.7 6.9-10.4 4.3-24.1-5.7-31.2zm272-170.9c10.6-6.3 13.7-20 7.7-30.3-6.3-10.6-19.7-14-30-7.7s-13.7 20-7.4 30.6c6 10.3 19.4 13.7 29.7 7.4zm-191.1 58c7.7-5.4 9.4-16 4.3-23.7s-15.7-9.4-23.1-4.3c-7.7 5.4-9.4 16-4.3 23.7 5.1 7.8 15.6 9.5 23.1 4.3zm372.3 156c-7.4 1.7-12.3 9.1-10.6 16.9 1.4 7.4 8.9 12.3 16.3 10.6 7.4-1.4 12.3-8.9 10.6-16.6-1.5-7.4-8.9-12.3-16.3-10.9zm39.7-56.8c-1.1-5.7-6.6-9.1-12-8-5.7 1.1-9.1 6.9-8 12.6 1.1 5.4 6.6 9.1 12.3 8 5.4-1.5 9.1-6.9 7.7-12.6zM447 138.9c-8.6 6-10.6 17.7-4.9 26.3 5.7 8.6 17.4 10.6 26 4.9 8.3-6 10.3-17.7 4.6-26.3-5.7-8.7-17.4-10.9-25.7-4.9zm-6.3 139.4c26.3 43.1 15.1 100-26.3 129.1-17.4 12.3-37.1 17.7-56.9 17.1-12 47.1-69.4 64.6-105.1 32.6-1.1.9-2.6 1.7-3.7 2.9-39.1 27.1-92.3 17.4-119.4-22.3-9.7-14.3-14.6-30.6-15.1-46.9-65.4-10.9-90-94-41.1-139.7-28.3-46.9.6-107.4 53.4-114.9C151.6 70 234.1 38.6 290.1 82c67.4-22.3 136.3 29.4 130.9 101.1 41.1 12.6 52.8 66.9 19.7 95.2zm-70 74.3c-3.1-20.6-40.9-4.6-43.1-27.1-3.1-32 43.7-101.1 40-128-3.4-24-19.4-29.1-33.4-29.4-13.4-.3-16.9 2-21.4 4.6-2.9 1.7-6.6 4.9-11.7-.3-6.3-6-11.1-11.7-19.4-12.9-12.3-2-17.7 2-26.6 9.7-3.4 2.9-12 12.9-20 9.1-3.4-1.7-15.4-7.7-24-11.4-16.3-7.1-40 4.6-48.6 20-12.9 22.9-38 113.1-41.7 125.1-8.6 26.6 10.9 48.6 36.9 47.1 11.1-.6 18.3-4.6 25.4-17.4 4-7.4 41.7-107.7 44.6-112.6 2-3.4 8.9-8 14.6-5.1 5.7 3.1 6.9 9.4 6 15.1-1.1 9.7-28 70.9-28.9 77.7-3.4 22.9 26.9 26.6 38.6 4 3.7-7.1 45.7-92.6 49.4-98.3 4.3-6.3 7.4-8.3 11.7-8 3.1 0 8.3.9 7.1 10.9-1.4 9.4-35.1 72.3-38.9 87.7-4.6 20.6 6.6 41.4 24.9 50.6 11.4 5.7 62.5 15.7 58.5-11.1zm5.7 92.3c-10.3 7.4-12.9 22-5.7 32.6 7.1 10.6 21.4 13.1 32 6 10.6-7.4 13.1-22 6-32.6-7.4-10.6-21.7-13.5-32.3-6z"/>
+</symbol>
+
+<symbol id="icon-telegram" viewBox="0 0 496 512">
+<title>telegram</title>
+<path class="path1" d="M248 8C111 8 0 119 0 256s111 248 248 248 248-111 248-248S385 8 248 8zm121.8 169.9l-40.7 191.8c-3 13.6-11.1 16.9-22.4 10.5l-62-45.7-29.9 28.8c-3.3 3.3-6.1 6.1-12.5 6.1l4.4-63.1 114.9-103.8c5-4.4-1.1-6.9-7.7-2.5l-142 89.4-61.2-19.1c-13.3-4.2-13.6-13.3 2.8-19.7l239.1-92.2c11.1-4 20.8 2.7 17.2 19.5z"/>
+</symbol>
+
+<symbol id="icon-gitter" viewBox="0 0 384 512">
+<title>gitter</title>
+<path class="path1" d="M66.4 322.5H16V0h50.4v322.5zM166.9 76.1h-50.4V512h50.4V76.1zm100.6 0h-50.4V512h50.4V76.1zM368 76h-50.4v247H368V76z"/>
+</symbol>
+
 <symbol id="icon-github" viewBox="0 0 1024 1024">
 <title>github</title>
 <path class="path1" d="M674.816 579.021c-36.762 0-66.56 41.318-66.56 92.109 0 50.893 29.798 92.211 66.56 92.211s66.56-41.318 66.56-92.211c-0.051-50.79-29.798-92.109-66.56-92.109zM906.547 339.251c7.629-18.688 7.936-124.877-32.512-226.611 0 0-92.723 10.189-233.011 106.496-29.44-8.192-79.258-12.186-128.973-12.186-49.818 0-99.584 3.994-129.024 12.186-140.339-96.307-233.062-106.496-233.062-106.496-40.397 101.734-39.987 207.923-32.461 226.611-47.514 51.61-76.544 113.613-76.544 198.195 0 367.923 305.306 373.811 382.31 373.811 17.51 0 52.122 0.102 88.781 0.102 36.608 0 71.27-0.102 88.678-0.102 77.107 0 382.31-5.888 382.31-373.811 0-84.582-28.979-146.586-76.493-198.195zM513.434 866.048h-2.867c-193.075 0-343.501-22.989-343.501-210.688 0-45.005 15.872-86.682 53.606-121.293 62.822-57.702 169.216-27.187 289.894-27.187 0.512 0 1.024 0 1.485 0 0.512 0 0.922 0 1.382 0 120.678 0 227.123-30.515 289.997 27.187 37.632 34.611 53.504 76.288 53.504 121.293 0 187.699-150.374 210.688-343.501 210.688zM349.235 579.021c-36.762 0-66.56 41.318-66.56 92.109 0 50.893 29.798 92.211 66.56 92.211 36.813 0 66.611-41.318 66.611-92.211 0-50.79-29.798-92.109-66.611-92.109z"></path>

diff --git a/_includes/social-links.html b/_includes/social-links.html
@@ -1,103 +1,122 @@
 <div class="social-links">
-    {% if site.facebook %}
-        <a class="link" data-title="facebook.com/{{ site.facebook }}" href="http://facebook.com/{{ site.facebook }}" target="_blank">
+
+    {% if include.data.meetup %}
+    <a class="link" data-title="{{ include.data.city }}" href="http://meetup.com/{{ include.data.meetup }}" target="_blank">
+        <svg class="icon icon-meetup"><use xlink:href="#icon-meetup"></use></svg>
+    </a>
+    {% endif %}
+
+    {% if include.data.facebook %}
+        <a class="link" data-title="facebook.com/{{ include.data.facebook }}" href="http://facebook.com/{{ include.data.facebook }}" target="_blank">
             <svg class="icon icon-facebook"><use xlink:href="#icon-facebook"></use></svg>
         </a>
     {% endif %}
 
-    {% if site.twitter %}
-        <a class="link" data-title="twitter.com/{{ site.twitter }}" href="http://twitter.com/{{ site.twitter }}" target="_blank">
+    {% if include.data.twitter %}
+        <a class="link" data-title="twitter.com/{{ include.data.twitter }}" href="http://twitter.com/{{ include.data.twitter }}" target="_blank">
             <svg class="icon icon-twitter"><use xlink:href="#icon-twitter"></use></svg>
         </a>
     {% endif %}
 
-    {% if site.google %}
-        <a class="link" data-title="plus.google.com/+{{ site.google }}" href="http://plus.google.com/+{{ site.google }}" target="_blank">
+    {% if include.data.google %}
+        <a class="link" data-title="plus.google.com/+{{ include.data.google }}" href="http://plus.google.com/+{{ include.data.google }}" target="_blank">
             <svg class="icon icon-google"><use xlink:href="#icon-google"></use></svg>
         </a>
     {% endif %}
 
-    {% if site.instagram %}
-        <a class="link" data-title="instagram.com/{{ site.instagram }}" href="http://instagram.com/{{ site.instagram }}" target="_blank">
+    {% if include.data.instagram %}
+        <a class="link" data-title="instagram.com/{{ include.data.instagram }}" href="http://instagram.com/{{ include.data.instagram }}" target="_blank">
             <svg class="icon icon-instagram"><use xlink:href="#icon-instagram"></use></svg>
         </a>
     {% endif %}
 
-    {% if site.pinterest %}
-        <a class="link" data-title="pinterest.com/{{ site.pinterest }}" href="http://pinterest.com/{{ site.pinterest }}" target="_blank">
+    {% if include.data.pinterest %}
+        <a class="link" data-title="pinterest.com/{{ include.data.pinterest }}" href="http://pinterest.com/{{ include.data.pinterest }}" target="_blank">
             <svg class="icon icon-pinterest"><use xlink:href="#icon-pinterest"></use></svg>
         </a>
     {% endif %}
 
-    {% if site.linkedin %}
-        <a class="link" data-title="linkedin.com/in/{{ site.linkedin }}" href="http://linkedin.com/in/{{ site.linkedin }}" target="_blank">
+    {% if include.data.linkedin %}
+        <a class="link" data-title="linkedin.com/in/{{ include.data.linkedin }}" href="http://linkedin.com/in/{{ include.data.linkedin }}" target="_blank">
             <svg class="icon icon-linkedin"><use xlink:href="#icon-linkedin"></use></svg>
         </a>
     {% endif %}
 
-    {% if site.youtube %}
-        <a class="link" data-title="youtube.com/{{ site.youtube }}" href="http://youtube.com/{{ site.youtube }}" target="_blank">
+    {% if include.data.youtube %}
+        <a class="link" data-title="youtube.com/{{ include.data.youtube }}" href="http://youtube.com/{{ include.data.youtube }}" target="_blank">
             <svg class="icon icon-youtube"><use xlink:href="#icon-youtube"></use></svg>
         </a>
     {% endif %}
 
-    {% if site.spotify %}
-        <a class="link" data-title="open.spotify.com/user/{{ site.spotify }}" href="https://open.spotify.com/user/{{ site.spotify }}" target="_blank">
+    {% if include.data.spotify %}
+        <a class="link" data-title="open.spotify.com/user/{{ include.data.spotify }}" href="https://open.spotify.com/user/{{ include.data.spotify }}" target="_blank">
             <svg class="icon icon-spotify"><use xlink:href="#icon-spotify"></use></svg>
         </a>
     {% endif %}
 
-    {% if site.lastfm %}
-        <a class="link" data-title="last.fm/user/{{ site.lastfm }}" href="https://last.fm/user/{{ site.lastfm }}" target="_blank">
+    {% if include.data.lastfm %}
+        <a class="link" data-title="last.fm/user/{{ include.data.lastfm }}" href="https://last.fm/user/{{ include.data.lastfm }}" target="_blank">
             <svg class="icon icon-lastfm"><use xlink:href="#icon-lastfm"></use></svg>   
         </a>
     {% endif %}
 
-    {% if site.github %}
-        <a class="link" data-title="github.com/{{ site.github }}" href="https://github.com/{{ site.github }}" target="_blank">
+    {% if include.data.github %}
+        <a class="link" data-title="github.com/{{ include.data.github }}" href="https://github.com/{{ include.data.github }}" target="_blank">
             <svg class="icon icon-github"><use xlink:href="#icon-github"></use></svg>
         </a>
     {% endif %}
 
-    {% if site.stackoverflow %}
-        <a class="link" data-title="stackoverflow.com/users/{{ site.stackoverflow }}" href="http://stackoverflow.com/users/{{ site.stackoverflow }}" target="_blank">
+    {% if include.data.stackoverflow %}
+        <a class="link" data-title="stackoverflow.com/users/{{ include.data.stackoverflow }}" href="http://stackoverflow.com/users/{{ include.data.stackoverflow }}" target="_blank">
             <svg class="icon icon-stackoverflow"><use xlink:href="#icon-stackoverflow"></use></svg>
         </a>
     {% endif %}
 
-    {% if site.quora %}
-        <a class="link" data-title="quora.com/profile/{{ site.quora }}" href="https://www.quora.com/profile/{{ site.quora }}" target="_blank">
+    {% if include.data.quora %}
+        <a class="link" data-title="quora.com/profile/{{ include.data.quora }}" href="https://www.quora.com/profile/{{ include.data.quora }}" target="_blank">
             <svg class="icon icon-quora"><use xlink:href="#icon-quora"></use></svg>
         </a>
     {% endif %}
 
-    {% if site.reddit %}
-        <a class="link" data-title="reddit.com/user/{{ site.reddit }}" href="https://www.reddit.com/user/{{ site.reddit }}" target="_blank">
+    {% if include.data.reddit %}
+        <a class="link" data-title="reddit.com/user/{{ include.data.reddit }}" href="https://www.reddit.com/user/{{ include.data.reddit }}" target="_blank">
             <svg class="icon icon-reddit"><use xlink:href="#icon-reddit"></use></svg>
         </a>
     {% endif %}
 
-    {% if site.medium %}
-        <a class="link" data-title="medium.com/@{{ site.medium }}" href="https://medium.com/@{{ site.medium }}" target="_blank">
+    {% if include.data.medium %}
+        <a class="link" data-title="medium.com/@{{ include.data.medium }}" href="https://medium.com/@{{ include.data.medium }}" target="_blank">
             <svg class="icon icon-medium"><use xlink:href="#icon-medium"></use></svg>
         </a>
     {% endif %}
 
-    {% if site.vimeo %}
-        <a class="link" data-title="vimeo.com/{{ site.vimeo }}" href="https://vimeo.com/{{ site.vimeo }}" target="_blank">
+    {% if include.data.vimeo %}
+        <a class="link" data-title="vimeo.com/{{ include.data.vimeo }}" href="https://vimeo.com/{{ include.data.vimeo }}" target="_blank">
             <svg class="icon icon-vimeo"><use xlink:href="#icon-vimeo"></use></svg>
         </a>
     {% endif %}
 
-    {% if site.lanyrd %}
-        <a class="link" data-title="lanyrd.com/{{ site.lanyrd }}" href="https://lanyrd.com/{{ site.lanyrd }}" target="_blank">
+    {% if include.data.lanyrd %}
+        <a class="link" data-title="lanyrd.com/{{ include.data.lanyrd }}" href="https://lanyrd.com/{{ include.data.lanyrd }}" target="_blank">
             <svg class="icon icon-microphone"><use xlink:href="#icon-microphone"></use></svg>
         </a>
     {% endif %}
 
-    {% if site.email %}
-        <a class="link" data-title="{{ site.email }}" href="mailto:{{ site.email }}">
+    {% if include.data.email %}
+        <a class="link" data-title="{{ include.data.email }}" href="mailto:{{ include.data.email }}">
             <svg class="icon icon-mail"><use xlink:href="#icon-mail"></use></svg>
         </a>
     {% endif %}
+
+    {% if include.data.gitter %}
+    <a class="link" data-title="{{ include.data.gitter }}" href="https://gitter.im/{{ include.data.gitter }}" target="_blank">
+        <svg class="icon icon-gitter"><use xlink:href="#icon-gitter"></use></svg>
+    </a>
+    {% endif %}
+
+    {% if include.data.telegram %}
+    <a class="link" data-title="telegram/{{ include.data.telegram }}" href="https://t.me/joinchat/{{ include.data.telegram }}" target="_blank">
+        <svg class="icon icon-telegram"><use xlink:href="#icon-telegram"></use></svg>
+    </a>
+    {% endif %}
 </div>
diff --git a/_layouts/about.html b/_layouts/about.html
@@ -18,6 +18,6 @@ <h1 class="title">{{ page.title }}</h1>
     {{content}}
 </div>
 
-{% include social-links.html %}
+{% include social-links.html data=site %}
 
 {% include footer.html %}
diff --git a/assets/images/meetups/jenkins_by/logo.png b/assets/images/meetups/jenkins_by/logo.png
diff --git a/assets/images/meetups/jenkins_spb/logo.png b/assets/images/meetups/jenkins_spb/logo.png
diff --git a/assets/images/meetups/jenkins_yaroslavl/logo.png b/assets/images/meetups/jenkins_yaroslavl/logo.png
diff --git a/meetups/index.html b/meetups/index.html
@@ -3,25 +3,31 @@
 title: Митапы
 ---
 <section class="list">
-    <p><b>Work in progress...</b></p>
 
     <table>
         {% for meetup in site.data.meetups %}
             <tr>
+                <td width="96px">
+                    {% if meetup.logo %}
+                    <a class="link" href="{{ projectUrl }}">
+                        <img src="{{ meetup.logo }}" alt="{{ meetup.city }} - лого митапа"/>
+                    </a>
+                    {% else %}
+                    <a class="link" href="{{ projectUrl }}">
+                        <img src="{{ site.url }}/{{ site.picture }}" alt="{{ meetup.city }} - лого митапа"/>
+                    </a>
+                    {% endif %}
+                </td>
+                <td width="16px">
+                </td>
                 <td>
                     <div class="item {% if post.star %}star{% endif %}"  align="top">
                         <a class="url" href="{% if meetup.externalLink %}{{ meetup.externalLink }}{% else %}{{ site.url }}{{ meetup.url }}{% endif %}">
                             <h3 class="title">{{ meetup.city }}</h3>
                         </a>
+                        {% include social-links.html data=meetup %}
                     </div>
                 </td>
-                <td width="64px">
-                    {% if meetup.logo %}
-                        <a class="link" href="{{ projectUrl }}">
-                            <img src="{{ meetup.logo }}" alt="{{ meetup.city }} - лого митапа"/>
-                        </a>
-                    {% endif %}
-                </td>
             </tr>
         {% endfor %}
     </table>