Commit 80340e7e authored by Lisa Seeto's avatar Lisa Seeto Committed by Cecilia Vela Gurovic
Browse files

Bug 1893159: Dashboard widgets are not receiving customisable theme styling 



- add in styling for widgets
- add upgrade step to show warning to resave custom theme

Change-Id: Ie6b46989200e4a19300ac228229dfe14bf0e8565
Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
parent cba19459

htdocs/lib/db/upgrade.php

+12 −0
Original line number Diff line number Diff line
@@ -1700,5 +1700,17 @@ function xmldb_core_upgrade($oldversion=0) { 
        }

    }



    // set customethemeupdate to true for Bug 1893159s

    if ($oldversion < 2020013011) {

        $custom_themes = get_records_sql_array("SELECT name FROM {institution} WHERE theme = ?", array('custom'));

        if ($custom_themes) {

            // set_config_institution requires the Institution class.

            require_once(get_config('docroot') . 'lib/institution.php');

            foreach ($custom_themes as $inst) {

                set_config_institution($inst->name, 'customthemeupdate', true);

            }

        }

    }



    return $status;

}

htdocs/lib/version.php

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ $config = new stdClass(); 
// See https://wiki.mahara.org/wiki/Developer_Area/Version_Numbering_Policy

// For upgrades on stable branches, increment the version by one.  On master, use the date.



$config->version = 2020013010;

$config->version = 2020013011;

$config->series = '20.04';

$config->release = '20.04.2testing';

$config->minupgradefrom = 2017031605;

htdocs/theme/raw/templates/customcss.tpl

+12 −0
Original line number Diff line number Diff line
@@ -127,6 +127,18 @@ 
    border-top-color: {$data.headings};

}



.dashboard-widget-container .thumbnail-widget .widget-heading {

    border-top-color: {$data.headings};

}



.dashboard-widget-container .thumbnail-widget .widget-heading .circle-bg {

    background-color: {$data.headings};

}



.dashboard-widget-container .widget-detail {

    background-color: {$data.headings} !important;

}



.dashboard-widget-container .logged-in .widget-heading p,

a.card-footer:hover .icon.float-right,

.modal-docked .modal-header .close:hover .times,