From 3843bdf888e79ea71a1e80219d5920a5192d80c1 Mon Sep 17 00:00:00 2001 From: Christian Dresen <c.dresen@fh-muenster.de> Date: Thu, 17 Dec 2015 00:32:10 +0100 Subject: [PATCH] Minor Changes in Base Template --- web/templates/base.html | 31 ++++++++------------- web/warpauth/templates/warpauth/about.html | 3 ++ web/warpauth/templatetags/__init__.py | 0 web/warpauth/urls.py | 12 +------- web/warpauth/util.py | 2 -- web/warpzone.db | Bin 53248 -> 54272 bytes 6 files changed, 16 insertions(+), 32 deletions(-) delete mode 100644 web/warpauth/templatetags/__init__.py diff --git a/web/templates/base.html b/web/templates/base.html index 1de9eac..de3320c 100644 --- a/web/templates/base.html +++ b/web/templates/base.html @@ -1,3 +1,5 @@ +{% load i18n %} + <html> <head> <link rel="stylesheet" href="{{ MEDIA_URL }}/media/css/bootstrap.min.css" /> @@ -27,7 +29,7 @@ <div class="container"> <div class="navbar-header"> <a class="navbar-brand" href="/"> - <img style="display: inline; text-align:left" height="25" width="25" src='/media/warpzone_logo.png'/> WarpAuth + <img style="display: inline; text-align:left" height="25" width="25" src='/media/warpzone_logo.png'/> Warpzone </a> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#myNavbar"> <span class="icon-bar"></span> @@ -40,26 +42,17 @@ <ul class="nav navbar-nav"> {% for page in pages %} {% if page.name != "Logout" and page.name != "Admin" and page.name != "Configuration" %} - <li><a href="/{{ page.link }}">{{ page.name}}</a></li> - {% endif %} + <li><a href="/{{ page.link }}">{{ page.name }}</a></li> + {% endif %} {% endfor %} </ul> - {% for page in pages %} - {% if page.name == "Logout" %} - <ul class="nav navbar-nav navbar-right"><li><a href="/{{ page.link }}">{{ page.name}}</a></li></ul> - {% elif page.name == "Admin" and user.is_superuser %} - <ul class="nav navbar-nav navbar-right"> - <li> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{ page.name}}<span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="/{{ page.link }}_daemon/">Daemon</a></li> - <li><a href="/{{ page.link }}_services/">Services</a></li> - <li><a href="/{{ page.link }}_regex/">Regex</a></li> - </ul> - </li> - </ul> - {% endif %} - {% endfor %} + <ul class="nav navbar-nav navbar-right"><li><a href="/logout">{% trans "Logout" %}</a></li></ul> + <ul class="nav navbar-nav navbar-right"><li><a href="/profile">{% trans "Profile Settings" %}</a></li></ul> + + {% if user.is_superuser %} + <ul class="nav navbar-nav navbar-right"><li><a href="/admin">{% trans "Admin" %}</a></li></ul> + {% endif %} + {% endif %} </div> </div> diff --git a/web/warpauth/templates/warpauth/about.html b/web/warpauth/templates/warpauth/about.html index 18b0584..23230b5 100644 --- a/web/warpauth/templates/warpauth/about.html +++ b/web/warpauth/templates/warpauth/about.html @@ -3,5 +3,8 @@ {% load i18n %} {% block content %} +<h2>{{ body_text }}</h2> +<p class="lead">{% trans "Welcome to Warpzone internal" %}</p><p /> + {% endblock %} \ No newline at end of file diff --git a/web/warpauth/templatetags/__init__.py b/web/warpauth/templatetags/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/web/warpauth/urls.py b/web/warpauth/urls.py index 425ac20..8566b63 100644 --- a/web/warpauth/urls.py +++ b/web/warpauth/urls.py @@ -8,18 +8,8 @@ urlpatterns = [ url(r'^reset_password/$', reset_password.gen_token, name='index'), url(r'^reset_password/(?P<reset_hash>\w+)/$', reset_password.change_password, name='index'), - # Main Page - + # Main Page url(r'^$', main.index, name='index'), - ] - -""" -url(r'^pizza/$', warp_food.index, name='warp_foot'), -url(r'^pizza/view/(?P<sheet_id>\w+)/$', warp_food.view, name='warp_foot_view'), -url(r'^pizza/toggle_sheet/(?P<sheet_id>\w+)/$', warp_food.toggle_closed, name='warp_foot_toggle_closed'), -url(r'^pizza/toggle_paid/(?P<order_id>\w+)/$', warp_food.toggle_paid, name='warp_foot_toggle_paid'), -url(r'^pizza/export_sheet/(?P<sheet_id>\w+)/$', warp_food.export_sheet, name='warp_foot_export_sheet'), -""" \ No newline at end of file diff --git a/web/warpauth/util.py b/web/warpauth/util.py index e2e0407..3f881d6 100644 --- a/web/warpauth/util.py +++ b/web/warpauth/util.py @@ -1,6 +1,4 @@ pages = {'pages': [ {"link":"pizza", "name": "PizzaSheet"}, {"link":"about", "name": "About"}, - {"link":"logout", "name": "Logout"}, - {"link":"admin", "name": "Admin"} ]} diff --git a/web/warpzone.db b/web/warpzone.db index b209dcbfbccb71f5b07682a2fc1f5b0a6e2b64cc..63ba1400f02eb26d7f41a3af1e3848f1bb4495de 100644 GIT binary patch delta 2637 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 delta 1917 zcmah}ZERCz6n@WpZrAp%1Ln4N-PWzEE8FY}yX{!(_!^WihtUlxE)m_z+HGyu7WRR2 zKiEcq5EG-9H{eHLAu$@oVQ6n+VvHX#Vl*&KG$=nN7=DZxj06%EjUv9iTe~49-sU_x zeeOBuecsd4GxiRSoyJ#6^PPl{25y<hE7!Rzoy0k#)o@COm(wrm@lTw^Tlgzp$7}c# zUREj%&!Erg=I?6iIM}K=Sgah1$~Y`FauD-4==5pKg?54$@EC4G6P=<*=@v@iQ+Ns5 zlX4R%?V2;RaGd1ePJ+MSclZ(R#6CQW@ua*K+0NWzFtG95!h$MZDt+3*QzvgI@f$>} z&<BPFdpm{(Lj6UED<K#O#CsAQv2ag+U@)AB59Ah6lyuJr`uD1V-HAjn(I4c|fD*Zn z9_S5)21NzhaoIy!(nClO_~1D8)7R-0{8*OTlrv?!kX@<rrHTciKp-YUOd!GE*f+0B zskE1Zqa{~s@_68&doZx4FO)rEZ+K)Rz-8_acV$U->y%YU>taO{quUHxlO(}mxIZtg zSe2Holx3Frc5L3@-)!}7*!cKnt1T0tOizd)sn=b6sLfhq3kPkrwd47DT9Z$L@zvpY zFf^P=V@pz|IWe^<%be4aaiS?}szxxpDHIC^flL!JO*hhS@IzU?xZ_~g5>@!2eGdv( zTb((eBisD^{}!GJVCR}W?7Y2@#g!bkR+)S(`_rk7Sh$FO>D)ye_gy4YCe+`t$5ZcZ zXz;o+64<Ha{MA0mI9HQqWzBL4AWwnasAIyWm6kCa!9k2;FYdwJxC>jc1vlY3^r8#v zlJYcVbz5s(Vz~wZM2m`LY1EghSfZjijk;nLO)47Mk*%`66(2<#8t9#*e2KC<Eh|=w z0<lzNBxajbr2jXq-o9AJX?rG`J-7V>13rvRbQbe4ifu{x2g+ujXk4G}S+<sF6f6~x zNy-k8-Yi(`S$grX=veg069s&(1vp3G9QDy*RMMZMd=gl!n&r4la!gw*S@U{}(%m!x zir~M2`HfbWyUEqi)ZkemHM$x-u2j3QtlmiY7MR8q9>q@HL4nTD&*=m`NIU5|S^(D| z2`@trtOpG_PY#oIS+3GKj2Z$?kB(i9+u5t}X7)5UOT3BQiPf+vZtulx?AxfsCb$hm z9jq;CV=JS!vJ#OeTI@m~7*yASFA%qK-<n<#>}I5jUEp>$QqD#rD_9%1+DHw%7k-3Y z;+70oRi*dV5;#e43g5s1+=6C$o1Uky(E+-RT3{BwhLcHo7})m-CwrUQXrh|=6Ao6( zO-R^vj&fDH$hP+_*IMTNVeXf4zgiO6TYXk-smklwMb4MZ`+soXtj6fs@|aay%zgJ- z9lLe5fOW>qTGRaZv6v&ZSEy5jHGg61^u1g#9-DNP(+aAA8}K812JgagIKVsVhjmZ` zh2$=ok>wL?X7b3W7!37=215(~k#eH|P7u3#`QlteTM7iI1~J{m>=c!$q54G?)QK#e zqZd_B=@PYqK2t&E%sFNO+@M~`Q#|L-=PjN-lUh-iPF+kJD+E3yY$9HwJoWx0DA0Tl zQ-z?*r@s*mj1U~6x8Zl1gps7&3#@a;0TyYS71C48uD2dy&$hk@e8JZXf};6iidsh+ zUl?lW*<bILhP(H98{K?c)CX2Yy|KuU*X8Q&XSct+n_s^$(k@AoR=HDO{fz&cn!0!s HA58rR&fGLw -- GitLab