Skip to content
Snippets Groups Projects
Commit a2583418 authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Refactoring everything Bioforsk -> NIBIO

parent 78af6301
Branches
No related tags found
No related merge requests found
Showing
with 104 additions and 104 deletions
......@@ -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.
......
#
# 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
......
#
# 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.
......
# Copyright (C) 2014 Bioforsk
# Copyright (C) 2014 NIBIO
#
# This file is part of VIPSWeb
#
......
# Copyright (C) 2014 Bioforsk
# Copyright (C) 2014 NIBIO
#
# This file is part of VIPSWeb
#
......
# 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"
......
# 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"
......
#
# 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.
......
/*
* 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)
......
/*
* 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
......
/*
* 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>
*/
......
/*
* 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
......
/*
* 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>
*/
/**
......
......@@ -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>
......
{% 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/>.
*
*/
......
......@@ -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/>.
*
*/
......
#
# 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
......
#
# 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
......
#
# 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/>.
#
"""
......
{
"_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": [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment