Revision f277a1cd ui/templates/machines_icon.html

b/ui/templates/machines_icon.html
53 53 
                    </h5>
54 54 
                </div>
55 55 
                <a href="#" class="ip">
56 
                    <h5>{% trans "IP" %}: <span class="public">node.public_ip</span></h5>
56 
                    <h5>
57 
                        {% trans "IP:" %} <span class="ip-version-label">v4</span> <span class="public ipv4-text"></span>
58 
                        <span class="ip-version-label">v6</span> <span class="public ipv6-text"></span>
59 
                    </h5>
57 60 
                </a>
58 61 
            </div>
59 62 
            <div class="info">
......
633 636 
            // find and display ips
634 637 
            var ips = get_public_ips(server);
635 638 
            existing.find("a.ip span.public").text(ips['ip4']);
639 
            existing.find("a.ip span.public.ipv6-text").text(ips['ip6']);
636 640 
        }
637 641 
        // if it doesn't exist and the server is not DELETED, make a new entry
638 642 
        else if ( server.status != 'DELETED') {
......
684 688 
            // find and display ips
685 689 
            var ips = get_public_ips(server);
686 690 
            machine.find("a.ip span.public").text(ips['ip4']);
691 
            machine.find("a.ip span.public.ipv6-text").text(ips['ip6']);
687 692 
        }
688 693 
        /*
689 694 
        Do some repeated actions that include:
......
713 718 
    Do some standard stuff, repeated each time
714 719 
    FIXME: Can these be moved to a new function?
715 720 
    */
721 
    fix_v6_addresses();
716 722 
    $("div.large-spinner").hide();
717 723 
    $("div.running").removeClass("disabled");
718 724 
    // show all separators and hide the last one

Also available in: Unified diff