Permalink
Browse files

Merge pull request #85 from supriyasawant/master

All modules, wiki, loom, image, document and video libraries integrated.
  • Loading branch information...
2 parents cad11e2 + 94535d4 commit 3ba6b57c6d605262ef9e1f7bba8d62ea20aacc36 @gnowgi committed Sep 26, 2012
Showing with 2,873 additions and 1,026 deletions.
  1. +9 −7 demo/dashboard.py
  2. +1 −1 demo/grappelli/templates/admin/includes_grappelli/header.html
  3. +8 −5 demo/settings.py
  4. +1 −1 gstudio/createhtml.py
  5. +8 −0 gstudio/forms.py
  6. +316 −70 gstudio/methods.py
  7. +192 −171 gstudio/static/gstudio/js/addcontent.js
  8. +201 −0 gstudio/static/gstudio/js/loomscripts.js
  9. +43 −1 gstudio/static/gstudio/js/orgitdown/orgitdown/jquery.orgitdown.js
  10. BIN gstudio/static/gstudio/js/orgitdown/orgitdown/sets/org/images/close.jpeg
  11. +8 −5 gstudio/static/gstudio/js/orgitdown/orgitdown/sets/org/set.js
  12. +4 −0 gstudio/static/gstudio/js/orgitdown/orgitdown/sets/savedata.js
  13. +74 −16 gstudio/templates/gstudio/NewGroup.html
  14. +1 −0 gstudio/templates/gstudio/NewPage.html
  15. +2 −0 gstudio/templates/gstudio/NewSection1.html
  16. +7 −4 gstudio/templates/gstudio/NewTopic1.html
  17. +10 −7 gstudio/templates/gstudio/_header.html
  18. +93 −7 gstudio/templates/gstudio/_nodetype_detail.html
  19. +25 −18 gstudio/templates/gstudio/docu.html
  20. +177 −0 gstudio/templates/gstudio/fulldocument.html
  21. +16 −10 gstudio/templates/gstudio/fullscreen.html
  22. +46 −24 gstudio/templates/gstudio/home.html
  23. +18 −10 gstudio/templates/gstudio/image.html
  24. +60 −149 gstudio/templates/gstudio/more.html
  25. +7 −0 gstudio/templates/gstudio/nodes_search.html
  26. +39 −16 gstudio/templates/gstudio/nodetype_detail.html
  27. +9 −0 gstudio/templates/gstudio/nodetype_search.html
  28. +33 −20 gstudio/templates/gstudio/skeleton.html
  29. +54 −59 gstudio/templates/gstudio/tags/comment.html
  30. +18 −51 gstudio/templates/gstudio/tags/commentpage.html
  31. +54 −8 gstudio/templates/gstudio/transcript.html
  32. +2 −2 gstudio/templates/gstudio/version_diff.html
  33. +21 −10 gstudio/templates/gstudio/video.html
  34. +115 −29 gstudio/templates/metadashboard/grpdashboard.html
  35. +72 −43 gstudio/templates/metadashboard/pgedashboard.html
  36. +7 −8 gstudio/templates/metadashboard/userdashboard.html
  37. +4 −4 gstudio/templates/metadashboard/wikidashboard.html
  38. +46 −1 gstudio/templatetags/gstudio_tags.py
  39. +13 −2 gstudio/urls/__init__.py
  40. +1 −1 gstudio/urls/docu.py
  41. +1 −1 gstudio/urls/image.py
  42. +1 −1 gstudio/urls/video.py
  43. +17 −9 gstudio/views/ajaxviews.py
  44. +125 −38 gstudio/views/docu.py
  45. +30 −9 gstudio/views/group.py
  46. +3 −2 gstudio/views/groupadd.py
  47. +131 −46 gstudio/views/image.py
  48. +16 −0 gstudio/views/nodetypes.py
  49. +16 −20 gstudio/views/page.py
  50. +14 −2 gstudio/views/pageadd.py
  51. +3 −2 gstudio/views/sectionadd1.py
  52. +1 −1 gstudio/views/topicadd.py
  53. +3 −2 gstudio/views/topicadd1.py
  54. +12 −12 gstudio/views/user.py
  55. +226 −100 gstudio/views/video.py
  56. +1 −0 gstudio/xmlrpc/metaweblog.py
  57. +1 −1 objectapp/createhtml.py
  58. 0 objectapp/static/objectapp/js/orgitdown/orgitdown/jquery.orgitdown.js
  59. +32 −1 objectapp/static/objectapp/js/orgitdown/orgitdown/sets/savedata.js
  60. +100 −11 objectapp/templates/objectapp/_gbobject_detail.html
  61. +95 −2 objectapp/templates/objectapp/tags/recent_gbobjects.html
  62. +2 −2 objectapp/templates/objectapp/version_diff.html
  63. +22 −3 objectapp/templatetags/objectapp_tags.py
  64. +1 −0 recaptcha/__init__.py
  65. 0 recaptcha/client/__init__.py
  66. +94 −0 recaptcha/client/captcha.py
  67. +68 −0 recaptcha/client/mailhide.py
  68. +27 −0 recaptcha/fields.py
  69. +15 −0 recaptcha/widgets.py
  70. +1 −1 setup.py
View
@@ -96,10 +96,12 @@ def init_with_context(self, context):
column=1,
collapsible=False,
models=(
- 'gstudio.models.Objecttype',
- 'gstudio.models.Attributetype',
- 'gstudio.models.Relationtype',
'objectapp.models.Gbobject',
+ 'objectapp.models.System',
+ 'gstudio.models.Relation',
+ 'gstudio.models.Attribute',
+
+
),
),
@@ -111,10 +113,10 @@ def init_with_context(self, context):
column=1,
collapsible=True,
models=(
-
+ 'gstudio.models.Objecttype',
+ 'gstudio.models.Attributetype',
+ 'gstudio.models.Relationtype',
'gstudio.models.Metatype',
- 'gstudio.models.Relation',
- 'gstudio.models.Attribute',
'gstudio.models.Systemtype',
'gstudio.models.Processtype',
'gstudio.models.AttributeSpecification',
@@ -135,7 +137,7 @@ def init_with_context(self, context):
collapsible=True,
models=(
'objectapp.models.Process',
- 'objectapp.models.System',
+
),
),
@@ -38,7 +38,7 @@
<!-- Documentation -->
{% url django-admindocs-docroot as docsroot %}
{% if docsroot %}
- <li><a href="{{ docsroot }}">{% trans 'Documentation' %}</a></li>
+ <!-- <li><a href="{{ docsroot }}">{% trans 'Documentation' %}</a></li>-->
{% endif %}
{% endblock %}
</ul>
View
@@ -29,6 +29,8 @@
}
STATIC_URL = '/static/'
+RECAPTCHA_PUBLIC_KEY = '6LcBr9USAAAAAJNHxpA5_2nQK9JnKQCU3kTUstEK'
+RECAPTCHA_PRIVATE_KEY = '6LcBr9USAAAAABYW6VgsQeupDHy2R42G4aGsHxXr'
MEDIA_URL = '/static'
MEDIA_ROOT = os.path.join(os.path.dirname(__file__), '../demo/grappelli/static/grappelli/img')
@@ -40,6 +42,7 @@
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')
VIDEO_PANDORA_URL = os.getenv("HOME")+"/.ox/client.json"
+FILE_URL = os.path.join(os.path.dirname(__file__), '/tmp/beta/')
FILE_UPLOAD_MAX_MEMORY_SIZE= 524288000
JPEG_ROOT = None
@@ -57,7 +60,7 @@
LANGUAGE_CODE = 'en'
-GRAPPELLI_ADMIN_TITLE = '<a href="/nodetypes/" title="Gnowledge Studio">Gnowledge Studio</a>'
+GRAPPELLI_ADMIN_TITLE = '<a href="/" title="Gnowledge Studio">Gnowledge Studio</a>'
GRAPPELLI_INDEX_DASHBOARD = "demo.dashboard.CustomIndexDashboard"
@@ -158,10 +161,10 @@
)
-if DEBUG:
- EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
+#if DEBUG:
+# EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
-from gstudio.xmlrpc import GSTUDIO_XMLRPC_METHODS
-XMLRPC_METHODS = GSTUDIO_XMLRPC_METHODS
+#from gstudio.xmlrpc import GSTUDIO_XMLRPC_METHODS
+#XMLRPC_METHODS = GSTUDIO_XMLRPC_METHODS
View
@@ -6,7 +6,7 @@
def main(argv):
#f_name =sys.argv[1]
- f_name = "/tmp/file.org"
+ f_name = sys.argv[2]+sys.argv[1]
s1='commands.getoutput("emacs --batch '
s2=" --eval '"
s3="(org-export-as-html nil)'"
View
@@ -20,10 +20,18 @@
from django.forms import *
from django.contrib.admin import widgets
from registration.forms import *
+from recaptcha import fields as recaptcha_fields
+from registration.forms import RegistrationForm
+
+class RecaptchaRegistrationForm(RegistrationForm):
+ recaptcha = recaptcha_fields.ReCaptchaField()
+
class UserRegistrationForm(RegistrationForm):
first_name = forms.CharField()
last_name = forms.CharField()
+ recaptcha = recaptcha_fields.ReCaptchaField()
+
class MetatypeForm(ModelForm):
Oops, something went wrong.

0 comments on commit 3ba6b57

Please sign in to comment.