launchpad-reviewers team mailing list archive

[Raphaël Badin <raphael.badin@xxxxxxxxxxxxx>]

Raphaël Badin has proposed merging lp:~rvb/maas/fix-static-img-path into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/fix-static-img-path/+merge/114205

This branch fixes two img paths: we should use STATIC_URL instead of /static/ so that we can cope with a prefix like that one used in production (/MAAS/).
-- 
https://code.launchpad.net/~rvb/maas/fix-static-img-path/+merge/114205
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/fix-static-img-path into lp:maas.

=== modified file 'src/maasserver/templates/maasserver/node_edit.html'
--- src/maasserver/templates/maasserver/node_edit.html	2012-06-28 12:05:09 +0000
+++ src/maasserver/templates/maasserver/node_edit.html	2012-07-10 14:52:21 +0000
@@ -44,7 +44,7 @@
         <a title="Delete mac address"
            class="icon"
            href="{% url 'mac-delete' macaddress.node.system_id macaddress.mac_address %}">
-          <img src="/static/img/delete.png" alt="delete"/>
+          <img src="{{ STATIC_URL }}img/delete.png" alt="delete"/>
         </a>
         </p>
         {% empty %}
@@ -54,7 +54,7 @@
       <li>
         <a class="add-link add-mac-form"
            href="{% url 'mac-add' node.system_id %}">
-          <img src="/static/img/inline_add.png" alt="+" class="icon"/>
+          <img src="{{ STATIC_URL }}img/inline_add.png" alt="+" class="icon"/>
           Add additional MAC address
         </a>
       </li>