From 0d2b38f994985d517eddd715fb7139923fa0ed48 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 26 Aug 2010 02:45:48 +0000 Subject: [PATCH] Enhance ECM module --- htdocs/ecm/index.php | 173 +++++++++++++++++++++------ htdocs/theme/common/folder-new.png | Bin 0 -> 1399 bytes htdocs/theme/common/view-refresh.png | Bin 0 -> 2024 bytes 3 files changed, 138 insertions(+), 35 deletions(-) create mode 100644 htdocs/theme/common/folder-new.png create mode 100644 htdocs/theme/common/view-refresh.png diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php index 4cdd968aae6..1d5808cbdea 100644 --- a/htdocs/ecm/index.php +++ b/htdocs/ecm/index.php @@ -183,12 +183,50 @@ if ($_REQUEST['action'] == 'confirm_deletesection' && $_REQUEST['confirm'] == 'y /******************************************************************* - * PAGE - * - * Put here all code to do according to value of "action" parameter + * View ********************************************************************/ -llxHeader(); +$morejs=array( +"/includes/jquery/js/jquery.layout-latest.js" +); +$morehead=" +"; + +llxHeader($morehead,$langs->trans("ECM"),'','','','',$morejs,'',0,0); $form=new Form($db); $ecmdirstatic = new ECMDirectory($db); @@ -231,35 +269,67 @@ $head = ecm_prepare_head_fm($fac); //dol_fiche_head($head, 'file_manager', '', 1); -print ''; +//$conf->use_javascript_ajax=0; -// Toolbar -print ''; - //print ''; + else + { + print ''; + //print $langs->trans('ECMAddSection'); + print ''; + print ''; + } +} +//print ''; +//print ''; +
+
'; + print ''; + + print '
'; - // Construit liste des repertoires - if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$action)) +if ($conf->use_javascript_ajax) +{ +?> +
+
+'; + + // Toolbar + print '
'; +} + +// Construit liste des repertoires +if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$action)) +{ + if ($user->rights->ecm->setup) { - if ($user->rights->ecm->setup) - { - print ''.$langs->trans('ECMAddSection').''; - } - else - { - print ''.$langs->trans('ECMAddSection').''; - } + print ''; + //print $langs->trans('ECMAddSection'); + print ''; + print ''; } - //print ''; - //print ''.img_picto($langs->trans("Refresh"),'refresh').''; - print ''.$langs->trans('Refresh').''; - -print '
'; +//print ''.img_picto($langs->trans("Refresh"),'refresh').''; +print ''; +print ''; +//print $langs->trans('Refresh'); +print ''; +if ($conf->use_javascript_ajax) +{ +?> + -print '
'; +} -print ''; // Left area @@ -605,8 +675,18 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti } +if ($conf->use_javascript_ajax) +{ +?> + -print ''; +
+
'; +} // Right area $relativepath=$ecmdir->getRelativePath(); @@ -623,24 +703,47 @@ $formfile->list_of_documents($filearray,'','ecm',$param,1,$relativepath,$user->r // print '
'; +if ($conf->use_javascript_ajax) +{ +} +else +{ + print ''; -print ''; + // Actions attach new file + print ''; + //print ''; + //print ''; + print ''; +} - -// Actions buttons -print ''; -//print ''; -//print ''; -print ''; if (! empty($section)) { $formfile->form_attach_new_file(DOL_URL_ROOT.'/ecm/index.php','none',0,$section,$user->rights->ecm->upload); } else print ' '; -print ''; -print ''; +if ($conf->use_javascript_ajax) +{ +?> + + + + + + + + + +'; + + print ''; +} print '
'; diff --git a/htdocs/theme/common/folder-new.png b/htdocs/theme/common/folder-new.png new file mode 100644 index 0000000000000000000000000000000000000000..fcd15c018493cecd0498daa8d0f2e1cf3f4126e3 GIT binary patch literal 1399 zcmV--1&I2IP)z-K!S}0j0Bh&te);ZX=I05*+DB zsZhlEzxYo?X2Sn^n9ri9PPsuy+eBJHO(0s#s53Bz^0@%_@85suz5n1U0#Ot_Ow;tc z4<0;_HDR0FCM4U~xQmz+Bw%z3zK7?D*(g3ayCyz)@ZNuL_wHS?EJH*P5kd%v2&%eD zfJcuWeY4;1e+PKD63^H{tM4J{9gMw&CO5ED!8iyba0f)?b)8mfrd58l24JmS?CtHP z`}_Nd2;Tb@$Vr|+G#ZV%i2UFLK#%Dl)psz}_o4D0CjJscZ-8w84&w)C^lu_lCoIr; zZDQ*ArxzWNZnsO8WrPsc@&rIcFvdj2n4jLeckgG$7=H2VWBY~OzPa`0$nI`ucB31a zDBcCrB#9S!TG?-+2OSi!IwvfKsvH=DtN>KC==FNFUav<8VdcPy_*npedcEG*+}xzo zsd01jW41N}Th|v{+i=+UU2Jp*W3LhXtcLy99N0kj-a?Z@2se333mBhspxJEFZnyE? zjUcSu0$;D! zX}8<_ePH?BUh_paaTQHJXF7X~W(loAsfLn@Oi;g%@CQUD%-z$rFH1(#ts9R%-u~iW zp4|G;hd=z~Z_WXz>U=mH((m`_jkeq)`4t19y1sWm=#Ux)r8W^b4Aa_ zDBq@58I#xofHG8RR3;?RgrG4+`39r>8sq#;%J3F@eHomrT>*p;d=y2?TQIB8s3v4H zcO?K-%hBY{(n(3l$_}+;N*sAaEDPUYly#VvZ<81Aqx`jh8Nh5ZnJ^lSDBL!+G@*RD zxDo(>mkI}?cbOHNbZUoGD>EYFP_;~pCi|mZnzbE_cLcPz2H>14qbQ=)YT?F~S{mcR z)mpG}0>h-(Vp42jO#p<2GZfE^+-O-QGY4Mw*8o&?nq?W&Sq9uDi48&Yl>km_!6H~n z2coAnDv@QDmm#2^t^qjbN>wFobZBV8wD2z#Q9TvV0S%?U6wN08)F( z&PNbsJS){IM{58gGRgCtku9+e!||*nFT-n)Jq;IxtZ>F~$$P+iuOhODs?9V+33(Zo zyS}jXt2ptz_7tVCC|p8?;TnLdPMmXQx)7>1A}a#UpH_OIu)b){a?}8m+~Xuv{`9LK zAHz@90E~z@l4d2SA$PL+B7 zp{pIy(bFla{xQ%6M&|&Ij*k8)x4)M-AM^MhPhLU%>S0udhkyI+&(DpWd9DGQ&**AE z`Wm$zAV3Bj0Rx`dcCmTpnQ#qAUNe9La!&rm{vV&0_z$|iO8zfMYH0uf002ovPDHLk FV1m5tllTAt literal 0 HcmV?d00001 diff --git a/htdocs/theme/common/view-refresh.png b/htdocs/theme/common/view-refresh.png new file mode 100644 index 0000000000000000000000000000000000000000..606ea9eba46b82eea04678e64369b97e595f9da5 GIT binary patch literal 2024 zcmVP)3&2703Vg-nY!=84tGEaSdr|grO`3Ts7naC?zFPi$WDz z4_xq^mdg&AI3QJ9o}K?+x&OHZ~Kd)lWAr^ZC{9C>)PF4plg=Tf{kY z7+97I)^5AV9LFGb0B@UKShkwLDQn&w;rtP8XvFvna0iFc(3KaQ}=Z5 z3$U)f>AQYi`NQ_FRRxzWE@ec3Bmzl-O9Ux%eguFsK;aCjjE&YCefH_|owh@6lOwUW zW&e&L09gCI#)lL|oU~mxFfG8khNf)+T|M&rw`&5$VIO2(kU$`r192pQh#)0F5+ErD zqN^OPBz$z~wtc##({O+WCh58m{9ju)RfXO-c?DhoWxV+MU4Jg&j2~)vqB<}u;)6>B z!*UQyWMNni6d_O))DQ{jAOdVx!g3@?5^PB@Z5M(wJiNL>t*j_h|8nxmfp{_-cw*Bs zS~xd6A=wE46j1BeFQ2c^D=Wg)_5phT<6Cktk>QMi5mC;END9vE#q*=)s-^Qol@%r2 zr!u5X7a7w=GGif?Ng=2!*s*0*AZysrbd|Z1rU%dk-&0eyz<22Fi|(zv2{@93;M}w< zr<=IDqhDi~l~jJvLd*ta!F5>Ua6G zg0r7|W#uB@%F21lVA4c9V?#|9HZ%- zNG7>qInaE*;gH|=K|t3(a2)3*kvri`PiC!$YI^|sSW&p8C<@}E7Ki{MfH8oxiHB}X z4JbBTM*y>wH-10t*MD65*eb0*X&{ldAd%}8g&mj@ zAnV93Rd9@EvLE($JMFe2Mw8iu>ALplbmBD)Oq@kk=ru7s4iLh9&EV&94LDcf?Z zrxR~(?(l8gxY#Jn+l#GlGU9)QCviU6LP>e;Uh-Yx%&6c#| zI-4&Z-1+&G=@KzFs+Kpm4b1(Y7`Z^MiA@PG-e!d~sDj~-$IeN^cIyh=a4P%7FTt+g z%|0w3t4>|*f1tU!Sy5GOYwlZP8URnBG6s|sX~<-40K^4&ZS|g`rPBd)MlOZpY4@uD zU#4)XYKza=NF;YK23SIjObOt9W)J~4dq*HS#}9Wtgbi!Tw+W8+b@fM{uc>RC*xd7$ zmiD8n!m2o@DCB#N7#72N6 zi^|kl(IWNor@b$Ab`Sk(eZ$ccwj*ED44nU@>8Vupi|B5b%*N;8PQc)CI5Bq{r}gKiZ6}LCzg(nWON}EopA+}e|Ag9K_IBR(P&uF1Ag4;>KVzJ<_|8uvZHaz9Uua3-bu*A zZ?*6T%S*CbHazH81P5aT0+2Bsqzwl`FhrwaF}o}hCJBtB4Wtblj!WR2F|KHENh*#D zq>^b^hB0c!)ni_*@c;|}ZuKV6`1jV4;oIjQwNn+FI(lM1U$b;xA@0`|FoyhlAwV*Bl_c|d2W4q#)E^A^n5L-!V{jy3nl{pgg=8}ACS!@LZD#({eetcI_Fs9Y1AsMdn9P&C z20;IE?aO!g273O|R6vDuCnE)-KCMgh10JsC(r_+GD_?o~_V zg$oee1K<@e0C*w1!cP9)1e?*j-Xv?hqaf~unD`ImKK5UPJ;I1>GIMqS0000