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 00000000000..fcd15c01849 Binary files /dev/null and b/htdocs/theme/common/folder-new.png differ diff --git a/htdocs/theme/common/view-refresh.png b/htdocs/theme/common/view-refresh.png new file mode 100644 index 00000000000..606ea9eba46 Binary files /dev/null and b/htdocs/theme/common/view-refresh.png differ