Commit 677ae6e7 authored by Jakob Moser's avatar Jakob Moser
Browse files

Merge branch 'master' into 11-optimize-and-unify-php

parents d9edb366 f213db4b

README.md

+3 −3
Original line number Diff line number Diff line
@@ -41,11 +41,11 @@ GitLab provides [a list of the differences between "fscoli next" and "Fachschaft 
* `style.css` includes a CSS snippet adapted from the Stack Overflow answer https://stackoverflow.com/a/52226523/ by [binaryfunt][binaryfunt] which is licensed under [**CC BY-SA 4.0**][cc-by-sa-4.0]. More details can be found in the respective file.

* The [icon this repository uses](https://gitlab.cl.uni-heidelberg.de/uploads/-/system/project/avatar/720/web-design-padded.png) was made by [monkik][monkik] from [www.flaticon.com][flaticon] and is licensed under the **Flaticon License**.



[original]:https://gitlab.cl.uni-heidelberg.de/fachschaft/wp-theme/-/tags/original

[original]:https://gitlab.cl.uni-heidelberg.de/fachschaft/fscoli-next/-/tags/original

[personads]:https://personads.me/

[current-zip]:https://gitlab.cl.uni-heidelberg.de/fachschaft/wp-theme/-/archive/master/wp-theme-master.zip

[current-zip]:https://gitlab.cl.uni-heidelberg.de/fachschaft/fscoli-next/-/archive/master/fscoli-next-master.zip

[gpl-3.0]:https://www.gnu.org/licenses/gpl-3.0.html

[diff]:https://gitlab.cl.uni-heidelberg.de/fachschaft/wp-theme/-/compare/original...master

[diff]:https://gitlab.cl.uni-heidelberg.de/fachschaft/fscoli-next/-/compare/original...master

[flaticon]:https://www.flaticon.com/

[monkik]:https://www.flaticon.com/authors/monkik

[binaryfunt]:https://stackoverflow.com/users/3217306/binaryfunt

header.php

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ get_header(); 
                    echo 'Blog | ';

                } elseif(is_search()) {

                    echo 'Suchergebnisse | ';

                } elseif(is_404()) {

                    echo '404 | ';

                } elseif(!is_front_page()) {

                    // get_the_title does not escape the returned values

                    // (see https://developer.wordpress.org/reference/functions/get_the_title/#comment-1653)

style.css

+3 −3
Original line number Diff line number Diff line 
/*

 * Theme Name: fscoli next

 * Theme URI: https://gitlab.cl.uni-heidelberg.de/fachschaft/wp-theme

 * Theme URI: https://gitlab.cl.uni-heidelberg.de/fachschaft/fscoli-next

 * Description: Ein zeitloses WordPress-Theme für die Fachschaft Computerlinguistik in Heidelberg, gehalten in den Farben rot, grau und schwarz. +++ Detaillierte Angaben zu Lizenz, Änderungen und beitragenden Autoren finden sich in der style.css sowie im beiliegenden README.

 * Tags: custom-header, custom-menu, blog, education, full-width-template

 *

 * Author: personads :: Maximilian Müller-Eberstein (ursprüngliche Version und Design); Jakob Moser (Code-Rewrite)

 * Author URI: https://personads.me/

 *

 * Version: 1.3.2-beta

 * Version: 1.3.3-beta

 *

 * License: GNU General Public License v3.0

 * License URI: https://www.gnu.org/licenses/gpl-3.0.html

 *

 * The "fscoli next" WordPress theme is based on the "Fachschaft Computerlinguistik WordPress Theme", Copyright 2015 personads.

 * "Fachschaft Computerlinguistik WordPress Theme" is distributed under the terms of the GNU GPL and can be obtained at

 * https://gitlab.cl.uni-heidelberg.de/fachschaft/wp-theme/-/tags/original

 * https://gitlab.cl.uni-heidelberg.de/fachschaft/fscoli-next/-/tags/original

 *

 * The "fscoli next" WordPress theme contains modifications made by Jakob Moser (2020--2021), which are listed in more detail in

 * the README.md provided with this theme. "fscoli next" is distributed under the terms of the GNU GPL.