From a25834186e13e354605b3b2f6d7d80c7a6faa4c8 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
Date: Sun, 19 Jul 2015 13:01:20 +0200
Subject: [PATCH] Refactoring everything Bioforsk -> NIBIO
---
LICENSE.txt | 8 ++++----
VIPSWeb/context_processors.py | 12 ++++++------
VIPSWeb/local_settings_sample.py | 12 ++++++------
VIPSWeb/locale/bg/LC_MESSAGES/django.po | 2 +-
VIPSWeb/locale/bg/LC_MESSAGES/djangojs.po | 2 +-
VIPSWeb/locale/nb/LC_MESSAGES/django.po | 4 ++--
VIPSWeb/locale/nb/LC_MESSAGES/djangojs.po | 14 +++++++-------
VIPSWeb/settings.py | 12 ++++++------
VIPSWeb/static/css/vipsweb.css | 14 +++++++-------
VIPSWeb/static/js/forecastmap.js | 16 ++++++++--------
VIPSWeb/static/js/frontpage.js | 14 +++++++-------
.../static/js/js_apps/oatFloweringModelForm.js | 8 ++++----
VIPSWeb/static/js/util.js | 14 +++++++-------
VIPSWeb/static/js/validateForm.js | 2 +-
VIPSWeb/templates/base.html | 12 ++++++------
VIPSWeb/templates/index.html | 12 ++++++------
VIPSWeb/urls.py | 12 ++++++------
VIPSWeb/views.py | 14 +++++++-------
VIPSWeb/wsgi.py | 12 ++++++------
.../formdefinitions/barleyNetBlotchForm.json | 12 ++++++------
cerealblotchmodels/urls.py | 12 ++++++------
common/middleware/whodid.py | 12 ++++++------
common/util.py | 14 +++++++-------
forecasts/admin.py | 12 ++++++------
forecasts/locale/bg/LC_MESSAGES/django.po | 2 +-
forecasts/locale/nb/LC_MESSAGES/django.po | 4 ++--
forecasts/models.py | 12 ++++++------
forecasts/templates/forecasts/detail.html | 12 ++++++------
forecasts/templates/forecasts/detail_error.html | 12 ++++++------
forecasts/templates/forecasts/index.html | 12 ++++++------
forecasts/templates/models/detail.html | 12 ++++++------
forecasts/templates/models/index.html | 12 ++++++------
forecasts/templates/models/modelLocalNames.js | 16 ++++++++--------
forecasts/templatetags/forecast_extras.py | 12 ++++++------
forecasts/urls.py | 12 ++++++------
forecasts/views.py | 14 +++++++-------
information/admin.py | 12 ++++++------
information/urls.py | 12 ++++++------
information/views.py | 12 ++++++------
messages/admin.py | 12 ++++++------
messages/locale/nb/LC_MESSAGES/django.po | 2 +-
messages/models.py | 12 ++++++------
messages/urls.py | 12 ++++++------
messages/views.py | 12 ++++++------
organisms/models.py | 12 ++++++------
organisms/static/organisms/organismsUtil.js | 2 +-
organisms/urls.py | 12 ++++++------
organisms/views.py | 12 ++++++------
requirements.txt | 12 ++++++------
49 files changed, 263 insertions(+), 263 deletions(-)
diff --git a/LICENSE.txt b/LICENSE.txt
index 703c9b99..940d3ebf 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -44,17 +44,17 @@ this license set forward by yourself or any party deviating its rights from you.
This file is part of <application name>. <application name> is free
software: you can redistribute it and/or modify it under the terms of
- the Bioforsk Open Source License as published by Bioforsk, either
+ the NIBIO Open Source License as published by NIBIO, either
version 1 of the License, or (at your option) any later version.
<application name> is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- Bioforsk Open Source License for more details.
+ NIBIO Open Source License for more details.
- You should have received a copy of the Bioforsk Open Source License
+ You should have received a copy of the NIBIO Open Source License
along with <application name>. If not, see
- <http://www.bioforsk.no/licenses/>.
+ <http://www.nibio.no/licenses/>.
It is also recommended that you add information on how to contact you by
electronic and paper mail.
diff --git a/VIPSWeb/context_processors.py b/VIPSWeb/context_processors.py
index ffa835b1..c401f6cb 100644
--- a/VIPSWeb/context_processors.py
+++ b/VIPSWeb/context_processors.py
@@ -1,19 +1,19 @@
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
from django.conf import settings as _settings
diff --git a/VIPSWeb/local_settings_sample.py b/VIPSWeb/local_settings_sample.py
index 57183d32..eaa8b916 100644
--- a/VIPSWeb/local_settings_sample.py
+++ b/VIPSWeb/local_settings_sample.py
@@ -1,19 +1,19 @@
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
## SAMPLE local_settings file. Copy to local_settings.py and configure as needed.
diff --git a/VIPSWeb/locale/bg/LC_MESSAGES/django.po b/VIPSWeb/locale/bg/LC_MESSAGES/django.po
index f4edd049..fbe2e986 100644
--- a/VIPSWeb/locale/bg/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/bg/LC_MESSAGES/django.po
@@ -1,4 +1,4 @@
-# Copyright (C) 2014 Bioforsk
+# Copyright (C) 2014 NIBIO
#
# This file is part of VIPSWeb
#
diff --git a/VIPSWeb/locale/bg/LC_MESSAGES/djangojs.po b/VIPSWeb/locale/bg/LC_MESSAGES/djangojs.po
index af693a2a..92187c6f 100644
--- a/VIPSWeb/locale/bg/LC_MESSAGES/djangojs.po
+++ b/VIPSWeb/locale/bg/LC_MESSAGES/djangojs.po
@@ -1,4 +1,4 @@
-# Copyright (C) 2014 Bioforsk
+# Copyright (C) 2014 NIBIO
#
# This file is part of VIPSWeb
#
diff --git a/VIPSWeb/locale/nb/LC_MESSAGES/django.po b/VIPSWeb/locale/nb/LC_MESSAGES/django.po
index 8dfe1315..103493a1 100644
--- a/VIPSWeb/locale/nb/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/nb/LC_MESSAGES/django.po
@@ -1,4 +1,4 @@
-# Copyright (C) 2014 Bioforsk
+# Copyright (C) 2014 NIBIO
#
# This file is part of VIPSWeb
#
@@ -22,7 +22,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-06-03 15:34+0200\n"
"PO-Revision-Date: 2013-11-07 20:18+0200\n"
-"Last-Translator: Tor-Einar Skog <tor-einar.skog@bioforsk.no>\n"
+"Last-Translator: Tor-Einar Skog <tor-einar.skog@nibio.no>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
diff --git a/VIPSWeb/locale/nb/LC_MESSAGES/djangojs.po b/VIPSWeb/locale/nb/LC_MESSAGES/djangojs.po
index eb344222..85f342a5 100644
--- a/VIPSWeb/locale/nb/LC_MESSAGES/djangojs.po
+++ b/VIPSWeb/locale/nb/LC_MESSAGES/djangojs.po
@@ -1,18 +1,18 @@
-# Copyright (C) 2014 Bioforsk
+# Copyright (C) 2014 NIBIO
#
# This file is part of VIPSWeb
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
#, fuzzy
msgid ""
@@ -21,7 +21,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-06-04 10:29+0200\n"
"PO-Revision-Date: 2014-12-28 15:17+0100\n"
-"Last-Translator: Tor-Einar Skog <tor-einar.skog@bioforsk.no>\n"
+"Last-Translator: Tor-Einar Skog <tor-einar.skog@nibio.no>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
diff --git a/VIPSWeb/settings.py b/VIPSWeb/settings.py
index ca2674ca..c95c3a36 100644
--- a/VIPSWeb/settings.py
+++ b/VIPSWeb/settings.py
@@ -1,19 +1,19 @@
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
# Django settings for VIPSWeb project.
diff --git a/VIPSWeb/static/css/vipsweb.css b/VIPSWeb/static/css/vipsweb.css
index 5f5a4e1e..66e6d13c 100644
--- a/VIPSWeb/static/css/vipsweb.css
+++ b/VIPSWeb/static/css/vipsweb.css
@@ -1,26 +1,26 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSWeb.
* VIPSWeb is free software: you can redistribute it and/or modify
- * it under the terms of the Bioforsk Open Source License as published by
- * Bioforsk, either version 1 of the License, or (at your option) any
+ * it under the terms of the NIBIO Open Source License as published by
+ * NIBIO, either version 1 of the License, or (at your option) any
* later version.
*
* VIPSWeb is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
*
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
*
*/
/*
Document : vipsweb.css
Created on : Nov 7, 2013, 10:55:15 AM
- Author : Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ Author : Tor-Einar Skog <tor-einar.skog@nibio.no>
Description:
Main stylesheet of the VIPSWeb web app. Cusomizes the bootstrap.css and
other frameworks (e.g. OpenLayers)
diff --git a/VIPSWeb/static/js/forecastmap.js b/VIPSWeb/static/js/forecastmap.js
index 10df87e8..e0e1cc40 100644
--- a/VIPSWeb/static/js/forecastmap.js
+++ b/VIPSWeb/static/js/forecastmap.js
@@ -1,25 +1,25 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSWeb.
* VIPSWeb is free software: you can redistribute it and/or modify
- * it under the terms of the Bioforsk Open Source License as published by
- * Bioforsk, either version 1 of the License, or (at your option) any
+ * it under the terms of the NIBIO Open Source License as published by
+ * NIBIO, either version 1 of the License, or (at your option) any
* later version.
*
* VIPSWeb is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
*
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
*
*/
/**
- * @copyright 2014 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2014 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
// Couple of global elements
diff --git a/VIPSWeb/static/js/frontpage.js b/VIPSWeb/static/js/frontpage.js
index 46669b61..ca2963ee 100644
--- a/VIPSWeb/static/js/frontpage.js
+++ b/VIPSWeb/static/js/frontpage.js
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSWeb.
* VIPSWeb is free software: you can redistribute it and/or modify
- * it under the terms of the Bioforsk Open Source License as published by
- * Bioforsk, either version 1 of the License, or (at your option) any
+ * it under the terms of the NIBIO Open Source License as published by
+ * NIBIO, either version 1 of the License, or (at your option) any
* later version.
*
* VIPSWeb is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
*
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
*
*/
@@ -23,7 +23,7 @@
*
* Depending on /currentLanguage.js
*
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
diff --git a/VIPSWeb/static/js/js_apps/oatFloweringModelForm.js b/VIPSWeb/static/js/js_apps/oatFloweringModelForm.js
index bc283346..3e5d511b 100644
--- a/VIPSWeb/static/js/js_apps/oatFloweringModelForm.js
+++ b/VIPSWeb/static/js/js_apps/oatFloweringModelForm.js
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSWeb.
* VIPSWeb is free software: you can redistribute it and/or modify
@@ -24,7 +24,7 @@
* <li>the oat flowering model in the VIPS forecasting system </li>
* <li>moment.js and moment-timezone.js (http://momentjs.com)</li>
* </ul>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
// *********** Configuration section ****************
@@ -35,14 +35,14 @@ var detailURL = null;
var DEBUG = false;
// Settings for VIPS forecasting system
-var serverUri = "https://coremanager.vips.bioforsk.no";
+var serverUri = "https://coremanager.vips.nibio.no";
//var serverUri = "http://vipscoremanager";
var runUri= serverUri + "/models/OATFLOWERM/run";
var coreUserName = "";
var corePass = "";
// Location of weather data source
-var weatherDataBaseUri = "http://lmt.bioforsk.no/agrometbase/export/getSeasonDailyTemperaturesJSON.php";
+var weatherDataBaseUri = "http://lmt.nibio.no/agrometbase/export/getSeasonDailyTemperaturesJSON.php";
//var weatherDataBaseUri = "http://agrometbase-local/agrometbase/export/getSeasonDailyTemperaturesJSON.php";
// Setting current time
diff --git a/VIPSWeb/static/js/util.js b/VIPSWeb/static/js/util.js
index 5be96581..e5940fa2 100644
--- a/VIPSWeb/static/js/util.js
+++ b/VIPSWeb/static/js/util.js
@@ -1,26 +1,26 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSWeb.
* VIPSWeb is free software: you can redistribute it and/or modify
- * it under the terms of the Bioforsk Open Source License as published by
- * Bioforsk, either version 1 of the License, or (at your option) any
+ * it under the terms of the NIBIO Open Source License as published by
+ * NIBIO, either version 1 of the License, or (at your option) any
* later version.
*
* VIPSWeb is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
*
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
*
*/
/**
* Utility JavaScript. Used here and there. To whom it may concern...
*
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
/**
diff --git a/VIPSWeb/static/js/validateForm.js b/VIPSWeb/static/js/validateForm.js
index b320e680..d32b95fd 100644
--- a/VIPSWeb/static/js/validateForm.js
+++ b/VIPSWeb/static/js/validateForm.js
@@ -60,7 +60,7 @@ var emailReg = /^([\w-\.]+@([\w-]+\.)+[\w-]{2,4})?$/;
/**
* Validation function for all forms
* @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*
* It depends on the following:
* <ul>
diff --git a/VIPSWeb/templates/base.html b/VIPSWeb/templates/base.html
index 38ad6345..b4908f12 100644
--- a/VIPSWeb/templates/base.html
+++ b/VIPSWeb/templates/base.html
@@ -1,21 +1,21 @@
{% comment %}
/*
- * Copyright (c) 2015 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2015 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSWeb.
* VIPSWeb is free software: you can redistribute it and/or modify
- * it under the terms of the Bioforsk Open Source License as published by
- * Bioforsk, either version 1 of the License, or (at your option) any
+ * it under the terms of the NIBIO Open Source License as published by
+ * NIBIO, either version 1 of the License, or (at your option) any
* later version.
*
* VIPSWeb is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
*
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
*
*/
diff --git a/VIPSWeb/templates/index.html b/VIPSWeb/templates/index.html
index 62e8144d..b02f0ea4 100644
--- a/VIPSWeb/templates/index.html
+++ b/VIPSWeb/templates/index.html
@@ -2,21 +2,21 @@
{% comment %}
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSWeb.
* VIPSWeb is free software: you can redistribute it and/or modify
- * it under the terms of the Bioforsk Open Source License as published by
- * Bioforsk, either version 1 of the License, or (at your option) any
+ * it under the terms of the NIBIO Open Source License as published by
+ * NIBIO, either version 1 of the License, or (at your option) any
* later version.
*
* VIPSWeb is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
*
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
*
*/
diff --git a/VIPSWeb/urls.py b/VIPSWeb/urls.py
index 05d87818..5fdf60a2 100644
--- a/VIPSWeb/urls.py
+++ b/VIPSWeb/urls.py
@@ -1,19 +1,19 @@
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
from django.conf.urls import patterns, include, url
diff --git a/VIPSWeb/views.py b/VIPSWeb/views.py
index 32983910..5c0228dc 100644
--- a/VIPSWeb/views.py
+++ b/VIPSWeb/views.py
@@ -1,21 +1,21 @@
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
-# @author: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+# @author: Tor-Einar Skog <tor-einar.skog@nibio.no>
from django.shortcuts import render
from django.conf import settings
from django.utils import translation
diff --git a/VIPSWeb/wsgi.py b/VIPSWeb/wsgi.py
index aa40a57e..ff8ffae4 100644
--- a/VIPSWeb/wsgi.py
+++ b/VIPSWeb/wsgi.py
@@ -1,19 +1,19 @@
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
"""
diff --git a/cerealblotchmodels/static/cerealblotchmodels/formdefinitions/barleyNetBlotchForm.json b/cerealblotchmodels/static/cerealblotchmodels/formdefinitions/barleyNetBlotchForm.json
index 3de2dd8a..51426613 100644
--- a/cerealblotchmodels/static/cerealblotchmodels/formdefinitions/barleyNetBlotchForm.json
+++ b/cerealblotchmodels/static/cerealblotchmodels/formdefinitions/barleyNetBlotchForm.json
@@ -1,20 +1,20 @@
{
"_licenseNote": [
- "Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>. ",
+ "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. ",
"",
"This file is part of VIPSLogic. ",
"VIPSLogic is free software: you can redistribute it and/or modify ",
- "it under the terms of the Bioforsk Open Source License as published by ",
- "Bioforsk, either version 1 of the License, or (at your option) any ",
+ "it under the terms of the NIBIO Open Source License as published by ",
+ "NIBIO, either version 1 of the License, or (at your option) any ",
"later version. ",
"",
"VIPSLogic is distributed in the hope that it will be useful, ",
"but WITHOUT ANY WARRANTY; without even the implied warranty of ",
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ",
- "Bioforsk Open Source License for more details. ",
+ "NIBIO Open Source License for more details. ",
"",
- "You should have received a copy of the Bioforsk Open Source License ",
- "along with VIPSLogic. If not, see <http://www.bioforsk.no/licenses/>. "
+ "You should have received a copy of the NIBIO Open Source License ",
+ "along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>. "
],
"_comment" : "Structure of the observationForm and how to validate it",
"fields": [
diff --git a/cerealblotchmodels/urls.py b/cerealblotchmodels/urls.py
index b5e0bde8..874644ce 100644
--- a/cerealblotchmodels/urls.py
+++ b/cerealblotchmodels/urls.py
@@ -1,19 +1,19 @@
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
from django.conf.urls import patterns, url
from cerealblotchmodels import views
diff --git a/common/middleware/whodid.py b/common/middleware/whodid.py
index cc90dbfc..c0e0fa0f 100644
--- a/common/middleware/whodid.py
+++ b/common/middleware/whodid.py
@@ -1,20 +1,20 @@
"""
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
"""
"""
diff --git a/common/util.py b/common/util.py
index 39aaa0f8..cf2d8d36 100644
--- a/common/util.py
+++ b/common/util.py
@@ -1,23 +1,23 @@
# coding: utf-8
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
-# Author: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+# Author: Tor-Einar Skog <tor-einar.skog@nibio.no>
from datetime import datetime
diff --git a/forecasts/admin.py b/forecasts/admin.py
index ff8a8637..5e79b159 100644
--- a/forecasts/admin.py
+++ b/forecasts/admin.py
@@ -1,19 +1,19 @@
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
from django.contrib import admin
from forecasts.models import ResultParameter, MeasurementUnit, ModelGraphParameter, HighChartsType
diff --git a/forecasts/locale/bg/LC_MESSAGES/django.po b/forecasts/locale/bg/LC_MESSAGES/django.po
index 755cbbd3..8b049f66 100644
--- a/forecasts/locale/bg/LC_MESSAGES/django.po
+++ b/forecasts/locale/bg/LC_MESSAGES/django.po
@@ -1,4 +1,4 @@
-# Copyright (C) 2014 Bioforsk
+# Copyright (C) 2014 NIBIO
#
# This file is part of VIPSWeb
#
diff --git a/forecasts/locale/nb/LC_MESSAGES/django.po b/forecasts/locale/nb/LC_MESSAGES/django.po
index 9f205b2d..d8afa179 100644
--- a/forecasts/locale/nb/LC_MESSAGES/django.po
+++ b/forecasts/locale/nb/LC_MESSAGES/django.po
@@ -1,4 +1,4 @@
-# Copyright (C) 2014 Bioforsk
+# Copyright (C) 2014 NIBIO
#
# This file is part of VIPSWeb
#
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
# along with VIPSWeb. If not, see <http://www.gnu.org/licenses/>.
-# Tor-Einar Skog <tor-einar.skog@bioforsk.no>, 2013.
+# Tor-Einar Skog <tor-einar.skog@nibio.no>, 2013.
#
#, fuzzy
msgid ""
diff --git a/forecasts/models.py b/forecasts/models.py
index 3788d360..ad7b6011 100644
--- a/forecasts/models.py
+++ b/forecasts/models.py
@@ -1,20 +1,20 @@
# coding: utf-8
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
from datetime import datetime
diff --git a/forecasts/templates/forecasts/detail.html b/forecasts/templates/forecasts/detail.html
index b2a93bda..66b1d738 100644
--- a/forecasts/templates/forecasts/detail.html
+++ b/forecasts/templates/forecasts/detail.html
@@ -2,21 +2,21 @@
{% comment %}
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
# @author: Tor-Einar Skog
diff --git a/forecasts/templates/forecasts/detail_error.html b/forecasts/templates/forecasts/detail_error.html
index 1928153d..0e9259b9 100644
--- a/forecasts/templates/forecasts/detail_error.html
+++ b/forecasts/templates/forecasts/detail_error.html
@@ -2,21 +2,21 @@
{% comment %}
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
# @author: Tor-Einar Skog
diff --git a/forecasts/templates/forecasts/index.html b/forecasts/templates/forecasts/index.html
index d5b27990..e58e4362 100644
--- a/forecasts/templates/forecasts/index.html
+++ b/forecasts/templates/forecasts/index.html
@@ -3,21 +3,21 @@
{% comment %}
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
{% endcomment %}
diff --git a/forecasts/templates/models/detail.html b/forecasts/templates/models/detail.html
index 6004b403..779973fd 100644
--- a/forecasts/templates/models/detail.html
+++ b/forecasts/templates/models/detail.html
@@ -1,21 +1,21 @@
{% extends "base.html" %}
{% comment %}
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
{% endcomment %}
{% load i18n %}
diff --git a/forecasts/templates/models/index.html b/forecasts/templates/models/index.html
index eefbfac9..e5b8c98f 100644
--- a/forecasts/templates/models/index.html
+++ b/forecasts/templates/models/index.html
@@ -1,21 +1,21 @@
{% extends "base.html" %}
{% comment %}
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
{% endcomment %}
{% load i18n %}
diff --git a/forecasts/templates/models/modelLocalNames.js b/forecasts/templates/models/modelLocalNames.js
index e1fa3352..fbcd1cb3 100644
--- a/forecasts/templates/models/modelLocalNames.js
+++ b/forecasts/templates/models/modelLocalNames.js
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+ * Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
*
* This file is part of VIPSWeb.
* VIPSWeb is free software: you can redistribute it and/or modify
- * it under the terms of the Bioforsk Open Source License as published by
- * Bioforsk, either version 1 of the License, or (at your option) any
+ * it under the terms of the NIBIO Open Source License as published by
+ * NIBIO, either version 1 of the License, or (at your option) any
* later version.
*
* VIPSWeb is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * Bioforsk Open Source License for more details.
+ * NIBIO Open Source License for more details.
*
- * You should have received a copy of the Bioforsk Open Source License
- * along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
*
*/
@@ -21,8 +21,8 @@
* Include this in your HTML page if you want to avoid fetching local names
* of the models asynchronously from VIPSLogic
*
- * @copyright 2014 <a href="http://www.bioforsk.no/">Bioforsk</a>
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @copyright 2014 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
{% load forecast_extras %}
var modelLocalNames= {};
diff --git a/forecasts/templatetags/forecast_extras.py b/forecasts/templatetags/forecast_extras.py
index 959f47aa..9846f50a 100644
--- a/forecasts/templatetags/forecast_extras.py
+++ b/forecasts/templatetags/forecast_extras.py
@@ -1,19 +1,19 @@
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
from django import template
diff --git a/forecasts/urls.py b/forecasts/urls.py
index 1032146a..69d3c90f 100644
--- a/forecasts/urls.py
+++ b/forecasts/urls.py
@@ -1,19 +1,19 @@
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
from django.conf.urls import patterns, url
from django.views.decorators.cache import cache_page
diff --git a/forecasts/views.py b/forecasts/views.py
index 73382c8a..79dabc4c 100644
--- a/forecasts/views.py
+++ b/forecasts/views.py
@@ -1,21 +1,21 @@
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
-# @author: Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+# @author: Tor-Einar Skog <tor-einar.skog@nibio.no>
from django.http import HttpResponse
diff --git a/information/admin.py b/information/admin.py
index a42af2da..cfc9bcc8 100644
--- a/information/admin.py
+++ b/information/admin.py
@@ -1,19 +1,19 @@
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
from django.contrib import admin
diff --git a/information/urls.py b/information/urls.py
index 65788392..9a18bfc6 100644
--- a/information/urls.py
+++ b/information/urls.py
@@ -1,19 +1,19 @@
#
-# Copyright (c) 2015 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2015 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
from django.conf.urls import patterns, url
diff --git a/information/views.py b/information/views.py
index abed76e2..0870a4ca 100644
--- a/information/views.py
+++ b/information/views.py
@@ -1,19 +1,19 @@
#
-# Copyright (c) 2015 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2015 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
from django.shortcuts import render
diff --git a/messages/admin.py b/messages/admin.py
index d9345e36..5e7e0b1f 100644
--- a/messages/admin.py
+++ b/messages/admin.py
@@ -1,19 +1,19 @@
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
"""
diff --git a/messages/locale/nb/LC_MESSAGES/django.po b/messages/locale/nb/LC_MESSAGES/django.po
index e0753d0d..1f9b6dfc 100644
--- a/messages/locale/nb/LC_MESSAGES/django.po
+++ b/messages/locale/nb/LC_MESSAGES/django.po
@@ -1,4 +1,4 @@
-# Copyright (C) 2014 Bioforsk
+# Copyright (C) 2014 NIBIO
#
# This file is part of VIPSWeb
#
diff --git a/messages/models.py b/messages/models.py
index fca54dec..1f48cae1 100644
--- a/messages/models.py
+++ b/messages/models.py
@@ -1,19 +1,19 @@
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
import requests
diff --git a/messages/urls.py b/messages/urls.py
index b8ed55de..47dacdc6 100644
--- a/messages/urls.py
+++ b/messages/urls.py
@@ -1,19 +1,19 @@
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
from django.conf.urls import patterns, url
diff --git a/messages/views.py b/messages/views.py
index 2c62a730..3e708593 100644
--- a/messages/views.py
+++ b/messages/views.py
@@ -1,19 +1,19 @@
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
from django.shortcuts import render
diff --git a/organisms/models.py b/organisms/models.py
index 4b656ecf..1374b67c 100644
--- a/organisms/models.py
+++ b/organisms/models.py
@@ -1,19 +1,19 @@
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
import requests
diff --git a/organisms/static/organisms/organismsUtil.js b/organisms/static/organisms/organismsUtil.js
index a64bff3a..3b67ff91 100644
--- a/organisms/static/organisms/organismsUtil.js
+++ b/organisms/static/organisms/organismsUtil.js
@@ -20,7 +20,7 @@
/**
* Utility JavaScript. Used here and there. To whom it may concern...
*
- * @author Tor-Einar Skog <tor-einar.skog@bioforsk.no>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
*/
function getOrganismLocalNameWithFallback(organism, currentLanguage, defaultLanguage)
diff --git a/organisms/urls.py b/organisms/urls.py
index 652c605f..454ce623 100644
--- a/organisms/urls.py
+++ b/organisms/urls.py
@@ -1,19 +1,19 @@
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
from django.conf.urls import patterns, url
diff --git a/organisms/views.py b/organisms/views.py
index d7c01172..f46d30bc 100644
--- a/organisms/views.py
+++ b/organisms/views.py
@@ -1,19 +1,19 @@
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
from django.shortcuts import render, get_object_or_404
diff --git a/requirements.txt b/requirements.txt
index 24614624..d26ac3f7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,19 +1,19 @@
#
-# Copyright (c) 2014 Bioforsk <http://www.bioforsk.no/>.
+# Copyright (c) 2014 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
-# it under the terms of the Bioforsk Open Source License as published by
-# Bioforsk, either version 1 of the License, or (at your option) any
+# it under the terms of the NIBIO Open Source License as published by
+# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# Bioforsk Open Source License for more details.
+# NIBIO Open Source License for more details.
#
-# You should have received a copy of the Bioforsk Open Source License
-# along with VIPSWeb. If not, see <http://www.bioforsk.no/licenses/>.
+# You should have received a copy of the NIBIO Open Source License
+# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
# Please add requirements here
--
GitLab