musician reorder code websites,webapps

orchestra/contrib/musician/urls.py

@@ -25,19 +25,25 @@ urlpatterns = [
 
     path('billing/', views.BillingView.as_view(), name='billing'),
     path('bills/<int:pk>/download/', views.BillDownloadView.as_view(), name='bill-download'),
+    
     path('profile/', views.ProfileView.as_view(), name='profile'),
     path('profile/setLang/<code>', views.profile_set_language, name='profile-set-lang'),
+    
     path('address/', views.AddressListView.as_view(), name='address-list'),
     path('address/new/', views.MailCreateView.as_view(), name='address-create'),
     path('address/<int:pk>/', views.MailUpdateView.as_view(), name='address-update'),
     path('address/<int:pk>/delete/', views.AddressDeleteView.as_view(), name='address-delete'),
+    
     path('mailboxes/', views.MailboxListView.as_view(), name='mailbox-list'),
     path('mailboxes/new/', views.MailboxCreateView.as_view(), name='mailbox-create'),
     path('mailboxes/<int:pk>/', views.MailboxUpdateView.as_view(), name='mailbox-update'),
     path('mailboxes/<int:pk>/delete/', views.MailboxDeleteView.as_view(), name='mailbox-delete'),
     path('mailboxes/<int:pk>/change-password/', views.MailboxChangePasswordView.as_view(), name='mailbox-password'),
+    
     path('mailing-lists/', views.MailingListsView.as_view(), name='mailing-lists'),
+    
     path('databases/', views.DatabaseListView.as_view(), name='database-list'),
+    
     path('saas/', views.SaasListView.as_view(), name='saas-list'),
     
     path('webappusers/', views.WebappUserListView.as_view(), name='webappuser-list'),

orchestra/contrib/musician/views.py

@@ -50,8 +50,8 @@ from .models import MailinglistService, SaasService
 from .settings import ALLOWED_RESOURCES, MUSICIAN_EDIT_ENABLE_PHP_OPTIONS
 from .utils import get_bootstraped_percent
 
-from .tidy_views.webapps import *
-from .tidy_views.websites import *
+from .webapps.views import *
+from .websites.views import *
 
 logger = logging.getLogger(__name__)
 

orchestra/contrib/musician/webapps/views.py

@@ -10,7 +10,7 @@ from orchestra.contrib.musician.mixins import (CustomContextMixin, ExtendedPagin
                      UserTokenRequiredMixin)
 
 from orchestra.contrib.webapps.models import WebApp, WebAppOption
-from orchestra.contrib.musician.tidy_forms.webapps import WebappOptionCreateForm, WebappOptionUpdateForm
+from .forms import WebappOptionCreateForm, WebappOptionUpdateForm
 
 from orchestra.contrib.musician.settings import MUSICIAN_EDIT_ENABLE_PHP_OPTIONS
 

orchestra/contrib/musician/websites/views.py

@@ -12,7 +12,7 @@ from orchestra.contrib.musician.mixins import (CustomContextMixin, ExtendedPagin
                      UserTokenRequiredMixin)
 
 from orchestra.contrib.websites.models import Website, Content, WebsiteDirective
-from orchestra.contrib.musician.tidy_forms.websites import ( WebsiteUpdateForm, WesiteContentCreateForm,
+from .forms import ( WebsiteUpdateForm, WesiteContentCreateForm,
                                                             WesiteDirectiveCreateForm)