Skip to content

Commit 9d4c637

Browse files
xwolfdexwolfde
authored
Merge pull request #80 from RRZE-Webteam/dev
Release 1.13
2 parents d50b5a3 + 7de31e7 commit 9d4c637

File tree

300 files changed

+7382
-13412
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

300 files changed

+7382
-13412
lines changed

‎.gitignore

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎401.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
get_template_part('template-parts/hero', 'error');
1212

1313
?>
14-
15-
1614
<section id="content">
1715
<div class="container">
1816
<div class="row">
@@ -25,10 +23,11 @@
2523
<?php _e('Leider ist Ihre Anmeldung fehlgeschlagen.','fau'); ?>
2624
</p>
2725
</div>
28-
<div class="error-image"></div>
29-
<div class="error-search">
30-
<?php get_template_part('template-parts/search', 'try'); ?>
31-
</div>
26+
<?php
27+
get_template_part('template-parts/error', 'siegel');
28+
get_template_part('template-parts/error', 'trysearch');
29+
?>
30+
3231
</div>
3332
<?php get_template_part('template-parts/search', 'helper'); ?>
3433

‎403.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
<?php _e('Leider dürfen Sie auf diese Seite nicht zugreifen.','fau'); ?>
2626
</p>
2727
</div>
28-
<div class="error-image"></div>
29-
<div class="error-search">
30-
<?php get_template_part('template-parts/search', 'try'); ?>
31-
</div>
28+
<?php
29+
get_template_part('template-parts/error', 'siegel');
30+
get_template_part('template-parts/error', 'trysearch');
31+
?>
3232

3333
</div>
3434

‎404.php

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,28 @@
1515
<section id="content">
1616
<div class="container">
1717
<div class="row">
18-
<h1 class="screen-reader-text"><?php echo __('Seite nicht gefunden','fau'); ?></h1>
19-
20-
<div class="error-notice">
21-
<p class="hinweis">
22-
<strong><?php _e('Es tut uns leid.','fau'); ?></strong>
23-
</p>
24-
<p>
25-
<?php _e('Die von Ihnen aufgerufene Seite existiert nicht oder ihre Adresse hat sich durch Änderungen an der Seitenstruktur geändert.','fau'); ?>
26-
</p>
18+
<div class="col-xs-12">
19+
<main<?php echo fau_get_page_langcode($post->ID);?> id="droppoint" class="error-content">
20+
<h1 class="screen-reader-text"><?php echo __('Seite nicht gefunden','fau'); ?></h1>
2721

28-
</div>
29-
<div class="error-image"></div>
30-
<div class="error-search">
31-
<?php get_template_part('template-parts/search', 'try'); ?>
32-
</div>
22+
<div class="error-notice">
23+
<p class="hinweis">
24+
<strong><?php _e('Es tut uns leid.','fau'); ?></strong>
25+
</p>
26+
<p>
27+
<?php _e('Die von Ihnen aufgerufene Seite existiert nicht oder ihre Adresse hat sich durch Änderungen an der Seitenstruktur geändert.','fau'); ?>
28+
</p>
29+
30+
</div>
31+
<?php
32+
get_template_part('template-parts/error', 'siegel');
33+
get_template_part('template-parts/error', 'trysearch');
34+
?>
35+
36+
</main>
3337
</div>
3438
<?php get_template_part('template-parts/search', 'helper'); ?>
35-
39+
</div>
3640
</div>
3741

3842
</section>

‎README.md

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎archive-person.php

Lines changed: 33 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -9,59 +9,46 @@
99

1010
get_header();
1111

12-
$posttype = get_post_type();
13-
get_template_part('template-parts/hero', 'index');
14-
$active_sidebar = false;
15-
?>
16-
17-
<div id="content">
18-
<div class="container">
19-
20-
<div class="row">
21-
<?php if ( is_active_sidebar( 'search-sidebar' ) ) {
22-
// add sidebar and nest content in sub-row
23-
$active_sidebar = 1; ?>
24-
<div class="search-sidebar">
25-
<?php dynamic_sidebar( 'search-sidebar' ); ?>
26-
</div>
27-
<div class="search-resultnested">
28-
<div class="row">
29-
12+
$posttype = get_post_type();
13+
get_template_part('template-parts/hero', 'index');
14+
$active_sidebar = false;
15+
?>
16+
17+
<div id="content">
18+
<div class="content-container">
19+
<div class="content-row">
20+
<div class="search-resultnested">
21+
<main>
22+
<h1 class="screen-reader-text"><?php
23+
$post_type = get_post_type_object(get_post_type());
24+
echo $post_type->labels->name;
25+
?></h1>
26+
<?php
27+
while ( have_posts() ) {
28+
the_post();
29+
echo FAU_Person_Shortcodes::fau_person(array("id"=> $post->ID, 'format' => 'kompakt', 'showlink' => 1));
30+
} ?>
31+
32+
<nav class="navigation">
33+
<div class="nav-previous"><?php previous_posts_link(__('<span class="meta-nav">&laquo;</span> Vorherige Einträge', 'fau')); ?></div>
34+
<div class="nav-next"><?php next_posts_link(__('Weitere Einträge <span class="meta-nav">&raquo;</span>', 'fau'), '' ); ?></div>
35+
</nav>
36+
</main>
37+
</div>
38+
39+
<?php if ( is_active_sidebar( 'search-sidebar' ) ) { ?>
40+
<div class="search-sidebar">
41+
<?php dynamic_sidebar( 'search-sidebar' ); ?>
42+
</div>
3043
<?php } ?>
31-
<div class="col-xs-12">
32-
<main id="droppoint">
33-
<h1 class="screen-reader-text"><?php echo __('Index','fau'); ?></h1>
34-
<?php
35-
36-
while ( have_posts() ) {
37-
the_post();
38-
echo FAU_Person_Shortcodes::fau_person(array("id"=> $post->ID, 'format' => 'kompakt', 'showlink' => 1));
39-
} ?>
40-
41-
<nav class="navigation">
42-
<div class="nav-previous"><?php previous_posts_link(__('<span class="meta-nav">&laquo;</span> Vorherige Einträge', 'fau')); ?></div>
43-
<div class="nav-next"><?php next_posts_link(__('Weitere Einträge <span class="meta-nav">&raquo;</span>', 'fau'), '' ); ?></div>
44-
</nav>
4544

46-
</main>
47-
</div>
48-
<?php if ( is_active_sidebar( 'search-sidebar' ) ) { ?>
49-
</div>
50-
</div>
51-
<?php } ?>
52-
53-
</div>
54-
55-
<?php if(get_post_type() == 'post') {
56-
get_template_part('template-parts/sidebar', 'news');
57-
} ?>
58-
</div>
5945
</div>
60-
6146
</div>
47+
</div>
6248

6349

6450
<?php
6551
get_template_part('template-parts/footer', 'social');
6652
get_footer();
6753

54+

‎attachment.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<div class="container">
1818
<div class="row">
1919

20-
<main id="droppoint">
20+
<main>
2121
<h1 class="screen-reader-text"><?php the_title(); ?></h1>
2222
<?php
2323

‎comments.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?php
22
global $options;
33

4+
if ( is_singular() ) wp_enqueue_script( "comment-reply" );
5+
46
?>
57
<h2 id="comments-title"><?php _e("Kommentare", 'fau'); ?></h2>
68

‎css/admin.css

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎css/editor-style.css

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)