ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

replaced cms_menu with static menu

Browse source
This commit is contained in:
Arvind Tiwari 2018-04-12 22:24:50 +05:30
parent d53e70be2c
commit 5679289329
3 changed files with 34 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
digitalglarus/static/blog.ungleich.ch/css/clean-blog.css
View file

@ -70,7 +70,7 @@ hr.small {
} }
.navbar-custom .navbar-brand { .navbar-custom .navbar-brand {
color: white; color: white;
padding: 20px; padding: 5px 20px;
} }
.navbar-custom .navbar-brand:hover, .navbar-custom .navbar-brand:hover,
.navbar-custom .navbar-brand:focus { .navbar-custom .navbar-brand:focus {

33
dynamicweb/urls.py
View file

@ -18,8 +18,8 @@ import debug_toolbar
urlpatterns = [ urlpatterns = [
url(r'^index.html$', LandingView.as_view()), url(r'^index.html$', LandingView.as_view()),
url(r'^open_api/', include('opennebula_api.urls', url(r'^open_api/',
namespace='opennebula_api')), include('opennebula_api.urls', namespace='opennebula_api')),
url(r'^railshosting/', RailsHostingView.as_view(), url(r'^railshosting/', RailsHostingView.as_view(),
name="rails.hosting"), name="rails.hosting"),
url(r'^nodehosting/', NodeJSHostingView.as_view(), url(r'^nodehosting/', NodeJSHostingView.as_view(),
@ -28,8 +28,7 @@ urlpatterns = [
name="django.hosting"), name="django.hosting"),
url(r'^nosystemd/', include('nosystemd.urls', namespace="nosystemd")), url(r'^nosystemd/', include('nosystemd.urls', namespace="nosystemd")),
url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')), url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
url(r'^jsi18n/(?P<packages>\S+?)/$', url(r'^jsi18n/(?P<packages>\S+?)/$', i18n.javascript_catalog),
i18n.javascript_catalog),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
urlpatterns += i18n_patterns( urlpatterns += i18n_patterns(
@ -45,28 +44,22 @@ urlpatterns += i18n_patterns(
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),
url(r'^datacenterlight/', url(r'^datacenterlight/',
include('datacenterlight.urls', namespace="datacenterlight")), include('datacenterlight.urls', namespace="datacenterlight")),
url(r'^hosting/', RedirectView.as_view( url(r'^hosting/', RedirectView.as_view(url=reverse_lazy('hosting:login')),
url=reverse_lazy('hosting:login')), name='redirect_hosting_login'), name='redirect_hosting_login'),
url(r'^alplora/', include('alplora.urls', namespace="alplora")), url(r'^alplora/', include('alplora.urls', namespace="alplora")),
url(r'^membership/', include(membership_urls)), url(r'^membership/', include(membership_urls)),
url(r'^digitalglarus/', include('digitalglarus.urls', url(r'^digitalglarus/',
namespace="digitalglarus")), include('digitalglarus.urls', namespace="digitalglarus")),
url(r'^cms/blog/', url(r'^cms/blog/', include('ungleich.urls', namespace='ungleich')),
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'^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')), RedirectView.as_view(pattern_name='ungleich:post-detail')),
url(r'^blog/$', RedirectView.as_view( url(r'^blog/$',
url=reverse_lazy('ungleich:post-list') RedirectView.as_view(url=reverse_lazy('ungleich:post-list')), name='blog_list_view'),
), name='blog_list_view'
),
url(r'^cms/', include('cms.urls')), 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 url(r'^$', RedirectView.as_view(url='/cms') if REDIRECT_TO_CMS
else LandingView.as_view()), else LandingView.as_view()),
url(r'^', url(r'^', include('ungleich_page.urls', namespace='ungleich_page')),
include('ungleich_page.urls',
namespace='ungleich_page'),
name='ungleich_page'),
) )
urlpatterns += [ urlpatterns += [

5
ungleich/templates/cms/ungleichch/_menu.html
View file

@ -18,6 +18,10 @@
<!-- Collect the nav links, forms, and other content for toggling --> <!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li>
<a href="{% url 'djangocms_blog:posts-latest' %}">Ungleich Blog</a>
</li>
{% comment %}
{% for child in children %} {% 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 %}"> <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> <a href="{{ child.attr.redirect_url|default:child.get_absolute_url }}">{{ child.get_menu_title }}</a>
@ -28,6 +32,7 @@
{% endif %} {% endif %}
</li> </li>
{% endfor %} {% endfor %}
{% endcomment %}
</ul> </ul>
</div> </div>
<!-- /.navbar-collapse --> <!-- /.navbar-collapse -->