Fix up hierarchy on all of the generated report screens.

This commit is contained in:
Justin Shreve 2016-02-17 09:40:08 -08:00
parent 7058facc68
commit 6d683b7492
4 changed files with 23 additions and 8 deletions

File diff suppressed because one or more lines are too long

View File

@ -2422,6 +2422,7 @@ img.help_tip {
.woocommerce {
.woo-nav-tab-wrapper {
margin-bottom: 16px !important;
border-bottom: 1px solid #ccc;
}
.subsubsub {
@ -3907,7 +3908,7 @@ img.ui-datepicker-trigger {
margin: 0 !important;
}
h3.stats_range {
div.stats_range,h3.stats_range {
border-bottom-color: #dfdfdf;
margin: 0;
padding: 0 !important;
@ -3932,6 +3933,7 @@ img.ui-datepicker-trigger {
padding: 0;
zoom: 1;
background: #f5f5f5;
border-bottom: 1px solid #ccc;
&:before,
&:after {
@ -3948,6 +3950,8 @@ img.ui-datepicker-trigger {
margin: 0;
padding: 0;
line-height: 26px;
font-weight: bold;
font-size: 14px;
a {
border-right: 1px solid #dfdfdf;

View File

@ -10,7 +10,11 @@ if ( ! defined( 'ABSPATH' ) ) {
?>
<div class="wrap woocommerce">
<div class="icon32 icon32-woocommerce-reports" id="icon-woocommerce"><br /></div><h2 class="nav-tab-wrapper woo-nav-tab-wrapper">
<div class="icon32 icon32-woocommerce-reports" id="icon-woocommerce"><br /></div>
<h1><?php echo sprintf( esc_html__( '%s Report' ), $reports[ $current_tab ]['title'] ); ?></h1>
<p class="nav-tab-wrapper woo-nav-tab-wrapper">
<?php
foreach ( $reports as $key => $report_group ) {
echo '<a href="'.admin_url( 'admin.php?page=wc-reports&tab=' . urlencode( $key ) ).'" class="nav-tab ';
@ -19,7 +23,7 @@ if ( ! defined( 'ABSPATH' ) ) {
}
?>
<?php do_action('wc_reports_tabs'); ?>
</h2>
</p>
<?php if ( sizeof( $reports[ $current_tab ]['reports'] ) > 1 ) {
?>
@ -52,8 +56,12 @@ if ( ! defined( 'ABSPATH' ) ) {
$report = $reports[ $current_tab ][ 'reports' ][ $current_report ];
if ( ! isset( $report['hide_title'] ) || $report['hide_title'] != true )
echo '<h3>' . $report['title'] . '</h3>';
if ( ! isset( $report['hide_title'] ) || $report['hide_title'] != true ) {
echo '<h2>' . esc_html( $report['title'] ) . '</h2>';
}
else {
echo '<h2 class="screen-reader-text">' . esc_html( $report['title'] ) . '</h2>';
}
if ( $report['description'] )
echo '<p>' . $report['description'] . '</p>';

View File

@ -11,7 +11,10 @@ if ( ! defined( 'ABSPATH' ) ) {
<div id="poststuff" class="woocommerce-reports-wide">
<div class="postbox">
<h3 class="stats_range">
<h3 class="screen-reader-text"><?php echo esc_html( $ranges[ $current_range ] ); ?></h3>
<div class="stats_range">
<?php $this->get_export_button(); ?>
<ul>
<?php
@ -43,7 +46,7 @@ if ( ! defined( 'ABSPATH' ) ) {
</form>
</li>
</ul>
</h3>
</div>
<?php if ( empty( $hide_sidebar ) ) : ?>
<div class="inside chart-with-sidebar">
<div class="chart-sidebar">