'.$object->label.'
';
}
- if ($object->element != 'product' && $object->element != 'bookmark' && $object->element != 'ecm_directories')
+ if (method_exists($object, 'getBannerAddress') && $object->element != 'product' && $object->element != 'bookmark' && $object->element != 'ecm_directories' && $object->element != 'ecm_files')
{
$morehtmlref.='';
$morehtmlref.=$object->getBannerAddress('refaddress',$object);
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 07c8b0aff00..bbb80f52cba 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -411,31 +411,33 @@ class EcmDirectory // extends CommonObject
* @param string $option Sur quoi pointe le lien
* @param int $max Max length
* @param string $more Add more param on a link
+ * @param int $notooltip 1=Disable tooltip
* @return string Chaine avec URL
*/
- function getNomUrl($withpicto=0,$option='',$max=0,$more='')
+ function getNomUrl($withpicto=0, $option='', $max=0, $more='', $notooltip=0)
{
global $langs;
$result='';
//$newref=str_replace('_',' ',$this->ref);
$newref=$this->ref;
- $newlabel=$langs->trans("ShowECMSection").': '.$newref;
- $linkclose='"'.($more?' '.$more:'').' title="'.dol_escape_htmltag($newlabel, 1).'" class="classfortooltip">';
+ $label=$langs->trans("ShowECMSection").': '.$newref;
+ $linkclose='"'.($more?' '.$more:'').' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
- $link = 'picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+ if ($withpicto != 2) $result.= ($max?dol_trunc($newref,$max,'middle'):$newref);
+ $result .= $linkend;
- if ($withpicto) $result.=($link.img_object($newlabel, $picto, 'class="classfortooltip"').$linkend);
- if ($withpicto && $withpicto != 2) $result.=' ';
- if ($withpicto != 2) $result.=$link.($max?dol_trunc($newref,$max,'middle'):$newref).$linkend;
return $result;
}
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index a329adfd116..ae16ad85eaf 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -43,6 +43,7 @@ class EcmFiles //extends CommonObject
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'ecm_files';
+ public $picto = 'generic';
/**
*/
@@ -752,43 +753,7 @@ class EcmFiles //extends CommonObject
static function LibStatut($status,$mode=0)
{
global $langs;
-
- if ($mode == 0)
- {
- $prefix='';
- if ($status == 1) return $langs->trans('Enabled');
- if ($status == 0) return $langs->trans('Disabled');
- }
- if ($mode == 1)
- {
- if ($status == 1) return $langs->trans('Enabled');
- if ($status == 0) return $langs->trans('Disabled');
- }
- if ($mode == 2)
- {
- if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
- if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
- }
- if ($mode == 3)
- {
- if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
- if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
- }
- if ($mode == 4)
- {
- if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
- if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
- }
- if ($mode == 5)
- {
- if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
- if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
- }
- if ($mode == 6)
- {
- if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
- if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
- }
+ return '';
}
diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php
index 339df01b88a..5a14b95291f 100644
--- a/htdocs/ecm/docfile.php
+++ b/htdocs/ecm/docfile.php
@@ -247,10 +247,9 @@ if ($action == 'edit')
print '';
}
-dol_fiche_head($head, 'card', $langs->trans("File"), 0, 'generic');
+dol_fiche_head($head, 'card', $langs->trans("File"), -1, 'generic');
+
-print '';
-print '
| '.$langs->trans("Ref").' | '; $s=''; $tmpecmdir=new EcmDirectory($db); // Need to create a new one $tmpecmdir->fetch($ecmdir->id); @@ -259,7 +258,7 @@ $i=0; while ($tmpecmdir && $result > 0) { $tmpecmdir->ref=$tmpecmdir->label; - $s=$tmpecmdir->getNomUrl(1).$s; + $s=$tmpecmdir->getNomUrl(1).$s; if ($tmpecmdir->fk_parent) { $s=' -> '.$s; @@ -272,28 +271,18 @@ while ($tmpecmdir && $result > 0) $i++; } -print img_picto('','object_dir').' '.$langs->trans("ECMRoot").' -> '; -print $s; -print ' -> '; -if ($action == 'edit') print ''; -else print $urlfile; -print ' | ||||||||||||||||||||||
| '.$langs->trans("Description").' | '; -if ($action == 'edit') -{ - print ''; -} -else print dol_nl2br($ecmdir->description); -print ' | ||||||||||||||||||||||
| '.$langs->trans("ECMCreationUser").' | '; -$userecm=new User($db); -$userecm->fetch($ecmdir->fk_user_c); -print $userecm->getNomUrl(1); -print ' | ||||||||||||||||||||||
| '.$langs->trans("ECMCreationDate").' | ';
+$s = img_picto('','object_dir').' '.$langs->trans("ECMRoot").' -> '.$s.' -> ';
+if ($action == 'edit') $s .= '';
+else $s .= $urlfile;
+
+$object->ref=''; // Force to hide ref
+dol_banner_tab($object, '', $morehtml, 0, '', '', $s);
+
+print ' ';
+
+print '';
+print ' ';
print ajax_autoselect('downloadinternallink');
print ajax_autoselect('downloadlink');
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 56f9b692e94..8841778ce26 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -337,165 +337,6 @@ dol_fiche_head($head, 'index', $langs->trans("ECMArea").' - '.$langs->trans("ECM
$module='ecm';
include DOL_DOCUMENT_ROOT.'/ecm/tpl/filemanager.tpl.php';
-
-/*
-// Start container of all panels
-?>
-
-
-
-
-';
-
-// Toolbar
-if ($user->rights->ecm->setup)
-{
- print '';
- print ' ';
-// End top panel, toolbar
-
-?>
- ';
- print '';
-}
-else
-{
- print '';
- print '';
- print '';
-}
-$url=((! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))?'#':($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module?'&module='.$module:'').($section?'§ion='.$section:'')));
-print '';
-print ' ';
-print '';
-
-
-// Start Add new file area
-$nameforformuserfile = 'formuserfileecm';
-
-print '';
-
-// To attach new file
-if ((! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) || ! empty($section))
-{
- if ((empty($section) || $section == -1) && ($module != 'medias'))
- {
- ?>
-
- form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section?$section:-1), $user->rights->ecm->upload, 48, null, '', 0, '', 0, $nameforformuserfile);
-}
-else print ' ';
-
-print ' ';
-// End Add new file area
-
-
-print '
-formconfirm($_SERVER["PHP_SELF"].'?section='.$section, $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection',$ecmdir->label), 'confirm_deletesection','','',1);
-}
-// End confirm
-
-
-if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$action) || $action == 'delete')
-{
- print '
-
-
-
-use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) {
- include DOL_DOCUMENT_ROOT.'/ecm/tpl/enablefiletreeajax.tpl.php';
-}
-*/
-
// End of page
dol_fiche_end();
diff --git a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
index 4be1bf1979a..3e77c0acd92 100644
--- a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
+++ b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
@@ -33,8 +33,8 @@ $(document).ready(function() {
$('#filetree').fileTree({
root: '',
- // Ajax called if we click to expand a dir (not a file). Parameter 'dir' is provided as a POST parameter by fileTree code.
- script: '',
+ // Ajax called if we click to expand a dir (not a file). Parameter 'dir' is provided as a POST parameter by fileTree code to this following URL.
+ script: '',
folderEvent: 'click', // 'dblclick'
multiFolder: false },
// Called if we click on a file (not a dir)
@@ -46,7 +46,7 @@ $(document).ready(function() {
function(elem) {
id=elem.attr('id').substr(12); // We get id that is 'fmdirlia_id_xxx' (id we want is xxx)
jQuery("#_section_dir").val(elem.attr('rel'));
- jQuery("#_section_id").val(id);
+ jQuery("#_section_id").val(id);
jQuery('#').show();
}
);
@@ -73,7 +73,7 @@ function loadandshowpreview(filedirname,section)
$('#ecmfileview').empty();
- var url = '?action=preview&module=§ion='+section+'&file='+urlencode(filedirname);
+ var url = '?action=preview&module=§ion='+section+'&file='+urlencode(filedirname);
$.get(url, function(data) {
//alert('Load of url '+url+' was performed : '+data);
pos=data.indexOf("TYPE=directory",0);
diff --git a/htdocs/ecm/tpl/filemanager.tpl.php b/htdocs/ecm/tpl/filemanager.tpl.php
index e80e9fd3e83..c5216deb170 100644
--- a/htdocs/ecm/tpl/filemanager.tpl.php
+++ b/htdocs/ecm/tpl/filemanager.tpl.php
@@ -57,8 +57,8 @@ else
}
if ($module == 'ecm')
{
- $url=((! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))?'#':($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module?'&module='.$module:'').($section?'§ion='.$section:'')));
- print '';
+ $tmpurl=((! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))?'#':($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module?'&module='.$module:'').($section?'§ion='.$section:'')));
+ print '';
print '
-
-
-
-
-
-';
print '';
}
@@ -150,7 +150,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
print '';
$mode='noajax';
- $url=DOL_URL_ROOT.'/ecm/index.php';
+ if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php';
include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirtree.php';
print ' ';
@@ -173,7 +173,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
$mode='noajax';
-$url=DOL_URL_ROOT.'/ecm/index.php';
+if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php';
include_once DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php';
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 79eca309e59..b3f1116d50c 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -52,7 +52,6 @@ $pageid=GETPOST('pageid', 'int');
$pageref=GETPOST('pageref', 'aZ09');
$action=GETPOST('action','alpha');
-
if (GETPOST('delete')) { $action='delete'; }
if (GETPOST('preview')) $action='preview';
if (GETPOST('createsite')) { $action='createsite'; }
@@ -67,6 +66,18 @@ if (GETPOST('editcontent')) { $action='editcontent'; }
if (GETPOST('createfromclone')) { $action='createfromclone'; }
if (GETPOST('createpagefromclone')) { $action='createpagefromclone'; }
+// Load variable for pagination
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
+$sortfield = GETPOST("sortfield",'alpha');
+$sortorder = GETPOST("sortorder",'alpha');
+$page = GETPOST("page",'int');
+if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+//if (! $sortfield) $sortfield='name';
+//if (! $sortorder) $sortorder='ASC';
+
if (empty($action)) $action='preview';
$object=new Website($db);
@@ -111,7 +122,6 @@ $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain
//$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current
-
/*
* Actions
*/
@@ -1792,6 +1802,7 @@ if ($action == 'file_manager')
//print ''.$langs->trans("FeatureNotYetAvailable").'';
$module = 'medias';
+ if (empty($url)) $url=DOL_URL_ROOT.'/website/index.php';
include DOL_DOCUMENT_ROOT.'/ecm/tpl/filemanager.tpl.php';
}
| ||||||||||||||||||||||