-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #627 from RRZE-Webteam/beta
New Version 1.11
- Loading branch information
Showing
131 changed files
with
5,250 additions
and
30,884 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,6 @@ | |
|
||
Wordpress-Theme für zentrale Einrichtungen der Friedrich-Alexander-Universität Erlangen-Nürnberg (FAU) | ||
|
||
Eine Dokumentation kann unter https://wordpress.rrze.fau.de gefunden werden. | ||
|
||
## Download | ||
|
||
|
@@ -23,10 +22,7 @@ GNU General Public License (GPL) Version 2 | |
License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) | ||
* Font Roboto, https://www.fontsquirrel.com/license/roboto | ||
Apache License, Version 2.0, January 2004 | ||
* fancyBox v2.1.5 fancyapps.com | ||
* jQuery carouFredSel 6.2.1, https://dev7studios.com/ | ||
* Slick Slider v1.9 | ||
* hoverIntent v1.8.0 | ||
* Bootstrap 3.3.7, http://getbootstrap.com/ | ||
|
||
|
||
|
@@ -39,10 +35,21 @@ Please use github for submitting new features or bugs: | |
or send an email to | ||
[email protected] | ||
|
||
## Dokumentation | ||
|
||
Eine Dokumentation des THemes und dessen Funktionen findet sich unter der Adresse | ||
https://wordpress.rrze.fau.de | ||
|
||
|
||
## Entwickler-Hinweise | ||
|
||
## Testportal | ||
|
||
Testseiten und Hinweise zur Neuentwicklung finden sich auf dem Testportal | ||
https://www.beta.wordpress.rrze.fau.de/ . | ||
Dort finden sich auch weitere Hinweise zur Entwicklung. | ||
|
||
|
||
### SASS-Compiler | ||
|
||
Die CSS Anweisungen werden mittels SASS erzeugt. Hierzu werden im Verzeichnis | ||
|
@@ -66,4 +73,13 @@ sein. Außerdem sind Source-Map Dateien nicht benötigt. Die dafür notwendige | |
Compiler-Argumente sind daher ```--style compressed --sourcemap=none``` | ||
|
||
|
||
|
||
## Hinweis zu Vendor-Prefixes | ||
|
||
In den SASS-Dateien befinden sich teilweise noch Vendor-Prefixes. Diese wurde | ||
in älteren Versionen in das Theme eingestellt, als es noch keinen Autoprefixer | ||
gab. | ||
Diese Vendor-Prefixes sollen in den nächsten Versionen des Themes entfernt werden. | ||
Vendor-Prefixes sollen stattdessen -sofern sie noch benötigt werden- durch einen | ||
Autoprefixer auf das style.css ergänzt werden. Diese Funktion und die dazugehörigen | ||
Konfigurationsdateien sind jedoch (aktuell) nicht Teil des GitHub-Projektes. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,67 +1,67 @@ | ||
<?php | ||
/** | ||
* The main template file. | ||
* | ||
* @package WordPress | ||
* @subpackage FAU | ||
* @since FAU 1.0 | ||
*/ | ||
|
||
get_header(); | ||
|
||
$posttype = get_post_type(); | ||
get_template_part('template-parts/hero', 'index'); | ||
$active_sidebar = false; | ||
?> | ||
|
||
<div id="content"> | ||
<div class="container"> | ||
|
||
<div class="row"> | ||
<?php if ( is_active_sidebar( 'search-sidebar' ) ) { | ||
// add sidebar and nest content in sub-row | ||
$active_sidebar = 1; ?> | ||
<div class="search-sidebar"> | ||
<?php dynamic_sidebar( 'search-sidebar' ); ?> | ||
</div> | ||
<div class="search-resultnested"> | ||
<div class="row"> | ||
|
||
<?php } ?> | ||
<div class="col-xs-12"> | ||
<main> | ||
<h1 class="screen-reader-text"><?php echo __('Index','fau'); ?></h1> | ||
<?php | ||
|
||
while ( have_posts() ) { | ||
the_post(); | ||
echo FAU_Person_Shortcodes::fau_person(array("id"=> $post->ID, 'format' => 'kompakt', 'showlink' => 1)); | ||
} ?> | ||
|
||
<nav class="navigation"> | ||
<div class="nav-previous"><?php previous_posts_link(__('<span class="meta-nav">«</span> Vorherige Einträge', 'fau')); ?></div> | ||
<div class="nav-next"><?php next_posts_link(__('Weitere Einträge <span class="meta-nav">»</span>', 'fau'), '' ); ?></div> | ||
</nav> | ||
|
||
</main> | ||
</div> | ||
<?php if ( is_active_sidebar( 'search-sidebar' ) ) { ?> | ||
</div> | ||
</div> | ||
<?php } ?> | ||
|
||
</div> | ||
|
||
<?php if(get_post_type() == 'post') { | ||
get_template_part('template-parts/sidebar', 'news'); | ||
} ?> | ||
</div> | ||
</div> | ||
|
||
</div> | ||
|
||
|
||
<?php | ||
get_template_part('template-parts/footer', 'social'); | ||
get_footer(); | ||
|
||
<?php | ||
/** | ||
* The main template file. | ||
* | ||
* @package WordPress | ||
* @subpackage FAU | ||
* @since FAU 1.0 | ||
*/ | ||
|
||
get_header(); | ||
|
||
$posttype = get_post_type(); | ||
get_template_part('template-parts/hero', 'index'); | ||
$active_sidebar = false; | ||
?> | ||
|
||
<div id="content"> | ||
<div class="container"> | ||
|
||
<div class="row"> | ||
<?php if ( is_active_sidebar( 'search-sidebar' ) ) { | ||
// add sidebar and nest content in sub-row | ||
$active_sidebar = 1; ?> | ||
<div class="search-sidebar"> | ||
<?php dynamic_sidebar( 'search-sidebar' ); ?> | ||
</div> | ||
<div class="search-resultnested"> | ||
<div class="row"> | ||
|
||
<?php } ?> | ||
<div class="col-xs-12"> | ||
<main id="droppoint"> | ||
<h1 class="screen-reader-text"><?php echo __('Index','fau'); ?></h1> | ||
<?php | ||
|
||
while ( have_posts() ) { | ||
the_post(); | ||
echo FAU_Person_Shortcodes::fau_person(array("id"=> $post->ID, 'format' => 'kompakt', 'showlink' => 1)); | ||
} ?> | ||
|
||
<nav class="navigation"> | ||
<div class="nav-previous"><?php previous_posts_link(__('<span class="meta-nav">«</span> Vorherige Einträge', 'fau')); ?></div> | ||
<div class="nav-next"><?php next_posts_link(__('Weitere Einträge <span class="meta-nav">»</span>', 'fau'), '' ); ?></div> | ||
</nav> | ||
|
||
</main> | ||
</div> | ||
<?php if ( is_active_sidebar( 'search-sidebar' ) ) { ?> | ||
</div> | ||
</div> | ||
<?php } ?> | ||
|
||
</div> | ||
|
||
<?php if(get_post_type() == 'post') { | ||
get_template_part('template-parts/sidebar', 'news'); | ||
} ?> | ||
</div> | ||
</div> | ||
|
||
</div> | ||
|
||
|
||
<?php | ||
get_template_part('template-parts/footer', 'social'); | ||
get_footer(); | ||
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.