cashonly
/
cashonly
3
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity
Browse Source

revert changes made for another branch

migrate/django4
informaniac 1 year ago
parent
f5d7c19149
commit
1c9e6bded5
1 changed files with 140 additions and 137 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      cashonly/web/templates/cashonly/web/base.html

19
cashonly/web/templates/cashonly/web/base.html
Unescape View File

@ -17,7 +17,6 @@ @@ -17,7 +17,6 @@
<script type="text/javascript">
function getuserinfo(xs){
let userinfo;
if(xs)
userinfo = '<strong>{% trans "Name" %}</strong>: {{ user.first_name }} {{ user.last_name }}<br/>';
else
@ -34,12 +33,13 @@ @@ -34,12 +33,13 @@
$('#xs-userinfo').popover({animation: true, placement: 'bottom', trigger: 'hover', content: getuserinfo(true), html: true, container: '#top-navbar'});
});
</script>
{% endblock %}
</head>
<body>
<div class="container" id="main">
<div class="navbar navbar-default navbar-fixed-top" id="top-navbar">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#top-navbar-collapse" data-testid="navbar-toggle">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#top-navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
</button>
<div class="navbar-header">
<a class="navbar-brand" href="{% url 'overview' %}" data-testid="navbar-brand">Kassensystem</a>
<a class="navbar-brand" href="{% url 'overview' %}">Kassensystem</a>
<div class="pull-right visible-xs" style="padding-right: 1em">
<p class="navbar-text" id="xs-userinfo">
<span class="glyphicon glyphicon-info-sign"></span>
@ -59,14 +59,15 @@ @@ -59,14 +59,15 @@
<div class="collapse navbar-collapse" id="top-navbar-collapse">
<ul class="nav navbar-nav">
<li><a href="{% url 'overview' %}" data-testid="nav-overview">{% trans "Overview" %}</a></li>
<li><a href="{% url 'products' %}" data-testid="nav-products">{% trans "Buy" %}</a></li>
<li><a href="{% url 'transactions' %}" data-testid="nav-transactions">{% trans "Transaction list" context "monthly staement" %}</a></li>
<li><a href="{% url 'usersettings' %}" data-testid="nav-usersettings">{% trans "Preferences" %}</a></li>
<li><a href="{% url 'overview' %}">{% trans "Overview" %}</a></li>
<li><a href="{% url 'products' %}">{% trans "Buy" %}</a></li>
<li><a href="{% url 'transactions' %}">{% trans "Transaction list" context "monthly staement" %}</a></li>
<li><a href="{% url 'usersettings' %}">{% trans "Preferences" %}</a></li>
{% if user.is_staff %}
<li><a href="{% url 'admin:index' %}" data-testid="nav-administration">{% trans "Administration" %}</a></li>
<li><a href="{% url 'admin:index' %}">{% trans "Administration" %}</a></li>
{% endif %}
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="hidden-xs">
<p class="navbar-text" id="userinfo">
@ -150,6 +151,8 @@ @@ -150,6 +151,8 @@
</div>
</div>
</div>
</body>
</html>

Write Preview
Loading…
Cancel
Save