Commit d30ac29c by Dudás Ádám

cloud: breaking lines

parent e8443130
......@@ -22,9 +22,11 @@ urlpatterns = patterns('',
url(r'^$', 'one.views.index', ),
url(r'^info/$', 'one.views.info', ),
url(r'^home/$', 'one.views.home', ),
url(r'^vm/new/(?P<template>\d+)/$', 'one.views.vm_new', name='new_vm_from_template'),
url(r'^vm/new/(?P<template>\d+)/$', 'one.views.vm_new',
name='new_vm_from_template'),
url(r'^ajax/vm/new/(?P<template>\d+)/$', 'one.views.vm_new_ajax', ),
url(r'^vm/new/s(?P<share>\d+)/$', 'one.views.vm_new', name='new_vm_form_share'),
url(r'^vm/new/s(?P<share>\d+)/$', 'one.views.vm_new',
name='new_vm_form_share'),
url(r'^vm/show/(?P<iid>\d+)/$', 'one.views.vm_show', ),
url(r'^vm/delete/(?P<iid>\d+)/$', 'one.views.vm_delete', ),
url(r'^vm/stop/(?P<iid>\d+)/$', 'one.views.vm_stop', ),
......@@ -47,9 +49,9 @@ urlpatterns = patterns('',
url(r'^ajax/share/(?P<id>\d+)/(?P<gid>\d+)$',
'one.views.ajax_share_wizard', ),
url(r'^ajax/vm/status/(?P<iid>\d+)$',
'one.views.vm_ajax_instance_status', ),
'one.views.vm_ajax_instance_status', ),
url(r'^ajax/vm/rename/(?P<iid>\d+)/$',
'one.views.vm_ajax_rename', ),
'one.views.vm_ajax_rename', ),
url(r'^key/add/$', 'one.views.key_add', ),
url(r'^ajax/key/delete/$', 'one.views.key_ajax_delete', ),
url(r'^ajax/key/reset/$', 'one.views.key_ajax_reset', ),
......@@ -75,15 +77,17 @@ urlpatterns = patterns('',
url(r'^language/(?P<lang>[-A-Za-z]+)/$', 'school.views.language', ),
url(r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict, ),
url(r'^b/(?P<token>.*)/$', 'one.views.boot_token', ),
url(r'^group/show/(?P<gid>\d+)/$', 'school.views.group_show', name='group_show'),
url(r'^group/show/(?P<gid>\d+)/$', 'school.views.group_show',
name='group_show'),
url(r'^group/new/$', 'school.views.group_new', ),
url(r'^ajax/group/(?P<gid>\d+)/add/$',
'school.views.group_ajax_add_new_member', ),
'school.views.group_ajax_add_new_member', ),
url(r'^ajax/group/(?P<gid>\d+)/addOwner/$',
'school.views.group_ajax_add_new_owner', ),
'school.views.group_ajax_add_new_owner', ),
url(r'^ajax/group/(?P<gid>\d+)/remove/$',
'school.views.group_ajax_remove_member', ),
'school.views.group_ajax_remove_member', ),
url(r'^ajax/group/delete/$', 'school.views.group_ajax_delete', ),
url(r'^ajax/group/autocomplete/$', 'school.views.group_ajax_owner_autocomplete', ),
url(r'^ajax/group/autocomplete/$',
'school.views.group_ajax_owner_autocomplete', ),
url(r'^stat/$', 'one.views.stat'),
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment