summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes1
-rw-r--r--HISTORY1
-rw-r--r--framework/PradoBase.php9
-rw-r--r--framework/powered.gifbin0 -> 1482 bytes
4 files changed, 10 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index d9b0fc37..632c072d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2152,6 +2152,7 @@ framework/Xml/TFeedDocument.php -text
framework/Xml/TRssFeedDocument.php -text
framework/Xml/TXmlDocument.php -text
framework/interfaces.php -text
+framework/powered.gif -text
framework/prado.php -text
/index.html -text
/phing -text
diff --git a/HISTORY b/HISTORY
index 30d9b0a6..1d360b86 100644
--- a/HISTORY
+++ b/HISTORY
@@ -26,6 +26,7 @@ ENH: Ticket#503 - Localization and parameter tags can now appear as a substring
ENH: Ticket#513 - Display last modified / revision in quickstart (Wei)
ENH: Ticket#519 - Update TActiveRecord implementation (Wei)
ENH: Ticket#537 - TActiveRecord Pk info ENH [usage: http://trac.pradosoft.com/prado/ticket/537] (Wei)
+ENH: Ticket#561 - Powered by PRADO image to become an asset (Qiang)
ENH: Ticket#569 - Added TTextBox.PersistPassword property (Qiang)
ENH: Added PRADO_CHMOD constant so that users can specify the permission of PRADO-created directories (Qiang)
ENH: Added Display property to TWebControl (Wei)
diff --git a/framework/PradoBase.php b/framework/PradoBase.php
index aab9aac8..16a27b08 100644
--- a/framework/PradoBase.php
+++ b/framework/PradoBase.php
@@ -103,7 +103,14 @@ class PradoBase
*/
public static function poweredByPrado()
{
- return '<a title="Powered by PRADO" href="http://www.pradosoft.com/" target="_blank"><img src="http://www.pradosoft.com/images/powered.gif" style="border-width:0px;" alt="Powered by PRADO" /></a>';
+ if(self::$_application!==null)
+ {
+ $am=self::$_application->getAssetManager();
+ $url=$am->publishFilePath(self::getPathOfNamespace('System.powered','.gif'));
+ }
+ else
+ $url='http://www.pradosoft.com/images/powered.gif';
+ return '<a title="Powered by PRADO" href="http://www.pradosoft.com/" target="_blank"><img src="'.$url.'" style="border-width:0px;" alt="Powered by PRADO" /></a>';
}
/**
diff --git a/framework/powered.gif b/framework/powered.gif
new file mode 100644
index 00000000..abad3b17
--- /dev/null
+++ b/framework/powered.gif
Binary files differ