------------------------------------------------------------
revno: 1068
committer: Roger Martin <[email protected]>
branch nick: aikiframework
timestamp: Fri 2012-02-03 21:48:09 +0100
message:
UPDGRADER_CSS accepts one or more files
modified:
assets/apps/upgrader/defaults.php
assets/apps/upgrader/upgrader.php
--
lp:aikiframework
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk
Your team Aiki Framework Developers is subscribed to branch lp:aikiframework.
To unsubscribe from this branch go to
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk/+edit-subscription
=== modified file 'assets/apps/upgrader/defaults.php'
--- assets/apps/upgrader/defaults.php 2012-02-03 20:26:59 +0000
+++ assets/apps/upgrader/defaults.php 2012-02-03 20:48:09 +0000
@@ -26,5 +26,7 @@
"</p>";
// don't define UPGRADER_CSS if you want use aiki admin theme
-// Don't add extension: .css or rtl.css will be added.
-// $UPGRADER_CSS= "./upgrader";
+// Don't add extension: .css or rtl.css will be added.
+// Include path.
+// separate css files by ;
+// $UPGRADER_CSS= "./../../theme/default/installer_upgrader;./mysite";
=== modified file 'assets/apps/upgrader/upgrader.php'
--- assets/apps/upgrader/upgrader.php 2012-02-03 20:26:59 +0000
+++ assets/apps/upgrader/upgrader.php 2012-02-03 20:48:09 +0000
@@ -131,7 +131,7 @@
// internationalization
$language = $t->translateTo();
$text_direction = $t->t("dir='ltr'");
-$cssSuffix = ( $text_direction=="dir='ltr'" ? "": "rtl" );
+$cssSuffix = ( $text_direction=="dir='ltr'" ? ".css": "rtl.css" );
// note: text direction can be set in .po file
// insert values and results in html template
@@ -140,11 +140,14 @@
$result = sprintf(template($step), $message, $aditional.$help) ;
// theme
-if ( isset($UPGRADER_CSS) ){
- $css = $UPGRADER_CSS.$cssSuffix;
-} else {
- $css = "./../../themes/" . config("AIKI-ADMIN-THEME","default") . "/installer_upgrader" . $cssSuffix;
+if ( !isset($UPGRADER_CSS) ) {
+ $UPGRADER_CSS = "./../../themes/" . config("AIKI-ADMIN-THEME","default") . "/installer_upgrader" ;
}
+$css="";
+foreach ( explode(";" , $UPGRADER_CSS ) as $fileCSS ) {
+ $css .= "<link rel='stylesheet' href='{$fileCSS}{$cssSuffix}' type='text/css' media='all'>\n";
+}
+
echo <<< HTML
<!DOCTYPE HTML>
@@ -152,7 +155,7 @@
<head>
<title>{$UPGRADER_TITLE_TAG}</title>
<meta charset='utf-8' >
- <link rel='stylesheet' href='{$css}.css' type="text/css" media="all">
+ {$css}
{$javascripts}
</head>
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
