From e1e0bdb4fc732928eb8da0d40394d68e6fc2bd71 Mon Sep 17 00:00:00 2001
From: Jan-Frederik Rieckers <rieckers@uni-bremen.de>
Date: Fri, 1 Dec 2017 20:40:46 +0100
Subject: [PATCH] Add possibility to link to mastodon

---
 app/assets/fonts/mastodon.eot                 | Bin 0 -> 5796 bytes
 app/assets/fonts/mastodon.otf                 | Bin 0 -> 4068 bytes
 app/assets/fonts/mastodon.svg                 |  14 ++++++
 app/assets/fonts/mastodon.ttf                 | Bin 0 -> 5628 bytes
 app/assets/fonts/mastodon.woff                | Bin 0 -> 3204 bytes
 app/assets/stylesheets/application.css        |   1 +
 app/assets/stylesheets/mastodon.css.scss      |  45 ++++++++++++++++++
 app/controllers/admin/contacts_controller.rb  |   2 +-
 app/models/contact.rb                         |   4 +-
 app/views/admin/contacts/edit.html.haml       |   1 +
 app/views/conferences/_social_media.html.haml |  21 ++++++++
 .../20171201163628_add_mastodon_to_contact.rb |   5 ++
 db/schema.rb                                  |   3 +-
 13 files changed, 92 insertions(+), 4 deletions(-)
 create mode 100755 app/assets/fonts/mastodon.eot
 create mode 100755 app/assets/fonts/mastodon.otf
 create mode 100755 app/assets/fonts/mastodon.svg
 create mode 100755 app/assets/fonts/mastodon.ttf
 create mode 100755 app/assets/fonts/mastodon.woff
 create mode 100755 app/assets/stylesheets/mastodon.css.scss
 create mode 100644 app/views/conferences/_social_media.html.haml
 create mode 100644 db/migrate/20171201163628_add_mastodon_to_contact.rb

diff --git a/app/assets/fonts/mastodon.eot b/app/assets/fonts/mastodon.eot
new file mode 100755
index 0000000000000000000000000000000000000000..59cd79abcb858d809fcb753eb4c4e1bffbd75b08
GIT binary patch
literal 5796
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
P*#5q9{16Al7}0+L>gMVi

literal 0
HcmV?d00001

diff --git a/app/assets/fonts/mastodon.otf b/app/assets/fonts/mastodon.otf
new file mode 100755
index 0000000000000000000000000000000000000000..2d415249aba8713392bcbc0b37aca624f5f63afa
GIT binary patch
literal 4068
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
TgYRDX);3T1vc=s@ONjmf)Ll4R

literal 0
HcmV?d00001

diff --git a/app/assets/fonts/mastodon.svg b/app/assets/fonts/mastodon.svg
new file mode 100755
index 00000000..8ea5bf6e
--- /dev/null
+++ b/app/assets/fonts/mastodon.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Copyright (C) 2017 by original authors @ fontello.com</metadata>
+<defs>
+<font id="mastodon" horiz-adv-x="1000" >
+<font-face font-family="mastodon" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
+<missing-glyph horiz-adv-x="1000" />
+<glyph glyph-name="logo" unicode="&#xe800;" d="M947 251c-14-71-123-148-248-163-66-8-130-15-199-12-112 5-200 27-200 27 0-11 0-21 2-31 14-111 109-118 200-121 91-3 172 23 172 23l3-83c0 0-63-34-177-40-62-3-140 2-230 25-197 52-230 262-235 474-2 63-1 122-1 172 0 217 142 280 142 280 72 33 195 47 323 48l3 0c128-1 251-15 322-48 0 0 142-63 142-280 0 0 2-160-19-271m-148 254l0-263-104 0 0 255c0 54-23 81-68 81-50 0-75-32-75-96l0-140-104 0 0 140c0 64-25 96-75 96-45 0-68-27-68-81l0-255-104 0 0 263c0 54 14 96 41 128 29 31 66 48 112 48 53 0 93-21 120-62l26-43 26 43c27 41 67 62 120 62 46 0 83-17 112-48 27-32 41-74 41-128" horiz-adv-x="1000" />
+
+<glyph glyph-name="logo_alt" unicode="&#xe801;" d="M945 251c-14-71-122-148-247-163-65-8-129-15-198-12-112 5-200 27-200 27 0-11 1-22 2-31 15-111 110-118 199-121 91-3 172 23 172 23l4-83c0 0-64-34-177-40-62-4-139 1-230 25-195 52-229 262-234 474-1 63 0 122 0 172 0 217 141 280 141 280 72 33 194 47 322 48l3 0c127-1 250-15 321-48 0 0 142-63 142-280 0 0 2-160-20-271m-628 183c0-39-31-70-70-70-38 0-70 31-70 70 0 39 32 71 70 71 39 0 70-32 70-71m253 0c0-39-31-70-70-70-39 0-70 31-70 70 0 39 31 71 70 71 39 0 70-32 70-71m253 0c0-39-32-70-70-70-39 0-70 31-70 70 0 39 31 71 70 71 38 0 70-32 70-71" horiz-adv-x="1000" />
+</font>
+</defs>
+</svg>
\ No newline at end of file
diff --git a/app/assets/fonts/mastodon.ttf b/app/assets/fonts/mastodon.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..60c8ad301a75b01a6e6e32dca987434abea9989f
GIT binary patch
literal 5628
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
Ch}UEQ

literal 0
HcmV?d00001

diff --git a/app/assets/fonts/mastodon.woff b/app/assets/fonts/mastodon.woff
new file mode 100755
index 0000000000000000000000000000000000000000..733653731186078c6fbc05d6c5c2e1d58e150c9e
GIT binary patch
literal 3204
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

literal 0
HcmV?d00001

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index c95bbb87..0767d15d 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -18,4 +18,5 @@
  *= require osem-navbar
  *= require selectize
  *= require selectize.bootstrap3
+ *= require mastodon
 */
diff --git a/app/assets/stylesheets/mastodon.css.scss b/app/assets/stylesheets/mastodon.css.scss
new file mode 100755
index 00000000..ddb481d1
--- /dev/null
+++ b/app/assets/stylesheets/mastodon.css.scss
@@ -0,0 +1,45 @@
+@font-face {
+  font-family: 'mastodon';
+  src: font-url('mastodon.eot');
+  src: local('☺'),
+       font-url('mastodon.otf') format('opentype'),
+       font-url('mastodon.woff') format('woff'),
+       font-url('mastodon.ttf') format('truetype'),
+       font-url('mastodon.svg') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+
+ [class^="icon-"]:before, [class*=" icon-"]:before {
+  font-family: "mastodon";
+  font-style: normal;
+  font-weight: normal;
+  speak: none;
+
+  display: inline-block;
+  text-decoration: inherit;
+  width: 1em;
+  margin-right: .2em;
+  text-align: center;
+  /* opacity: .8; */
+
+  /* For safety - reset parent styles, that can break glyph codes*/
+  font-variant: normal;
+  text-transform: none;
+
+  /* fix buttons height, for twitter bootstrap */
+  line-height: 1em;
+
+  /* you can be more comfortable with increased icons size */
+  /* font-size: 120%; */
+
+  /* Font smoothing. That was taken from TWBS */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+  /* Uncomment for 3D effect */
+  /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
+}
+
+.icon-mastodon:before { content: '\e800'; } /* '' */
+.icon-mastodon_alt:before { content: '\e801'; } /* '' */
diff --git a/app/controllers/admin/contacts_controller.rb b/app/controllers/admin/contacts_controller.rb
index 72ac0d42..1003e098 100644
--- a/app/controllers/admin/contacts_controller.rb
+++ b/app/controllers/admin/contacts_controller.rb
@@ -22,7 +22,7 @@ module Admin
 
     # Only allow a trusted parameter "white list" through.
     def contact_params
-      params.require(:contact).permit(:social_tag, :email, :facebook, :googleplus, :twitter, :instagram, :public, :sponsor_email)
+      params.require(:contact).permit(:social_tag, :email, :facebook, :googleplus, :twitter, :instagram, :mastodon, :public, :sponsor_email)
     end
   end
 end
diff --git a/app/models/contact.rb b/app/models/contact.rb
index 799c8748..dd7196dd 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -5,11 +5,11 @@ class Contact < ApplicationRecord
 
   validates :conference, presence: true
   # Conferences only have one contact
-  validates :facebook, :twitter, :googleplus, :instagram,
+  validates :facebook, :twitter, :googleplus, :instagram, :mastodon,
             format: URI::regexp(%w(http https)), allow_blank: true
 
   def has_social_media?
-    return true if facebook.present? || twitter.present? || googleplus.present? || instagram.present? || email.present?
+    return true if facebook.present? || twitter.present? || googleplus.present? || instagram.present? || mastodon.present? || email.present?
     false
   end
 end
diff --git a/app/views/admin/contacts/edit.html.haml b/app/views/admin/contacts/edit.html.haml
index db06dd7e..1c48e48a 100644
--- a/app/views/admin/contacts/edit.html.haml
+++ b/app/views/admin/contacts/edit.html.haml
@@ -16,4 +16,5 @@
         = f.input :googleplus, label: 'Google+ Url', hint: 'This will appear in the social media section as the link to the Google+ Page of your Conference'
         = f.input :twitter, hint: 'This will appear in the social media section as the link to the Twitter Page of your Conference'
         = f.input :instagram, hint: 'This will appear in the social media section as the link to the Instagram Page of your Conference'
+        = f.input :mastodon, hint: 'This will appear in the social media section as the link to the Mastodon Page of your Conference'
       = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }
diff --git a/app/views/conferences/_social_media.html.haml b/app/views/conferences/_social_media.html.haml
new file mode 100644
index 00000000..49216b6c
--- /dev/null
+++ b/app/views/conferences/_social_media.html.haml
@@ -0,0 +1,21 @@
+.container
+  .row
+    .col-md-12.text-center
+      - unless @conference.contact.facebook.blank?
+        = link_to "#{ @conference.contact.facebook }" do
+          %i.fa.fa-facebook-square.fa-4x
+      - unless @conference.contact.twitter.blank?
+        = link_to "#{ @conference.contact.twitter }" do
+          %i.fa.fa-twitter.fa-4x
+      - unless @conference.contact.instagram.blank?
+        = link_to "#{ @conference.contact.instagram }" do
+          %i.fa.fa-instagram.fa-4x
+      - unless @conference.contact.googleplus.blank?
+        = link_to "#{ @conference.contact.googleplus }" do
+          %i.fa.fa-google-plus-square.fa-4x
+      - unless @conference.contact.mastodon.blank?
+        = link_to "#{ @conference.contact.mastodon }" do
+          %i.fa.icon-mastodon.fa-4x
+      - unless @conference.contact.email.blank?
+        = mail_to "#{ @conference.contact.email }" do
+          %i.fa.fa-envelope-o.fa-4x
diff --git a/db/migrate/20171201163628_add_mastodon_to_contact.rb b/db/migrate/20171201163628_add_mastodon_to_contact.rb
new file mode 100644
index 00000000..9b022019
--- /dev/null
+++ b/db/migrate/20171201163628_add_mastodon_to_contact.rb
@@ -0,0 +1,5 @@
+class AddMastodonToContact < ActiveRecord::Migration
+  def change
+    add_column :contacts, :mastodon, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 43602f9b..ed33d5a3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20171130172334) do
+ActiveRecord::Schema.define(version: 20171201163628) do
 
   create_table "ahoy_events", force: :cascade do |t|
     t.integer  "visit_id"
@@ -145,6 +145,7 @@ ActiveRecord::Schema.define(version: 20171130172334) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "sponsor_email"
+    t.string   "mastodon"
   end
 
   create_table "delayed_jobs", force: :cascade do |t|