Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixes things

  • Loading branch information...
commit 48051779c0f7a714d9ed903949413b4c0e1b5ef1 1 parent 11208f0
@peterbe peterbe authored brandonsavage committed
View
1  .gitignore
@@ -15,3 +15,4 @@ vendor
tmp/*
*~
*.mo
+/dragnet/settings/local.py
View
3  .gitmodules
@@ -1,3 +1,6 @@
[submodule "vendor"]
path = vendor
url = git://github.com/mozilla/playdoh-lib.git
+[submodule "vendor-local/src/django-auth-ldap"]
+ path = vendor-local/src/django-auth-ldap
+ url = git://github.com/ametaireau/django-auth-ldap.git
View
2  dragnet/settings/base.py
@@ -8,7 +8,7 @@
INSTALLED_APPS = get_apps(append=(
'dragnet.users',
'dragnet.dll',
-
+
))
# Because Jinja2 is the default template loader, add any non-Jinja templated
View
35 static/js/dll/detail.js
@@ -1,18 +1,21 @@
+var Tabs = (function() {
+ return {
+ clicked: function($element) {
+ $('.active').removeClass('active');
+ $('.information').addClass('out-of-focus');
+ $($element.attr('href')).removeClass('out-of-focus');
+ $element.closest('li').addClass('active');
+ }
+ };
+})();
+
$(document).ready(function () {
-
- $('ul.tab-list li a').click(function() {
- classAttr = $(this).attr('class')
- $('ul.tab-list li').removeClass('active')
- $(this).parent().addClass("active")
- $('.information').addClass('out-of-focus')
- $('#' + classAttr).removeClass('out-of-focus')
- });
-
- if(window.location.hash == '#comments') {
- $('.information').addClass('out-of-focus')
- $(window.location.hash).removeClass('out-of-focus')
- $('ul.tab-list li').removeClass('active')
- $('ul.tab-list li a.comments').parent().addClass('active')
- }
-
+ $('ul.tab-list li a').click(function() {
+ Tabs.clicked($(this));
+ });
+
+ if (location.hash.search(/#(comments|details|history)/) > -1) {
+ $('a[href="' + location.hash + '"]').click();
+ }
+
});
View
13 templates/base.html
@@ -1,3 +1,4 @@
+<!doctype html>
<html>
<head>
<title>{% block title %}Mozilla Dragnet{% endblock %}</title>
@@ -8,23 +9,23 @@
{% block site_css %}
{% endblock %}
-
+
{% compress js %}
<script src="{{ static('js/libs/jquery-1.9.0.js') }}"></script>
<script src="{{ static('js/dll/nav.js') }}"></script>
{% endcompress %}
-
+
{% block site_js %}
{% endblock %}
-
+
{% block extrahead %}{% endblock %}
-
+
</head>
<body>
<div class="page-header">
<p><a href="{{ url('dll.home') }}">Mozilla Dragnet</a></p>
-
+
<form action="{{ url('dll.search')}}" method="get">
{% set search = BasicSearchForm(request) %}
{{ search.term }}
@@ -41,4 +42,4 @@
{% endif %}
</div>
</body>
-</html>
+</html>
1  vendor-local/src/django-auth-ldap
@@ -0,0 +1 @@
+Subproject commit 6646117158848af140fab8a0fba631fd73e8a73b
View
1  vendor-local/vendor.pth
@@ -0,0 +1 @@
+src/django-auth-ldap
Please sign in to comment.
Something went wrong with that request. Please try again.