Commit 35912f11 authored by Jakob Moser's avatar Jakob Moser
Browse files

Merge branch '1-rewrite-theme' into 'master' 

Resolve "Rewrite theme"

Closes #1

See merge request fachschaft/wp-theme!2
parents 0d3a55f2 c4a4e644

404.php

+18 −20
Original line number Diff line number Diff line 
<?php

/*

    Theme: Fachschaft Computerlinguistik

    404 Template File

/**

 * Template for the error 404 (Not Found) page.

 *

 * WordPress identifies this file by its name (which MUST be 404.php)

 * and displays it whenever an HTTP 404 is sent.

 *

 * @see https://codex.wordpress.org/Creating_an_Error_404_Page

 */



get_header();

?>

			<!-- content -->

			<div class="post-container">

                <div class="post-header">

                </div>

				<div class="post-title">

					<h1 class="post-title-box">Error: 404</h1>

				</div>

				<div class="post-content error404">

                    <div class="icon">

                        ?!

                    </div>

                    <div class="message">

                        Die angefragte Seite existiert leider nicht.

                    </div>

				</div>

                <div class="post-meta">

				</div>

<main>

    <article>

        <header>

            <h1>Fehler: 404</h1>

        </header>

        <div class="content jumbo">

            <div class="icon">?!</div>

            <div class="message">Die angefragte Seite existiert leider nicht.</div>

        </div>

        <footer></footer>

    </article>

</main>

<?php get_footer(); ?>

README.md

+52 −1
Original line number Diff line number Diff line 
Repository icon made by <a href="https://www.flaticon.com/authors/monkik" title="monkik">monkik</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a>
 
# fscoli next



Maintainer: Jakob Moser <moser@cl.uni-heidelberg.de>



*Based on the ["Fachschaft Computerlinguistik WordPress Theme"][original] by [personads :: Maximilian Müller-Eberstein][personads].*



<img alt="Promotional image for the theme" src="screenshot.png" width="400px" title="Hallo lieber Mit-Coli aus der Zukunft! Cool, dass du bis hierhin vorgestoßen bist :) Geht es der Website gut?"/>



A timeless WordPress theme for the Fachschaft Computerlinguistik in Heidelberg in the colors red, gray and black.



## :wrench: Download and install



[**:inbox_tray: Download current version**][current-zip]



Download the current version by clicking on the link above (this will download the ZIP file GitLab automatically prepares with all the current contents of this repository).



Then, upload the file to WordPress in the "Themes" section and enable it. Done :)



## :checkered_flag: Development



The `master` branch of this repository is push-protected, so you cannot push changes directly to it. Instead, you should create a feature branch, commit all your changes there, push that branch and then merge it into master via a merge request.



We recommend that you first create an issue describing what you want to do and then use GitLab's built-in "Create merge request and branch" feature for that. This way, it is also always documented who is working on which changes.



You can of course also always change the branch protection in the settings, but we would recommend against that.



## :scales: License



The "fscoli next" WordPress theme is distributed under the terms of the [**GNU General Public License v3.0**][gpl-3.0].



### Relationship to the original version



"fscoli next" is based on the ["Fachschaft Computerlinguistik WordPress Theme"][original], Copyright 2015 personads, which is also distributed under the terms of the GNU General Public License v3.0.



It contains modifications made by Jakob Moser in 2020 and 2021, namely added responsiveness, a few bug fixes and a rewrite of the underlying HTML, PHP and CSS. Jakob also modified the `screenshot.png` image to include the name of the new theme. The original design work by personads was left more or less intact, so there is little visual difference between the two themes.



GitLab provides [a list of the differences between "fscoli next" and "Fachschaft Computerlinguistik WordPress Theme"][diff].



### Differently licensed content



* `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

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

[current-zip]:https://gitlab.cl.uni-heidelberg.de/fachschaft/wp-theme/-/archive/master/wp-theme-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

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

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

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

[cc-by-sa-4.0]:https://creativecommons.org/licenses/by-sa/4.0/

footer.php

+9 −11
Original line number Diff line number Diff line 
<?php

/*

    Theme: Fachschaft Computerlinguistik

    Footer Template File

/**

 * Template for the footer.

 *

 * WordPress identifies this file by its name (which MUST be footer.php).

 * It is included in the other templates by using get_footer();

 *

 * @see https://codex.wordpress.org/Theme_Development#Basic_Templates

 */



get_header();

?>



			<!-- footer -->

			<div id="footer">

                <div>

    <footer>

        <a href="<?php echo home_url()."/legal/#impressum"; ?>">Impressum</a> | <a href="<?php echo home_url()."/legal/#rechtliches"; ?>">Rechtliches</a> | <a href="<?php echo home_url()."/legal/#datenschutz"; ?>">Datenschutz</a>

        <span class="copyright">&copy; Fachschaft Computerlinguistik, Heidelberg</span>

                </div>

			</div>

    </footer>

    <?php wp_footer(); ?>

</body>

</html>

functions.php

+0 −52
Original line number Diff line number Diff line
@@ -23,56 +23,4 @@ 
        return $mime_types;

    }

    add_filter('upload_mimes', 'fscoli_mime_types', 1, 1);

	// - add custom colors

	add_filter('tiny_mce_before_init', 'fscoli_mce4_options');

	function fscoli_mce4_options( $init ) {

		$default_colours = '

			"000000", "Black",

			"993300", "Burnt orange",

			"333300", "Dark olive",

			"003300", "Dark green",

			"003366", "Dark azure",

			"000080", "Navy Blue",

			"333399", "Indigo",

			"333333", "Very dark gray",

			"800000", "Maroon",

			"FF6600", "Orange",

			"808000", "Olive",

			"008000", "Green",

			"008080", "Teal",

			"0000FF", "Blue",

			"666699", "Grayish blue",

			"808080", "Gray",

			"FF0000", "Red",

			"FF9900", "Amber",

			"99CC00", "Yellow green",

			"339966", "Sea green",

			"33CCCC", "Turquoise",

			"3366FF", "Royal blue",

			"800080", "Purple",

			"999999", "Medium gray",

			"FF00FF", "Magenta",

			"FFCC00", "Gold",

			"FFFF00", "Yellow",

			"00FF00", "Lime",

			"00FFFF", "Aqua",

			"00CCFF", "Sky blue",

			"993366", "Brown",

			"C0C0C0", "Silver",

			"FF99CC", "Pink",

			"FFCC99", "Peach",

			"FFFF99", "Light yellow",

			"CCFFCC", "Pale green",

			"CCFFFF", "Pale cyan",

			"99CCFF", "Light sky blue",

			"CC99FF", "Plum",

			"FFFFFF", "White"

			';

		$custom_colours = '

			"990000", "fscoli dark red"

			';

		$init['textcolor_map'] = '['.$default_colours.','.$custom_colours.']';

		$init['textcolor_rows'] = 6;

		return $init;

	}

?>

header.php

+24 −18
Original line number Diff line number Diff line
@@ -10,32 +10,38 @@ get_header(); 
<!DOCTYPE html>

<html <?php language_attributes(); ?>>

    <head>

        <meta charset="<?php bloginfo('charset'); ?>"/>

        <title>

            <?php

            if ( is_front_page() ) {

                bloginfo('name');

            } elseif (is_home()) {

                echo 'Blog | '.get_bloginfo('name');

            } else {

                echo get_the_title($post->ID).' | '.get_bloginfo('name');

                if(is_home()) {

                    echo 'Blog | ';

                } elseif(is_search()) {

                    echo 'Suchergebnisse | ';

                } 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)

                    // So, to be on the safe side, we escape it here.

                    echo esc_html(get_the_title($post->ID)).' | ';

                }

        ?></title>

                bloginfo('name');

            ?>

        </title>



        <link rel="stylesheet" type="text/css" href="<?php echo get_stylesheet_uri();?>" />

        <link rel="shortcut icon" href="<?php echo get_template_directory_uri();?>/img/favicon.png" />

        <link rel="alternate" type="application/rss+xml" title="fscoli blog" href="<?php bloginfo('rss2_url'); ?>" />

        <meta name="copyright" content="Fachschaft Computerlinguistik">



        <meta charset="<?php bloginfo('charset'); ?>" />

        <meta name="copyright" content="Fachschaft Computerlinguistik" />

        <meta name="description" content="<?php bloginfo('description');?>" />

        <meta name="viewport" content="width=device-width, initial-scale=1.0" />



        <?php wp_head(); ?>

    </head>

    <body>

		<div id="top">

			<a class="logo-link" href="<?php echo home_url();?>"><div class="logo"></div></a>

            <a class="menu-toggle" href="#menu-container">Menü</a>

            <nav id="menu-container">

				<?php wp_nav_menu( array('container'=>'false', 'container-id'=>'menu-container', 'sort_column'=>'menu_order')); ?>

    <body class="<?php echo is_admin_bar_showing() ? 'has-admin-bar' : '';?>">

        <header>

            <a class="logo" href="<?php echo home_url();?>"></a>

            <a class="nav-toggle" href="#nav">Menü</a>

            <nav id="nav">

                <?php wp_nav_menu(array('container'=>'false')); ?>

            </nav>

		</div>

        <div id="top-padding">

        </div>
 
        </header>