Merge pull request #6 from ikresoft/master

bootstrap table classes and url support for django 1.6

Author: jsoa

stories/templates/admin/qe_change_list_results.html

@@ -4,7 +4,7 @@
 </div>
 {% endif %}
 {% if results %}
-  <table cellspacing="0" id="result_list">
+  <table cellspacing="0" id="result_list" class="table table-striped table-bordered table-hover table-condensed">
     <thead>
       <tr>
         <th>Quick Links</th>

stories/urls.py

@@ -2,8 +2,10 @@
 # -*- coding: utf-8 -*-
 """URL definitions for news stories
 """
-
-from django.conf.urls.defaults import patterns, url
+try:
+    from django.conf.urls.defaults import patterns, url
+except ImportError:
+    from django.conf.urls import patterns, url
 from django.views.generic import (ArchiveIndexView, YearArchiveView,
     MonthArchiveView, WeekArchiveView, DayArchiveView, TodayArchiveView,
     DateDetailView)