Skip to content

Commit

Permalink
Merge pull request #645 from schul-cloud/pilot-schools-about
Browse files Browse the repository at this point in the history
add schools to about page
  • Loading branch information
Niklas Kiefer authored Apr 23, 2018
2 parents dd66b19 + 1c3cd70 commit 841a40d
Show file tree
Hide file tree
Showing 35 changed files with 298 additions and 76 deletions.
6 changes: 5 additions & 1 deletion controllers/about.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ const express = require('express');
const router = express.Router();
const authHelper = require('../helpers/authentication');

// Schools
const schools = require('../helpers/content/schools.json');

router.get('/', function (req, res, next) {

authHelper.isAuthenticated(req).then(isAuthenticated => {
Expand All @@ -14,7 +17,8 @@ router.get('/', function (req, res, next) {
return Promise.resolve(template);
}).then( template =>
res.render(template, {
inline: !!template.includes('guest')
inline: !!template.includes('guest'),
schools
})
);
});
Expand Down
141 changes: 141 additions & 0 deletions helpers/content/schools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
{
"bp": [
{
"name": "Elisabethenschule Frankfurt am Main",
"logo": "/images/schools/bp/Elisabethenschule-Frankfurt-am-Main.png",
"url": "http://www.elisabethenschule.net/eli-news.html"
},
{
"name": "Georg-Christoph-Lichtenberg-Schule Kassel",
"logo": "/images/schools/bp/Georg-Christoph-Lichtenberg-Schule Kassel.jpg",
"url": "http://lg-ks.de/"
},
{
"name": "Gymnasium Carolinum Neustrelitz",
"logo": "/images/schools/bp/Gymnasium Carolinum Neustrelitz.jpg",
"url": "https://www.carolinum.de/"
},
{
"name": "Gymnasium Marianum Meppen",
"logo": "/images/schools/bp/Gymnasium Marianum Meppen.jpg",
"url": "http://www.marianum-meppen.de/"
},
{
"name": "Hohenstaufen-Gymnasium Kaiserslautern",
"logo": "/images/schools/bp/Hohenstaufen-Gymnasium Kaiserslautern.png",
"url": "https://www.hsg-kl.de/"
},
{
"name": "Johann-Michael-Sailer-Gymnasium Dillingen",
"logo": "/images/schools/bp/Johann-Michael-Sailer-Gymnasium Dillingen.png",
"url": "http://www.sailer-gymnasium.de/"
},
{
"name": "Wilhelm-Hittorf-Gymnasium Münster",
"logo": "/images/schools/bp/Wilhelm-Hittorf-Gymnasium Münster.png",
"url": "http://www.wilhelm-hittorf-gymnasium.de/aktuelles/"
}
],
"others": [
{
"name": "Dientzenhofer-Gymnasium",
"logo": "/images/schools/Dientzenhofer-Gymnasium.png",
"url": "https://www.dg-info.de/"
},
{
"name": "Franz-Stock-Gymnasium Arnsberg",
"logo": "/images/schools/Franz-Stock-Gymnasium Arnsberg.jpg",
"url": "https://www.fsg-arnsberg.de/"
},
{
"name": "Gauß-Gymnasium Worms",
"logo": "/images/schools/Gauß-Gymnasium Worms.png",
"url": "http://www.gauss-worms.de/index.php?id=2"
},
{
"name": "Gemeinschaftsschule Bellevue Saarbrücken",
"logo": "/images/schools/Gemeinschaftsschule Bellevue Saarbrücken.png",
"url": "http://www.gts-bellevue.de/ganztagsschule/"
},
{
"name": "Gymnasium Saarburg",
"logo": "/images/schools/Gymnasium Saarburg.gif",
"url": "https://www.gymnasium-saarburg.de/"
},
{
"name": "Heinrich-Hertz-Gymnasium Berlin",
"logo": "/images/schools/Heinrich-Hertz-Gymnasium Berlin.png",
"url": "https://www.hhgym.de/"
},
{
"name": "Johannes-Kepler-Gymnasium Lebach",
"logo": "/images/schools/Johannes-Kepler-Gymnasium Lebach.jpg",
"url": "https://www.jkg-lebach.de/jkg/"
},
{
"name": "Klaus-Gorth-Schule",
"logo": "/images/schools/Klaus-Gorth-Schule.JPG",
"url": "http://www.klaus-groth-schule.de/"
},
{
"name": "Landesgymnasium für Hochbegabte Schwäbisch Gmünd",
"logo": "/images/schools/Landesgymnasium für Hochbegabte Schwäbisch Gmünd.png",
"url": "http://www.lgh-gmuend.de/"
},
{
"name": "Landesschule Pforta Naumburg",
"logo": "/images/schools/Landesschule Pforta Naumburg.jpg",
"url": "https://www.landesschule-pforta.de/index.php"
},
{
"name": "Leininger-Gymnasium Grünstadt",
"logo": "/images/schools/Leininger-Gymnasium Grünstadt.png",
"url": "http://leiningergymnasium.de/"
},
{
"name": "Marie-Curie-Gymnasium Ludwigsfelde",
"logo": "/images/schools/Marie-Curie-Gymnasium Ludwigsfelde.png",
"url": "http://mcgym.de/startseite.html"
},
{
"name": "Martin-Luther-Schule Marburg",
"logo": "/images/schools/Martin-Luther-Schule Marburg.jpg",
"url": "http://www.mls-marburg.de/"
},
{
"name": "Otto-Schott-Gymnasium Mainz",
"logo": "/images/schools/Otto-Schott-Gymnasium Mainz.png",
"url": "http://osg-mainz.de/"
},
{
"name": "Ratsgymnasium Wolfsburg",
"logo": "/images/schools/Ratsgymnasium Wolfsburg.jpg",
"url": "http://www.ratsgymnasium-wolfsburg.de/"
},
{
"name": "Schillerschule Hannover",
"logo": "/images/schools/Schillerschule Hannover.png",
"url": "http://www.schillerschule-hannover.de/"
},
{
"name": "Stiftsgymnasium Sindelfingen",
"logo": "/images/schools/Stiftsgymnasium Sindelfingen.png",
"url": "https://www.stiftsgymnasium.de/"
},
{
"name": "Ursulaschule Osnabrück",
"logo": "/images/schools/Gymnasium Ursulaschule Osnabrück.jpg",
"url": "http://www.ursulaschule.de/"
},
{
"name": "Wilhelm-Gymnasium Braunschweig",
"logo": "/images/schools/Wilhelm-Gymnasium Braunschweig.jpg",
"url": "https://www.wilhelm-gym.de/"
},
{
"name": "Wilhelm-Ostwald-Schule Gymnasium",
"logo": "/images/schools/Wilhelm-Ostwald-Schule Gymnasium.png",
"url": "https://www.ostwaldgymnasium.de/index.php"
}
]
}
Binary file added static/images/schools/Dientzenhofer-Gymnasium.png
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.
Binary file added static/images/schools/Gauß-Gymnasium Worms.png
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.
Binary file added static/images/schools/Gymnasium Saarburg.gif
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.
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.
Binary file added static/images/schools/Klaus-Gorth-Schule.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.
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.
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/images/schools/Ratsgymnasium Wolfsburg.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.
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.
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.
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.
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.
30 changes: 30 additions & 0 deletions static/styles/about/about.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
@import '../lib/colors';

.section-about {
h3 {
color: $primaryColor;
font-weight: bold;
}
h4 {
color: $primaryColor;
font-weight: bold;
}
hgroup {
text-align: center;
font-weight: bold;
margin: 60px 0 60px;
width: 100%;
}

.section-title {
width: 100%;
padding: 10px 0 20px;
line-height: 1.75rem;
h4 {
color: $primaryColor;
margin-bottom: 0;
margin-right: 20px;
font-weight: 700;
}
}
}
5 changes: 5 additions & 0 deletions static/styles/partner/partner.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@ hgroup {

.section-partner {
h5 {
color: $primaryColor !important;
margin-top: 20px;
}
h4 {
color: $primaryColor;
font-weight: bold;
margin-top: 20px;
}
ul {
Expand Down
Loading

0 comments on commit 841a40d

Please sign in to comment.