summaryrefslogtreecommitdiff
path: root/demos
diff options
context:
space:
mode:
authorChristophe.Boulain <>2009-06-02 08:16:54 +0000
committerChristophe.Boulain <>2009-06-02 08:16:54 +0000
commit0847a5cb9bc02872e472622e1eec56896a412078 (patch)
tree0f43a88df53333f01e06e1f214c31a77f412e1c0 /demos
parent0ce86cec9911151088341846dd2677bfed2ff51e (diff)
parent8e0cb0ff0a89603740c7a46a43c87a6d3267ca6f (diff)
Merging latest 3.1 changes into trunk
Diffstat (limited to 'demos')
-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
5 files changed, 3 insertions, 3 deletions
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