mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 13:02:07 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-44139-master' of git://github.com/ds125v/moodle

Browse Source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Damyon Wiese 2014-02-24 15:28:51 +08:00
commit ccc2966709
7 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
admin/renderer.php
View File

@ -610,10 +610,10 @@ class core_admin_renderer extends plugin_renderer_base {
}
$maturitylevel = get_string('maturity' . $maturity, 'admin');
return $this->box(
return $this->warning(
$this->container(get_string('maturitycorewarning', 'admin', $maturitylevel)) .
$this->container($this->doc_link('admin/versions', get_string('morehelp'))),
'generalbox maturitywarning');
'error');
}
/*
@ -628,10 +628,8 @@ class core_admin_renderer extends plugin_renderer_base {
return '';
}
return $this->box(
$this->container(get_string('testsiteupgradewarning', 'admin', $testsite)),
'generalbox testsitewarning'
);
$warning = (get_string('testsiteupgradewarning', 'admin', $testsite));
return $this->warning($warning, 'error');
}
/**
@ -663,11 +661,16 @@ class core_admin_renderer extends plugin_renderer_base {
return ''; // No worries.
}
$level = 'warning';
if ($maturity == MATURITY_ALPHA) {
$level = 'error';
}
$maturitylevel = get_string('maturity' . $maturity, 'admin');
return $this->box(
get_string('maturitycoreinfo', 'admin', $maturitylevel) . ' ' .
$this->doc_link('admin/versions', get_string('morehelp')),
'generalbox adminwarning maturityinfo maturity'.$maturity);
$warningtext = get_string('maturitycoreinfo', 'admin', $maturitylevel);
$warningtext .= ' ' . $this->doc_link('admin/versions', get_string('morehelp'));
return $this->warning($warningtext, $level);
}
/**
@ -682,7 +685,7 @@ class core_admin_renderer extends plugin_renderer_base {
*/
protected function available_updates($updates, $fetch) {
$updateinfo = $this->box_start('generalbox adminwarning availableupdatesinfo');
$updateinfo = '';
$someupdateavailable = false;
if (is_array($updates)) {
if (is_array($updates['core'])) {
@ -719,9 +722,7 @@ class core_admin_renderer extends plugin_renderer_base {
}
$updateinfo .= $this->container_end();
$updateinfo .= $this->box_end();
return $updateinfo;
return $this->warning($updateinfo);
}
/**

4
theme/base/style/admin.css
View File

@ -138,10 +138,6 @@
#page-admin-index .adminwarning .singlebutton,
#page-admin-index #layout-table .singlebutton {margin:20px;}
#page-admin-index .adminwarning.maturityinfo.maturity50 {background-color:#ffd3d9;}
#page-admin-index .adminwarning.maturityinfo.maturity100,
#page-admin-index .adminwarning.maturityinfo.maturity150 {background-color:#f3f2aa;}
#page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo {line-height:1.8;margin:20px auto;width:60%;text-align:left;}
#page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo .info.release {margin-right:10px;padding:5px 10px;-moz-border-radius: 10px;-webkit-border-radius: 10px;border-radius: 10px;}
#page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release {background-color:#ffd3d9;}

11
theme/bootstrapbase/less/moodle/admin.less
View File

@ -143,8 +143,6 @@ img.iconsmall {
#page-admin-course-category .buttons,
#page-admin-index .copyright,
#page-admin-index .copyrightnotice,
#page-admin-index .adminerror,
#page-admin-index .availableupdatesinfo,
#page-admin-index .adminerror .singlebutton,
#page-admin-index .adminwarning .singlebutton,
#page-admin-index #layout-table .singlebutton {
@ -208,21 +206,16 @@ img.iconsmall {
#page-admin-index .releasenoteslink,
#page-admin-index .adminwarning,
#page-admin-index .maturitywarning,
#page-admin-index .testsitewarning,
#page-admin-index .maturityinfo {
#page-admin-index .adminerror {
.alert;
width: 60%;
min-width: 220px;
margin: auto;
}
#page-admin-index .maturitywarning,
#page-admin-index .testsitewarning,
#page-admin-index .adminwarning.maturityinfo.maturity50 {
#page-admin-index .adminerror {
.alert-error;
}
#page-admin-index .adminwarning.availableupdatesinfo,
#page-admin-index .releasenoteslink {
.alert-info;
}

2
theme/bootstrapbase/style/moodle.css
View File

File diff suppressed because one or more lines are too long

7
theme/canvas/style/admin.css
View File

@ -19,6 +19,7 @@
padding: 1em 0;
}
#page-admin-index .adminerror,
#page-admin-index .adminwarning {
border: 1px solid #a35f1d;
background: #ffeeba;
@ -27,6 +28,10 @@
width: 75%;
}
#page-admin-index .adminerror {
background: #ffd3d9;
}
#page-admin-index .copyright {
text-align: center;
margin: 20px auto;
@ -125,4 +130,4 @@
}
#page-admin-webservice-service_functions .functiondesc {
font-size: 90%;
}
}

6
theme/formal_white/style/core.css
View File

@ -50,12 +50,6 @@ textarea {
text-align: right;
}
#page-admin-index .adminwarning.maturityinfo.maturity50,
#page-admin-index .adminwarning.maturityinfo.maturity100,
#page-admin-index .adminwarning.maturityinfo.maturity150 {
background-color: #C2E3C2;
}
.dir-rtl .loginbox .loginform .form-label {
float: none;
width: 100%;

5
theme/standard/style/admin.css
View File

@ -19,8 +19,6 @@
#page-admin-index .adminerror,
#page-admin-index .adminwarning {margin:20px;}
#page-admin-index .maturitywarning,
#page-admin-index .testsitewarning {margin-left:auto;margin-right:auto;text-align:center;width:60%;background-color:#ffd3d9;}
#page-admin-index .releasenoteslink {margin-left:auto;margin-right:auto;text-align:center;width:60%;}
#page-admin-enrol .enrolplugintable {width:700px;margin:1em auto;}
@ -81,7 +79,8 @@
.admin .generalboxcontent {background-color:#EEEEEE;}
.admin .generalbox {border-color:#BBBBBB;background-color:#EEEEEE;}
.admin .informationbox {border-color:#BBBBBB;background-color:#FFFFFF;}
#page-admin-index .adminerror {background-color:#FF6666;}
#page-admin-index .adminwarning {background-color:#f3f2aa;}
#page-admin-index .adminerror {background-color:#ffd3d9;}
#page-admin-index .c0 {background-color: #FAFAFA;}
.path-admin .blockstable > tbody > tr:nth-of-type(odd) {background-color: #F0F0F0;}
.path-admin .blockstable > tbody > tr:nth-of-type(even) {background-color: #FAFAFA;}