mirror of
https://github.com/moodle/moodle.git
synced 2025-03-13 12:10:34 +01:00
Merge branch 'w29_MDL-25699_m22_installcss' of git://github.com/skodak/moodle
This commit is contained in:
Sam Hemelryk
commit
00d8d33cdc
@ -217,11 +217,6 @@ if (isset($_GET['help'])) {
|
||||
install_print_help_page($_GET['help']);
|
||||
}
|
||||
|
||||
// send css?
|
||||
if (isset($_GET['css'])) {
|
||||
install_css_styles();
|
||||
}
|
||||
|
||||
//first time here? find out suitable dataroot
|
||||
if (is_null($CFG->dataroot)) {
|
||||
$CFG->dataroot = dirname(dirname(__FILE__)).DIRECTORY_SEPARATOR.'moodledata';
|
||||
|
||||
148
install/css.php
Normal file
148
install/css.php
Normal file
@ -0,0 +1,148 @@
|
||||
<?php
|
||||
// This file is part of Moodle - http://moodle.org/
|
||||
//
|
||||
// Moodle is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Moodle is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
/**
|
||||
* This script prints basic CSS for the installer
|
||||
*
|
||||
* @package core
|
||||
* @subpackage install
|
||||
* @copyright 2011 Petr Skoda (http://skodak.org)
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
|
||||
if (file_exists(dirname(dirname(__FILE__)).'/config.php')) {
|
||||
// already installed
|
||||
die;
|
||||
}
|
||||
|
||||
// include only the necessary stuff from themes, keep this small otherwise IE will complain...
|
||||
$files = array(
|
||||
'base/style/pagelayout.css',
|
||||
'base/style/core.css',
|
||||
'standard/style/core.css',
|
||||
'standard/style/css3.css');
|
||||
|
||||
|
||||
$content = '';
|
||||
|
||||
foreach($files as $file) {
|
||||
$content .= file_get_contents(dirname(dirname(__FILE__)).'/theme/'.$file) . "\n";
|
||||
}
|
||||
|
||||
$content .= "
|
||||
|
||||
h2 {
|
||||
text-align:center;
|
||||
}
|
||||
|
||||
#installdiv {
|
||||
width: 800px;
|
||||
margin-left:auto;
|
||||
margin-right:auto;
|
||||
}
|
||||
|
||||
#installdiv dt {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
#installdiv dd {
|
||||
padding-bottom: 0.5em;
|
||||
}
|
||||
|
||||
.stage {
|
||||
margin-top: 2em;
|
||||
margin-bottom: 2em;
|
||||
width: 100%;
|
||||
padding:25px;
|
||||
}
|
||||
|
||||
#installform {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#nav_buttons input {
|
||||
margin: 5px;
|
||||
}
|
||||
|
||||
#envresult {
|
||||
text-align:left;
|
||||
width: auto;
|
||||
margin-left:10em;
|
||||
}
|
||||
|
||||
#envresult dd {
|
||||
color: red;
|
||||
}
|
||||
|
||||
.formrow {
|
||||
clear:both;
|
||||
text-align:left;
|
||||
padding: 8px;
|
||||
}
|
||||
|
||||
.formrow label.formlabel {
|
||||
display:block;
|
||||
float:left;
|
||||
width: 260px;
|
||||
margin-right:5px;
|
||||
text-align:right;
|
||||
}
|
||||
|
||||
.formrow .forminput {
|
||||
display:block;
|
||||
float:left;
|
||||
}
|
||||
|
||||
fieldset {
|
||||
text-align:center;
|
||||
border:none;
|
||||
}
|
||||
|
||||
.hint {
|
||||
display:block;
|
||||
clear:both;
|
||||
padding-left: 265px;
|
||||
color: red;
|
||||
}
|
||||
|
||||
.configphp {
|
||||
text-align:left;
|
||||
background-color:white;
|
||||
padding:1em;
|
||||
width:95%;
|
||||
}
|
||||
|
||||
.stage6 .stage {
|
||||
font-weight: bold;
|
||||
color: red;
|
||||
}
|
||||
|
||||
";
|
||||
|
||||
// fix used urls
|
||||
$content = str_replace('[[pix:theme|hgradient]]', '../theme/standard/pix/hgradient.jpg', $content);
|
||||
$content = str_replace('[[pix:theme|vgradient]]', '../theme/standard/pix/vgradient.jpg', $content);
|
||||
|
||||
@header('Content-Disposition: inline; filename="css.php"');
|
||||
@header('Cache-Control: no-store, no-cache, must-revalidate');
|
||||
@header('Cache-Control: post-check=0, pre-check=0', false);
|
||||
@header('Pragma: no-cache');
|
||||
@header('Expires: Mon, 20 Aug 1969 09:23:00 GMT');
|
||||
@header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
|
||||
@header('Accept-Ranges: none');
|
||||
@header('Content-Type: text/css; charset=utf-8');
|
||||
|
||||
echo $content;
|
||||
@ -243,7 +243,7 @@ function install_print_help_page($help) {
|
||||
echo '<html dir="'.(right_to_left() ? 'rtl' : 'ltr').'">
|
||||
<head>
|
||||
<link rel="shortcut icon" href="theme/standard/pix/favicon.ico" />
|
||||
<link rel="stylesheet" type="text/css" href="'.$CFG->wwwroot.'/install.php?css=1" />
|
||||
<link rel="stylesheet" type="text/css" href="'.$CFG->wwwroot.'/install/css.php" />
|
||||
<title>'.get_string('installation','install').'</title>
|
||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
|
||||
<meta http-equiv="pragma" content="no-cache" />
|
||||
@ -290,20 +290,7 @@ function install_print_header($config, $stagename, $heading, $stagetext) {
|
||||
<head>
|
||||
<link rel="shortcut icon" href="theme/standard/pix/favicon.ico" />';
|
||||
|
||||
$sheets = array('pagelayout','core');
|
||||
$csss = array();
|
||||
foreach ($sheets as $sheet) {
|
||||
$csss[] = $CFG->wwwroot.'/theme/base/style/'.$sheet.'.css';
|
||||
}
|
||||
$sheets = array('core', 'css3');
|
||||
foreach ($sheets as $sheet) {
|
||||
$csss[] = $CFG->wwwroot.'/theme/standard/style/'.$sheet.'.css';
|
||||
}
|
||||
foreach ($csss as $css) {
|
||||
echo '<link rel="stylesheet" type="text/css" href="'.$css.'" />'."\n";
|
||||
}
|
||||
|
||||
echo '<link rel="stylesheet" type="text/css" href="'.$CFG->wwwroot.'/install.php?css=1" />
|
||||
echo '<link rel="stylesheet" type="text/css" href="'.$CFG->wwwroot.'/install/css.php" />
|
||||
<title>'.get_string('installation','install').' - Moodle '.$CFG->target_release.'</title>
|
||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
|
||||
<meta http-equiv="pragma" content="no-cache" />
|
||||
@ -381,118 +368,6 @@ function install_print_footer($config, $reload=false) {
|
||||
echo '</div></body></html>';
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Prints css needed on installation page, tries to look like the rest of installation.
|
||||
* Does not return.
|
||||
*
|
||||
* @global object
|
||||
*/
|
||||
function install_css_styles() {
|
||||
global $CFG;
|
||||
|
||||
@header('Content-type: text/css'); // Correct MIME type
|
||||
@header('Cache-Control: no-store, no-cache, must-revalidate');
|
||||
@header('Cache-Control: post-check=0, pre-check=0', false);
|
||||
@header('Pragma: no-cache');
|
||||
@header('Expires: Mon, 20 Aug 1969 09:23:00 GMT');
|
||||
@header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
|
||||
|
||||
//TODO: add rtl support here, make it match new default theme MDL-21149
|
||||
|
||||
echo '
|
||||
|
||||
h2 {
|
||||
text-align:center;
|
||||
}
|
||||
|
||||
#installdiv {
|
||||
width: 800px;
|
||||
margin-left:auto;
|
||||
margin-right:auto;
|
||||
}
|
||||
|
||||
#installdiv dt {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
#installdiv dd {
|
||||
padding-bottom: 0.5em;
|
||||
}
|
||||
|
||||
.stage {
|
||||
margin-top: 2em;
|
||||
margin-bottom: 2em;
|
||||
width: 100%;
|
||||
padding:25px;
|
||||
}
|
||||
|
||||
#installform {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#nav_buttons input {
|
||||
margin: 5px;
|
||||
}
|
||||
|
||||
#envresult {
|
||||
text-align:left;
|
||||
width: auto;
|
||||
margin-left:10em;
|
||||
}
|
||||
|
||||
#envresult dd {
|
||||
color: red;
|
||||
}
|
||||
|
||||
.formrow {
|
||||
clear:both;
|
||||
text-align:left;
|
||||
padding: 8px;
|
||||
}
|
||||
|
||||
.formrow label.formlabel {
|
||||
display:block;
|
||||
float:left;
|
||||
width: 260px;
|
||||
margin-right:5px;
|
||||
text-align:right;
|
||||
}
|
||||
|
||||
.formrow .forminput {
|
||||
display:block;
|
||||
float:left;
|
||||
}
|
||||
|
||||
fieldset {
|
||||
text-align:center;
|
||||
border:none;
|
||||
}
|
||||
|
||||
.hint {
|
||||
display:block;
|
||||
clear:both;
|
||||
padding-left: 265px;
|
||||
color: red;
|
||||
}
|
||||
|
||||
.configphp {
|
||||
text-align:left;
|
||||
background-color:white;
|
||||
padding:1em;
|
||||
width:95%;
|
||||
}
|
||||
|
||||
.stage6 .stage {
|
||||
font-weight: bold;
|
||||
color: red;
|
||||
}
|
||||
|
||||
';
|
||||
|
||||
die;
|
||||
}
|
||||
|
||||
/**
|
||||
* Install Moodle DB,
|
||||
* config.php must exist, there must not be any tables in db yet.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user