Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
akrys committed Jan 7, 2018
2 parents 441aac2 + c9b87c9 commit b6950a8
Show file tree
Hide file tree
Showing 86 changed files with 1,443 additions and 23 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
_site
.idea
.idea
.DS_Store
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
source 'https://rubygems.org'
gem 'github-pages', group: :jekyll_plugins
gem 'minima'
gem 'jekyll-seo-tag'
gem 'minima'
2 changes: 0 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,6 @@ PLATFORMS

DEPENDENCIES
github-pages
jekyll-github-metadata
jekyll-seo-tag
minima

BUNDLED WITH
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ A map filled with people being involved in [REDAXO](https://redaxo.org) CMS. Hos

![Screenshot](https://raw.githubusercontent.com/FriendsOfREDAXO/community/assets/community_02.png)

The screenshot above shows what user entries look like. You’ll even get your own URL for your entry, which is awesome! Look, this is a [link to Markus](https://friendsofredaxo.github.io/community/#staabm).

## How to add and manage your entry?

You can add your marker to the map and manage your data by yourself. Learn about [3 ways how to manage your entry](https://github.com/FriendsOfREDAXO/community/tree/master/_directory)! 🚀
Expand Down
10 changes: 9 additions & 1 deletion SETUP.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,16 @@ To set up the website on your local machine, the following steps are required:
2. Install __Bundler__ if not yet available

$ gem install bundler
3. Install the necessary libraries if not yet available

$ apt install build-essential patch ruby-dev libffi-dev zlib1g-dev liblzma-dev

4. Install __Bundles__ if not yet available

$ bundle install

3. __Start Jekyll__
5. __Start Jekyll__

$ bundle exec jekyll serve

Expand Down
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

theme: minima
repository: FriendsOfREDAXO/community
plugins: ['jekyll-seo-tag']
plugins: []
timezone: Europe/Berlin

# SEO
Expand Down
6 changes: 5 additions & 1 deletion _directory/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ Learn about 3 ways how to manage your entry:

__This is the best option:__ fork the repo, add or update your entry and send a pull request. Once merged, it will be live on the map! 💯

👉 Did you know you don’t need to work with Git to add your entry? GitHub provides all the tools on its website and you can start using them immediately, see [Howto: add your entry via GitHub website](https://github.com/FriendsOfREDAXO/community/blob/master/_directory/howto-add-entry-via-github.md).

## 2. Open an issue

Second best option: if you’re not familiar with forking and pull requests, just open a [GitHub issue](https://github.com/FriendsOfREDAXO/community/issues) with your data inside. We’ll take care and add your data to the map.
Expand All @@ -22,10 +24,12 @@ Btw: what data? 👇

Have a look at the example file [`.data.example.yml`](https://github.com/FriendsOfREDAXO/community/blob/master/_directory/.data.example.yml). Aside from dummy data it contains a lot of __helpful comments__ on how to structure your data!

For your entry, add a new folder inside of `_directory/data`. It is best to name the folder after your name so that you can find it later. Add a `data.yml` which contains your data according to the example file. Also add an image to the folder, if you don’t want to refer to an external image (like gravatar.com).
For your entry, add a new folder inside of `_directory/data`. It is best to name the folder after your name so that you can find it later and get a cool URL for it! (just like [Jan](https://friendsofredaxo.github.io/community/#dergel) has one). Add a `data.yml` which contains your data according to the example file. Also add an image to the folder, if you don’t want to refer to an external image (like gravatar.com or your GitHub profile picture).

If you're not sure, take a look at existing user folders to see how to do it. And no worries, the data is always save, you cannot do anything wrong!

## What data should I provide?

The map requires your name or nickname and your geo position. Everything else is optional. Of course we'd all love to read more about you and maybe see your picture! But it’s completely up to you whether to provide it or not!

❤️
Binary file added _directory/data/alexwenz/alexwenz.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions _directory/data/alexwenz/data.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
# name (required)
# may be your real name or your nick; not your company name.
# teams: feel free to add multiple entries for each of your members!
name: Alex Wenz

# geo location (required)
# provide your favored level of detail by number of digits (like 50.107811 vs 50.11)
# you may use services like openstreetmap.org to find out your geo location
latitude: 50.0739730
longitude: 8.2388930

# bio
# describe yourself, your involvement in the project and the community or whatever is relevant for you.
# should be 300 chars at maximum. no markup or line breaks!
bio: ""

# image or gravatar
# provide image file from current folder (like 'johndoe.jpg') or gravatar url (generated via https://3v4l.org/OXG7H)
# should be square and about 200-300 px size!
image: alexwenz.jpg

# links
# one or more links to your website, your github profile, twitter, facebook et al.
# 4 links, tops!
links:
- https://redaxo.org/support/agenturen/alex-wenz-_-digitale-medien-wenz-alex/

---
30 changes: 30 additions & 0 deletions _directory/data/alissadreiling/data.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
# name (required)
# may be your real name or your nick; not your company name.
# teams: feel free to add multiple entries for each of your members!
name: Alissa Dreiling

# geo location (required)
# provide your favored level of detail by number of digits (like 50.107811 vs 50.11)
# you may use services like openstreetmap.org to find out your geo location
latitude: 50.2749534
longitude: 8.649196

# bio
# describe yourself, your involvement in the project and the community or whatever is relevant for you.
# should be 300 chars at maximum. no markup or line breaks!
bio: "Hey, ich bin Alissa von der Denksportler Grafikmanufaktur, wir kümmern uns um die grafischen Belange von kleinen und mittelständigen Unternehmen. Wir arbeiten schon seit Jahren mit Redaxo und lieben es!"

# image or gravatar
# provide image file from current folder (like 'johndoe.jpg') or gravatar url (generated via https://3v4l.org/OXG7H)
# should be square and about 200-300 px size!
image: https://www.gravatar.com/avatar/f9c2c7ccc788353cf87978fd391ab942?s=200

# links
# one or more links to your website, your github profile, twitter, facebook et al.
# 4 links, tops!
links:
- https://www.denksportler-grafikmanufaktur.de
- https://www.facebook.com/Denksportler

---
29 changes: 29 additions & 0 deletions _directory/data/andreastietz/data.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
# name (required)
# may be your real name or your nick; not your company name.
# teams: feel free to add multiple entries for each of your members!
name: Andreas (Tito) Tietz

# geo location (required)
# provide your favored level of detail by number of digits (like 50.107811 vs 50.11)
# you may use services like openstreetmap.org to find out your geo location
latitude: 50.780
longitude: 6.100

# bio
# describe yourself, your involvement in the project and the community or whatever is relevant for you.
# should be 300 chars at maximum. no markup or line breaks!
bio: "In addition to my work for Aachen's biggest marketing agency (where I work with Redaxo as well), I also build websites with Redaxo on a part-time basis. And this since 2005 with growing enthusiasm."

# image or gravatar
# provide image file from current folder (like 'johndoe.jpg') or gravatar url (generated via https://3v4l.org/OXG7H)
# should be square and about 200-300 px size!
image: tito_300.jpg

# links
# one or more links to your website, your github profile, twitter, facebook et al.
# 4 links, tops!
links:
- http://tietz-munoz.de

---
Binary file added _directory/data/andreastietz/tito_300.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions _directory/data/beategoeckeritz/data.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
# name (required)
# may be your real name or your nick; not your company name.
# teams: feel free to add multiple entries for each of your members!
name: Beate Göckeritz

# geo location (required)
# provide your favored level of detail by number of digits (like 50.107811 vs 50.11)
# you may use services like openstreetmap.org to find out your geo location
latitude: 50.2683000
longitude: 10.9748500

# bio
# describe yourself, your involvement in the project and the community or whatever is relevant for you.
# should be 300 chars at maximum. no markup or line breaks!
bio: "Allrounder at GN2: screendesign, frontend development, fresh air, espresso. Most of the time into WordPress, but ♥ connected with REDAXO!"

# image or gravatar
# provide image file from current folder (like 'johndoe.jpg') or gravatar url (generated via https://3v4l.org/OXG7H)
# should be square and about 200-300 px size!
image: beategoeckeritz.png

# links
# one or more links to your website, your github profile, twitter, facebook et al.
# 4 links, tops!
links:
- http://www.gn2.de

---
Binary file added _directory/data/bertram/bertram.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions _directory/data/bertram/data.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
# name (required)
# may be your real name or your nick; not your company name.
# teams: feel free to add multiple entries for each of your members!
name: Bertram

# geo location (required)
# provide your favored level of detail by number of digits (like 50.107811 vs 50.11)
# you may use services like openstreetmap.org to find out your geo location
latitude: 48.19115
longitude: 16.36356

# bio
# describe yourself, your involvement in the project and the community or whatever is relevant for you.
# should be 300 chars at maximum. no markup or line breaks!
bio: "Bertram bewegt sich gerne in den Weiten des Webs. Redaxo nennt sich die Matrix in der er sich bewegt, weil „code is poetry“ und Bertram liest gerne. Er schaut auch gerne mal ins Grüne, liebt aber die Stadt, die gut aufgelegt auch einmal zum Tanzen einlädt."

# image or gravatar
# provide image file from current folder (like 'johndoe.jpg') or gravatar url (generated via https://3v4l.org/OXG7H)
# should be square and about 200-300 px size!
image: bertram.jpg

# links
# one or more links to your website, your github profile, twitter, facebook et al.
# 4 links, tops!
links:
- http://www.beast.at

---
28 changes: 28 additions & 0 deletions _directory/data/brandes-webdesign/data.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
# name (required)
# may be your real name or your nick
name: Mirco Brandes

# geo location (required)
# provide your favored level of detail by number of digits (like 50.107811 vs 50.11)
# you may use services like openstreetmap.org to find out your geo location
latitude: 49.742914
longitude: 6.700444

# bio
# describe yourself, your involvement in the project and the community or whatever is relevant for you.
# should be 300 chars at maximum. no markup or line breaks!
bio: "Redaxo Programierer seit 2007. Ich setze für Agenturen und Grafiker deren Designvorlagen 1:1 fürs CMS Redaxo um und erstelle dafür responsive Templates, sowie die passenden Module und Addons."

# image or gravatar
# provide image file from current folder (like 'johndoe.jpg') or gravatar url (like 'https://www.gravatar.com/avatar/{HASH}')
# should be square and about 200-300 px size!
image: mirco_brandes.jpg

# links
# one or more links to your website, your github profile, twitter, facebook et al.
# 4 links, tops!
links:
- http://www.brandes-webdesign.de

---
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions _directory/data/c-reiss/data.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
# name (required)
# may be your real name or your nick; not your company name.
# teams: feel free to add multiple entries for each of your members!
name: Christian Reiß

# geo location (required)
# provide your favored level of detail by number of digits (like 50.107811 vs 50.11)
# you may use services like openstreetmap.org to find out your geo location
latitude: 49.832539
longitude: 8.7504448

# bio
# describe yourself, your involvement in the project and the community or whatever is relevant for you.
# should be 300 chars at maximum. no markup or line breaks!
bio: "Developer at Manétage for Redaxo."

# links
# one or more links to your website, your github profile, twitter, facebook et al.
# 4 links, tops!
links:
- http://www.manetage.de

---
29 changes: 29 additions & 0 deletions _directory/data/chrfickinger/data.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
# name (required)
# may be your real name or your nick; not your company name.
# teams: feel free to add multiple entries for each of your members!
name: Christian Fickinger

# geo location (required)
# provide your favored level of detail by number of digits (like 50.107811 vs 50.11)
# you may use services like openstreetmap.org to find out your geo location
latitude: 49.27
longitude: 7.11

# bio
# describe yourself, your involvement in the project and the community or whatever is relevant for you.
# should be 300 chars at maximum. no markup or line breaks!
bio: ""

# image or gravatar
# provide image file from current folder (like 'johndoe.jpg') or gravatar url (generated via https://3v4l.org/OXG7H)
# should be square and about 200-300 px size!
#image: johndoe.jpg

# links
# one or more links to your website, your github profile, twitter, facebook et al.
# 4 links, tops!
links:
- https://github.com/chrfickinger

---
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions _directory/data/christophstaeblein/data.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
# name (required)
# may be your real name or your nick; not your company name.
# teams: feel free to add multiple entries for each of your members!
name: Christoph Stäblein

# geo location (required)
# provide your favored level of detail by number of digits (like 50.107811 vs 50.11)
# you may use services like openstreetmap.org to find out your geo location
latitude: 53.3460359
longitude: -6.2650629

# bio
# describe yourself, your involvement in the project and the community or whatever is relevant for you.
# should be 300 chars at maximum. no markup or line breaks!
bio: "Hey, I’m a globetrotter. Frontend and backend development in Myanmar and Ireland. Canada next. OXID and WordPress, but I have been involved in REDAXO for several years."

# image or gravatar
# provide image file from current folder (like 'johndoe.jpg') or gravatar url (generated via https://3v4l.org/OXG7H)
# should be square and about 200-300 px size!
image: christophstaeblein.png

# links
# one or more links to your website, your github profile, twitter, facebook et al.
# 4 links, tops!
links:
- https://www.facebook.com/BottysLifeLog
- https://www.gn2-netwerk.de

---
30 changes: 30 additions & 0 deletions _directory/data/cukabeka/data.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
# name (required)
# may be your real name or your nick; not your company name.
# teams: feel free to add multiple entries for each of your members!
name: cukabeka

# geo location (required)
# provide your favored level of detail by number of digits (like 50.107811 vs 50.11)
# you may use services like openstreetmap.org to find out your geo location
latitude: 51.2103883
longitude: 6.7730429

# bio
# describe yourself, your involvement in the project and the community or whatever is relevant for you.
# should be 300 chars at maximum. no markup or line breaks!
bio: "Grüetzi! I'm a designer, developer and REDAXO enthusiast since Version 3, building and tweaking projects for happy clients."

# image or gravatar
# provide image file from current folder (like 'johndoe.jpg') or gravatar url (generated via https://3v4l.org/OXG7H)
# should be square and about 200-300 px size!
image: redaxo-map.jpg

# links
# one or more links to your website, your github profile, twitter, facebook et al.
# 4 links, tops!
links:
- https://github.com/cukabeka
- https://twitter.com/cukabeka

---
Binary file added _directory/data/cukabeka/redaxo-map.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit b6950a8

Please sign in to comment.