extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-06-26 12:31:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed responsive problems with navigation moved logo into body of page altered headings

Browse Source
This commit is contained in:
Leon Harris 2013-11-26 10:59:45 +00:00
parent 7fcb829e54
commit a419956f4c
5 changed files with 80 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
helpdesk/static/helpdesk/helpdesk-extend.css
View File

@ -35,7 +35,9 @@ Bootstrap overrides
.errorlist {padding: 0;} .errorlist {padding: 0;}
.has-error .input-group input, .has-error .input-group select, .has-error .input-group textarea {border-color: #b94a48} .has-error .input-group input, .has-error .input-group select, .has-error .input-group textarea {border-color: #b94a48}
#helpdesk-nav-collapse #searchform {
padding-top: 0;
}
/* /*
Add your custom styles here Add your custom styles here
@ -46,6 +48,4 @@ Add your custom styles here
padding: 10px 0; padding: 10px 0;
} }
#helpdesk-body {padding-top: 100px;} #helpdesk-body {padding-top: 100px;}
#header .navbar-nav { img.brand {padding-right: 30px;}
padding-top: 25px;
}

3
helpdesk/templates/helpdesk/base.html
View File

@ -101,7 +101,8 @@
<body id="helpdesk-body"> <body id="helpdesk-body">
<div id='container' class="container"> <div id='container' class="container">
<div id='header' class="row"> <div id='header' class="row">
<h1>{% block h1_title %}{% trans "Helpdesk" %}{% endblock %}</h1> {% if helpdesk_settings.HELPDESK_ORG_LOGO %}<img class="brand pull-right" src="{{ helpdesk_settings.HELPDESK_ORG_LOGO }}" />{% endif %}
<h1>{% block h1_title %}{{ helpdesk_settings.HELPDESK_PREPEND_ORG_NAME|default:'' }} {% trans "Helpdesk" %}{% endblock %}</h1>
{% include "helpdesk/navigation.html" %} {% include "helpdesk/navigation.html" %}
</div> </div>

87
helpdesk/templates/helpdesk/navigation.html
View File

@ -1,20 +1,30 @@
{% load i18n %}{% load url from future %} {% load i18n %}{% load url from future %}
{% if helpdesk_settings.HELPDESK_NAVIGATION_ENABLED and user.is_authenticated or user.is_staff %}
<nav class="navbar navbar-default navbar-fixed-top" role="navigation"> <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
{% if helpdesk_settings.HELPDESK_ORG_LOGO %}<img class="navbar-brand" src="{{ helpdesk_settings.HELPDESK_ORG_LOGO }}" />{% endif %} <div class="navbar-header">
<ul id="dropdown" class="nav navbar-nav"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#helpdesk-nav-collapse">
<li><a href='{% url 'helpdesk_dashboard' %}'><span class="glyphicon glyphicon-dashboard"></span> {% trans "Dashboard" %}</a></li> <span class="sr-only">Toggle navigation</span>
<li><a href='{% url 'helpdesk_list' %}'><span class="glyphicon glyphicon-tags"></span> {% trans "Tickets" %}</a></li> <span class="icon-bar"></span>
<li><a href='{% url 'helpdesk_submit' %}'><span class="glyphicon glyphicon-plus"></span> {% trans "New Ticket" %}</a></li> <span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
</div>
<div class="collapse navbar-collapse" id="helpdesk-nav-collapse">
{% if helpdesk_settings.HELPDESK_NAVIGATION_ENABLED and user.is_authenticated or user.is_staff %}
<ul class="nav navbar-nav">
<li><a href='{% url 'helpdesk_dashboard' %}'><span class="glyphicon glyphicon-dashboard"></span> <span class="nav-text">{% trans "Dashboard" %}</span></a></li>
<li><a href='{% url 'helpdesk_list' %}'><span class="glyphicon glyphicon-tags"></span> <span class="nav-text">{% trans "Tickets" %}</span></a></li>
<li><a href='{% url 'helpdesk_submit' %}'><span class="glyphicon glyphicon-plus"></span> <span class="nav-text">{% trans "New Ticket" %}</span></a></li>
{% if helpdesk_settings.HELPDESK_NAVIGATION_STATS_ENABLED %} {% if helpdesk_settings.HELPDESK_NAVIGATION_STATS_ENABLED %}
<li><a href='{% url 'helpdesk_report_index' %}'><span class="glyphicon glyphicon-stats"></span> {% trans "Stats" %}</a></li> <li><a href='{% url 'helpdesk_report_index' %}'><span class="glyphicon glyphicon-stats"></span><span class="nav-text"> {% trans "Stats" %}</span></a></li>
{% endif %} {% endif %}
{% if helpdesk_settings.HELPDESK_KB_ENABLED_STAFF %} {% if helpdesk_settings.HELPDESK_KB_ENABLED_STAFF %}
<li><a href='{% url 'helpdesk_kb_index' %}'><span class="glyphicon glyphicon-tree-deciduous"></span> {% trans "Knowledgebase" %}</a></li> <li><a href='{% url 'helpdesk_kb_index' %}'><span class="glyphicon glyphicon-tree-deciduous"></span><span class="nav-text">{% trans "Knowledgebase" %}</span></a></li>
{% endif %} {% endif %}
{% if user_saved_queries_ %} {% if user_saved_queries_ %}
<li class="headerlink"><a><span class="glyphicon glyphicon-filter"></span> {% trans "Load Saved Query" %}</a> <li class="headerlink dropdown"><a class="dropdown-toggle" data-toggle="dropdown" href="#"><span class="glyphicon glyphicon-filter"></span><span class="nav-text"> {% trans "Saved Query" %} <b class="caret"></b></span></a>
<ul> <ul class="dropdown-menu">
{% for q in user_saved_queries_ %} {% for q in user_saved_queries_ %}
<li><a href="{% url 'helpdesk_list' %}?saved_query={{ q.id }}">{{ q.title }} <li><a href="{% url 'helpdesk_list' %}?saved_query={{ q.id }}">{{ q.title }}
{% if q.shared %} {% if q.shared %}
@ -24,36 +34,41 @@
</ul> </ul>
</li> </li>
{% endif %} {% endif %}
<li><a href='{% url 'logout' %}'><span class="glyphicon glyphicon-logout"></span> {% trans "Logout" %}</a></li> <li><a href='{% url 'logout' %}'><span class="glyphicon glyphicon-log-out"></span><span class="nav-text">{% trans "Logout" %}</span></a></li>
{% if not query %}<li> </ul>
{% if not query %}
<form class="navbar-form navbar-left" id='searchform' method='get' action="{% url 'helpdesk_list' %}"> <form class="navbar-form navbar-left" id='searchform' method='get' action="{% url 'helpdesk_list' %}">
<div class="form-group"> <div class="input-group">
<input type='text' name='q' size='6' class='input form-control' placeholder='{% trans "Search..." %}' id='search_query' title='{% trans "Enter a keyword, or a ticket number to jump straight to that ticket." %}'/> <input type='text' name='q' size='15' class='input form-control' placeholder='{% trans "Search..." %}' id='search_query' title='{% trans "Enter a keyword, or a ticket number to jump straight to that ticket." %}'/>
<input type='hidden' name='status' value='1' /><input type='hidden' name='status' value='2' /><input type='hidden' name='status' value='3' /> <input type='hidden' name='status' value='1' /><input type='hidden' name='status' value='2' /><input type='hidden' name='status' value='3' />
<input type='hidden' name='search_type' value='header' /> <input type='hidden' name='search_type' value='header' />
{% csrf_token %} {% csrf_token %}
<span class="input-group-btn">
<button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span> Go</button>
</span>
</div> </div>
<button type="submit" class="btn btn-default">Submit</button>
</form> </form>
</li>{% endif %}
</ul> {% endif %}
{% else %}
<ul id="dropdown" class="nav navbar-nav">
{% if helpdesk_settings.HELPDESK_ALLOW_NON_STAFF_TICKET_UPDATE %}
<li><a href='{% url 'helpdesk_dashboard' %}'>{% trans "Dashboard" %}</a></li>
<li><a href='{% url 'helpdesk_submit' %}'>{% trans "Submit A Ticket" %}</a></li>
{% else %}
{% if helpdesk_settings.HELPDESK_SUBMIT_A_TICKET_PUBLIC %}
<li><a href='{% url 'helpdesk_home' %}'>{% trans "Submit A Ticket" %}</a></li>
{% endif %}
{% endif %}
{% if helpdesk_settings.HELPDESK_KB_ENABLED %}<li><a href='{% url 'helpdesk_kb_index' %}'>{% trans "Knowledgebase" %}</a></li>{% endif %}
{% if not request.path == '/helpdesk/login/' or user.is_authenticated %}
<li>{% if user.is_authenticated %}<a href='{% url 'logout' %}'>{% trans "Logout" %}</a>{% else %}<a href='{% url 'login' %}?next={% if next %}{{ next|escape }}{% else %}{% url 'helpdesk_home' %}{% endif %}'>{% trans "Log In" %}</a>{% endif %}</li>
{% endif %}
</ul>
{% endif %}
</div>
</nav> </nav>
{% else %}
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
{% if helpdesk_settings.HELPDESK_ORG_LOGO %}<img class="navbar-brand" src="{{ helpdesk_settings.HELPDESK_ORG_LOGO }}" />{% endif %}
<ul id="dropdown" class="nav navbar-nav">
{% if helpdesk_settings.HELPDESK_ALLOW_NON_STAFF_TICKET_UPDATE %}
<li><a href='{% url 'helpdesk_dashboard' %}'>{% trans "Dashboard" %}</a></li>
<li><a href='{% url 'helpdesk_submit' %}'>{% trans "Submit A Ticket" %}</a></li>
{% else %}
{% if helpdesk_settings.HELPDESK_SUBMIT_A_TICKET_PUBLIC %}
<li><a href='{% url 'helpdesk_home' %}'>{% trans "Submit A Ticket" %}</a></li>
{% endif %}
{% endif %}
{% if helpdesk_settings.HELPDESK_KB_ENABLED %}<li><a href='{% url 'helpdesk_kb_index' %}'>{% trans "Knowledgebase" %}</a></li>{% endif %}
{% if not request.path == '/helpdesk/login/' or user.is_authenticated %}
<li>{% if user.is_authenticated %}<a href='{% url 'logout' %}'>{% trans "Logout" %}</a>{% else %}<a href='{% url 'login' %}?next={% if next %}{{ next|escape }}{% else %}{% url 'helpdesk_home' %}{% endif %}'>{% trans "Log In" %}</a>{% endif %}</li>
{% endif %}
</ul>
</nav>
{% endif %}

3
helpdesk/templates/helpdesk/public_base.html
View File

@ -4,7 +4,7 @@
<html> <html>
<head> <head>
<title>{% block helpdesk_title %}{{ helpdesk_settings.HELPDESK_PREPEND_ORG_NAME|default:'' }} {% trans "Helpdesk" %}{% endblock %}</title> <title>{% block helpdesk_title %}{{ helpdesk_settings.HELPDESK_PREPEND_ORG_NAME|default:'' }} {% trans "Helpdesk" %}{% endblock %}</title>
<script src='{{ STATIC_URL }}helpdesk/jquery-1.5.min.js' type='text/javascript' language='javascript'></script> <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.0.2/js/bootstrap.min.js"></script> <script src="http://netdna.bootstrapcdn.com/bootstrap/3.0.2/js/bootstrap.min.js"></script>
<link href="http://netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css" rel="stylesheet"> <link href="http://netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css" rel="stylesheet">
<link rel='stylesheet' href='{{ STATIC_URL }}helpdesk/helpdesk-extend.css' type='text/css' /> <link rel='stylesheet' href='{{ STATIC_URL }}helpdesk/helpdesk-extend.css' type='text/css' />
@ -13,6 +13,7 @@
<body id="helpdesk-body"> <body id="helpdesk-body">
<div id='container' class="container"> <div id='container' class="container">
<div id='header' class="row"> <div id='header' class="row">
{% if helpdesk_settings.HELPDESK_ORG_LOGO %}<img class="brand pull-right" src="{{ helpdesk_settings.HELPDESK_ORG_LOGO }}" />{% endif %}
<h1>{{ helpdesk_settings.HELPDESK_PREPEND_ORG_NAME|default:'' }} {% trans "Helpdesk" %}</h1> <h1>{{ helpdesk_settings.HELPDESK_PREPEND_ORG_NAME|default:'' }} {% trans "Helpdesk" %}</h1>
{% include "helpdesk/navigation.html" %} {% include "helpdesk/navigation.html" %}
</div> </div>