fixed merges

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/locale/en/LC_MESSAGES/django.mo

@@ -1,23 +1,43 @@
+# vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4
 """
 This file demonstrates two different styles of tests (one doctest and one
 unittest). These will both pass when you run "manage.py test".
 
 Replace these with more appropriate tests for your application.
 """
+import json
+from django.utils import unittest
+from django.test.client import Client
+from djity.project.models import Project
+import djity 
 
-from django.test import TestCase
+class ProjectTest(unittest.TestCase):
+    fixtures = [djity.__path__[0]+'/fixtures/test_project.json']
 
-class SimpleTest(TestCase):
-    def test_basic_addition(self):
+    def setUp(self):
+        # Every test needs a client.
+        self.client = Client()
+
+
+    def test_login(self):
         """
-        Tests that 1 + 1 always equals 2.
+        Test the login
         """
-        self.failUnlessEqual(1 + 1, 2)
+        argv = {
+                'js_traget':'document',
+                'path':'',
+                'username':'admin',
+                'password':'admin',
+                'project_name':'root',
+                'module_name':'home',
+                'LANGUAGE_CODE':'fr'
+                }
+        Project.objects.get(name='root')
+        response = self.client.post('/dajaxice/djity.portal.login/',{'callback':'Dajax.process','argv':json.dumps(argv)})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context['username'], 'admin')
+
+        
 
-__test__ = {"doctest": """
-Another way to test that 1 + 1 is equal to 2.
 
->>> 1 + 1 == 2
-True
-"""}
 

djity/project/tests.py

@@ -14,6 +14,7 @@ $.widget("ui.editable",{
 			get_function:undefined,
 			//send the id of the div to the save and get function
 			send_divid:false,
+
 			toolbar:'maxi',
 	},
 	_create: function() {
@@ -59,6 +60,7 @@ $.widget("ui.editable",{
 			 */
 			if(! self.options.simple)
 			{
+
 				self.editor_button = $('<button  title="'+gettext('Rich Edit')+'">'+gettext('Rich Edit')+'</button>')
 					.button({
 						icons:{
@@ -143,12 +145,12 @@ $.widget("ui.editable",{
 				editorBox = self.editorBox;
 
 			editorBox.hide(options.effect);
+
 			self._isOpen = false;
 			if(self.is_editor){
 				self.close_editor();
 			}
 			self.close();	
-
 
 	},
 
@@ -182,6 +184,7 @@ $.widget("ui.editable",{
 
 	},
 
+
 	save : function(close){
 			var self = this,
 				options = self.options,
@@ -355,8 +358,4 @@ $.widget("ui.editable",{
 			document.execCommand ('insertLineBreak', false, null);
 	},
 
-
-
-
-
 });

djity/static/djity/js/widgets/editable.js

@@ -31,7 +31,6 @@ dj.widgets.register =
 			dj.widgets.register.close();
 		};
 
-
 		this.dialog = $('<div id="register_dialog" class="ui-helper-hidden" title="' + gettext('Create an account') +'"></div>')
 			.keyup(function(e)
 			{

djity/static/djity/js/widgets/register.js

@@ -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" >

djity/templates/djity/simplepage/page.html

@@ -119,10 +119,8 @@ def _new_func(*args,**kwargs):
             if module_name and not 'module' in context:
                 context.message(_("This page does not exist on this project !"))
                 context["module"] = {'label':_('Page not found')}
-                return render_to_response('djity/base.html',context)
-                #t = loader.get_template('djity/base.html')
-                #r = t.render(context)
-                #return HttpResponseNotFound(r)
+                templ = loader.get_template('djity/base.html')
+                return HttpResponseNotFound(templ.render(context))
 
             if 'js_target' in context:
                 func(*args,**kwargs)

djity/utils/decorators.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',