Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Respect My Net
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thomas Lohninger
Respect My Net
Commits
3b5425fe
Commit
3b5425fe
authored
Mar 21, 2016
by
Okhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding the langauge switch, and some aesthetics on the main bar
parent
58b3de62
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
40 additions
and
20 deletions
+40
-20
nnmon/templates/base.html
nnmon/templates/base.html
+37
-19
nnmon/templates/view.html
nnmon/templates/view.html
+1
-1
nnmon/urls.py
nnmon/urls.py
+2
-0
No files found.
nnmon/templates/base.html
View file @
3b5425fe
...
...
@@ -38,20 +38,6 @@
<body>
<div
id=
"header"
>
<h1><a
href=
"{% url 'homepage' %}"
>
Respect My Net
<span>
{% trans "Report cases of Net Neutrality violations" %}
</span></a></h1>
<div
id=
"user"
>
<p>
{% if user.is_authenticated %}
{{ user.username }},
<a
href=
"{%root_url%}/accounts/logout"
>
{% trans "Logout" %}
</a>
<span>
or
</span>
<a
href=
"{%root_url%}/admin/"
>
{% trans "Admin" %}
</a>
{% block adminext %}
{% endblock %}
{% else %}
<a
href=
"{%root_url%}/admin/"
id=
"login"
>
{% trans "Login" %}
</a>
{% endif %}
</p>
</div>
</div>
<nav
class=
"navbar navbar-default"
>
...
...
@@ -71,18 +57,50 @@
<li
role=
"presentation"
{%
block
active_tab_cases
%}{%
endblock
%}
><a
href=
"{% url 'list_violations' %}"
>
{% trans "Cases" %}
</a></li>
<li
role=
"presentation"
{%
block
active_tab_about
%}{%
endblock
%}
><a
href=
"{%root_url%}/about"
>
{% trans "What is Net Neutrality?" %}
</a></li>
<li
role=
"presentation"
{%
block
active_tab_start
%}{%
endblock
%}
><a
href=
"{%root_url%}/start"
>
{% trans "Start Monitoring" %}
</a></li>
{% if user.is_authenticated %}
<p
class=
"navbar-text"
>
{{ user.username }}
</p>
<li
role=
"presentation"
class=
"dropdown"
>
<a
class=
"dropdown-toggle"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
href=
"#"
>
{% trans "Admin Action" %}
<span
class=
"caret"
></span></a>
<ul
class=
"dropdown-menu"
>
<li><a
href=
"{%root_url%}/accounts/logout"
>
{% trans "Logout" %}
</a></li>
<li><a
href=
"{%root_url%}/admin/"
>
{% trans "Admin" %}
</a></li>
<li
role=
"separator"
class=
"divder"
></li>
{% block adminext %}
{% endblock %}
</ul>
{% else %}
<li
role=
"presentation"
><a
href=
"{%root_url%}/admin/"
id=
"login"
>
{% trans "Login" %}
</a></li>
{% endif %}
</ul>
<form
action=
"{% url 'set_language' %}"
method=
"post"
class=
"navbar-form"
>
{% csrf_token %}
<div
class=
"input-group"
>
<select
class=
"form-control"
name=
"language"
>
{% get_current_language as LANGUAGE_CODE %}
{% get_available_languages as LANGUAGES %}
{% get_language_info_list for LANGUAGES as languages %}
{% for language in languages %}
<option
value=
"{{ language.code }}"
{%
if
language.code =
=
LANGUAGE_CODE
%}
selected=
"selected"
{%
endif
%}
>
{{ language.name_local }} ({{ language.code }})
</option>
{% endfor %}
</select>
<span
class=
"input-group-btn"
>
<button
type=
"submit"
class=
"btn btn-default"
>
Go
</button>
</span>
</div>
</form>
<form
action=
"/search/"
method=
"get"
class=
"navbar-form navbar-right"
>
<div
class=
"
form
-group"
>
<div
class=
"
input
-group"
>
<input
type=
"text"
class=
"form-control"
placeholder=
"Quick Search..."
>
<span
class=
"input-group-btn"
>
<button
type=
"submit"
class=
"btn btn-default"
>
Search
</button>
</span>
</div>
{% buttons %}
<button
type=
"submit"
class=
"btn btn-default"
>
Search
</button>
{% endbuttons %}
</form>
</nav>
</div>
</div>
</nav>
{% if messages %}
{% for message in messages %}
...
...
nnmon/templates/view.html
View file @
3b5425fe
...
...
@@ -6,7 +6,7 @@
{% block styles %}
{% endblock %}
{% block adminext %}
,
<a
href=
"{%root_url%}/admin/bt/violation/{{v.id}}/ "
>
{% trans "Edit" %}
</a
>
<li><a
href=
"{%root_url%}/admin/bt/violation/{{v.id}}/ "
>
{% trans "Edit" %}
</a></li
>
{% endblock %}
{% block scripts %}
<script
type=
"text/javascript"
src=
"/static/js/jquery.min.js"
></script>
...
...
nnmon/urls.py
View file @
3b5425fe
...
...
@@ -82,6 +82,8 @@ urlpatterns = patterns('',
include
(
operator_api_resource
.
urls
)),
url
(
r
'^search/'
,
bt
.
ViolationSearchView
.
as_view
(
template_name
=
'search/search.html'
)),
# Language switch
url
(
r
'^i18n/'
,
include
(
'django.conf.urls.i18n'
)),
)
if
settings
.
DEV_SERVER
==
True
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment