From 7838a12792be197628ab7f34910f1c87dd113295 Mon Sep 17 00:00:00 2001 From: tr4ck3ur Date: Sun, 15 Feb 2015 14:46:19 +0100 Subject: [PATCH] Fix ckeditor, uploader and add piwik --- development.ini | 3 +- jm2l/static/css/jm2l.css | 4 +++ jm2l/static/vendor/fileupload/img/loading.gif | Bin 0 -> 3897 bytes jm2l/templates/Profil/Profil.mako | 21 ++++---------- jm2l/templates/Staff/EditPresse.mako | 6 ++-- jm2l/templates/Staff/pole.mako | 2 +- jm2l/templates/Staff/tasks.mako | 2 +- jm2l/templates/edit_event.mako | 2 +- jm2l/templates/edit_tiers.mako | 8 +++--- jm2l/templates/helpers.mako | 5 ++-- jm2l/templates/jm2l.mako | 2 +- jm2l/templates/layout.mako | 26 +++++++++++++++++- jm2l/templates/modals.mako | 4 +-- jm2l/upload.py | 5 +--- 14 files changed, 53 insertions(+), 37 deletions(-) create mode 100644 jm2l/static/vendor/fileupload/img/loading.gif diff --git a/development.ini b/development.ini index e36ed74..2621409 100644 --- a/development.ini +++ b/development.ini @@ -6,8 +6,7 @@ [app:main] use = egg:JM2L -pyramid.reload_templates = false -#true +pyramid.reload_templates = true pyramid.debug_authorization = false pyramid.debug_notfound = false pyramid.debug_routematch = false diff --git a/jm2l/static/css/jm2l.css b/jm2l/static/css/jm2l.css index 5a3de2f..de94fbf 100644 --- a/jm2l/static/css/jm2l.css +++ b/jm2l/static/css/jm2l.css @@ -1,3 +1,7 @@ +a { + cursor: pointer; +} + .borderbox { border: 1px solid #e1e4e5; margin: 1px 0 24px; diff --git a/jm2l/static/vendor/fileupload/img/loading.gif b/jm2l/static/vendor/fileupload/img/loading.gif new file mode 100644 index 0000000000000000000000000000000000000000..90f28cbdbb390b095e0d619cbe8d91208798e58f GIT binary patch literal 3897 zcmZvfcR1T?8^ABwb_x$y{p1+>Yb$`dLr?0DW)y5y-57+?!PEJmyrlv?FQgU)K z^$+m(2RfoVbqYWS0G%+J=-j=drD>|8AS+KxL%o*)0)PM?>H*Mx2iHt~mnWZ=N>W+t zB|S>mk9=ZpYXc!T7UZI&`(-T$A=k$fH%{0DUBGwg!#nk?dE^E3gDApBHVTIQQFjd% z@8i*q&q?bJ^`q%$4G<}clybdVd-s{xsx+KupPg;W4bOvd7w*pJ;3oEg_PFlG;yL8+oShz**1=iDRZ*E(Q<#5R=A*XP5H_Y=1xJoCem%-&eKb6zV0ff z>legqW&{=3KP~Y8@#^3-+sNyevrSganP&X1J3*?KZrnP&@8z-DF>$5H-D+bme&k}k z=b(j;=N4)0R8Q6PZLj2pkrz)`V_M!E?dlE7mCX3opU@wz96Zurx4FmWL37=7TCuG9 z`GkMU?-=3W2u(X1pJ+1-D8$#M3IyxB%pDQB;2(M(eo?G5D~tz~6dTT3ItGfkWI&$< z&#Xo;(n_Kq+TlC@hpWm<{qK@(J8G++We#hbNi^se<6nV2;T4 zNDqriR!3dHvF711Txh1!vT{};LzV^uLH;6l)wR@$;KDJa`VOrZ+ccMJt-r043s&2t^bewdCj@xurE^v)WL95dQ z!~&h-7Yqg)+cJl7{=U2?_+E7^{JVv*AQbVh@R_RBt12dDs-#^ZEg=TA;LKR69HAv*?v1IO*LrVkl0@jm)`Yw>Ei;Cb<`Ge=JHj9g^C7+M?`w@g>lBl#q%UG z`}!%t5@M1z}?nB z*Tj60Y$FR82XGHd41y*mrUDeYh38hddS#Y*SGE@ZP#F{1I^fy8Y9@AY`0m};Z?t1t zvl@XaOzm2oTG^`5GXjVpu-2S*n4*kB%YDv4k&aM?8%y+(ZsV3)1mZz23da;)wH@7&`|Ado=<=+Ih>-Zw;?kA^kOQDkl*L3<;+? z<|M0rPu_-Pn1S;!V&9?Lji{M@0Mr#T9>Bk`lq`z3P)1&h>Ho;*au|vDvsVjp-qT0e z*UUfQ?Gpz$g9n2bA}a7zWNb7tHVzcwml}2{C{dOsk47z6B0pahT~Ju4TqIILBp68& zNmxrkQf(GrV^cF{Yg;>8XC;}Vr=*X4p!6N-twSOZPz$&PLr@%}eIZ zD~Lt1l{LgdQhk+JLo-cX3#q!jvb?Lbps#;m@ZHexhyq{?ko#d0H90e$K08CzSlrS) zWo6dl)B48d)b`HU-u~MD$9uai7`L)G>3*T{10aZCYqqL(n*#FQw0j@zj_M(+#c zyVt!MW{V+4vZ?)+0bac?NfTw2K79`dH+R{6nT57bfL{LIoi7Ag$(vz$+eju9d$7B zJG&Z{dzkyk1G(>p`qfHW#%#yxr>AUYK0KOvygWa*I`naEY4hR2MjvI{YUR`Z@fYi( z@9Pv+(V>39D#Fg`k5 zAvd8jHQhWpvV^33oSVP7D7mS*y)&b|zlvB`kzM|}?rCIuU=S7LEHVa$xY zK7bdtLDWL^SFw^20+{?ObjZr9KUx(0o0SBj_xZyoID`D^`r^?VSAjk}{spA|BzpP` z*n{4_ZGkmTM)r5(MRv|pCYSwXX2mHCy0;?C3wFJlI=Ud1imCcH_f;o6U;m-fmBwF| zxeaFV_F$)h(s28}mNsGy`ZELug@>6%MYAH2>|xIMd-hlX4DyCpx2_fIxR&9HR| zOo=QmRf1OdI|P;~oA(JKyL+Po2Z!q-^EdYxV{T>gIls8gp+tex@r9h|)?()zIoc!` z<-T`fILv04Ax z`;g5e;{OrXwNr!u98>p5O4V$kGW+Q$xy7wyq-@a{rvp{O^`YL+YM=2l%U^u_1752E zp+H?P>LBTO+=z(KcG8T2As`wFiAndgQX_?Fb7*g8g`&_orui5i9PU;=s2FX6FR#co zE~~Dn%@VI68P?So8?|?o7*sXav^B}J^pd-Y`tL^zz~d9Gy3^POy}9|$k4r+sE2(Oq zblxd%Y40fR?Z;>w9%bM7>MRCe0$W>a1Ua)1%pg!3Ef2a&@`nE+@wdq?gKL=1$&mG5 zc=xRumn_dNMN(4+^D|}e-AyHhgXp*ONwPc4Gw0}8JwtWo>9B=>)bspG45{b5-#-%j z#bmSnf0`_jYO*x%*xv*H2=qB?SKiue@ymKb_UgCALL`qak+Q!sG{OTY*|7f zF|)MHlBhu2NPE6kwyB8|f2F;hBma7LM{kKLHEAkujx^eiH``22TTe~S&x|jOJYJkz zURwXOva!82K-vG?eb}>euy=GkG2A=!`dKFQr>UIzv90~@YW71c)Ya_7S_1LJKEn=2 za9pc*k?HqfnAE_>s??ukJY)v<(7$cFuo!w*RiJ0d-5_)cb6+|EH)TS4n7hww64>2( zX`J7xEP2C2?VS3M{VJ)C5ViP4(Z`>SCWHnQ7<3K_6^4f~Mj(aUsSP$sAU+{HDVa|% zjWr{KUyB;EnHVu#ZXuo!TYQ1qV?~J(RTVWMwIb943uEgYoSL4Q{n!XxSX^4BEKja{T3;I9*k1pzv%fm_`3SgoyubBr<2{X$I3cSkh@M@_ zva>k51!i{|%nxvFY7J+Rb3l)ox#Z|V1(l_kR#-t@$lq>-DPeX*yA#-ro8yw)#5xk? z+50S$Vwd${7o-V=V1Vdg4meiIid>Ez$~Vn1NH?g!jTGE3bC@Dm6pR*Gx184p0Mz~i D^>?LD literal 0 HcmV?d00001 diff --git a/jm2l/templates/Profil/Profil.mako b/jm2l/templates/Profil/Profil.mako index 8bd87d7..4a20282 100644 --- a/jm2l/templates/Profil/Profil.mako +++ b/jm2l/templates/Profil/Profil.mako @@ -55,7 +55,7 @@ DicForm = { 'website': {'PlaceHolder':u"http://ma-page-web.moi","FieldStyle":"width:16em;"}, 'gpg_key': {'PlaceHolder':u"Ma clé gpg", "FieldStyle":"width:90%;"}, 'soc_link':{'PlaceHolder':u"#jm2l sur irc.freenode.org","FieldStyle":"width:90%;"}, - 'bio': {'PlaceHolder':u"Ma Bilibiographie", "FieldStyle":"width:95%;min-height:150px;", "fieldset":True }, + 'bio': {'PlaceHolder':u"Ma Bilibiographie", "FieldStyle":"width:95%;min-height:150px;", "fieldset":True, "ckeditor":1 }, 'tiersship': {'Ignore':True} } %> @@ -63,20 +63,21 @@ DicForm = {
Activité + Si vous ne trouvez pas l'entité que vous souhaitez promouvoir (Association, GULL, Entreprise, Logiciel, ...). + Vous pouvez en ajouter une. +
- ## - + - ## % for num, dicdata in enumerate(profil_form._fields.get("tiersship").data): - ##
AnnéeEntitéeEntité Rôle Action
Move 2015 @@ -99,7 +100,6 @@ DicForm = {
Move @@ -141,17 +141,8 @@ DicForm = { - - + - - -## Handle Popover of this form -## diff --git a/jm2l/templates/Staff/EditPresse.mako b/jm2l/templates/Staff/EditPresse.mako index 3b9b700..590f5b8 100644 --- a/jm2l/templates/Staff/EditPresse.mako +++ b/jm2l/templates/Staff/EditPresse.mako @@ -16,7 +16,7 @@ <% DicForm = { 'year_uid': {'PlaceHolder':u"Mon Nom", "FieldStyle":"width:16em;", 'ContainerStyle':"float:left;"}, - 'doss_presse': {'PlaceHolder':u"Dossier de presse", "FieldStyle":"width:95%;min-height:600px;"}, + 'doss_presse': {'PlaceHolder':u"Dossier de presse", "FieldStyle":"width:95%;min-height:600px;", "ckeditor":"1"}, } %>
@@ -29,6 +29,6 @@ DicForm = {

-${helpers.uploader_js()} \ No newline at end of file +##${helpers.uploader_js()} \ No newline at end of file diff --git a/jm2l/templates/Staff/pole.mako b/jm2l/templates/Staff/pole.mako index c8cfb1a..909c4d1 100644 --- a/jm2l/templates/Staff/pole.mako +++ b/jm2l/templates/Staff/pole.mako @@ -40,5 +40,5 @@ DicForm = { ${helpers.uploader("poles", form.uid.data, u"Attachement" )} %endif \ No newline at end of file diff --git a/jm2l/templates/Staff/tasks.mako b/jm2l/templates/Staff/tasks.mako index d3d9ded..9ff75eb 100644 --- a/jm2l/templates/Staff/tasks.mako +++ b/jm2l/templates/Staff/tasks.mako @@ -44,5 +44,5 @@ DicForm = { ${helpers.uploader("tasks", form.uid.data, u"Attachement" )} %endif \ No newline at end of file diff --git a/jm2l/templates/edit_event.mako b/jm2l/templates/edit_event.mako index fee9f33..9639396 100644 --- a/jm2l/templates/edit_event.mako +++ b/jm2l/templates/edit_event.mako @@ -216,5 +216,5 @@ if formAdd: for jsitem in formAdd._fields.keys(): context._kwargs['postpone_js'].append( "$('#%s-help').popover();" % jsitem ) %> -${helpers.uploader_js()} +##${helpers.uploader_js()} % endif \ No newline at end of file diff --git a/jm2l/templates/edit_tiers.mako b/jm2l/templates/edit_tiers.mako index 5b7a49c..58d300a 100644 --- a/jm2l/templates/edit_tiers.mako +++ b/jm2l/templates/edit_tiers.mako @@ -144,9 +144,9 @@ DicForm = {

-% if 'uid' in form._fields: - ${helpers.uploader_js()} -% endif +##% if 'uid' in form._fields: +## ${helpers.uploader_js()} +##% endif <%def name="jsAddOn()"> @@ -154,7 +154,7 @@ DicForm = { %if 1: - - +## +## +plop % else: diff --git a/jm2l/templates/jm2l.mako b/jm2l/templates/jm2l.mako index 99a9bb7..fc2043b 100644 --- a/jm2l/templates/jm2l.mako +++ b/jm2l/templates/jm2l.mako @@ -150,4 +150,4 @@
-${h.uploader_js()} +##${h.uploader_js()} diff --git a/jm2l/templates/layout.mako b/jm2l/templates/layout.mako index 4e1023b..8988c4c 100644 --- a/jm2l/templates/layout.mako +++ b/jm2l/templates/layout.mako @@ -1,5 +1,6 @@ +<%namespace name="helpers" file="jm2l:templates/helpers.mako"/> JM2L 2015 @@ -20,6 +21,8 @@ + ## + ## <% @@ -28,6 +31,8 @@ DisplayYear = request.session.get('year', 2015) %> <%def name="jsAddOn()"> <%def name="cssAddOn()"> +${helpers.uploader_js()} +
@@ -68,7 +73,7 @@ DisplayYear = request.session.get('year', 2015)
  • Me déconnecter
    • % else:
  • Je m'inscris
    • -
  • Je m'identifier
    • +
  • Je m'identifie
    • % endif
    @@ -109,6 +114,7 @@ DisplayYear = request.session.get('year', 2015) + ${self.jsAddOn()} ## Then Handle Javascript + + + + + + diff --git a/jm2l/templates/modals.mako b/jm2l/templates/modals.mako index e41cc4c..6ee1556 100644 --- a/jm2l/templates/modals.mako +++ b/jm2l/templates/modals.mako @@ -125,7 +125,7 @@
    - ${helpers.uploader_js()} + ##${helpers.uploader_js()} @@ -150,7 +150,7 @@ Les images de taille supérieure à 300x300 pixels seront redimensionnés. ${helpers.uploader("users", uid, "une Photo")} - ${helpers.uploader_js()} + ##${helpers.uploader_js()}
    diff --git a/jm2l/upload.py b/jm2l/upload.py index e063dc4..f0fe718 100644 --- a/jm2l/upload.py +++ b/jm2l/upload.py @@ -97,7 +97,7 @@ class MediaPath(): p = IMAGEPATH + [ media_table ] + [ linked_id ] elif media_table=='tasks': # Use Current Year - p = IMAGEPATH + [ 2015, media_table ] + [ linked_id ] + p = IMAGEPATH + [ str(2015), media_table ] + [ linked_id ] elif media_table in ['RIB', 'Justif']: slug = User.by_id(linked_id).slug p = IMAGEPATH + ['users'] + [ slug ] + [ self.media_table ] @@ -143,7 +143,6 @@ class MediaUpload(MediaPath): if RealMime!=result['type']: result['error'] = 'l\'extension du fichier ne correspond pas à son contenu - ' result['error'] += "( %s vs %s )" % (RealMime, result['type']) - print "%s != %s" % (RealMime, result['type']) return False # Accept images and mime types listed if not RealMime in ACCEPTED_MIMES: @@ -343,7 +342,6 @@ class MediaUpload(MediaPath): result['name'] = os.path.basename(fieldStorage.filename) result['type'] = fieldStorage.type result['size'] = self.get_file_size(fieldStorage.file) - print result if self.validate(result, fieldStorage.file): with open( self.mediapath(result['name'] + '.type'), 'w') as f: f.write(result['type']) @@ -391,7 +389,6 @@ class MediaView(MediaPath): test = f.read() self.request.response.content_type = test except IOError: - print os.path.basename(name)+".type file not found" pass #try: if 1: