------------------------------------------------------------
revno: 1067
committer: Roger Martin <[email protected]>
branch nick: aikiframework
timestamp: Fri 2012-02-03 21:26:59 +0100
message:
updater uses themes for css
removed:
assets/apps/upgrader/images/
assets/apps/upgrader/images/aiki_logo.png
assets/apps/upgrader/images/error.png
assets/apps/upgrader/images/help.png
assets/apps/upgrader/images/info.png
assets/apps/upgrader/images/installer_bg.png
assets/apps/upgrader/images/next.png
assets/apps/upgrader/images/ok.png
assets/apps/upgrader/images/page_bg.png
assets/apps/upgrader/images/toggle.png
assets/apps/upgrader/upgrader.css
added:
assets/themes/
assets/themes/default/
assets/themes/default/images/
assets/themes/default/images/aiki_logo.png
assets/themes/default/images/error.png
assets/themes/default/images/help.png
assets/themes/default/images/info.png
assets/themes/default/images/installer_bg.png
assets/themes/default/images/next.png
assets/themes/default/images/ok.png
assets/themes/default/images/page_bg.png
assets/themes/default/images/toggle.png
assets/themes/default/installer_upgrader.css
modified:
assets/apps/upgrader/defaults.php
assets/apps/upgrader/library.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-01 22:40:03 +0000
+++ assets/apps/upgrader/defaults.php 2012-02-03 20:26:59 +0000
@@ -24,3 +24,7 @@
$t->t("This is aiki UPGRADER.")."<br>".
$t->t("Please <strong>make a backup</strong> for all files and don't forget copy database.").
"</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";
=== removed directory 'assets/apps/upgrader/images'
=== removed file 'assets/apps/upgrader/images/aiki_logo.png'
Binary files assets/apps/upgrader/images/aiki_logo.png 2012-02-01 22:40:03 +0000 and assets/apps/upgrader/images/aiki_logo.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'assets/apps/upgrader/images/error.png'
Binary files assets/apps/upgrader/images/error.png 2012-02-01 22:40:03 +0000 and assets/apps/upgrader/images/error.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'assets/apps/upgrader/images/help.png'
Binary files assets/apps/upgrader/images/help.png 2012-02-01 22:40:03 +0000 and assets/apps/upgrader/images/help.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'assets/apps/upgrader/images/info.png'
Binary files assets/apps/upgrader/images/info.png 2012-02-01 22:40:03 +0000 and assets/apps/upgrader/images/info.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'assets/apps/upgrader/images/installer_bg.png'
Binary files assets/apps/upgrader/images/installer_bg.png 2012-02-01 22:40:03 +0000 and assets/apps/upgrader/images/installer_bg.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'assets/apps/upgrader/images/next.png'
Binary files assets/apps/upgrader/images/next.png 2012-02-01 22:40:03 +0000 and assets/apps/upgrader/images/next.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'assets/apps/upgrader/images/ok.png'
Binary files assets/apps/upgrader/images/ok.png 2012-02-01 22:40:03 +0000 and assets/apps/upgrader/images/ok.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'assets/apps/upgrader/images/page_bg.png'
Binary files assets/apps/upgrader/images/page_bg.png 2012-02-01 22:40:03 +0000 and assets/apps/upgrader/images/page_bg.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'assets/apps/upgrader/images/toggle.png'
Binary files assets/apps/upgrader/images/toggle.png 2012-02-01 22:40:03 +0000 and assets/apps/upgrader/images/toggle.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'assets/apps/upgrader/library.php'
--- assets/apps/upgrader/library.php 2012-02-03 19:28:23 +0000
+++ assets/apps/upgrader/library.php 2012-02-03 20:26:59 +0000
@@ -269,7 +269,7 @@
// Manual upgrades by SQL statments -------------------------------
$sqls = array();
- include_once "upgrades.php";
+ include_once "upgrades.php"; // creates $upgrades array
// filter revision
foreach ( $upgrades as $revision=>$sql ){
if ( $revision > $REVISION ) {
=== removed file 'assets/apps/upgrader/upgrader.css'
--- assets/apps/upgrader/upgrader.css 2012-02-03 19:28:23 +0000
+++ assets/apps/upgrader/upgrader.css 1970-01-01 00:00:00 +0000
@@ -1,300 +0,0 @@
-/**
- * Aiki Framework (PHP)
- *
- * @author Roger Martin
- * @copyright (c) 2008-2011 Aiki Lab Pte Ltd
- * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html
- * @link http://www.aikiframework.org
- * @category Aiki
- * @package apps
- *
- */
-
-* {
- margin: 0;
- padding: 0;}
-
-body {
- background: #444 url(./images/installer_bg.png) repeat-x top left;
- font: normal normal normal 14px/18px sans-serif ;
- }
-
-select,
-input {
- font: normal normal normal 14px/18px sans-serif ;
-
-}
-
-
-#page {
- margin: 40px auto;
- width: 600px;
- background: #fff url(./images/page_bg.png) 6px 3px no-repeat;
- color: #333;
- padding: 18px 24px;
- border-radius: 12px ;
- box-shadow: 12px 12px 12px #000;}
-
-p {
- margin: 9px 0 }
-p.note {
- margin: 4px 0px 14px 0px;
- font-size: 12px;
- color: #555;}
-
-h1 {
- color: #111;
- font-size: 28px;
- line-height:36px;
- border-bottom:1px dotted #999;
- background: url(./images/aiki_logo.png) no-repeat top right;
- padding-bottom:8px;
- margin: 9px 0px;}
-
-
-h1 em {
- display: block;
- font-size: 14px;
- line-height: 18px;
- font-style: normal;
- color: #72cccf;
-}
-
-h1 strong { text-transform: uppercase }
-
-
-span.error {
- color: #a40000;
-}
-
-fieldset {
- border:none;
- border: 1px solid #666;
- border-radius: 5px;
- padding:9px;
- margin-bottom: 18px;}
-
-legend {
- display: block;
- margin:0 auto;
- font-weight: bold;
- background-color: #666;
- border-radius: 4px ;
- color: #fff;
- padding: 7px 5% 2px 5%;
- width:87%;
-}
-
-fieldset.db {
- float:left;
- width:45%;
- }
-
-fieldset.other {
- float:right;
- width:45%;
- }
-
-label {
- display: block;
-}
-
-
-div.actions {
- clear: both;
- overflow: auto;
- border-top:1px dotted #d0d0d0;
- margin: 18px 0 6px 0;
-}
-
-div.help {
- clear: both;
- margin: 18px 0 6px 0;
- background: url(./images/help.png) no-repeat 0px 0px;
- padding-left: 22px;
-}
-
-
-div.ok,
-div.error,
-div.message-strong {
- padding: 9px 18px 9px 50px;;
- margin: 9px 0px;
- border-radius: 8px ;
- border: 3px solid #e5e5e5;
- border: 1px solid #999;
-}
-
-div.error,
-div.ok {
- font-size: 20px;
- line-height: 27px;
- box-shadow: 3px 3px 3px #eee;
-}
-
-div.error em,
-div.ok em {
- font-style: normal;
- display:block;
- font-size: 14px;
- line-height: 18px;}
-
-div.message {
- padding: 9px 0px 9px 50px;
- background: #fff url(./images/info.png) no-repeat 8px 12px;
-}
-
-
-div.error { background: #fff url(./images/error.png) no-repeat 8px 6px; }
-div.message-strong { background: #f2f2f2 url(./images/info.png) no-repeat 8px 6px;}
-div.ok { background: #fff url(./images/ok.png) no-repeat 8px 6px;}
-
-
-a.button,
-input.button,
-.user-input {
- border: 1px solid #777;
- padding: 5px 4px 2px 4px;
- border-radius: 4px ;
- box-shadow: 4px 4px 2px #f0f0f0;
- background-color:#fff;
- color: #333;
-}
-
-.user-input {
- width: 215px;
-}
-
-
-input#captcha {
-width: 5em ;
-margin:7px;
-float:left;}
-
-img.captcha {
-display:block;
-float:left;
-clear:left;
-margin:4px 8px 4px 0px;;
-padding: 3px;
-border: 1px solid #777;}
-
-a.button,
-input.button {
- display:block;}
-
-.user-input:focus {
- border-color: #f57900}
-
-span.required {
- font-size: 18px;
- padding-left: 4px;
- color: #666;}
-
-span.info {
- display: block;
- font-size: 14px;
- padding: 5px 0px 2px 4px;
- color: #888;}
-
-span.wrong {
- color: #A00;
- text-transform: uppercase;
- font-weight: bold;
- }
-
-p.required {
-clear: both;}
-
-a.button,
-input.button {
- padding: 5px 12px 2px 12px;
- background-color: #f2f2f2;
- float:left;
- text-decoration: none;
- margin: 18px 9px 9px 0px;
-}
-
-input.next {
- background: url(./images/next.png) no-repeat right center;
- padding-right: 28px;
- margin-right: 0px;
- float: right }
-
-a.button:hover,
-input.button:hover {
- background-color: #ddd;
-}
-
-textarea.filedump {
- width:98%;
- height: 20em;}
-
-p.errors { margin:9px 0px 9px 50px; clear:both; color: #900; padding-top:9px;}
-textarea.errordump {
- margin-left: 50px;
- width: 500px;
- height: 20em;}
-
-
-#f_language { margin-bottom:9px; padding-bottom:9px; overflow:auto;}
-#f_language input,
-#f_language select,
-#f_language label { display: inline; margin-right:0.5em; }
-
-
-#welcome {
- line-height: 1.4em;
- padding:12px;
- margin-bottom: 24px;
-}
-
-div.links {
- position: relative;
- top: 6px;
- z-index:99;
- overflow: auto }
-
-a.toggle:hover { color: #999}
-a.toggle:active { color: #000}
-
-a.toggle {
- outline: none !important;
- text-transform: uppercase;
- display:block;
- float:left;
- color: #555;
- padding: 6px 12px 12px 12px;
- background-position: bottom center;
- background-repeat: no-repeat;
- text-decoration:none;}
-
-a.active {
- background-image: url(images/toggle.png) }
-
-div.toggle pre {
-font-size: 0.8em;}
-
-div.toggle {
- line-height: 1.4em;
- width:100%;
- padding:16px 16px 12px 32px;
- position: relative;
- left: -24px;
- border-bottom: 1px solid #f4e355;
- border-top: 1px solid #f4e355;
- background-color: #f8ed90;
- margin-bottom: 24px;
- overflow: auto;
- max-height:400px;
-}
-
-div.toggle h2 { font-weight: bold; font-size: 1.2em; padding-bottom: 0.2em; }
-div.toggle ul,
-div.toggle ol { padding-left: 36px;}
-
-#file-list { overflow:auto }
-#file-list div.col { float:left; width:43%; margin-right:6%;}
-
-div.finished {
-margin-top: 36px !important}
=== modified file 'assets/apps/upgrader/upgrader.php'
--- assets/apps/upgrader/upgrader.php 2012-02-03 19:28:23 +0000
+++ assets/apps/upgrader/upgrader.php 2012-02-03 20:26:59 +0000
@@ -129,23 +129,30 @@
// internationalization
-$language = $t->translateTo();
-$css = $t->t("upgrader.css");
-$text_direction= $t->t("dir='ltr'");
-// note: which css to use, and text direction can be set in .po file
+$language = $t->translateTo();
+$text_direction = $t->t("dir='ltr'");
+$cssSuffix = ( $text_direction=="dir='ltr'" ? "": "rtl" );
+// note: text direction can be set in .po file
// insert values and results in html template
$stepOf = sprintf( $t->t("Step %d of %d"), $step, steps(-1) ) ;
$cSteps = steps($step);
$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;
+}
+
echo <<< HTML
<!DOCTYPE HTML>
<html lang="{$language}" {$text_direction}>
<head>
<title>{$UPGRADER_TITLE_TAG}</title>
<meta charset='utf-8' >
- <link rel='stylesheet' href='./{$css}' type="text/css" media="all">
+ <link rel='stylesheet' href='{$css}.css' type="text/css" media="all">
{$javascripts}
</head>
=== added directory 'assets/themes'
=== added directory 'assets/themes/default'
=== added directory 'assets/themes/default/images'
=== added file 'assets/themes/default/images/aiki_logo.png'
Binary files assets/themes/default/images/aiki_logo.png 1970-01-01 00:00:00 +0000 and assets/themes/default/images/aiki_logo.png 2012-02-03 20:26:59 +0000 differ
=== added file 'assets/themes/default/images/error.png'
Binary files assets/themes/default/images/error.png 1970-01-01 00:00:00 +0000 and assets/themes/default/images/error.png 2012-02-03 20:26:59 +0000 differ
=== added file 'assets/themes/default/images/help.png'
Binary files assets/themes/default/images/help.png 1970-01-01 00:00:00 +0000 and assets/themes/default/images/help.png 2012-02-03 20:26:59 +0000 differ
=== added file 'assets/themes/default/images/info.png'
Binary files assets/themes/default/images/info.png 1970-01-01 00:00:00 +0000 and assets/themes/default/images/info.png 2012-02-03 20:26:59 +0000 differ
=== added file 'assets/themes/default/images/installer_bg.png'
Binary files assets/themes/default/images/installer_bg.png 1970-01-01 00:00:00 +0000 and assets/themes/default/images/installer_bg.png 2012-02-03 20:26:59 +0000 differ
=== added file 'assets/themes/default/images/next.png'
Binary files assets/themes/default/images/next.png 1970-01-01 00:00:00 +0000 and assets/themes/default/images/next.png 2012-02-03 20:26:59 +0000 differ
=== added file 'assets/themes/default/images/ok.png'
Binary files assets/themes/default/images/ok.png 1970-01-01 00:00:00 +0000 and assets/themes/default/images/ok.png 2012-02-03 20:26:59 +0000 differ
=== added file 'assets/themes/default/images/page_bg.png'
Binary files assets/themes/default/images/page_bg.png 1970-01-01 00:00:00 +0000 and assets/themes/default/images/page_bg.png 2012-02-03 20:26:59 +0000 differ
=== added file 'assets/themes/default/images/toggle.png'
Binary files assets/themes/default/images/toggle.png 1970-01-01 00:00:00 +0000 and assets/themes/default/images/toggle.png 2012-02-03 20:26:59 +0000 differ
=== added file 'assets/themes/default/installer_upgrader.css'
--- assets/themes/default/installer_upgrader.css 1970-01-01 00:00:00 +0000
+++ assets/themes/default/installer_upgrader.css 2012-02-03 20:26:59 +0000
@@ -0,0 +1,300 @@
+/**
+ * Aiki Framework (PHP)
+ *
+ * @author Roger Martin
+ * @copyright (c) 2008-2011 Aiki Lab Pte Ltd
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html
+ * @link http://www.aikiframework.org
+ * @category Aiki
+ * @package apps
+ *
+ */
+
+* {
+ margin: 0;
+ padding: 0;}
+
+body {
+ background: #444 url(./images/installer_bg.png) repeat-x top left;
+ font: normal normal normal 14px/18px sans-serif ;
+ }
+
+select,
+input {
+ font: normal normal normal 14px/18px sans-serif ;
+
+}
+
+
+#page {
+ margin: 40px auto;
+ width: 600px;
+ background: #fff url(./images/page_bg.png) 6px 3px no-repeat;
+ color: #333;
+ padding: 18px 24px;
+ border-radius: 12px ;
+ box-shadow: 12px 12px 12px #000;}
+
+p {
+ margin: 9px 0 }
+p.note {
+ margin: 4px 0px 14px 0px;
+ font-size: 12px;
+ color: #555;}
+
+h1 {
+ color: #111;
+ font-size: 28px;
+ line-height:36px;
+ border-bottom:1px dotted #999;
+ background: url(./images/aiki_logo.png) no-repeat top right;
+ padding-bottom:8px;
+ margin: 9px 0px;}
+
+
+h1 em {
+ display: block;
+ font-size: 14px;
+ line-height: 18px;
+ font-style: normal;
+ color: #72cccf;
+}
+
+h1 strong { text-transform: uppercase }
+
+
+span.error {
+ color: #a40000;
+}
+
+fieldset {
+ border:none;
+ border: 1px solid #666;
+ border-radius: 5px;
+ padding:9px;
+ margin-bottom: 18px;}
+
+legend {
+ display: block;
+ margin:0 auto;
+ font-weight: bold;
+ background-color: #666;
+ border-radius: 4px ;
+ color: #fff;
+ padding: 7px 5% 2px 5%;
+ width:87%;
+}
+
+fieldset.db {
+ float:left;
+ width:45%;
+ }
+
+fieldset.other {
+ float:right;
+ width:45%;
+ }
+
+label {
+ display: block;
+}
+
+
+div.actions {
+ clear: both;
+ overflow: auto;
+ border-top:1px dotted #d0d0d0;
+ margin: 18px 0 6px 0;
+}
+
+div.help {
+ clear: both;
+ margin: 18px 0 6px 0;
+ background: url(./images/help.png) no-repeat 0px 0px;
+ padding-left: 22px;
+}
+
+
+div.ok,
+div.error,
+div.message-strong {
+ padding: 9px 18px 9px 50px;;
+ margin: 9px 0px;
+ border-radius: 8px ;
+ border: 3px solid #e5e5e5;
+ border: 1px solid #999;
+}
+
+div.error,
+div.ok {
+ font-size: 20px;
+ line-height: 27px;
+ box-shadow: 3px 3px 3px #eee;
+}
+
+div.error em,
+div.ok em {
+ font-style: normal;
+ display:block;
+ font-size: 14px;
+ line-height: 18px;}
+
+div.message {
+ padding: 9px 0px 9px 50px;
+ background: #fff url(./images/info.png) no-repeat 8px 12px;
+}
+
+
+div.error { background: #fff url(./images/error.png) no-repeat 8px 6px; }
+div.message-strong { background: #f2f2f2 url(./images/info.png) no-repeat 8px 6px;}
+div.ok { background: #fff url(./images/ok.png) no-repeat 8px 6px;}
+
+
+a.button,
+input.button,
+.user-input {
+ border: 1px solid #777;
+ padding: 5px 4px 2px 4px;
+ border-radius: 4px ;
+ box-shadow: 4px 4px 2px #f0f0f0;
+ background-color:#fff;
+ color: #333;
+}
+
+.user-input {
+ width: 215px;
+}
+
+
+input#captcha {
+width: 5em ;
+margin:7px;
+float:left;}
+
+img.captcha {
+display:block;
+float:left;
+clear:left;
+margin:4px 8px 4px 0px;;
+padding: 3px;
+border: 1px solid #777;}
+
+a.button,
+input.button {
+ display:block;}
+
+.user-input:focus {
+ border-color: #f57900}
+
+span.required {
+ font-size: 18px;
+ padding-left: 4px;
+ color: #666;}
+
+span.info {
+ display: block;
+ font-size: 14px;
+ padding: 5px 0px 2px 4px;
+ color: #888;}
+
+span.wrong {
+ color: #A00;
+ text-transform: uppercase;
+ font-weight: bold;
+ }
+
+p.required {
+clear: both;}
+
+a.button,
+input.button {
+ padding: 5px 12px 2px 12px;
+ background-color: #f2f2f2;
+ float:left;
+ text-decoration: none;
+ margin: 18px 9px 9px 0px;
+}
+
+input.next {
+ background: url(./images/next.png) no-repeat right center;
+ padding-right: 28px;
+ margin-right: 0px;
+ float: right }
+
+a.button:hover,
+input.button:hover {
+ background-color: #ddd;
+}
+
+textarea.filedump {
+ width:98%;
+ height: 20em;}
+
+p.errors { margin:9px 0px 9px 50px; clear:both; color: #900; padding-top:9px;}
+textarea.errordump {
+ margin-left: 50px;
+ width: 500px;
+ height: 20em;}
+
+
+#f_language { margin-bottom:9px; padding-bottom:9px; overflow:auto;}
+#f_language input,
+#f_language select,
+#f_language label { display: inline; margin-right:0.5em; }
+
+
+#welcome {
+ line-height: 1.4em;
+ padding:12px;
+ margin-bottom: 24px;
+}
+
+div.links {
+ position: relative;
+ top: 6px;
+ z-index:99;
+ overflow: auto }
+
+a.toggle:hover { color: #999}
+a.toggle:active { color: #000}
+
+a.toggle {
+ outline: none !important;
+ text-transform: uppercase;
+ display:block;
+ float:left;
+ color: #555;
+ padding: 6px 12px 12px 12px;
+ background-position: bottom center;
+ background-repeat: no-repeat;
+ text-decoration:none;}
+
+a.active {
+ background-image: url(images/toggle.png) }
+
+div.toggle pre {
+font-size: 0.8em;}
+
+div.toggle {
+ line-height: 1.4em;
+ width:100%;
+ padding:16px 16px 12px 32px;
+ position: relative;
+ left: -24px;
+ border-bottom: 1px solid #f4e355;
+ border-top: 1px solid #f4e355;
+ background-color: #f8ed90;
+ margin-bottom: 24px;
+ overflow: auto;
+ max-height:400px;
+}
+
+div.toggle h2 { font-weight: bold; font-size: 1.2em; padding-bottom: 0.2em; }
+div.toggle ul,
+div.toggle ol { padding-left: 36px;}
+
+#file-list { overflow:auto }
+#file-list div.col { float:left; width:43%; margin-right:6%;}
+
+div.finished {
+margin-top: 36px !important}
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
