Revision 85f1cd1e snf-cyclades-app/synnefo/ui/templates/home.html
b/snf-cyclades-app/synnefo/ui/templates/home.html | ||
---|---|---|
51 | 51 |
<![endif]--> |
52 | 52 |
|
53 | 53 |
<script src="{{ SYNNEFO_JS_URL }}utils.js"></script> |
54 |
<script src="{{ SYNNEFO_JS_URL }}auth.js"></script> |
|
54 | 55 |
<script src="{{ SYNNEFO_JS_URL }}sync.js"></script> |
55 | 56 |
<script src="{{ SYNNEFO_JS_URL }}models.js"></script> |
56 | 57 |
<script src="{{ SYNNEFO_JS_URL }}glance_models.js"></script> |
... | ... | |
65 | 66 |
<script src="{{ SYNNEFO_JS_WEB_URL }}ui_networks_view.js"></script> |
66 | 67 |
<script src="{{ SYNNEFO_JS_WEB_URL }}ui_metadata_view.js"></script> |
67 | 68 |
<script src="{{ SYNNEFO_JS_WEB_URL }}ui_feedback_view.js"></script> |
68 |
<script src="{{ SYNNEFO_JS_WEB_URL }}ui_invitations_view.js"></script> |
|
69 | 69 |
<script src="{{ SYNNEFO_JS_WEB_URL }}ui_create_view.js"></script> |
70 | 70 |
<script src="{{ SYNNEFO_JS_WEB_URL }}ui_connect_view.js"></script> |
71 | 71 |
<script src="{{ SYNNEFO_JS_WEB_URL }}ui_public_keys_view.js"></script> |
... | ... | |
75 | 75 |
<script src="{{ SYNNEFO_JS_WEB_URL }}ui_main_view.js"></script> |
76 | 76 |
|
77 | 77 |
<!-- the following views require refactor --> |
78 |
<script src="{{ SYNNEFO_JS_URL }}invitations.js"></script> |
|
79 | 78 |
<script src="{{ SYNNEFO_JS_URL }}synnefo.js"></script> |
80 | 79 |
|
81 | 80 |
<script> |
... | ... | |
91 | 90 |
var TIMEOUTS_OCCURED = 0; |
92 | 91 |
var SKIP_TIMEOUTS = 1; |
93 | 92 |
var UPDATE_INTERVAL = {{ update_interval }}; |
94 |
var LOGOUT_REDIRECT = '{{ logout_redirect }}'; |
|
95 |
var INVITATIONS_URL = "{% url invitations %}"; |
|
96 |
var INVITATIONS_TITLE = "{% trans "Invite people" %}"; |
|
97 | 93 |
var APP_DEBUG = {% if DEBUG %}true{% else %}false{% endif %}; |
98 | 94 |
var FEEDBACK_URL = "{% url feedback %}"; |
99 | 95 |
var FEEDBACK_TITLE = "{% trans "Send feedback" %}"; |
... | ... | |
190 | 186 |
<div id="header"> |
191 | 187 |
<div id="user"> |
192 | 188 |
<div class="usermenu"> |
193 |
<div class="username">{{ request.user.uniq }}</div>
|
|
189 |
<div class="username"></div> |
|
194 | 190 |
<ul class="useractions"> |
195 |
<li class="invitations"><a class="action" href="#">{% trans "invite friends..." %}</a></li> |
|
196 | 191 |
<li class="feedback"><a class="action" href="#">{% trans "send feedback..." %}</a></li> |
197 | 192 |
<li class="api"><a class="action" href="#">{% trans "API access..." %}</a></li> |
198 | 193 |
<li class="public_keys"><a class="action" href="#">{% trans "ssh public keys..." %}</a></li> |
... | ... | |
312 | 307 |
|
313 | 308 |
// bind menu actions |
314 | 309 |
$(".usermenu .logout").click(function() { |
315 |
synnefo.ui.logout();
|
|
310 |
synnefo.auth_client.logout();
|
|
316 | 311 |
}); |
317 | 312 |
|
318 | 313 |
$(".usermenu .api").click(function(){ |
... | ... | |
422 | 417 |
<span class="reload-app">{% trans "Reload" %}</span> |
423 | 418 |
</div> |
424 | 419 |
</div> |
425 |
{% include "partials/invitations.html" %} |
|
426 | 420 |
<div id="feedback-overlay-content" class="hidden overlay-content feedback-form"> |
427 | 421 |
<div class="description"> |
428 | 422 |
<p> |
... | ... | |
559 | 553 |
synnefo.config.handle_window_exceptions = {{ handle_window_exceptions }}; |
560 | 554 |
synnefo.config.ajax_timeout = {{ timeout }}; |
561 | 555 |
synnefo.config.skip_timeouts = {{ skip_timeouts }}; |
562 |
synnefo.config.invitations_url = "{% url invitations %}"; |
|
563 | 556 |
synnefo.config.machines_icons_url = '{{ SYNNEFO_IMAGES_URL }}icons/machines/'; |
564 | 557 |
synnefo.config.vm_name_template = {{ vm_name_template|safe }}; |
565 | 558 |
synnefo.config.flavors_disk_templates_info = {{ flavors_disk_templates_info|safe }}; |
... | ... | |
568 | 561 |
'compute': {{ compute_api_url|safe }}, |
569 | 562 |
'glance': {{ glance_api_url|safe }} |
570 | 563 |
}; |
564 |
|
|
571 | 565 |
// TODO: configurable userdata urls in models.js |
572 | 566 |
synnefo.config.userdata_url = '/ui/userdata'; |
573 |
synnefo.config.logout_url = '{{ logout_redirect }}'; |
|
574 | 567 |
synnefo.config.userdata_keys_url = '{% url keys_collection %}'; |
575 | 568 |
synnefo.config.userdata_keys_limit = {{ userdata_keys_limit }}; |
569 |
|
|
576 | 570 |
// media config |
577 | 571 |
synnefo.config.media_url = '{{ UI_MEDIA_URL }}'; |
578 | 572 |
synnefo.config.js_url = '{{ SYNNEFO_JS_URL }}'; |
... | ... | |
582 | 576 |
synnefo.config.machines_icons_url = '{{ SYNNEFO_IMAGES_URL }}icons/machines/'; |
583 | 577 |
synnefo.config.support_ssh_os_list = {{ support_ssh_os_list|safe }}; |
584 | 578 |
synnefo.config.os_created_users = {{ os_created_users|safe }}; |
579 |
|
|
580 |
synnefo.config.logout_redirect = '{{ logout_redirect }}'; |
|
581 |
synnefo.config.login_redirect = '{{ login_redirect }}'; |
|
582 |
synnefo.config.auth_cookie_name = '{{ auth_cookie_name }}'; |
|
583 |
|
|
584 |
synnefo.auth_client = new synnefo.auth.AstakosClient({ |
|
585 |
login_url: synnefo.config.login_redirect, |
|
586 |
logout_url: synnefo.config.logout_redirect, |
|
587 |
cookie_name: synnefo.config.auth_cookie_name |
|
588 |
}); |
|
589 |
|
|
585 | 590 |
// user config |
586 |
synnefo.user = {}; |
|
587 |
synnefo.user.username = '{{ request.user.uniq }}'; |
|
588 |
synnefo.user.token = $.cookie("X-Auth-Token"); |
|
591 |
synnefo.user = synnefo.auth_client.get_user(); |
|
592 |
if (!synnefo.user) { synnefo.auth_client.redirect_to_login(); } |
|
593 |
|
|
594 |
$(".usermenu .username").text(synnefo.user.username); |
|
595 |
|
|
589 | 596 |
// images config |
590 | 597 |
synnefo.config.system_images_owners = {{ system_images_owners|safe }}; |
591 | 598 |
synnefo.ui.init(); |
592 |
synnefo.ui.main.bind("initial", function(){
|
|
599 |
synnefo.ui.main.bind("ready", function(){
|
|
593 | 600 |
}); |
594 | 601 |
|
595 | 602 |
}) |
Also available in: Unified diff