From: hernani <hernani@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Wed, 25 Aug 2010 06:01:34 +0000 (+0000)
Subject: Moves the myopenid logo to a big button, and the aol logo to a small button in the... 
X-Git-Tag: live~564
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/77c7fb49881b1df98ce3584468105ba78740fd48

Moves the myopenid logo to a big button, and the aol logo to a small button in the default authentication set.
Makes some other small tweaks and fixes.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@570 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/actions/node.py b/forum/actions/node.py
index dbbb658..50e4ef1 100644
--- a/forum/actions/node.py
+++ b/forum/actions/node.py
@@ -19,7 +19,11 @@ class AskAction(NodeEditAction):
     verb = _("asked")
 
     def process_data(self, **data):
-        question = Question(author=self.user, **self.create_revision_data(True, **data))
+        processed_data = self.create_revision_data(True, **data)
+        if 'added_at' in data:
+            processed_data['added_at'] = data['added_at']
+
+        question = Question(author=self.user, **processed_data)
         question.save()
         self.node = question
 
diff --git a/forum/models/node.py b/forum/models/node.py
index 6d8a483..0f8f5d3 100644
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -278,12 +278,15 @@ class Node(BaseModel, NodeContent):
     def get_revisions_url(self):
         return ('revisions', (), {'id': self.id})
 
-    def update_last_activity(self, user, save=False):
+    def update_last_activity(self, user, save=False, time=None):
+        if not time:
+            time = datetime.datetime.now()
+
         self.last_activity_by = user
-        self.last_activity_at = datetime.datetime.now()
+        self.last_activity_at = time
 
         if self.parent:
-            self.parent.update_last_activity(user, save=True)
+            self.parent.update_last_activity(user, save=True, time=time)
 
         if save:
             self.save()
@@ -378,7 +381,7 @@ class Node(BaseModel, NodeContent):
             super(BaseModel, self).save(*args, **kwargs)
             self.active_revision = self._create_revision(self.author, 1, title=self.title, tagnames=self.tagnames,
                                                          body=self.body)
-            self.update_last_activity(self.author)
+            self.update_last_activity(self.author, time=self.added_at)
 
         if self.parent_id and not self.abs_parent_id:
             self.abs_parent = self.parent.absolute_parent
diff --git a/forum/skins/default/media/images/openid/aol.gif b/forum/skins/default/media/images/openid/aol.gif
index dd629cb..92373d5 100644
Binary files a/forum/skins/default/media/images/openid/aol.gif and b/forum/skins/default/media/images/openid/aol.gif differ
diff --git a/forum/skins/default/media/images/openid/aol.png b/forum/skins/default/media/images/openid/aol.png
new file mode 100644
index 0000000..e5a51a8
Binary files /dev/null and b/forum/skins/default/media/images/openid/aol.png differ
diff --git a/forum/skins/default/media/images/openid/myopenid_big.png b/forum/skins/default/media/images/openid/myopenid_big.png
new file mode 100644
index 0000000..8c357cb
Binary files /dev/null and b/forum/skins/default/media/images/openid/myopenid_big.png differ
diff --git a/forum/skins/default/templates/osqaadmin/djstyle_base.html b/forum/skins/default/templates/osqaadmin/djstyle_base.html
index 9841138..f0258e7 100644
--- a/forum/skins/default/templates/osqaadmin/djstyle_base.html
+++ b/forum/skins/default/templates/osqaadmin/djstyle_base.html
@@ -9,6 +9,7 @@
     <link rel="stylesheet" href="{{ settings.ADMIN_MEDIA_PREFIX }}css/base.css" type="text/css"/>
     <link rel="stylesheet" href="{{ settings.ADMIN_MEDIA_PREFIX }}css/forms.css" type="text/css"/>
     <link rel="stylesheet" href="{{ settings.ADMIN_MEDIA_PREFIX }}css/changelists.css" type="text/css"/>
+    <!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="{{ settings.ADMIN_MEDIA_PREFIX }}css/ie.css" /><![endif]-->
     <link rel="stylesheet" type="text/css" media="screen" href="{% media "/media/style/djstyle_admin.css" %}"/>
     <script src="http://www.google.com/jsapi" type="text/javascript"></script>
     <script type="text/javascript">
diff --git a/forum_modules/localauth/authentication.py b/forum_modules/localauth/authentication.py
index 770ea08..c85a005 100644
--- a/forum_modules/localauth/authentication.py
+++ b/forum_modules/localauth/authentication.py
@@ -11,7 +11,7 @@ class LocalAuthConsumer(AuthenticationConsumer):
             raise InvalidAuthentication(" ".join(form_auth.errors.values()[0]))
 
 class LocalAuthContext(ConsumerTemplateContext):
-    mode = 'STACK_ITEM'
+    mode = 'STACK_ITEM'                      
     weight = 1000
     human_name = 'Local authentication'
     stack_item_template = 'modules/localauth/loginform.html'
diff --git a/forum_modules/openidauth/authentication.py b/forum_modules/openidauth/authentication.py
index dfd337f..0afd4c6 100644
--- a/forum_modules/openidauth/authentication.py
+++ b/forum_modules/openidauth/authentication.py
@@ -33,14 +33,14 @@ class AolAuthConsumer(OpenIdAbstractAuthConsumer):
         return 'http://openid.aol.com/' + uname
 
 class AolAuthContext(ConsumerTemplateContext):
-    mode = 'BIGICON'
+    mode = 'SMALLICON'
     type = 'SIMPLE_FORM'
     simple_form_context = {
         'your_what': 'AOL screen name'
     }
-    weight = 400
+    weight = 200
     human_name = 'AOL'
-    icon = '/media/images/openid/aol.gif'
+    icon = '/media/images/openid/aol.png'
 
 
 class MyOpenIdAuthConsumer(OpenIdAbstractAuthConsumer):
@@ -56,14 +56,14 @@ class MyOpenIdAuthConsumer(OpenIdAbstractAuthConsumer):
         return "http://%s.myopenid.com/" % blog_name
 
 class MyOpenIdAuthContext(ConsumerTemplateContext):
-    mode = 'SMALLICON'
+    mode = 'BIGICON'
     type = 'SIMPLE_FORM'
     simple_form_context = {
         'your_what': 'MyOpenID user name'
     }
-    weight = 200
+    weight = 400
     human_name = 'MyOpenID'
-    icon = '/media/images/openid/myopenid.png'
+    icon = '/media/images/openid/myopenid_big.png'
 
 
 class FlickrAuthConsumer(OpenIdAbstractAuthConsumer):