alamin
/
djing
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

add titles in devices app

devel
Dmitry Novikov 7 years ago
parent
aff0c4e161
commit
ea8beb6cd6
9 changed files with 17 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      devapp/templates/devapp/add_dev.html
  2. 3
      devapp/templates/devapp/dev.html
  3. 2
      devapp/templates/devapp/devices.html
  4. 2
      devapp/templates/devapp/devices_null_group.html
  5. 1
      devapp/templates/devapp/ext.htm
  6. 2
      devapp/templates/devapp/fix_dev_group.html
  7. 2
      devapp/templates/devapp/group_list.html
  8. 3
      devapp/views.py
  9. 2
      templates/all_base.html

2
devapp/templates/devapp/add_dev.html
View File

@ -1,6 +1,8 @@
{% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
{% load i18n bootstrap3 %} {% load i18n bootstrap3 %}
{% block title %}{% trans 'Add new device' %}{% endblock %}
{% block breadcrumb %} {% block breadcrumb %}
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><span class="glyphicon glyphicon-home"></span></li> <li><span class="glyphicon glyphicon-home"></span></li>

3
devapp/templates/devapp/dev.html
View File

@ -1,5 +1,8 @@
{% extends request.is_ajax|yesno:'nullcont.htm,devapp/ext.htm' %} {% extends request.is_ajax|yesno:'nullcont.htm,devapp/ext.htm' %}
{% load i18n bootstrap3 %} {% load i18n bootstrap3 %}
{% block title %}{{ form.comment.value }}{% endblock %}
{% block content %} {% block content %}
<div class="panel panel-default"> <div class="panel panel-default">

2
devapp/templates/devapp/devices.html
View File

@ -1,6 +1,8 @@
{% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
{% load i18n dpagination %} {% load i18n dpagination %}
{% block title %}{% trans 'Devices' %} - {{ group.title }}{% endblock %}
{% block breadcrumb %} {% block breadcrumb %}
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><span class="glyphicon glyphicon-home"></span></li> <li><span class="glyphicon glyphicon-home"></span></li>

2
devapp/templates/devapp/devices_null_group.html
View File

@ -1,6 +1,8 @@
{% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
{% load i18n dpagination %} {% load i18n dpagination %}
{% block title %}{% trans 'Devices without group' %}{% endblock %}
{% block breadcrumb %} {% block breadcrumb %}
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><span class="glyphicon glyphicon-home"></span></li> <li><span class="glyphicon glyphicon-home"></span></li>

1
devapp/templates/devapp/ext.htm
View File

@ -1,6 +1,7 @@
{% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
{% load i18n %} {% load i18n %}
{% block title %}{{ dev.comment }}{% endblock %}
{% block breadcrumb %} {% block breadcrumb %}
<ol class="breadcrumb"> <ol class="breadcrumb">

2
devapp/templates/devapp/fix_dev_group.html
View File

@ -1,6 +1,8 @@
{% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
{% load i18n bootstrap3 %} {% load i18n bootstrap3 %}
{% block title %}{% trans 'Fix device group' %}{% endblock %}
{% block breadcrumb %} {% block breadcrumb %}
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><span class="glyphicon glyphicon-home"></span></li> <li><span class="glyphicon glyphicon-home"></span></li>

2
devapp/templates/devapp/group_list.html
View File

@ -1,6 +1,8 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load i18n %} {% load i18n %}
{% block title %}{% trans 'Devices' %}{% endblock %}
{% block breadcrumb %} {% block breadcrumb %}
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><span class="glyphicon glyphicon-home"></span></li> <li><span class="glyphicon glyphicon-home"></span></li>

3
devapp/views.py
View File

@ -599,9 +599,8 @@ class GroupsListView(LoginAdminMixin, global_base_views.OrderedFilteredList):
model = Group model = Group
def get_queryset(self): def get_queryset(self):
groups = super(GroupsListView, self).get_queryset()
groups = get_objects_for_user(self.request.user, groups = get_objects_for_user(self.request.user,
'group_app.view_group', klass=groups,
'group_app.view_group', klass=Group,
accept_global_perms=False) accept_global_perms=False)
return groups return groups

2
templates/all_base.html
View File

@ -1,7 +1,7 @@
<!DOCTYPE html>{% load i18n globaltags static %} <!DOCTYPE html>{% load i18n globaltags static %}
<html lang="{{ LANGUAGE_CODE }}"> <html lang="{{ LANGUAGE_CODE }}">
<head> <head>
<title>{% global_var 'COMPANY_NAME' %} - {% trans 'Admin side' %}</title>
<title>{% block title %}{% global_var 'COMPANY_NAME' %} - {% trans 'Admin side' %}{% endblock %}</title>
<meta charset="UTF-8"> <meta charset="UTF-8">
<!--[if lt IE 9]><meta http-equiv="refresh" content="0;URL={% static 'bad_ie.html' %}" /><![endif]--> <!--[if lt IE 9]><meta http-equiv="refresh" content="0;URL={% static 'bad_ie.html' %}" /><![endif]-->
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">

Write Preview
Loading…
Cancel
Save