Revision 40e5d2d2
b/snf-cyclades-app/synnefo/app_settings/default/ui.py | ||
---|---|---|
153 | 153 |
UI_GROUP_PUBLIC_NETWORKS = True |
154 | 154 |
|
155 | 155 |
# The name of the grouped network view |
156 |
UI_GROUPED_NETWORK_NAME = 'Internet' |
|
156 |
UI_GROUPED_PUBLIC_NETWORK_NAME = 'Internet'
|
|
157 | 157 |
|
158 | 158 |
|
159 | 159 |
############### |
b/snf-cyclades-app/synnefo/ui/static/snf/js/ui/web/ui_networks_view.js | ||
---|---|---|
1132 | 1132 |
}, |
1133 | 1133 |
|
1134 | 1134 |
get_name: function() { |
1135 |
return synnefo.config.grouped_network_name || views.GroupedPublicNetworkView.__super__.get_name.call(this); |
|
1135 |
return synnefo.config.grouped_public_network_name || views.GroupedPublicNetworkView.__super__.get_name.call(this);
|
|
1136 | 1136 |
}, |
1137 | 1137 |
|
1138 | 1138 |
nic_in_network: function(nic) { |
b/snf-cyclades-app/synnefo/ui/templates/home.html | ||
---|---|---|
627 | 627 |
synnefo.config.network_strict_destroy = {{ network_strict_destroy }}; |
628 | 628 |
synnefo.config.network_allow_multiple_destory = {{ network_allow_multiple_destroy }}; |
629 | 629 |
synnefo.config.group_public_networks = {{ group_public_networks }}; |
630 |
synnefo.config.grouped_network_name = {{ grouped_network_name|safe }};
|
|
630 |
synnefo.config.grouped_public_network_name = {{ grouped_public_network_name|safe }};
|
|
631 | 631 |
|
632 | 632 |
synnefo.auth_client = new synnefo.auth.AstakosClient({ |
633 | 633 |
login_url: synnefo.config.login_redirect, |
b/snf-cyclades-app/synnefo/ui/views.py | ||
---|---|---|
137 | 137 |
NETWORK_ALLOW_MULTIPLE_DESTROY = getattr(settings, |
138 | 138 |
'UI_NETWORK_ALLOW_MULTIPLE_DESTROY', False) |
139 | 139 |
GROUP_PUBLIC_NETWORKS = getattr(settings, 'UI_GROUP_PUBLIC_NETWORKS', True) |
140 |
GROUPED_NETWORK_NAME = getattr(settings, 'UI_GROUPED_NETWORK_NAME', 'Internet')
|
|
140 |
GROUPED_PUBLIC_NETWORK_NAME = getattr(settings, 'UI_GROUPED_PUBLIC_NETWORK_NAME', 'Internet')
|
|
141 | 141 |
|
142 | 142 |
def template(name, request, context): |
143 | 143 |
template_path = os.path.join(os.path.dirname(__file__), "templates/") |
... | ... | |
197 | 197 |
'network_allow_duplicate_vm_nics': json.dumps(NETWORK_DUPLICATE_NICS), |
198 | 198 |
'network_strict_destroy': json.dumps(NETWORK_STRICT_DESTROY), |
199 | 199 |
'network_allow_multiple_destroy': json.dumps(NETWORK_ALLOW_MULTIPLE_DESTROY), |
200 |
'grouped_network_name': json.dumps(GROUPED_NETWORK_NAME),
|
|
200 |
'grouped_public_network_name': json.dumps(GROUPED_PUBLIC_NETWORK_NAME),
|
|
201 | 201 |
'group_public_networks': json.dumps(GROUP_PUBLIC_NETWORKS), |
202 | 202 |
'diagnostics_update_interval': json.dumps(DIAGNOSTICS_UPDATE_INTERVAL) |
203 | 203 |
} |
Also available in: Unified diff