summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe.Boulain <>2009-06-02 08:05:55 +0000
committerChristophe.Boulain <>2009-06-02 08:05:55 +0000
commit8e0cb0ff0a89603740c7a46a43c87a6d3267ca6f (patch)
treee2cea115b91a5c3bda8861334faf0db6a7806bb5
parentbaa16b4831f2a64ab5febb1b690612f24bb72b8a (diff)
Rename assets folder in Drag&Drop demo so it will be present in next prado release.
Fixed Issue#98
-rw-r--r--.gitattributes6
-rw-r--r--HISTORY1
-rwxr-xr-xdemos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page2
-rwxr-xr-xdemos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.php4
-rwxr-xr-xdemos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product1.png (renamed from demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product1.png)bin10711 -> 10711 bytes
-rwxr-xr-xdemos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product2.png (renamed from demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product2.png)bin9550 -> 9550 bytes
-rwxr-xr-xdemos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/trash.png (renamed from demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/trash.png)bin783 -> 783 bytes
7 files changed, 7 insertions, 6 deletions
diff --git a/.gitattributes b/.gitattributes
index ffd8639a..e8b3efd0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1281,9 +1281,9 @@ demos/quickstart/protected/pages/ActiveControls/DragDrop.page -text
demos/quickstart/protected/pages/ActiveControls/Home.page -text
demos/quickstart/protected/pages/ActiveControls/Introduction.page -text
demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page -text
-demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product1.png -text svneol=unset#image/png
-demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product2.png -text svneol=unset#image/png
-demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/trash.png -text svneol=unset#image/png
+demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product1.png -text svneol=unset#image/png
+demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product2.png -text svneol=unset#image/png
+demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/trash.png -text svneol=unset#image/png
demos/quickstart/protected/pages/ActiveControls/Samples/TActiveButton/Home.page -text
demos/quickstart/protected/pages/ActiveControls/Samples/TActiveButton/Home.php -text
demos/quickstart/protected/pages/ActiveControls/Samples/TActiveCheckBox/Home.page -text
diff --git a/HISTORY b/HISTORY
index e3e78035..c68999cd 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,4 +1,5 @@
Version 3.1.6 to be released
+BUG: Issue#98 - Missing file in quickstart demo (Chrisotphe)
BUG: Issue#164 - CultureInfo::validCulture should be declared as a static method (Christophe)
Version 3.1.5 May 24, 2009
diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page
index 89d64110..a826f5a8 100755
--- a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page
+++ b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page
@@ -38,7 +38,7 @@
}
.trash-hover {
- background-image: url(<%~ assets/trash.png%>);
+ background-image: url(<%~ images/trash.png%>);
}
</style>
diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.php b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.php
index 276ee6a4..0e4f6193 100755
--- a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.php
+++ b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.php
@@ -20,12 +20,12 @@ class Home extends TPage
return array (
array (
'ProductId' => 'Product1',
- 'ProductImageUrl' => $this->publishAsset('assets/product1.png'),
+ 'ProductImageUrl' => $this->publishAsset('images/product1.png'),
'ProductTitle' => 'Cup'
),
array (
'ProductId' => 'Product2',
- 'ProductImageUrl' => $this->publishAsset('assets/product2.png'),
+ 'ProductImageUrl' => $this->publishAsset('images/product2.png'),
'ProductTitle' => 'T-Shirt'
)
);
diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product1.png b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product1.png
index ae03d551..ae03d551 100755
--- a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product1.png
+++ b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product1.png
Binary files differ
diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product2.png b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product2.png
index 25e81ad7..25e81ad7 100755
--- a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product2.png
+++ b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product2.png
Binary files differ
diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/trash.png b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/trash.png
index 184f7628..184f7628 100755
--- a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/trash.png
+++ b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/trash.png
Binary files differ