Update for django 1.10 and fix links for css and js

7 files changed, 26 insertions, 24 deletions

diff --git a/python/gentoo_main/urls.py b/python/gentoo_main/urls.py
index 1eb5179..ff710c4 100644
--- a/python/gentoo_main/urls.py
+++ b/python/gentoo_main/urls.py
@@ -1,7 +1,8 @@
 # Copyright 1998-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-from django.conf.urls import patterns, include, url
+from django.conf.urls import url
+from . import views
 
 urlpatterns = [
 	url(r'^home/$', views.home),
diff --git a/python/tbc_www/models.py b/python/tbc_www/models.py
index 0d58bc1..a0a25f3 100644
--- a/python/tbc_www/models.py
+++ b/python/tbc_www/models.py
@@ -74,7 +74,7 @@ class EbuildsMetadata(models.Model):
 	class Meta:
 		db_table = 'ebuilds_metadata'
 	def __str__(self):
-		return '%s %s %s %s %s' % (self.Id, self.EbuildId, self,Commit, self.New, self.Descriptions)
+		return '%s %s %s %s %s' % (self.Id, self.EbuildId, self.Commit, self.New, self.Descriptions)
 
 class BuildLogs(models.Model):
 	BuildLogId = models.IntegerField(primary_key=True, db_column='build_log_id')
diff --git a/python/tbc_www/router.py b/python/tbc_www/router.py
index 7a512fd..bac2a30 100644
--- a/python/tbc_www/router.py
+++ b/python/tbc_www/router.py
@@ -23,8 +23,8 @@ class TBCRouter(object):
 			return True
 		return False
 
-	def allow_migrate(self, db, model):
-		if db == 'tbc' or model._meta.app_label == "tbc_www":
+	def allow_migrate(self, db, app_label, model_name=None, **hints):
+		if db == 'tbc' or app_label == "tbc_www":
 			return False # we're not using syncdb on our legacy database
 		else: # but all other models/databases are fine
 			return True
diff --git a/python/tbc_www/urls.py b/python/tbc_www/urls.py
index 5be267f..ea2db31 100644
--- a/python/tbc_www/urls.py
+++ b/python/tbc_www/urls.py
@@ -1,13 +1,14 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import url
+from . import views
 
-urlpatterns = patterns('tbc_www.views',
-	url(r'^home/$', 'home'),
-	url(r'^packages/$', 'categories'),
-	url(r'^categories/(?P<category_id>\d+)/$', 'packages'),
-	url(r'^packages/(?P<package_id>\d+)/$', 'ebuilds'),
-	url(r'^ebuild/(?P<ebuild_id>\d+)/$', 'ebuild'),
-	url(r'^new/logs/build/(?P<buildlog_id>\d+)/$', 'new_logs_build'),
-	url(r'^new/logs/$', 'new_logs'),
-	url(r'^new/repoman/$', 'new_repoman'),
-	url(r'^new/$', 'new_main'),
-)
+urlpatterns = [
+	url(r'^home/$', views.home),
+	url(r'^packages/$', views.categories),
+	url(r'^categories/(?P<category_id>\d+)/$', views.packages),
+	url(r'^packages/(?P<package_id>\d+)/$', views.ebuilds),
+	url(r'^ebuild/(?P<ebuild_id>\d+)/$', views.ebuild),
+	url(r'^new/logs/build/(?P<buildlog_id>\d+)/$', views.new_logs_build),
+	url(r'^new/logs/$', views.new_logs),
+	url(r'^new/repoman/$', views.new_repoman),
+	url(r'^new/$', views.new_main),
+]
diff --git a/python/templates/includes/layout/head.html b/python/templates/includes/layout/head.html
index d8ed708..22bfa58 100644
--- a/python/templates/includes/layout/head.html
+++ b/python/templates/includes/layout/head.html
@@ -11,8 +11,8 @@
   <meta name="twitter:image" content="https://www.gentoo.org/assets/img/logo/gentoo-g.png">
   <link rel="apple-touch-icon" href="https://www.gentoo.org/assets/img/logo/icon-192.png">
   <link rel="icon" sizes="192x192" href="https://www.gentoo.org/assets/img/logo/icon-192.png">
-  <link href="{{ site.cdnurl }}/bootstrap.min.css" rel="stylesheet" media="screen">
-  <link href="{{ site.cdnurl }}/tyrian.min.css" rel="stylesheet" media="screen">
+  <link href="https://assets.gentoo.org/tyrian/bootstrap.min.css" rel="stylesheet" media="screen">
+  <link href="https://assets.gentoo.org/tyrian/tyrian.min.css" rel="stylesheet" media="screen">
   <link href="https://www.gentoo.org/assets/css/screen.css" rel="stylesheet" media="screen">
   {% if page.extracss %}{% for css in page.extracss %}<link href="https://www.gentoo.org/assets/css/{{ css }}" rel="stylesheet" media="screen">{% endfor %}{% endif %}
   <link rel="icon" href="/favicon.ico" type="image/x-icon">
@@ -22,4 +22,4 @@
   <link rel="search" type="application/opensearchdescription+xml" href="https://www.gentoo.org/search/packages-gentoo-org.xml" title="Gentoo Packages">
   <link rel="search" type="application/opensearchdescription+xml" href="https://www.gentoo.org/search/archives-gentoo-org.xml" title="Gentoo List Archives">
   {% if page.meta %}{{ page.meta|safe|escape }}{% endif %}
-</head>
\ No newline at end of file
+</head>
diff --git a/python/templates/includes/layout/header.html b/python/templates/includes/layout/header.html
index 8b6bc63..585ea59 100644
--- a/python/templates/includes/layout/header.html
+++ b/python/templates/includes/layout/header.html
@@ -28,8 +28,8 @@
         </div>
         <div class="logo">
           <a href="/" title="Back to the homepage" class="site-logo">
-            <object data="{{ site.cdnurl }}/site-logo.svg" type="image/svg+xml">
-            <img src="{{ site.cdnurl }}/site-logo.png" alt="Gentoo Linux Logo">
+            <object data="https://assets.gentoo.org/tyrian/site-logo.svg" type="image/svg+xml">
+            <img src="https://assets.gentoo.org/tyrian/site-logo.png" alt="Gentoo Linux Logo">
             </object>
           </a>
         </div>
@@ -83,4 +83,4 @@
     </div>
   </nav>
   {% endif %}
-</header>
\ No newline at end of file
+</header>
diff --git a/python/templates/layout/base.html b/python/templates/layout/base.html
index eaa86f3..2344acd 100644
--- a/python/templates/layout/base.html
+++ b/python/templates/layout/base.html
@@ -14,8 +14,8 @@
 
     {% include "includes/layout/footer.html" %}
 
-    <script src="{{ site.cdnurl }}/jquery.min.js"></script>
-    <script src="{{ site.cdnurl }}/bootstrap.min.js"></script>
+    <script src="https://assets.gentoo.org/tyrian/jquery.min.js"></script>
+	<script src="https://assets.gentoo.org/tyrian/bootstrap.min.js"></script>
     {% if page.extrajs %}{% for js in page.extrajs %}<script src="{{ STATIC_ROOT }}/js/{{ js }}"></script>{% endfor %}{% endif %}
     {% if page.inlinejs %}<script>{{ page.inlinejs }}</script>{% endif %}
     <script type="text/javascript">