Skip to content

Commit

Permalink
Merge pull request #1019 from RRZE-Webteam/beta
Browse files Browse the repository at this point in the history 
Beta
  • Loading branch information
@xwolfde
xwolfde authored Jan 28, 2022
2 parents baec673 + 978bd78 commit 1f75337
Show file tree
Hide file tree
Showing 22 changed files with 50 additions and 71 deletions.
2 changes: 1 addition & 1 deletion css/fau-theme-editor-style.css
View file

Large diffs are not rendered by default.

11 changes: 3 additions & 8 deletions functions/constants.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// Name des Options-Array

$defaultoptions = [
'optiontable-version' => 74,
'optiontable-version' => 75,
// zaehlt jedesmal hoch, wenn neue Optionen eingefuegt werden
// oder Default Optionen geaendert werden. Vorhandene Defaultoptions
// in der Options-Table werden nur dann geändert, wenn der Wert erhöht
Expand Down Expand Up @@ -227,12 +227,7 @@
'advanced_blogroll_thumblink_alt_posttitle' => '"',
// Alternativer Tag wird mit dem Tiotel des verlinkten Beitrags gefüllt.
// Hier kann davor noch ein teil dahinter stehen.
'advanced_contentmenu_thumblink_alt_pretitle' => __('Zur Seite "','fau'),
// Alternativer Tag wird mit dem Tiotel des verlinkten Beitrags gefüllt.
// Hier kann davor noch ein Vortitel stehen.
'advanced_contentmenu_thumblink_alt_posttitle' => __('"','fau'),
// Alternativer Tag wird mit dem Tiotel des verlinkten Beitrags gefüllt.
// Hier kann davor noch ein teil dahinter stehen.

'advanced_topevent_thumblink_alt_pretitle' => __('Zum Artikel "','fau'),
// Alternativer Tag wird mit dem Tiotel des verlinkten Beitrags gefüllt.
// Hier kann davor noch ein Vortitel stehen.
Expand Down Expand Up @@ -527,7 +522,7 @@ function fau_get_searchable_fields() {
'advanced_display_postthumb_alt-from-desc' => array(
'type' => 'toggle',
'title' => __( 'Alternativtext Artikelbild', 'fau' ),
'label' => __( 'Bei der Darstellung des Artikelbildes wird das ALT-Attribut vom Inhalt der Bildbeschriebung gefüllt, wenn das ALT-Attribut leer ist.', 'fau' ),
'label' => __( 'Bei der Darstellung des Artikelbildes wird das ALT-Attribut vom Inhalt der Bildbeschreibung gefüllt, wenn das ALT-Attribut leer ist.', 'fau' ),
'default' => $defaultoptions['advanced_display_postthumb_alt-from-desc'],
'parent' => 'postoptions'
),
Expand Down
5 changes: 2 additions & 3 deletions functions/menu.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -521,9 +521,8 @@ function start_el(&$output, $item, $depth = 0, $args = array(), $id = 0) {
$imagehtml = '';
$imageurl = '';

$pretitle = $options['advanced_contentmenu_thumblink_alt_pretitle'];
$posttitle = $options['advanced_contentmenu_thumblink_alt_posttitle'];
$alttext = $pretitle.apply_filters('the_title', $item->title, $item->ID).$posttitle;
$pretitle = __('Zur Seite: ','fau');
$alttext = $pretitle.apply_filters('the_title', $item->title, $item->ID);
$alttext = esc_html($alttext);
$altattr = 'alt="'.$alttext.'"';

Expand Down
18 changes: 7 additions & 11 deletions functions/template-functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,12 @@ function fau_display_news_teaser($id = 0, $withdate = false, $hstart = 2, $hidem
$imagehtml = fau_get_image_htmlcode($post_thumbnail_id, 'rwd-480-3-2', $alttext, '', array('itemprop' => 'thumbnailUrl'));
if (fau_empty($imagehtml)) {
$imagehtml = fau_get_image_fallback_htmlcode('post-thumb', $alttext, '', array('itemprop' => 'thumbnailUrl'));
$usefallbackthumb = true;
$ownfallback = get_theme_mod('default_postthumb_image');
if ($ownfallback) {
$usefallbackthumb = false;
} else {
$usefallbackthumb = true;
}
}

$output .= '<div class="thumbnailregion';
Expand Down Expand Up @@ -709,13 +714,7 @@ function fau_custom_excerpt(
// remove most tags, but not those who are allowed

if (mb_strlen($excerpt) < 5) {
$excerpt = '<!-- '.__('Kein Inhalt', 'fau').' -->';
if (($needcontinue == 1) && ($withmore == true)) {
if ($continuenextline) {
$excerpt .= '<br>';
}
$excerpt .= $morestr;
}
$excerpt = '<!-- '.__('Kein Inhalt', 'fau').' -->';
return $excerpt;
}

Expand Down Expand Up @@ -1723,10 +1722,8 @@ function fau_get_image_fallback_htmlcode($size = 'rwd-480-3-2', $alttext = '', $
switch ($size) {

case 'topevent_thumb':

$width = $defaultoptions['default_rwdimage_width'];
$height = $defaultoptions['default_rwdimage_height'];

$fallback = get_theme_mod('fallback_topevent_image');
if ($fallback) {
$thisimage = wp_get_attachment_image_src($fallback, 'rwd-480-3-2');
Expand All @@ -1740,7 +1737,6 @@ function fau_get_image_fallback_htmlcode($size = 'rwd-480-3-2', $alttext = '', $
break;

case 'post-thumb':

$width = $defaultoptions['default_rwdimage_width'];
$height = $defaultoptions['default_rwdimage_height'];
$fallback = get_theme_mod('default_postthumb_image');
Expand Down
Binary file modified img/screenshots/screenshot-med.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/screenshots/screenshot-nat.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/screenshots/screenshot-phil.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/screenshots/screenshot-rw.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/screenshots/screenshot-tf.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified img/screenshots/screenshot-zuv.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "FAU-Einrichtungen",
"textdomain": "fau",
"version": "2.0.5",
"version": "2.0.8",
"keywords": [
"WordPress",
"Theme",
Expand Down
Binary file modified screenshot.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions src/sass/elements/_images.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ main, aside, .portalpage-sidebar, .widget {
&.aligncenter {
margin-left: calc(-#{$fau-gutter-width} / 2);
margin-right: calc(-#{$fau-gutter-width} / 2);
width: 100vw;
width: 100vw;
max-width: 100vw;

@media (min-width: $screen-xs) {
Expand All @@ -125,7 +125,6 @@ main, aside, .portalpage-sidebar, .widget {
width: 100vw;
max-width: 100vw;
@media (min-width: $screen-xs) {
width: auto;
max-width: 100%;
}
}
Expand All @@ -149,7 +148,7 @@ main, aside, .portalpage-sidebar, .widget {
&.aligncenter {
text-align: center;
float: none;

margin: 1rem auto;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/sass/fau-theme-editor-style.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/sass/fau-theme-style.css
View file

Large diffs are not rendered by default.

25 changes: 0 additions & 25 deletions src/sass/plugins/_ili-fau-templates.scss
View file

This file was deleted.

3 changes: 0 additions & 3 deletions src/sass/plugins/_plugins.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@
// FAU Oembed
@import "fau-oembed";

// ILI Templates
@import "ili-fau-templates";


// Social Share
// (not used yet) @import "social-share";
Expand Down
8 changes: 6 additions & 2 deletions src/sass/plugins/_rrze-calendar.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@

}


.rrze-calendar .event-date.bgcol-default,
.event-category-fau .event-date,
.event-category-einrichtungen .event-date {
background: var(--color-zentral-ci-hell);
Expand All @@ -134,7 +134,7 @@
color: var(--color-zentral-ci-hell-kontrast);
}
}

.rrze-calendar .event-date.bgcol-tf,
.event-category-techfak .event-date {
background: var(--color-tf-ci-hell);
color: var(--color-tf-ci-hell-kontrast);
Expand All @@ -146,6 +146,7 @@
}
}

.rrze-calendar .event-date.bgcol-rw,
.event-category-rwfak .event-date {
background: var(--color-rw-ci-hell);
color: var(--color-rw-ci-hell-kontrast);
Expand All @@ -157,6 +158,7 @@
}
}

.rrze-calendar .event-date.bgcol-phil,
.event-category-philfak .event-date {
background: var(--color-phil-ci-hell);
color: var(--color-phil-ci-hell-kontrast);
Expand All @@ -168,6 +170,7 @@
}
}

.rrze-calendar .event-date.bgcol-nat,
.event-category-natfak .event-date {
background: var(--color-nat-ci-hell);
color: var(--color-nat-ci-hell-kontrast);
Expand All @@ -179,6 +182,7 @@
}
}

.rrze-calendar .event-date.bgcol-med,
.event-category-medfak .event-date {
background: var(--color-med-ci-hell);
color: var(--color-med-ci-hell-kontrast);
Expand Down
2 changes: 1 addition & 1 deletion src/sass/plugins/_rrze-elements.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ button.expand-all {
/*-----------------------------------------------------------------------------------*/
/* Content Slider
/*-----------------------------------------------------------------------------------*/
#content .entry-content .content-slider.flexslider {
#content .content-slider.flexslider {
margin: 1rem 3rem;
.flex-control-nav,
.flex-direction-nav,
Expand Down
14 changes: 8 additions & 6 deletions src/sass/structure/content/_grid.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
max-width: calc(100% - $sidebar-width-inline - $grid-gutter-width);
width: calc(100% - $sidebar-width-inline - $grid-gutter-width);
}
@media (min-width: $screen-lg) {
@media (min-width: $screen-lg) {
max-width: calc(100% - $sidebar-width-inline-lg - $grid-gutter-width);
width: calc(100% - $sidebar-width-inline-lg - $grid-gutter-width);
}
Expand Down Expand Up @@ -162,23 +162,24 @@
}

@media (min-width: $screen-md) {
align-self: flex-start;
width: $sidebar-width-inline;
border-top: none;
margin-top: 0;
padding-top: 0;
}
@media (min-width: $screen-lg) {
width: $sidebar-width-inline-lg;
}


@media (min-width: $screen-lg) {
width: $sidebar-width-inline-lg;
}
}
}
.content-row .portalpage-sidebar {

@media (min-width: $screen-sm) {
align-self: flex-start;
width: $sidebar-width-portal;
max-width: $sidebar-maxwidth-portal;
max-width: $sidebar-maxwidth-portal;
margin-top: 0;
padding-left: floor(math.div($grid-gutter-width, 2));
border-top: none;
Expand Down Expand Up @@ -257,6 +258,7 @@
padding-right: ceil(math.div($grid-gutter-width, 2));
width: 100%;
@media (min-width: $screen-sm) {
align-self: flex-start;
padding-right: 0;
max-width: $sidebar-width-posts;
}
Expand Down
18 changes: 15 additions & 3 deletions src/sass/structure/navigation/_portalmenus.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,15 @@ main .subpages-menu,
padding: 0;
}

&.menu-item-has-children {
.portaltop {
flex-grow: unset;
&:hover, &:focus {
border-color: var(--color-menulink-hover-bg);
}
}
}

> p, // Quickfix für wpautop bei Verwendung des Shortcodes im Content-Bereich
.portaltop {
display: block;
Expand All @@ -185,6 +194,7 @@ main .subpages-menu,
border-bottom: 1px solid var(--color-ContentBorders);
width: 100%;
font-weight: bold;
flex-grow: 1;

.no-sub:not(.no-thumb) & {
position: absolute;
Expand All @@ -202,12 +212,13 @@ main .subpages-menu,

&:hover,
&:focus {
border-color: var(--color-menulink-hover-bg);
border-color: transparent;
}

a {
display: block;
width: 100%;
display: inline-block;
height: 100%;
padding: 10px 10px 8px 10px;
text-align: center;

Expand All @@ -224,6 +235,8 @@ main .subpages-menu,
text-decoration: none;
background-color: var(--color-menulink-hover-bg);
color: var(--color-menulink-hover-text);
display: block;
height: 100%
}
}

Expand All @@ -232,7 +245,6 @@ main .subpages-menu,
text-decoration: none;
background-color: var(--color-menulink-hover-bg);
color: var(--color-menulink-hover-text);

}

&.ext-link:after {
Expand Down
4 changes: 2 additions & 2 deletions style.css
View file

Large diffs are not rendered by default.

0 comments on commit 1f75337

Please sign in to comment.