From 77c7fb49881b1df98ce3584468105ba78740fd48 Mon Sep 17 00:00:00 2001 From: hernani Date: Wed, 25 Aug 2010 06:01:34 +0000 Subject: [PATCH] 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 --- forum/actions/node.py | 6 +++++- forum/models/node.py | 11 +++++++---- .../skins/default/media/images/openid/aol.gif | Bin 2116 -> 2101 bytes .../skins/default/media/images/openid/aol.png | Bin 0 -> 583 bytes .../media/images/openid/myopenid_big.png | Bin 0 -> 2106 bytes .../templates/osqaadmin/djstyle_base.html | 1 + forum_modules/localauth/authentication.py | 2 +- forum_modules/openidauth/authentication.py | 12 ++++++------ 8 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 forum/skins/default/media/images/openid/aol.png create mode 100644 forum/skins/default/media/images/openid/myopenid_big.png 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 dd629cb68a515201dc6a1930f156fb8a644a0fb2..92373d5fb7f964fcf45245b4aa03f85eb25d6297 100644 GIT binary patch literal 2101 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 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 0000000000000000000000000000000000000000..e5a51a8fd68d452ecab0e89c45fe404589bd9208 GIT binary patch literal 583 zcmV-N0=WH&P)1_`E-I1HGv}FZk1i9XQ1%?R=H#-X!)j$A`LLd$H7y$qfU;ukF V0D^(Zj8Xsq002ovPDHLkV1oPS7mNS^ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8c357cbe76eb8c10840070d8dfbe8e2fc24b8890 GIT binary patch literal 2106 zcmV-A2*vk_P)JZeHX;-XRYlgz%F0OTqFGm8ujhOs%l%POaUYuC=vmY4_2=>TaFR z>bTo&x2<*68N033>MBZIXiK#|PzVSGLOB`Z$yV*`BQ+F<#C#_qvU0>Oh}L^8!q@DSZ@5`qw5iJUk|<<=Ek7VSp@ z_(Xl*=Dqcf$tkYXCXXEy1=(117nOv%9JFDBphq1#Z005^_(xyOkCbxe9Rm)5NF?HY zYz7d~Yq@KjXTXM$@rC85Y~xN*q)CygV^XJSh?|CB6cS1!xv2;?H9={pOV;Zp#hHo& zzgog!Qs)uvq|3eS;}#l)v~xqo_K#a`=xq}&H-Ms$5g|JO2(>0F96GLPR5N6U`N+dB zxn;k~HZ~=SGsx0(2+5Nqij5P*P!PXdFt0JF03U=^_!8!pOAV1`KZM~M7W<7~M&5bs}usrRl zl8B|yX&$=rUfWy#L_$0TtD25{vhvs^O+{Ji|Bj+z;=m`fmC#v|Al;B3tu@+LZU6k4 zw=bTkc=XYfVE7}~T{l?l&K0R4hcEP~2kwLlnNKf|7V{WYDlK>pC{Vmu5ijR`+Nk3) zsZV5u`#ycFt``m-a2xQ16JsQjQQ$^VcrH$xl%P};a}!AZt%!qcGO6X(0HL$r*4i^1 zA!SEO*_91iSQJvOAUz~AMvTw2I$W@NOV2Q!N_r$#46y`o$Ky1I%Ist zy1Yn*IPm`X!zJt^zst|xT63WGW^TL`EacBx`p;b*tiGbZuCr3eq=R3o>uwm=W{3az zWJj=o*`Xcz@T>0HHwvp7wGhmrMRF>|3&J^tLM9hyhOrr5LQ=VtxK6a0)ftj_z^u3H z5F+pen3|`1tDCQ8#Rnfh)@vz!)Ws6%ERY-z|Cjd2hLwJz&>DFeb3rm<8v z_m|}=eM-JGNd}U8U2BEDgvZ#qVG(YBY+)#*OncwR9J%eS2k;1cK@$o5zyN#IOA>cicJ!OaXjIbi%bNB1(E(I)Ob8d|Oj(%(kzK;z|0(x{XkHj> zQ8%i6vw5czwfc37NH7ocAhkg`fF?2lV|E<^o&~={46P0)u=JEl>#N@Ir0^yPgX%k1 zMI1WxL5Jsp7G4hvV)+5jv8~Nf?ykHF6%~t4aZaOKiW9(?5iJ4?4vk0ZPSA`dz?mg^#-DKvO&AbRHXTgk*W+?A(*i1Qq*9?UV<&S5E&HgnrItXf;|4z3D zEaQ+kD^o)r7;r)ue?bTjL=Ms+Em8{S-(6Ap9A7FIzHt~-InfQn6)%P3SkHEYi1n>4|R>fJWv1SJUoBCBF4|*xi_HD z*{g#m>NRU;&N{rk{mZNX3dwR)I?&0TJ=yLWy;~c&k?QJfn~e>JA8-{nc4#eI4>jZc zGi?Jn}+<*m=rcNaym^Bsea{JN@9ZQivZ19+gQT}KGf3I5l)Iy_|9`#xE4Z7R0#AY zN6f~5gb0}}-DVj6{pCEczxI<<;O%b?HXS^3OT-B<+9uqnr)yu?9Cz5*WlY<068JG- z8H4YD2LEAQdQpa-AY_o=P!S8xbbK5tV*YJ&4kW5?#@4b_P${3=;0Xkq(Kdg>3zDwe zwtLoYhL2lpw|LY|JWJD2IXs z#1E>SWTg=7FRqSvIHzZSfA0%9(ZL+>KkN`<02Zhy;b5O~qX37?q=kuDS+NoyvD5! z4aLcpeGRIc#*bcE_N{3D4KsAU*ijfjCH>I;<1tsj7di%YCda#*vO!etBN%wT;LrP@ kO^XnUx%B@F;C~4)029<&*F`myE&u=k07*qoM6N<$f?0y^*8l(j literal 0 HcmV?d00001 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 @@ +