Permalink
Browse files

Merge branch 'master' of https://github.com/gnowgi/gnowsys-studio

Conflicts:
	django_gstudio.egg-info/PKG-INFO
	django_gstudio.egg-info/requires.txt
  • Loading branch information...
2 parents e5c4705 + 471a772 commit ef3793b349be5744d6ef98a034f0c009159ed85b Ankita committed Jul 3, 2012
Showing 2,342 changed files with 172,480 additions and 2,048 deletions.
View
@@ -2,7 +2,7 @@ include README.rst
include LICENSE.txt
include buildout.cfg
include bootstrap.py
-#recursive-include docs *
+recursive-include docs *
recursive-include patches *
recursive-include gstudio/fixtures *.json
recursive-include gstudio/locale *
View
@@ -54,10 +54,10 @@ To define binary relations (object properties) between classes and objects. e.g
* Attribute Specification
- To specify an attribute by a subject to say for example:
- population of India, color of a flower etc. These do not yeild a
- proposition but an expression, which can be used as a subject in
- another sentence.
+ To specify an attribute by a subject to say for example: population
+ of India, color of a flower etc. These do not yeild a proposition
+ but an expression, which can be used as a subject in another
+ sentence.
* Expression
@@ -136,7 +136,7 @@ django-blog-zinnia, which taught us best software development
practices as well! After reviewing each feature for the purpose of
semantic blogging, we will retain or extend the following features.
-
+The features listed here are not thourougly tested. There is a likelyhood of misbehavior.
* Comments
* Sitemaps
@@ -147,7 +147,7 @@ semantic blogging, we will retain or extend the following features.
* Tags
* Advanced search engine
* Prepublication and expiration
-* Edition in MarkDown, Textile or reStructuredText
+* Editing in MarkDown, Textile or reStructuredText
* Widgets (Popular entries, Similar entries, ...)
* Spam protection with Akismet or TypePad
* Admin dashboard
View
@@ -1,50 +1,3 @@
-# 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/>.
-
-
-# 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
@@ -78,9 +31,14 @@
STATIC_URL = '/static/'
MEDIA_URL = '/static'
-MEDIA_ROOT = '/static'
+#MEDIA_ROOT = '/static'
+MEDIA_ROOT = os.path.join(os.path.dirname(__file__), '../gstudio/static')
+PYSCRIPT_URL_GSTUDIO = os.path.join(os.path.dirname(__file__), '../gstudio/createhtml.py')
+PYSCRIPT_URL_OBJECTAPP = os.path.join(os.path.dirname(__file__), '../objectapp/createhtml.py')
+GSTUDIO_UPLOAD_TO = 'img/'
+
ADMIN_MEDIA_PREFIX = STATIC_URL + "grappelli/"
SECRET_KEY = 'jo-1rzm(%sf)3#n+fb7h955yu$3(pt63abhi12_t7e^^5q8dyw'
@@ -92,17 +50,26 @@
LANGUAGE_CODE = 'en'
-GRAPPELLI_ADMIN_TITLE = '<a href="/">Gnowledge Studio</a>'
+GRAPPELLI_ADMIN_TITLE = '<a href="/nodetypes/" title="Gnowledge Studio">Gnowledge Studio</a>'
GRAPPELLI_INDEX_DASHBOARD = "demo.dashboard.CustomIndexDashboard"
+GSTUDIO_RDF_FILEPATH = os.path.join(os.path.dirname(__file__), 'rdffiles.rdf')
# Authentication related
ACCOUNT_ACTIVATION_DAYS = 2
EMAIL_HOST = 'localhost'
DEFAULT_FROM_EMAIL = 'webmaster@localhost'
LOGIN_REDIRECT_URL = '/'
+# fourstore related
+FOURSTORE_KBNAME = "demo" # Name of 4store knowledge base
+FOURSTORE_PORT = 8067 # Port for 4store HTTP server
+SPARQL_ENDPOINT = "http://localhost:8067/sparql/"
+
+
+
+
LANGUAGES = (('en', gettext('English')),
@@ -159,6 +126,7 @@
'mptt',
'reversion',
'tagging',
+ 'markitup',
'django_xmlrpc',
'grappelli.dashboard',
'grappelli',
@@ -171,6 +139,9 @@
'registration',
'graphviz',
'demo',
+ 'fourstore',
+ 'HTTP4Store',
+ 'html5lib',
# Uncomment the south entry to activate south for database migrations
# Please do install south before uncommenting
# command: sudo pip install south
View
@@ -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/>.
-
"""Urls for the demo of Gstudio"""
from django.conf import settings
@@ -78,7 +31,7 @@
# import gstudio.regbackend
from gstudio.forms import *
from registration.views import register
-
+from views import home_view, more_view
admin.autodiscover()
@@ -88,12 +41,15 @@
urlpatterns = patterns(
'',
(r'^$', 'django.views.generic.simple.redirect_to',
- {'url': '/nodetypes/'}),
+ {'url': '/home/'}),
+ url(r'^home/', home_view),
+ url(r'^more/',more_view),
url(r'^nodetypes/', include('gstudio.urls')),
url(r'^objects/', include('objectapp.urls')),
url(r'^comments/', include('django.contrib.comments.urls')),
- url(r'^xmlrpc/$', 'django_xmlrpc.views.handle_xmlrpc'),
+ #URL for XMLRPC
+ url(r'^xmlrpc/$','django_xmlrpc.views.handle_xmlrpc'),
url(r'^i18n/', include('django.conf.urls.i18n')),
url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
url(r'^admin/gstudio/', include('gstudio.urls.ajaxurls')),
View
@@ -50,7 +50,10 @@
from django.template import loader
from django.template import Context
from django.http import HttpResponseServerError
-
+from django.shortcuts import render_to_response, get_object_or_404
+from django.contrib.auth.models import User
+from django.contrib.sites.models import Site
+from gstudio.models import Nodetype
def server_error(request, template_name='500.html'):
"""
@@ -63,3 +66,14 @@ def server_error(request, template_name='500.html'):
t = loader.get_template(template_name)
return HttpResponseServerError(
t.render(Context({'STATIC_URL': settings.STATIC_URL})))
+
+def __init__(self):
+ self.site = Site.objects.get_current()
+
+def home_view(request):
+ site = Site.objects.get_current()
+ return render_to_response('gstudio/home.html', {'user':request.user,'data':request.POST , 'site':site})
+
+def more_view(request):
+ return render_to_response('gstudio/more.html', {'user':request.user,'data':request.POST })
+
@@ -1 +0,0 @@
-
@@ -1 +0,0 @@
-
@@ -1,3 +0,0 @@
-demo
-gstudio
-objectapp
View
@@ -7,6 +7,6 @@ language representations of knowledge. If any of you would like to
contribute these modules, we will be more than happy to collaborate
with you. Please write about your interest to <glab@gnowledge.org>,
or join us to talk to our team in the mailing list or jabber
-conference room. We hang around in the glab room at
+conference room. We hang around in the room `glab` at
conference.jabber.org.
View
@@ -98,7 +98,7 @@
master_doc = 'index'
# General information about the project.
-project = u'Django Blog Gstudio'
+project = u'GNOWSYS Studio'
copyright = u'%s, %s' % (date.today().year, gstudio.__author__)
# The version info for the project you're documenting, acts as replacement for
@@ -271,6 +271,6 @@
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
- ('index', 'django-gstudio', u'django-gstudio Documentation',
+ ('index', 'gnowsys-studio', u'gnowsys-studio Documentation',
[u'gnowgi'], 1)
]
@@ -2,10 +2,14 @@
Creating Nodes
==============
-Use YOUR_URL\admin to login and create nodes. The network is built by
-adding the various nodetypes provided by the two main sets of the Gstudio
-application: Gstudio and Objectapp. The network emerges as you keep
-filling the forms one after the other.
+Register and login to construct the semantic network. The network is
+built by adding the various nodetypes provided by the two main sets of
+the gnowsys-studio application: Gstudio and Objectapp. The network emerges
+as you keep filling the forms one after the other.
+
+Documentation yet to be done. Meanwhile, ask for help in the mailing
+list.
+
Object types
============
View
@@ -1,10 +1,11 @@
-======================
-Contributing to Zinnia
-======================
+==============================
+Contributing to GNOWSYS-STUDIO
+==============================
.. highlightlang:: console
-Zinnia is an open-source project, so yours contributions are welcomed and needed.
+GNOWSYS-studio is a free software project, so yours contributions are
+welcome and needed.
.. _writing-code:
@@ -19,7 +20,7 @@ code ? You are welcome.
Process
-------
-#. `Fork`_ the code on Github.
+#. `Fork`_ the code on Github or savannah.
#. Clone a local copy of your fork.
#. Write tests.
#. Develop your code.
@@ -66,7 +67,7 @@ project, and serves as a reference for old timers.
On top of this, documentation is the one area where less technical people
can help most - you just need to write a semi-decent English. People need
-to understand you. We don’t care about style or correctness.
+to understand you. We don’t care about style or rigorously grammatical.
The documentation should :
@@ -76,7 +77,7 @@ The documentation should :
* Be accessible. You should assume the reader to be moderately familiar
with Python and Django, but not anything else.
-Keep it mind that documenting is most useful than coding, so your
+Keep it in mind that documenting is most useful than coding, so your
contribution will be greatly appreciated.
.. _writing-translations:
@@ -85,15 +86,4 @@ Translations
------------
If you want to contribute by updating a translation or adding a translation
-in your language, it's simple: create a account on Transifex.net and you
-will be able to edit the translations at this URL :
-
-https://www.transifex.net/projects/p/django-blog-zinnia/resource/djangopo/
-
-.. image:: http://www.transifex.net/projects/p/django-blog-zinnia/resource/djangopo/chart/image_png
-
-The translations hosted on Transifex.net will be pulled periodically in the
-repository, but if you are in a hurry, `send me a message`_.
-
-.. _`Fork`: https://github.com/Fantomas42/django-blog-zinnia/fork
-.. _`send me a message`: https://github.com/inbox/new/Fantomas42
+in your language, let us know.
Oops, something went wrong.

0 comments on commit ef3793b

Please sign in to comment.