summaryrefslogtreecommitdiff
path: root/addons/website/static/src
diff options
context:
space:
mode:
authorFabien Pinckaers <fp@openerp.com>2013-09-20 07:10:29 +0200
committerFabien Pinckaers <fp@openerp.com>2013-09-20 07:10:29 +0200
commita71804b74d661d4d5b2a74c8dce2585aa4207fb7 (patch)
treec112bde6c15f3bdbf87de71dc4752a58c7439274 /addons/website/static/src
parent3e1a4a01a6bfb1c5c369590f0ffc1ed9796438e9 (diff)
[IMP] Attachments with default images
bzr revid: fp@openerp.com-20130920051029-0t61gy4zz68dfckl
Diffstat (limited to 'addons/website/static/src')
-rw-r--r--addons/website/static/src/img/library/baby.jpg (renamed from addons/website/static/src/img/library/shutterstock_131909891.jpg)bin167985 -> 167985 bytes
-rw-r--r--addons/website/static/src/img/library/business_conference.jpg (renamed from addons/website/static/src/img/library/shutterstock_121837102.jpg)bin126907 -> 126907 bytes
-rw-r--r--addons/website/static/src/img/library/business_hands.jpg (renamed from addons/website/static/src/img/library/shutterstock_108327197.jpg)bin603432 -> 603432 bytes
-rw-r--r--addons/website/static/src/img/library/business_stats.jpg (renamed from addons/website/static/src/img/library/shutterstock_134150393.jpg)bin625061 -> 625061 bytes
-rw-r--r--addons/website/static/src/img/library/engineer.jpg (renamed from addons/website/static/src/img/library/shutterstock_133550600.jpg)bin406235 -> 406235 bytes
-rw-r--r--addons/website/static/src/img/library/flight.jpg (renamed from addons/website/static/src/img/library/shutterstock_129132983.jpg)bin642167 -> 642167 bytes
-rw-r--r--addons/website/static/src/img/library/gears.jpg (renamed from addons/website/static/src/img/library/shutterstock_64576072.jpg)bin87089 -> 87089 bytes
-rw-r--r--addons/website/static/src/img/library/helpdesk.jpg (renamed from addons/website/static/src/img/library/shutterstock_141778333.jpg)bin519706 -> 519706 bytes
-rw-r--r--addons/website/static/src/img/library/landscape_tree.jpg (renamed from addons/website/static/src/img/library/shutterstock_94652485.jpg)bin906294 -> 906294 bytes
-rw-r--r--addons/website/static/src/img/library/lazagne.jpg (renamed from addons/website/static/src/img/library/shutterstock_142426168.jpg)bin255588 -> 255588 bytes
-rw-r--r--addons/website/static/src/img/library/manufacturing.jpg (renamed from addons/website/static/src/img/library/shutterstock_146957396.jpg)bin800947 -> 800947 bytes
-rw-r--r--addons/website/static/src/img/library/personal_laptop.jpg (renamed from addons/website/static/src/img/library/shutterstock_138302168.jpg)bin480635 -> 480635 bytes
-rw-r--r--addons/website/static/src/img/library/school_kids.jpg (renamed from addons/website/static/src/img/library/shutterstock_144566138.jpg)bin609482 -> 609482 bytes
-rw-r--r--addons/website/static/src/img/library/ship_sea.jpg (renamed from addons/website/static/src/img/library/shutterstock_94642732.jpg)bin674937 -> 674937 bytes
-rw-r--r--addons/website/static/src/img/library/vegetables.jpg (renamed from addons/website/static/src/img/library/shutterstock_88218493.jpg)bin166485 -> 166485 bytes
-rw-r--r--addons/website/static/src/img/library/world.jpg (renamed from addons/website/static/src/img/library/shutterstock_107930255.jpg)bin155645 -> 155645 bytes
-rw-r--r--addons/website/static/src/js/website.editor.js2
-rw-r--r--addons/website/static/src/xml/website.editor.xml3
18 files changed, 2 insertions, 3 deletions
diff --git a/addons/website/static/src/img/library/shutterstock_131909891.jpg b/addons/website/static/src/img/library/baby.jpg
index 2e1b0cb877a..2e1b0cb877a 100644
--- a/addons/website/static/src/img/library/shutterstock_131909891.jpg
+++ b/addons/website/static/src/img/library/baby.jpg
Binary files differ
diff --git a/addons/website/static/src/img/library/shutterstock_121837102.jpg b/addons/website/static/src/img/library/business_conference.jpg
index 407137d159a..407137d159a 100644
--- a/addons/website/static/src/img/library/shutterstock_121837102.jpg
+++ b/addons/website/static/src/img/library/business_conference.jpg
Binary files differ
diff --git a/addons/website/static/src/img/library/shutterstock_108327197.jpg b/addons/website/static/src/img/library/business_hands.jpg
index cb012519301..cb012519301 100644
--- a/addons/website/static/src/img/library/shutterstock_108327197.jpg
+++ b/addons/website/static/src/img/library/business_hands.jpg
Binary files differ
diff --git a/addons/website/static/src/img/library/shutterstock_134150393.jpg b/addons/website/static/src/img/library/business_stats.jpg
index 1123100c675..1123100c675 100644
--- a/addons/website/static/src/img/library/shutterstock_134150393.jpg
+++ b/addons/website/static/src/img/library/business_stats.jpg
Binary files differ
diff --git a/addons/website/static/src/img/library/shutterstock_133550600.jpg b/addons/website/static/src/img/library/engineer.jpg
index bd0fa56c38f..bd0fa56c38f 100644
--- a/addons/website/static/src/img/library/shutterstock_133550600.jpg
+++ b/addons/website/static/src/img/library/engineer.jpg
Binary files differ
diff --git a/addons/website/static/src/img/library/shutterstock_129132983.jpg b/addons/website/static/src/img/library/flight.jpg
index 0071979a015..0071979a015 100644
--- a/addons/website/static/src/img/library/shutterstock_129132983.jpg
+++ b/addons/website/static/src/img/library/flight.jpg
Binary files differ
diff --git a/addons/website/static/src/img/library/shutterstock_64576072.jpg b/addons/website/static/src/img/library/gears.jpg
index 868c2532c41..868c2532c41 100644
--- a/addons/website/static/src/img/library/shutterstock_64576072.jpg
+++ b/addons/website/static/src/img/library/gears.jpg
Binary files differ
diff --git a/addons/website/static/src/img/library/shutterstock_141778333.jpg b/addons/website/static/src/img/library/helpdesk.jpg
index 9591abe164e..9591abe164e 100644
--- a/addons/website/static/src/img/library/shutterstock_141778333.jpg
+++ b/addons/website/static/src/img/library/helpdesk.jpg
Binary files differ
diff --git a/addons/website/static/src/img/library/shutterstock_94652485.jpg b/addons/website/static/src/img/library/landscape_tree.jpg
index fd5c9446c7b..fd5c9446c7b 100644
--- a/addons/website/static/src/img/library/shutterstock_94652485.jpg
+++ b/addons/website/static/src/img/library/landscape_tree.jpg
Binary files differ
diff --git a/addons/website/static/src/img/library/shutterstock_142426168.jpg b/addons/website/static/src/img/library/lazagne.jpg
index 21f10a01ca7..21f10a01ca7 100644
--- a/addons/website/static/src/img/library/shutterstock_142426168.jpg
+++ b/addons/website/static/src/img/library/lazagne.jpg
Binary files differ
diff --git a/addons/website/static/src/img/library/shutterstock_146957396.jpg b/addons/website/static/src/img/library/manufacturing.jpg
index dc7266e46a8..dc7266e46a8 100644
--- a/addons/website/static/src/img/library/shutterstock_146957396.jpg
+++ b/addons/website/static/src/img/library/manufacturing.jpg
Binary files differ
diff --git a/addons/website/static/src/img/library/shutterstock_138302168.jpg b/addons/website/static/src/img/library/personal_laptop.jpg
index 069487766dd..069487766dd 100644
--- a/addons/website/static/src/img/library/shutterstock_138302168.jpg
+++ b/addons/website/static/src/img/library/personal_laptop.jpg
Binary files differ
diff --git a/addons/website/static/src/img/library/shutterstock_144566138.jpg b/addons/website/static/src/img/library/school_kids.jpg
index 107b56bba97..107b56bba97 100644
--- a/addons/website/static/src/img/library/shutterstock_144566138.jpg
+++ b/addons/website/static/src/img/library/school_kids.jpg
Binary files differ
diff --git a/addons/website/static/src/img/library/shutterstock_94642732.jpg b/addons/website/static/src/img/library/ship_sea.jpg
index cd0057dbdd6..cd0057dbdd6 100644
--- a/addons/website/static/src/img/library/shutterstock_94642732.jpg
+++ b/addons/website/static/src/img/library/ship_sea.jpg
Binary files differ
diff --git a/addons/website/static/src/img/library/shutterstock_88218493.jpg b/addons/website/static/src/img/library/vegetables.jpg
index 61a2518bbc4..61a2518bbc4 100644
--- a/addons/website/static/src/img/library/shutterstock_88218493.jpg
+++ b/addons/website/static/src/img/library/vegetables.jpg
Binary files differ
diff --git a/addons/website/static/src/img/library/shutterstock_107930255.jpg b/addons/website/static/src/img/library/world.jpg
index b7b36d65360..b7b36d65360 100644
--- a/addons/website/static/src/img/library/shutterstock_107930255.jpg
+++ b/addons/website/static/src/img/library/world.jpg
Binary files differ
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index a28a3dc37d9..c2495e30d9c 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -727,7 +727,7 @@
method: 'search_read',
args: [],
kwargs: {
- fields: ['name'],
+ fields: ['name', 'website_url'],
domain: [['res_model', '=', 'ir.ui.view']],
order: 'name',
context: website.get_context(),
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index fb5b0977671..f17a5335e4c 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -151,8 +151,7 @@
</ul>
<div class="row mt16" t-foreach="rows" t-as="row">
<div class="col-sm-2" t-foreach="row" t-as="attachment">
- <t t-set="url">/website/attachment/<t t-esc="attachment.id"/></t>
- <img t-att-src="url" t-att-alt="attachment.name" class="img img-responsive"/>
+ <img t-att-src="attachment.website_url" t-att-alt="attachment.name" class="img img-responsive"/>
</div>
</div>
</div>