replaced cms_menu with static menu
This commit is contained in:
parent
d53e70be2c
commit
5679289329
3 changed files with 34 additions and 36 deletions
|
@ -70,7 +70,7 @@ hr.small {
|
|||
}
|
||||
.navbar-custom .navbar-brand {
|
||||
color: white;
|
||||
padding: 20px;
|
||||
padding: 5px 20px;
|
||||
}
|
||||
.navbar-custom .navbar-brand:hover,
|
||||
.navbar-custom .navbar-brand:focus {
|
||||
|
|
|
@ -18,8 +18,8 @@ import debug_toolbar
|
|||
|
||||
urlpatterns = [
|
||||
url(r'^index.html$', LandingView.as_view()),
|
||||
url(r'^open_api/', include('opennebula_api.urls',
|
||||
namespace='opennebula_api')),
|
||||
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(),
|
||||
|
@ -28,8 +28,7 @@ urlpatterns = [
|
|||
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),
|
||||
url(r'^jsi18n/(?P<packages>\S+?)/$', i18n.javascript_catalog),
|
||||
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||
|
||||
urlpatterns += i18n_patterns(
|
||||
|
@ -45,28 +44,22 @@ urlpatterns += i18n_patterns(
|
|||
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'^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'^cms/blog/',
|
||||
include('ungleich.urls', namespace='ungleich')),
|
||||
url(
|
||||
r'^blog/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<slug>\w[-\w]*)/$',
|
||||
url(r'^digitalglarus/',
|
||||
include('digitalglarus.urls', namespace="digitalglarus")),
|
||||
url(r'^cms/blog/', include('ungleich.urls', namespace='ungleich')),
|
||||
url(r'^blog/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/(?P<slug>\w[-\w]*)/$',
|
||||
RedirectView.as_view(pattern_name='ungleich:post-detail')),
|
||||
url(r'^blog/$', RedirectView.as_view(
|
||||
url=reverse_lazy('ungleich:post-list')
|
||||
), name='blog_list_view'
|
||||
),
|
||||
url(r'^blog/$',
|
||||
RedirectView.as_view(url=reverse_lazy('ungleich:post-list')), name='blog_list_view'),
|
||||
url(r'^cms/', include('cms.urls')),
|
||||
url(r'^blog/', include('djangocms_blog.urls', namespace='djangocms_blog')),
|
||||
url(r'^$', RedirectView.as_view(url='/cms') if REDIRECT_TO_CMS
|
||||
else LandingView.as_view()),
|
||||
url(r'^',
|
||||
include('ungleich_page.urls',
|
||||
namespace='ungleich_page'),
|
||||
name='ungleich_page'),
|
||||
url(r'^', include('ungleich_page.urls', namespace='ungleich_page')),
|
||||
)
|
||||
|
||||
urlpatterns += [
|
||||
|
|
|
@ -5,29 +5,34 @@
|
|||
<!-- Brand and toggle get grouped for better mobile display -->
|
||||
<div class="navbar-header page-scroll">
|
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="https://www.ungleich.ch">
|
||||
<img src="{% static "blog.ungleich.ch/img/logo_white.svg" %}" />
|
||||
<img src="{% static "blog.ungleich.ch/img/logo_white.svg" %}" />
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<!-- Collect the nav links, forms, and other content for toggling -->
|
||||
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
{% for child in children %}
|
||||
<li class="child{% if child.selected %} selected{% endif %}{% if child.ancestor %} ancestor{% endif %}{% if child.sibling %} sibling{% endif %}{% if child.descendant %} descendant{% endif %}">
|
||||
<a href="{{ child.attr.redirect_url|default:child.get_absolute_url }}">{{ child.get_menu_title }}</a>
|
||||
{% if child.children %}
|
||||
<ul>
|
||||
{% show_menu from_level to_level extra_inactive extra_active template "" "" child %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
</li>
|
||||
{% endfor %}
|
||||
<li>
|
||||
<a href="{% url 'djangocms_blog:posts-latest' %}">Ungleich Blog</a>
|
||||
</li>
|
||||
{% comment %}
|
||||
{% for child in children %}
|
||||
<li class="child{% if child.selected %} selected{% endif %}{% if child.ancestor %} ancestor{% endif %}{% if child.sibling %} sibling{% endif %}{% if child.descendant %} descendant{% endif %}">
|
||||
<a href="{{ child.attr.redirect_url|default:child.get_absolute_url }}">{{ child.get_menu_title }}</a>
|
||||
{% if child.children %}
|
||||
<ul>
|
||||
{% show_menu from_level to_level extra_inactive extra_active template "" "" child %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
</li>
|
||||
{% endfor %}
|
||||
{% endcomment %}
|
||||
</ul>
|
||||
</div>
|
||||
<!-- /.navbar-collapse -->
|
||||
|
|
Loading…
Reference in a new issue