Revision 0c2166b9
| b/snf-cyclades-app/synnefo/app_settings/urls.py | ||
|---|---|---|
| 50 | 50 |
|
| 51 | 51 |
cyclades_patterns = patterns('',
|
| 52 | 52 |
(prefix_pattern(UI_PREFIX), include('synnefo.ui.urls')),
|
| 53 |
url(r'^machines/console$', 'synnefo.ui.views.machines_console', |
|
| 54 |
name='ui_machines_console'), |
|
| 55 |
url(r'^machines/connect$', 'synnefo.ui.views.machines_connect', |
|
| 56 |
name='ui_machines_connect'), |
|
| 57 | 53 |
(prefix_pattern(VMAPI_PREFIX), include('synnefo.vmapi.urls')),
|
| 58 | 54 |
(prefix_pattern(PLANKTON_PREFIX), include('synnefo.plankton.urls')),
|
| 59 | 55 |
(prefix_pattern(HELPDESK_PREFIX), include('synnefo.helpdesk.urls')),
|
| b/snf-cyclades-app/synnefo/ui/static/snf/js/models.js | ||
|---|---|---|
| 1379 | 1379 |
port: data.port, |
| 1380 | 1380 |
password: data.password |
| 1381 | 1381 |
} |
| 1382 |
return '/machines/console?' + $.param(url_params);
|
|
| 1382 |
return synnefo.config.ui_console_url + '?' + $.param(url_params);
|
|
| 1383 | 1383 |
}, |
| 1384 | 1384 |
|
| 1385 | 1385 |
// action helper |
| ... | ... | |
| 1499 | 1499 |
}, |
| 1500 | 1500 |
|
| 1501 | 1501 |
get_connection_info: function(host_os, success, error) {
|
| 1502 |
var url = "/machines/connect";
|
|
| 1502 |
var url = synnefo.config.ui_connect_url;
|
|
| 1503 | 1503 |
params = {
|
| 1504 | 1504 |
ip_address: this.get_public_nic().get('ipv4'),
|
| 1505 | 1505 |
hostname: this.get_hostname(), |
| b/snf-cyclades-app/synnefo/ui/templates/home.html | ||
|---|---|---|
| 630 | 630 |
synnefo.config.use_glance = {{ use_glance }};
|
| 631 | 631 |
synnefo.config.indicators_icons_url = '{{ SYNNEFO_IMAGES_URL }}icons/indicators/';
|
| 632 | 632 |
synnefo.config.machines_icons_url = '{{ SYNNEFO_IMAGES_URL }}icons/machines/';
|
| 633 |
synnefo.config.ui_console_url = '{% url ui_machines_console %}';
|
|
| 634 |
synnefo.config.ui_connect_url = '{% url ui_machines_connect %}';
|
|
| 633 | 635 |
synnefo.config.support_ssh_os_list = {{ support_ssh_os_list|safe }};
|
| 634 | 636 |
synnefo.config.unknown_os = {{ unknown_os|safe }};
|
| 635 | 637 |
synnefo.config.os_created_users = {{ os_created_users|safe }};
|
| b/snf-cyclades-app/synnefo/ui/urls.py | ||
|---|---|---|
| 37 | 37 |
|
| 38 | 38 |
urlpatterns = patterns('',
|
| 39 | 39 |
url(r'^$', 'synnefo.ui.views.home', name='ui_index'), |
| 40 |
url(r'userdata/', include('synnefo.ui.userdata.urls'))
|
|
| 40 |
url(r'userdata/', include('synnefo.ui.userdata.urls')),
|
|
| 41 |
url(r'^machines/console$', 'synnefo.ui.views.machines_console', |
|
| 42 |
name='ui_machines_console'), |
|
| 43 |
url(r'^machines/connect$', 'synnefo.ui.views.machines_connect', |
|
| 44 |
name='ui_machines_connect'), |
|
| 41 | 45 |
) |
| 42 | 46 |
|
| 43 | 47 |
if settings.DEBUG or settings.TEST: |
Also available in: Unified diff