Merge branch 'master' of github.com:djity/djity

Author: albanm

README.rst

@@ -1,4 +1,3 @@
-
 Description
 ===========
 
@@ -24,9 +23,9 @@ License: GPL v3
 Links
 =====
 
-Homepage (roadmap, bug reports, etc.): http://redmine.djity.net/projects/djityportal
-Git page (forks, patches, etc.): https://github.com/djity/djity
-Official documentation: http://pypi.python.org/pypi/djity
+ * Homepage (roadmap, bug reports, etc.): http://redmine.djity.net/projects/djityportal
+ * Git page (forks, patches, etc.): https://github.com/djity/djity
+ * Official documentation: http://doc.djity.net/djity/
 
 Features
 ========

djity/templates/djity/simplepage/page.html

@@ -8,13 +8,14 @@
 {% endblock %}
 
 {% block module_onload %}
+if(dj.context.perm.edit){
 $('#simple_page_content').editable(
 	{
 		save_function:'djity.simplepage.save_simple_page',
 		get_function:'djity.simplepage.get_simple_page',
 		lang:dj.context.simple_page_lang
 	});
-
+}
 {% endblock %}
 {% block body %}
 <div id="simple_page_content" >

setup.py

@@ -15,9 +15,9 @@
         'templates/djity/*.html',
         'templates/djity/*/*.html',
         'templates/djity/style/*.css',
-        'media/*/*.*',
-        'media/*/*/*.*',
-        'media/*/*/*/*.*',
+        'static/*/*.*',
+        'static/*/*/*.*',
+        'static/*/*/*/*.*',
         'project_skeleton/*_tmpl',
         'project_skeleton/data/cache/setup_trap',
         'project_skeleton/media/setup_trap',