hosting navbar changed and consistent with dcl navbar
This commit is contained in:
		
					parent
					
						
							
								a0451fc8ea
							
						
					
				
			
			
				commit
				
					
						db891aaa1e
					
				
			
		
					 7 changed files with 108 additions and 93 deletions
				
			
		|  | @ -12,42 +12,54 @@ from django.views.generic import RedirectView | |||
| from django.core.urlresolvers import reverse_lazy | ||||
| import debug_toolbar | ||||
| 
 | ||||
| urlpatterns = [url(r'^index.html$', LandingView.as_view()), | ||||
|                url(r'^hosting/', include('hosting.urls', namespace="hosting")), | ||||
|                url(r'^open_api/', include('opennebula_api.urls', | ||||
|                                           namespace='opennebula_api')), | ||||
|                url(r'^railshosting/', RailsHostingView.as_view(), name="rails.hosting"), | ||||
|                url(r'^nodehosting/', NodeJSHostingView.as_view(), name="node.hosting"), | ||||
|                url(r'^djangohosting/', DjangoHostingView.as_view(), name="django.hosting"), | ||||
|                url(r'^nosystemd/', include('nosystemd.urls', namespace="nosystemd")), | ||||
|                url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')), | ||||
|                url(r'^jsi18n/(?P<packages>\S+?)/$', | ||||
|                    i18n.javascript_catalog), | ||||
|                ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) | ||||
| urlpatterns = [ | ||||
|     url(r'^index.html$', LandingView.as_view()), | ||||
|     url(r'^open_api/', include('opennebula_api.urls', | ||||
|                                namespace='opennebula_api')), | ||||
|     url(r'^railshosting/', RailsHostingView.as_view(), | ||||
|         name="rails.hosting"), | ||||
|     url(r'^nodehosting/', NodeJSHostingView.as_view(), | ||||
|         name="node.hosting"), | ||||
|     url(r'^djangohosting/', DjangoHostingView.as_view(), | ||||
|         name="django.hosting"), | ||||
|     url(r'^nosystemd/', include('nosystemd.urls', namespace="nosystemd")), | ||||
|     url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')), | ||||
|     url(r'^jsi18n/(?P<packages>\S+?)/$', | ||||
|         i18n.javascript_catalog), | ||||
| ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) | ||||
| 
 | ||||
| urlpatterns += i18n_patterns( | ||||
|     url(r'^hosting/', include('hosting.urls', namespace="hosting")), | ||||
| ) | ||||
| 
 | ||||
| # note the django CMS URLs included via i18n_patterns | ||||
| urlpatterns += i18n_patterns( | ||||
|                              url(r'^$', LandingView.as_view()), | ||||
|                              url(r'^admin/', include(admin.site.urls)), | ||||
|                              url(r'^datacenterlight/', include('datacenterlight.urls', namespace="datacenterlight")), | ||||
|                              url(r'^hosting/', RedirectView.as_view( | ||||
|                                  url=reverse_lazy('hosting:login')), name='redirect_hosting_login'), | ||||
|                              url(r'^alplora/', include('alplora.urls', namespace="alplora")), | ||||
|                              url(r'^membership/', include(membership_urls)), | ||||
|                              url(r'^digitalglarus/', include('digitalglarus.urls', | ||||
|                                                              namespace="digitalglarus")), | ||||
|                              # url(r'^blog/', include('ungleich.urls', namespace='ungleich')), | ||||
|                              url(r'^', | ||||
|                                  include('ungleich_page.urls', namespace='ungleich_page'), | ||||
|                                  name='ungleich_page'), | ||||
|                              url(r'^blog/', include('ungleich.urls', namespace='ungleich')), | ||||
|                              url(r'^', include('cms.urls')) | ||||
|                              ) | ||||
|     url(r'^$', LandingView.as_view()), | ||||
|     url(r'^admin/', include(admin.site.urls)), | ||||
|     url(r'^datacenterlight/', | ||||
|         include('datacenterlight.urls', namespace="datacenterlight")), | ||||
|     url(r'^hosting/', RedirectView.as_view( | ||||
|         url=reverse_lazy('hosting:login')), name='redirect_hosting_login'), | ||||
|     url(r'^alplora/', include('alplora.urls', namespace="alplora")), | ||||
|     url(r'^membership/', include(membership_urls)), | ||||
|     url(r'^digitalglarus/', include('digitalglarus.urls', | ||||
|                                     namespace="digitalglarus")), | ||||
|     # url(r'^blog/', include('ungleich.urls', namespace='ungleich')), | ||||
|     url(r'^', | ||||
|         include('ungleich_page.urls', | ||||
|                 namespace='ungleich_page'), | ||||
|         name='ungleich_page'), | ||||
|     url(r'^blog/', include('ungleich.urls', | ||||
|                            namespace='ungleich')), | ||||
|     url(r'^', include('cms.urls')) | ||||
| ) | ||||
| 
 | ||||
| urlpatterns += [ | ||||
|                         url(r'^media/(?P<path>.*)$', | ||||
|                             static_view.serve, { | ||||
|                                 'document_root': settings.MEDIA_ROOT, | ||||
|                             }), | ||||
|                         ] | ||||
|     url(r'^media/(?P<path>.*)$', | ||||
|         static_view.serve, { | ||||
|             'document_root': settings.MEDIA_ROOT, | ||||
|         }), | ||||
| ] | ||||
| 
 | ||||
| if settings.DEBUG: | ||||
|     urlpatterns += [url(r'^__debug__/', include(debug_toolbar.urls))] | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue