Merge lp:~subirjolly/openstack-web-control-panel/lp611799 into lp:openstack-web-control-panel

Proposed by Subir Jolly
Status: Merged
Approved by: Mike Mayo
Approved revision: 4
Merged at revision: 4
Proposed branch: lp:~subirjolly/openstack-web-control-panel/lp611799
Merge into: lp:openstack-web-control-panel
Diff against target: 12 lines (+1/-1)
1 file modified
public/openstack/OpenStackAPIClient.j (+1/-1)
To merge this branch: bzr merge lp:~subirjolly/openstack-web-control-panel/lp611799
Reviewer Review Type Date Requested Status
Mike Mayo Pending
Review via email: mp+31416@code.launchpad.net

Description of the change

Updated the location for Resources folder so that now images show up correctly.
Please review the changes and merge.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'public/openstack/OpenStackAPIClient.j'
2--- public/openstack/OpenStackAPIClient.j 2010-07-20 18:20:05 +0000
3+++ public/openstack/OpenStackAPIClient.j 2010-07-30 19:35:55 +0000
4@@ -69,7 +69,7 @@
5 filename = 'ubuntu-large.png';
6 }
7
8- return [[CPImage alloc] initWithContentsOfFile:'/capp-rcloud/Resources/' + filename];
9+ return [[CPImage alloc] initWithContentsOfFile:'/openstack/Resources/' + filename];
10 }
11
12 - (CPJSONPConnection)jsonpConnection:(CPString)url method:(id)method headers:(id)headers body:(CPString)body delegate:(id)delegate {

Subscribers

People subscribed via source and target branches