summaryrefslogtreecommitdiff
path: root/gstudio
diff options
context:
space:
mode:
Diffstat (limited to 'gstudio')
-rw-r--r--gstudio/4store_rdf_import.py15
-rw-r--r--gstudio/fstore_rdf_import.py15
-rw-r--r--gstudio/rdf.py49
-rw-r--r--gstudio/templates/gstudio/skeleton.html4
-rw-r--r--gstudio/views/graphs.py47
-rw-r--r--gstudio/views/history.py17
-rw-r--r--gstudio/views/nodetypes.py14
-rw-r--r--gstudio/views/quick_nodetype.py15
-rw-r--r--gstudio/views/sitemap.py15
-rw-r--r--gstudio/views/tags.py14
-rw-r--r--gstudio/views/trackback.py15
-rw-r--r--gstudio/views/userdashboard.py15
12 files changed, 51 insertions, 184 deletions
diff --git a/gstudio/4store_rdf_import.py b/gstudio/4store_rdf_import.py
index 5541895e..af07d94f 100644
--- a/gstudio/4store_rdf_import.py
+++ b/gstudio/4store_rdf_import.py
@@ -1,3 +1,18 @@
+# Copyright (c) 2011, 2012 Free Software Foundation
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+
+# This program 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
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
import rdflib
from rdflib.graph import ConjunctiveGraph as Graph
diff --git a/gstudio/fstore_rdf_import.py b/gstudio/fstore_rdf_import.py
index ea48548f..5e25a336 100644
--- a/gstudio/fstore_rdf_import.py
+++ b/gstudio/fstore_rdf_import.py
@@ -1,3 +1,18 @@
+# Copyright (c) 2011, 2012 Free Software Foundation
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+
+# This program 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
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
import rdflib
from rdflib.graph import ConjunctiveGraph as Graph
diff --git a/gstudio/rdf.py b/gstudio/rdf.py
index 771490be..bb99a05b 100644
--- a/gstudio/rdf.py
+++ b/gstudio/rdf.py
@@ -14,55 +14,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# This project incorporates work covered by the following copyright and permission notice:
-
-# Copyright (c) 2009, Julien Fache
-# All rights reserved.
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-# * Neither the name of the author nor the names of other
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-# OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-# Copyright (c) 2011, 2012 Free Software Foundation
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-
-# This program 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
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-
import rdflib
from rdflib.graph import ConjunctiveGraph as Graph
diff --git a/gstudio/templates/gstudio/skeleton.html b/gstudio/templates/gstudio/skeleton.html
index 87169691..170c8984 100644
--- a/gstudio/templates/gstudio/skeleton.html
+++ b/gstudio/templates/gstudio/skeleton.html
@@ -1,3 +1,6 @@
+<<<<<<< HEAD
+
+=======
{% load gstudio_tags i18n %}
{% get_tags as nodetype_tags %}
{% load adminmedia grp_tags %}
@@ -408,6 +411,7 @@ function load(key)
}
fill = d3.scale.category20();
+>>>>>>> 184877f00ded7fe61420111de4ec8d48d3bee634
var vis = d3.select("#chart")
.append("svg:svg")
.attr("id", "amazingViz")
diff --git a/gstudio/views/graphs.py b/gstudio/views/graphs.py
index e1ca63b1..e2cb107a 100644
--- a/gstudio/views/graphs.py
+++ b/gstudio/views/graphs.py
@@ -14,53 +14,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# This project incorporates work covered by the following copyright and permission notice:
-
-# Copyright (c) 2009, Julien Fache
-# All rights reserved.
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-# * Neither the name of the author nor the names of other
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-# OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Copyright (c) 2011, 2012 Free Software Foundation
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-
-# This program 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
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
"""Views for Gstudio nodetypes"""
diff --git a/gstudio/views/history.py b/gstudio/views/history.py
index 10fc7abb..e67401ae 100644
--- a/gstudio/views/history.py
+++ b/gstudio/views/history.py
@@ -1,3 +1,20 @@
+# Copyright (c) 2011, 2012 Free Software Foundation
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+
+# This program 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
+# GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+
from django.http import *
from reversion.models import *
from gstudio.models import *
diff --git a/gstudio/views/nodetypes.py b/gstudio/views/nodetypes.py
index 9c2a1a8d..2762e068 100644
--- a/gstudio/views/nodetypes.py
+++ b/gstudio/views/nodetypes.py
@@ -47,20 +47,6 @@
# OF THE POSSIBILITY OF SUCH DAMAGE.
-# Copyright (c) 2011, 2012 Free Software Foundation
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-
-# This program 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
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
"""Views for Gstudio nodetypes"""
diff --git a/gstudio/views/quick_nodetype.py b/gstudio/views/quick_nodetype.py
index 825a7850..3488e01b 100644
--- a/gstudio/views/quick_nodetype.py
+++ b/gstudio/views/quick_nodetype.py
@@ -46,21 +46,6 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
# OF THE POSSIBILITY OF SUCH DAMAGE.
-# Copyright (c) 2011, 2012 Free Software Foundation
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-
-# This program 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
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
"""Views for Gstudio quick nodetype"""
diff --git a/gstudio/views/sitemap.py b/gstudio/views/sitemap.py
index acdc8a13..659e9351 100644
--- a/gstudio/views/sitemap.py
+++ b/gstudio/views/sitemap.py
@@ -46,21 +46,6 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
# OF THE POSSIBILITY OF SUCH DAMAGE.
-# Copyright (c) 2011, 2012 Free Software Foundation
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-
-# This program 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
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
"""Views for Gstudio sitemap"""
diff --git a/gstudio/views/tags.py b/gstudio/views/tags.py
index 6b53baf0..7e1981a9 100644
--- a/gstudio/views/tags.py
+++ b/gstudio/views/tags.py
@@ -46,20 +46,6 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
# OF THE POSSIBILITY OF SUCH DAMAGE.
-# Copyright (c) 2011, 2012 Free Software Foundation
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-
-# This program 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
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/gstudio/views/trackback.py b/gstudio/views/trackback.py
index dbd179ff..7f87e6fb 100644
--- a/gstudio/views/trackback.py
+++ b/gstudio/views/trackback.py
@@ -46,21 +46,6 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
# OF THE POSSIBILITY OF SUCH DAMAGE.
-# Copyright (c) 2011, 2012 Free Software Foundation
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-
-# This program 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
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
"""Views for Gstudio trackback"""
diff --git a/gstudio/views/userdashboard.py b/gstudio/views/userdashboard.py
index 83d32fb5..9605c97d 100644
--- a/gstudio/views/userdashboard.py
+++ b/gstudio/views/userdashboard.py
@@ -46,21 +46,6 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
# OF THE POSSIBILITY OF SUCH DAMAGE.
-# Copyright (c) 2011, 2012 Free Software Foundation
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-
-# This program 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
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
from django.http import HttpResponse
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-10-28 07:54:11 +0000