Revision 6fe8c2ca
| b/snf-cyclades-app/conf/20-snf-cyclades-app-ui.conf | ||
|---|---|---|
| 75 | 75 |
## vms. {0} gets replaced by the image OS value
|
| 76 | 76 |
#VM_CREATE_NAME_TPL = "My {0} server"
|
| 77 | 77 |
# |
| 78 |
## Template to use to build vm hostname |
|
| 79 |
#UI_VM_HOSTNAME_FORMAT = 'snf-%(id)s.vm.synnefo.org' |
|
| 80 |
# |
|
| 81 | 78 |
## Name/description metadata for the available flavor disk templates |
| 82 | 79 |
## Dict key is the disk_template value as stored in database |
| 83 | 80 |
#UI_FLAVORS_DISK_TEMPLATES_INFO = {
|
| ... | ... | |
| 185 | 182 |
# 'admin@synnefo.gr': 'system', |
| 186 | 183 |
# 'images@synnefo.gr': 'system' |
| 187 | 184 |
#} |
| 185 |
# |
|
| 186 |
## Message to display for vms with empty fqdn value |
|
| 187 |
#UI_NO_FQDN_MESSAGE = 'No available FQDN' |
|
| b/snf-cyclades-app/synnefo/ui/static/snf/js/models.js | ||
|---|---|---|
| 2038 | 2038 |
|
| 2039 | 2039 |
// network metadata |
| 2040 | 2040 |
data['firewalls'] = {};
|
| 2041 |
|
|
| 2042 |
data['fqdn'] = data['SNF:fqdn'] || synnefo.config.vm_hostname_format.format(data['id']); |
|
| 2041 |
data['fqdn'] = data['SNF:fqdn']; |
|
| 2043 | 2042 |
|
| 2044 | 2043 |
// if vm has no metadata, no metadata object |
| 2045 | 2044 |
// is in json response, reset it to force |
| b/snf-cyclades-app/synnefo/ui/static/snf/js/ui/web/ui_icon_view.js | ||
|---|---|---|
| 828 | 828 |
// truncate name |
| 829 | 829 |
el.find("span.name").text(util.truncate(vm.get("name"), 40));
|
| 830 | 830 |
|
| 831 |
el.find('.fqdn').text(vm.get('fqdn'));
|
|
| 831 |
el.find('.fqdn').text(vm.get('fqdn') || synnefo.config.no_fqdn_message);
|
|
| 832 | 832 |
el.find("div.status").text(STATE_TEXTS[vm.state()]);
|
| 833 | 833 |
// set state class |
| 834 | 834 |
el.find("div.state").removeClass().addClass(views.IconView.STATE_CLASSES[vm.state()].join(" "));
|
| b/snf-cyclades-app/synnefo/ui/static/snf/js/ui/web/ui_single_view.js | ||
|---|---|---|
| 386 | 386 |
|
| 387 | 387 |
// truncate name |
| 388 | 388 |
el.find(".machine-detail.name").text(util.truncate(vm.get("name"), 53));
|
| 389 |
el.find(".fqdn").text(vm.get("fqdn"));
|
|
| 389 |
el.find(".fqdn").text(vm.get("fqdn") || synnefo.confi.no_fqdn_message);
|
|
| 390 | 390 |
// set the state (i18n ??) |
| 391 | 391 |
el.find(".state-label").text(STATE_TEXTS[vm.state()]);
|
| 392 | 392 |
// set state class |
| b/snf-cyclades-app/synnefo/ui/templates/home.html | ||
|---|---|---|
| 674 | 674 |
synnefo.config.network_allow_multiple_destory = {{ network_allow_multiple_destroy }};
|
| 675 | 675 |
synnefo.config.group_public_networks = {{ group_public_networks }};
|
| 676 | 676 |
synnefo.config.grouped_public_network_name = {{ grouped_public_network_name|safe }};
|
| 677 |
synnefo.config.vm_hostname_format = {{ vm_hostname_format|safe }};
|
|
| 677 |
synnefo.config.no_fqdn_message = {{ no_fqdn_message|safe }};
|
|
| 678 | 678 |
synnefo.config.automatic_network_range_format = {{ automatic_network_range_format|safe }};
|
| 679 | 679 |
synnefo.config.custom_image_help_url = '{{ custom_image_help_url|safe }}';
|
| 680 | 680 |
synnefo.config.forced_server_networks = {{ forced_server_networks|safe }};
|
| b/snf-cyclades-app/synnefo/ui/views.py | ||
|---|---|---|
| 95 | 95 |
|
| 96 | 96 |
# Additional settings |
| 97 | 97 |
VM_NAME_TEMPLATE = getattr(settings, "VM_CREATE_NAME_TPL", "My {0} server")
|
| 98 |
VM_HOSTNAME_FORMAT = getattr(settings, "UI_VM_HOSTNAME_FORMAT", |
|
| 99 |
'snf-%(id)s.vm.synnefo.org') |
|
| 100 |
|
|
| 101 |
if isinstance(VM_HOSTNAME_FORMAT, basestring): |
|
| 102 |
VM_HOSTNAME_FORMAT = VM_HOSTNAME_FORMAT % {'id': '{0}'}
|
|
| 98 |
NO_FQDN_MESSAGE = getattr(settings, "UI_NO_FQDN_MESSAGE", "No available FQDN") |
|
| 103 | 99 |
|
| 104 | 100 |
MAX_SSH_KEYS_PER_USER = getattr(settings, "USERDATA_MAX_SSH_KEYS_PER_USER") |
| 105 | 101 |
FLAVORS_DISK_TEMPLATES_INFO = \ |
| ... | ... | |
| 246 | 242 |
'private_networks_nic_hotplug': |
| 247 | 243 |
json.dumps(PRIVATE_NETWORKS_NIC_HOTPLUG), |
| 248 | 244 |
'diagnostics_update_interval': json.dumps(DIAGNOSTICS_UPDATE_INTERVAL), |
| 249 |
'vm_hostname_format': json.dumps(VM_HOSTNAME_FORMAT)
|
|
| 245 |
'no_fqdn_message': json.dumps(NO_FQDN_MESSAGE)
|
|
| 250 | 246 |
} |
| 251 | 247 |
return template('home', request, context)
|
| 252 | 248 |
|
Also available in: Unified diff