Skip to content

Commit

Permalink
changing headers to divs / fixing header regression
Browse files Browse the repository at this point in the history
  • Loading branch information
@dgershman
dgershman committed Jun 3, 2019
1 parent 3404a32 commit 46ecac5
Showing 1 changed file with 28 additions and 28 deletions.
56 changes: 28 additions & 28 deletions bmlt-meeting-list.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -919,6 +919,7 @@ function bmlt_meeting_list($atts = null, $content = null) {
$header_style .= "background-color:".$this->options['header_background_color'].";";
$header_style .= "font-size:".$this->options['header_font_size']."pt;";
$header_style .= "line-height:".$this->options['content_line_height'].";";
$header_style .= "text-align:center;padding-top:2px;padding-bottom:3px;";

if ( $this->options['header_uppercase'] == 1 ) {
$header_style .= 'text-transform: uppercase;';
Expand Down Expand Up @@ -1044,9 +1045,9 @@ function bmlt_meeting_list($atts = null, $content = null) {
$header_suffix = $this->options['county_suffix'];
}
if ( $newVal ) {
$header .= "<h2 style='".$header_style."'>".$this_unique_data.''.$header_suffix."</h2>";
$header .= "<div style='".$header_style."'>".$this_unique_data.''.$header_suffix."</div>";
} elseif ( $newCol ) {
$header .= "<h2 style='".$header_style."'>".$this_unique_data.''.$header_suffix." " . $cont . "</h2>";
$header .= "<div style='".$header_style."'>".$this_unique_data.''.$header_suffix." " . $cont . "</div>";
}
}
if ( $this->options['meeting_sort'] === 'neighborhood_city' ) {
Expand All @@ -1055,39 +1056,39 @@ function bmlt_meeting_list($atts = null, $content = null) {

if ( $newVal ) {
if ( $meeting_value['location_neighborhood'] !== '' ) {
$header .= "<h2 style='".$header_style."'>".$meeting_value['location_neighborhood'].''.$this->options['neighborhood_suffix']."</h2>";
$header .= "<div style='".$header_style."'>".$meeting_value['location_neighborhood'].''.$this->options['neighborhood_suffix']."</div>";
} elseif ( $meeting_value['location_municipality'] !== '' ) {
$header .= "<h2 style='".$header_style."'>".$meeting_value['location_municipality'].''.$this->options['city_suffix']."</h2>";
$header .= "<div style='".$header_style."'>".$meeting_value['location_municipality'].''.$this->options['city_suffix']."</div>";
} else {
$header .= "<h2 style='".$header_style."'>[NO NEIGHBORHOOD OR CITY DATA]</h2>";
$header .= "<div style='".$header_style."'>[NO NEIGHBORHOOD OR CITY DATA]</div>";
}
} elseif ( $newCol ) {
if ( $meeting_value['location_neighborhood'] !== '' ) {
$header .= "<h2 style='".$header_style."'>".$meeting_value['location_neighborhood'].''.$this->options['neighborhood_suffix']." " . $cont . "</h2>";
$header .= "<div style='".$header_style."'>".$meeting_value['location_neighborhood'].''.$this->options['neighborhood_suffix']." " . $cont . "</div>";
} elseif ( $meeting_value['location_municipality'] !== '' ) {
$header .= "<h2 style='".$header_style."'>".$meeting_value['location_municipality'].''.$this->options['city_suffix']." " . $cont . "</h2>";
$header .= "<div style='".$header_style."'>".$meeting_value['location_municipality'].''.$this->options['city_suffix']." " . $cont . "</div>";
} else {
$header .= "<h2 style='".$header_style."'>[NO NEIGHBORHOOD OR CITY DATA] " . $cont . "</h2>";
$header .= "<div style='".$header_style."'>[NO NEIGHBORHOOD OR CITY DATA] " . $cont . "</div>";
}
}
}
if ( $this->options['meeting_sort'] === 'weekday_area' || $this->options['meeting_sort'] === 'weekday_city' || $this->options['meeting_sort'] === 'weekday_county' ) {
if ( $newVal ) {
if ( $show_first_weekday === true ) {
if ( $current_weekday === $this->options['weekday_start'] ) {
$header .= "<h2 style='".$header_style."'>".$this->getday($meeting_value['weekday_tinyint'], false, $this->options['weekday_language'])."</h2>";
$header .= "<div style='".$header_style."'>".$this->getday($meeting_value['weekday_tinyint'], false, $this->options['weekday_language'])."</div>";
} else {
$header .= "<h2 style='".$header_style."margin-top:2pt;'>".$this->getday($meeting_value['weekday_tinyint'], false, $this->options['weekday_language'])."</h2>";
$header .= "<div style='".$header_style."margin-top:2pt;'>".$this->getday($meeting_value['weekday_tinyint'], false, $this->options['weekday_language'])."</div>";
}
$show_first_weekday = false;
} elseif ( utf8_encode($this->mpdf->y) == $this->options['margin_top'] ) {
$header .= "<h2 style='".$header_style."'>".$this->getday($meeting_value['weekday_tinyint'], false, $this->options['weekday_language'])." " . $cont . "</h2>";
$header .= "<div style='".$header_style."'>".$this->getday($meeting_value['weekday_tinyint'], false, $this->options['weekday_language'])." " . $cont . "</div>";
}

$header .= $this->options['sub_header_shown'] == 1 ? "<p style='margin-top:1pt; padding-top:1pt; font-weight:bold;'>".$area_name."</p>" : "";

} elseif ( utf8_encode($this->mpdf->y) == $this->options['margin_top'] ) {
$header .= "<h2 style='".$header_style."'>".$this->getday($meeting_value['weekday_tinyint'], false, $this->options['weekday_language'])." " . $cont . "</h2>";
$header .= "<div style='".$header_style."'>".$this->getday($meeting_value['weekday_tinyint'], false, $this->options['weekday_language'])." " . $cont . "</div>";
$header .= $this->options['sub_header_shown'] == 1 ? "<p style='margin-top:1pt; padding-top:1pt; font-weight:bold;'>".$area_name."</p>" : "";
}
}
Expand All @@ -1096,23 +1097,23 @@ function bmlt_meeting_list($atts = null, $content = null) {
$meeting_value['location_municipality'] = '[NO CITY DATA IN BMLT]';
}
if ( $newVal ) {
$header .= "<h2 style='".$header_style."'>".$meeting_value['location_municipality']."</h2>";
$header .= "<div style='".$header_style."'>".$meeting_value['location_municipality']."</div>";
} elseif ( $newCol ) {
$header .= "<h2 style='".$header_style."'>".$meeting_value['location_municipality']." " . $cont . "</h2>";
$header .= "<div style='".$header_style."'>".$meeting_value['location_municipality']." " . $cont . "</div>";
}
}
if ( $this->options['meeting_sort'] === 'group' ) {
if ( $newVal ) {
$header .= "<h2 style='".$header_style."'>".$meeting_value['meeting_name']."</h2>";
$header .= "<div style='".$header_style."'>".$meeting_value['meeting_name']."</div>";
} elseif ( $newCol ) {
$header .= "<h2 style='".$header_style."'>".$meeting_value['meeting_name']." " . $cont . "</h2>";
$header .= "<div style='".$header_style."'>".$meeting_value['meeting_name']." " . $cont . "</div>";
}
}
if ( $this->options['meeting_sort'] === 'day' ) {
if ( $newVal ) {
$header .= "<h2 style='".$header_style."'>".$this->getday($this_unique_value, false, $this->options['weekday_language'])."</h2>";
$header .= "<div style='".$header_style."'>".$this->getday($this_unique_value, false, $this->options['weekday_language'])."</div>";
} elseif ( $newCol ) {
$header .= "<h2 style='".$header_style."'>".$this->getday($meeting_value['weekday_tinyint'], false, $this->options['weekday_language'])." " . $cont . "</h2>";
$header .= "<div style='".$header_style."'>".$this->getday($meeting_value['weekday_tinyint'], false, $this->options['weekday_language'])." " . $cont . "</div>";
}
}
if ( $this->options['meeting_sort'] === 'borough_county' ) {
Expand All @@ -1121,19 +1122,19 @@ function bmlt_meeting_list($atts = null, $content = null) {

if ( $newVal ) {
if ( $meeting_value['location_city_subsection'] !== '' ) {
$header .= "<h2 style='".$header_style."'>".$meeting_value['location_city_subsection'].''.$this->options['borough_suffix']."</h2>";
$header .= "<div style='".$header_style."'>".$meeting_value['location_city_subsection'].''.$this->options['borough_suffix']."</div>";
} elseif ( $meeting_value['location_sub_province'] !== '' ) {
$header .= "<h2 style='".$header_style."'>".$meeting_value['location_sub_province'].''.$this->options['county_suffix']."</h2>";
$header .= "<div style='".$header_style."'>".$meeting_value['location_sub_province'].''.$this->options['county_suffix']."</div>";
} else {
$header .= "<h2 style='".$header_style."'>[NO BOROUGH OR COUNTY DATA]</h2>";
$header .= "<div style='".$header_style."'>[NO BOROUGH OR COUNTY DATA]</div>";
}
} elseif ( $newCol ) {
if ( $meeting_value['location_city_subsection'] !== '' ) {
$header .= "<h2 style='".$header_style."'>".$meeting_value['location_city_subsection'].''.$this->options['borough_suffix']." " . $cont . "</h2>";
$header .= "<div style='".$header_style."'>".$meeting_value['location_city_subsection'].''.$this->options['borough_suffix']." " . $cont . "</div>";
} elseif ( $meeting_value['location_sub_province'] !== '' ) {
$header .= "<h2 style='".$header_style."'>".$meeting_value['location_sub_province'].''.$this->options['county_suffix']." " . $cont . "</h2>";
$header .= "<div style='".$header_style."'>".$meeting_value['location_sub_province'].''.$this->options['county_suffix']." " . $cont . "</div>";
} else {
$header .= "<h2 style='".$header_style."'>[NO BOROUGH OR COUNTY DATA] " . $cont . "</h2>";
$header .= "<div style='".$header_style."'>[NO BOROUGH OR COUNTY DATA] " . $cont . "</div>";
}
}
}
Expand Down Expand Up @@ -1300,12 +1301,11 @@ function bmlt_meeting_list($atts = null, $content = null) {
$ph_footer_fix_bot = 5 - intval($this->options['margin_bottom']);
}

if (isset($this->options['top'])) {
if (intval($this->options['margin_top']) < 5) {
$ph_footer_fix_top = 5 - intval($this->options['top']);
}
if (intval($this->options['margin_top']) < 5) {
$ph_footer_fix_top = isset($this->options['top']) ? 5 - intval($this->options['top']) : 5;
}


$DAY_HEADER_HEIGHT = 5;
$PH_FOOTER_MM = $DAY_HEADER_HEIGHT + $ph_footer_fix_top + $ph_footer_fix_bot;

Expand Down

0 comments on commit 46ecac5

Please sign in to comment.