Revision c130b56e

b/settings.d/30-ui.conf
60 60
# A list of suggested vm roles to display to user on create wizard
61 61
VM_CREATE_SUGGESTED_ROLES = ["Database server", "File server", "Mail server", "Web server", "Proxy"]
62 62

  
63
# Template to be used for suggesting the user a default name for newly created
64
# vms.
65
# {0} gets replaced by the image OS value
66
VM_CREATE_NAME_TPL = "My {0} server"
67

  
63 68
#######################
64 69
# UI BEHAVIOUR SETTINGS
65 70
#######################
b/ui/static/snf/js/ui/web/ui_create_view.js
720 720
            if (!params.image || !params.flavor) { return }
721 721

  
722 722
            if (!params.image) { return }
723
            var vm_name = "My {0} server".format(params.image.get("name"));
723
            var vm_name_tpl = snf.config.vm_name_template || "My {0} server";
724
            var vm_name = vm_name_tpl.format(params.image.get("name"));
724 725
            var orig_name = vm_name;
725 726
            
726 727
            var existing = true;
b/ui/templates/home.html
531 531
            }
532 532
            
533 533
            // synnefo js config
534
            synnefo.VERSION = "{{ synnefo_version }}";
535

  
534 536
            synnefo.config.update_interval = {{ update_interval }};
535 537
            synnefo.config.delay_on_blur = {{ delay_on_blur }};
536 538
            synnefo.config.blur_delay = {{ blur_delay }};
......
539 541
            synnefo.config.ajax_timeout = {{ timeout }};
540 542
            synnefo.config.skip_timeouts = {{ skip_timeouts }};
541 543
            synnefo.config.invitations_url = "{% url invitations %}";
542
            synnefo.VERSION = "{{ synnefo_version }}";
544
            synnefo.config.machines_icons_url = '{{ SYNNEFO_IMAGES_URL }}icons/machines/';
545
            synnefo.config.vm_name_template = {{ vm_name_template|safe }};
543 546

  
544 547
            // TODO: make it dynamic
545 548
            synnefo.config.api_url = '/api/v1.1';
b/ui/views.py
85 85
                    "UI_SYNNEFO_JS_WEB_URL",
86 86
                    UI_SYNNEFO_JS_URL + "ui/web/")
87 87

  
88
VM_NAME_TEMPLATE = getattr(settings, "VM_CREATE_NAME_TPL", "My {0} server")
89

  
88 90
def template(name, context):
89 91
    template_path = os.path.join(os.path.dirname(__file__), "templates/")
90 92
    current_template = template_path + name + '.html'
......
120 122
               'update_hidden_views': json.dumps(UPDATE_HIDDEN_VIEWS),
121 123
               'handle_window_exceptions': json.dumps(HANDLE_WINDOW_EXCEPTIONS),
122 124
               'skip_timeouts': json.dumps(SKIP_TIMEOUTS),
125
               'vm_name_template': json.dumps(VM_NAME_TEMPLATE)
123 126
               }
124 127
    return template('home', context)
125 128

  

Also available in: Unified diff