From 6742601ed7669b6a91d08bf688fb30d64664000b Mon Sep 17 00:00:00 2001 From: Ali Lozano Date: Thu, 4 Jun 2015 00:39:55 -0500 Subject: [PATCH 1/2] agregados algunso metodos utiles al field de sir trevor y parametrizada la validacion de usuario del attach imagen --- .gitignore | 1 + sirtrevor/__init__.py | 23 +++++++++++++++++++++++ sirtrevor/__init__.pyc | Bin 0 -> 1863 bytes sirtrevor/admin.pyc | Bin 0 -> 201 bytes sirtrevor/conf.pyc | Bin 0 -> 1129 bytes sirtrevor/fields.pyc | Bin 0 -> 1920 bytes sirtrevor/forms.pyc | Bin 0 -> 984 bytes sirtrevor/models.pyc | Bin 0 -> 258 bytes sirtrevor/templatetags/__init__.pyc | Bin 0 -> 157 bytes sirtrevor/templatetags/sirtrevor.pyc | Bin 0 -> 931 bytes sirtrevor/urls.pyc | Bin 0 -> 469 bytes sirtrevor/views.py | 6 ++++-- sirtrevor/views.pyc | Bin 0 -> 2602 bytes sirtrevor/widgets.pyc | Bin 0 -> 3197 bytes 14 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 sirtrevor/__init__.pyc create mode 100644 sirtrevor/admin.pyc create mode 100644 sirtrevor/conf.pyc create mode 100644 sirtrevor/fields.pyc create mode 100644 sirtrevor/forms.pyc create mode 100644 sirtrevor/models.pyc create mode 100644 sirtrevor/templatetags/__init__.pyc create mode 100644 sirtrevor/templatetags/sirtrevor.pyc create mode 100644 sirtrevor/urls.pyc create mode 100644 sirtrevor/views.pyc create mode 100644 sirtrevor/widgets.pyc diff --git a/.gitignore b/.gitignore index 6061583..b319bff 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.sqlite3 +.idea \ No newline at end of file diff --git a/sirtrevor/__init__.py b/sirtrevor/__init__.py index de42229..d87cccc 100644 --- a/sirtrevor/__init__.py +++ b/sirtrevor/__init__.py @@ -1,8 +1,10 @@ import json from django.template.loader import render_to_string +from django.utils.encoding import python_2_unicode_compatible import six +#@python_2_unicode_compatible class SirTrevorContent(six.text_type): @property def html(self): @@ -14,9 +16,30 @@ def html(self): html.append(render_to_string(template_name, block['data'])) return u''.join(html) + def get_blocks(self, type=None): + if not len(self): + return + _blocks = json.loads(self)['data'] + + return [block for block in _blocks if not type or block['type'] is type or block['type'] in type] + + + def get_first_block(self, type=None): + try: + return self.get_blocks(type)[0] + except IndexError: + return None + + #def __str__(self): + # for block in self.get_blocks(): + # text = block['data'].get('text', False) + # if text: + # return text + custom_blocks_registry = {} + def register_block(block, name=None): if name is None: name = block.name diff --git a/sirtrevor/__init__.pyc b/sirtrevor/__init__.pyc new file mode 100644 index 0000000000000000000000000000000000000000..1fdd79db1739e7aeec031fcf9fe82b7bd41f790e GIT binary patch literal 1863 zcmb_dO>-MX5barg#1V4rd^kkK1rAUmfLs+$qyhyv9JuJPB4to1+1hBw%F3%)#*wk7knoEgbl@=oNf$RFbylH;m9-kG)Kosn^e z`lx>czVd(Y8TJj-a0uaSnOT>FD)GVP<*Z)$1S`vRcvY3jqhwX)(<-ycv|23FkiRUf zo*d=wH)r2e?xZS%EyFgq2#0^h@W&7qp%}3dlVpI1rooI55F#oS8DZ z7DgN61jCmQKr``N>a3KKU~(vucvf({fgQvrS{N(~=}F^N=Ki zI0>!o={jcn46{N37F1P|)%sDx=f#jx>SQc}LurVhrE< z=y!@f&kym6->1r#s*ZofYrXizxyosM46D-W=3U~~mgfO{GS9Qz`AxQL3!7vc=E&@u zq4t!({1Yw0B+)RFWKm_S!ouX*(p5|ALS0(%9n8ecC?OBXBL$drIzIv#UNNt!=_6CA zOI2wlv-sQk-?qgM^|{|pDQev0NBZ|7nUssZ7^ zpfBJC(U4+2^Oz#j%5Y`mz4iDz%k;`Z`BeHHrB!y$+Aia4tA_Xu*ytCCoR`am#%3(- zEL~p3MN%%4&vCIXpWh`~?$8Rmak#lQk8md8biJ*V+-|ZmPUN=A9w4vVXh8HuQ+Pw_ zB_9GQi#S(OnjSJz=4GV9V*AIV z*#}R$A4As*CNnSa2gvVg_m2hi>H1NfG*z-Ko{9F~Z^Pr8#Ioyt98$e~j0W=r%^g{( pLo9rybeYkm;@$1HdWa=+Jj3Bo-+VK}_^(0lmp@P5Okv1MWL}Mf+)f|TnNZwsuWU$rBD$oOH?1)K|VX6TJQyr zEkim=mN4G8P#nD3eKR4jmum-gM;^Rv#2oB%#s`=hgGtc0NR5s;ZKh$1_T6I?J5R>% zoVISfWs32stW-T#$FiE$4_skA^Dw^Brj)cB&d>Y}j71Xj0y(mkG)yp2>nLv!j59`! z)+=1@Aqu40GulU=BRI#l5pa%G7a)8DK8AB-2X|ZK`wdI6$f<{+Q{+77qB0>VwFCD= zGgs1UPb|4+u5H>O4;7w57;!=%Qo4mBPEMtrIZq9w^i(#+yX#>kUBfG>haBAvA{M=9 zAST4f<>Hbt5?G`@;sy&%o>CT^bU;hy2Wc98J@~>n)H&AgsIG3~<(Ji>?x005{|6#* znb28=n9^W)N@!A7m7e$lr-rhhTRoRnt7}4j*>CDFr<-$T7%t!@ z=DcVCU6|B9I!4VQL*AD7Zc}UT(Q^{!mEP```=f)c*ROxx&9~mZ9eK*b5i`T^>=zaD kQQPz$dakiH+^^31jczWGV--)tP-ogL5U=}US4&ddE`q4*cn5Ve9zK|&>@Qfd-v zQz}!|2c!j^4rne&4e5sHn&?kCB$b7OEF6s12P0Brn&z+AwRzw#7mWOn#k{wzGf<;# zi_z5BpH^S?_P0?B?fv_|Z4-VlF}hJ}=6Jl%%e`Zv351zHb1D-mrortDcaS004_@vg z3m<5&h@>E&kWY#6b%MNBf>sIL5~s?1f{&vde2c(5W3-IqV00Jf+7=01j#)@)I^(6x z5zP;9K{xXNYP)bAug{i%IU@?fePML4TOB)XUA5PkYFT%xuhePXE&5N+SRYDKJ)=;% z&*xVKD8Q#fC=#0@298v^y46zp4L*^w?bSuYYIyP-{J$9>^-u_aO!&9F?Rj6%PFmf0 zwCvw*?eHBPx}~|~DJG~KpkZvMSZmBn0p+@9OYvK yM}cEABAF5EaRgkP39vgjscm2vhXMUS@&(+z9K$eVUt=%7VICdGZHw*nL-q*8&C!wo literal 0 HcmV?d00001 diff --git a/sirtrevor/models.pyc b/sirtrevor/models.pyc new file mode 100644 index 0000000000000000000000000000000000000000..cdaf653fb90fe2a09b424a57efca54f810a6c91c GIT binary patch literal 258 zcmYLEK?=e!5Zp9XR4Die54qT@ARXQWf9nQ+$AKTG1t$%nY-e zgua5&=6OyF_?Cy~3b&mg2wVgdKt&)UK!gW^g7ToEkWth=B&>%)`Nm=dS<^?Tv?!I8 zPIqR2ERkks%9}Qkt`A%0yYLV}obvjpL$QxhK;!%Z6LH(^EcOFCLmJI_YD;7JT1kG- jYoU2JVrr#n+8g+vbx#Q|k7j_q3zSz?F5PVFzB(o!U6eU8 literal 0 HcmV?d00001 diff --git a/sirtrevor/templatetags/__init__.pyc b/sirtrevor/templatetags/__init__.pyc new file mode 100644 index 0000000000000000000000000000000000000000..498a2b3a56d356d9c4768733e24cb7c5e89db184 GIT binary patch literal 157 zcmZSn%**9*IXg6&0SXv_v;z&Q>v@#i>QbF^)Nz zG3AMQDfuxeS&4b+`MSlKMI}Y4W%)%h2v$jIZb43BNoq-AdT~sAd}dx|NqoFsL1hUC U&?uYS{FKt1R6CG`#X!se0O+kPoyp79GS^NS@8x^T z$}H5}sc+8vI^-)-b2GQ;a(9{2S>+tvwys4+ZtK$p7vtTaeL>qkC*f!btOK|Z-)rQA z(M4D{s0Be?OyYpTMy^Sc%9_;1tV$-_?aOD?eR)1hQ(^$?w zp3C=_SbY&0j!R>=PpN5&0}5MJSoKn1dvfR`=`cNHXD`k?{6l zUt^G|WxCPM=d!Y%=Ho-$#^u@$RJo`!8b-~Cd-Crw56;ipQ_7Hbbrw~*^b|6p5BXP< znunTYqgJ`4AEQR;%hSw&so5yW84eu&e2M!1wI2XwU$kh}%0&2W%Xtmqnf~ qGOMfftIW~QYtn|Trz(hBwoO=H*?$BnQvxxbHCRrKmGFJYyh)Q9{+!ZKiOme z9)1~w0M0GVz+rFY7C4rsEeLZE<-y4VqdhqY3lJ5-DH=Wx;Sxk8a7ul-P>IF=%FQ!b^D zt`c%)UqH=agc11^ys=(Es-qMiTt*^R&yp+}kn-(sA8AR^OaKBv1W2)vye~0sJ{%fn zq#U|V&D z3y(h`OeJ|$@8Z%swEK4V`HAhG^}4p(>GwPP2VZxO`|k73(c#lh|HRfQ5a5)tPT^M! z&7^>JY|bbP_7u}%Yo@%hV2Tn3K@M&JvY#2z*gh6CrxvIJ1VspzU}8Z~qTV>i4LO*i zMGk^8s0vJQC%VW3`6|5KvJ9#UK@BDaEiVF=fSjy=mxssGCGZO16~RNI1YQ|N1(=p* z7LyXZC_>g}hbFTNU=cdD&<9!S!1-Q%wkVU{cg(h$7n5 z5LJ}!&X^{lf#MYu8~E-nXfU`YY3r~@aF|mXXnGISeF)ysIHCRyJVrkrCbWhzvL5Qa zb&9r!aP(RmSm$F&ozHK3`MaSXitn)^i$YmM_RUArHy=+`9!Yhb3Ryai*k?)2`1-xw=$2G#O{17Q{Rfnvnhv zhM;AtBA1Fq29qkvy=ImrA}eeqy$$uqoxz8tIJXNWIAH_MW& z^#Cc&K07?>_G}7MpG4P$o-G{QD<1luIV}`C7M|;I#g&D&iL_T~i@x9RU?pBFdz~bN z-wg&PxiaL-ifV)JWgVv zj~?(aRo$8t;4B#PtaxI8 z4>CT=vQ2NPO$Ao}W~F1H66nsICx$QeMVpV+Wqa<@rpDCceR_CgI*d^EDr@}n&nmN3R@6n$ GvA+Q9Z#-`R literal 0 HcmV?d00001 diff --git a/sirtrevor/widgets.pyc b/sirtrevor/widgets.pyc new file mode 100644 index 0000000000000000000000000000000000000000..24a056f98e276873dd0fd7b183a42107eff26227 GIT binary patch literal 3197 zcmb_eTW=dx5T0FMVmnTHqnA)nTM)uf*?|XIgd#-S1Q9h&%G#l-6|~xVPpozJ;_f+a z8!358Uw8n196yC00N>16+fCK>DYp0c%*?sWnfc~BTl#mY@ykC4y8|jdCH(({NB@B) z#LuCasBil&#SSGd^<8qNtya(E0-y*P*SCS)yfr$7bvMwzh>ns#dS&=)Nepu zps+^qA|*}gHzC(axing$eTTvZy(T&#dfH!R54x>IcoY4H&vwf}*HqB#XL+KnSc9mQ zF;O}!Gz-w=>V?X+n$LKo!YHs}!!9sTzEQ7C#EV+P74!xZZL-9F7H5M4?dNJ3X_FtC zb1-$IyoYtO{7DoJl{po+`>^W`Gzt;JDTq&jScMfn#A}D+6uP3UkgAfZ&o0hzi}XltTf5N&;?ZHTre+Qpf+DcZVd zmuA{!(KbYTj_w?n$t=>SNk`(>)RptJW|qh-(-B|*htAQF`1uzJkh-l42*tLbATTD^ z(i_Bq)&>UB%VhwF%OJG91X8SP@oZGwYkfvC@W-Aeruo$VtYCQ0)hk*vJ@o zh=5uJ4?4X{93_#Nud*fLM{n=r%P=h%n(ZcIwJeVb=Mvb$v$00D6(R4Sxp11Maj_2Rs z+IjHM?>&9I(KU?xxn+Ih=X<+bJ+ZxW($?mq&7Qe_YSMf;U(8)|@s!=$_;q*F+gP{0 z=`0n`!$~r>Db$m($~``V1i|;CG%~*5;tG&CTE+X)3G$(q!ydepE@x2yfIw?wGc*mD zF9E{^46S@#r2Jpc6nWK|uah|tPE`r<1IL?C5pX9NrLu19=Jl0nsy@jI!(z?YX zy<6N!==pfhCQ%&vQe55&TX+|XAjb9_C%ccgcJ8hFyWW;}gNNKiBl+?^M^CT~g3W_s ztuJ^CGn*h|7U5~VY01zTr0HvH@hKk7z#!*3(sRSTMvbJ@A(UU1|z12*x8 z-IN>j8+6q421Q;FK42Xe*RaC3DGG%z)G7__)zmNXWm&@{{S`OUs$U&s$v8_@YV_*p z`9$T1#a}0h(#}ZhZ{Ih1l7?W0L6)o4dAD86y8XUc8!xa`@GMrVcqr Date: Mon, 15 Jun 2015 13:20:38 -0500 Subject: [PATCH 2/2] Fixed markdown in Heading. --- sirtrevor/templates/sirtrevor/blocks/heading.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sirtrevor/templates/sirtrevor/blocks/heading.html b/sirtrevor/templates/sirtrevor/blocks/heading.html index 2632dc7..b7e4873 100644 --- a/sirtrevor/templates/sirtrevor/blocks/heading.html +++ b/sirtrevor/templates/sirtrevor/blocks/heading.html @@ -1,4 +1,4 @@ {% load sirtrevor %}
-

{{ text|linebreaksbr }}

+

{{ text|markdown|linebreaksbr }}