Look and feel v16 of media manager

This commit is contained in:
Laurent Destailleur 2022-04-01 14:29:11 +02:00
parent a3dbcd0c27
commit 88e6c67c10
8 changed files with 131 additions and 24 deletions

View File

@ -42,8 +42,8 @@ body.FileArea
body, td, input, select body, td, input, select
{ {
font-size: 11px; /* font-size: 11px; */
font-family: 'Microsoft Sans Serif', Arial, Helvetica, Verdana, sans-serif; /* font-family: 'Microsoft Sans Serif', Arial, Helvetica, Verdana, sans-serif; */
} }
.ActualFolder .ActualFolder
@ -78,4 +78,6 @@ body, td, input, select
.fullHeight { .fullHeight {
height: 100%; height: 100%;
padding-left: 10px;
padding-right: 10px;
} }

View File

@ -25,15 +25,30 @@ require '../../connectors/php/config.php'; // This include the define('NOTOKENRE
global $Config; global $Config;
?> ?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
"http://www.w3.org/TR/html4/frameset.dtd">
<html> <html>
<head> <head>
<title><?php echo $langs->trans("MediaBrowser").' - '.$Config['UserFilesAbsolutePathRelative']; ?></title> <title><?php echo $langs->trans("MediaBrowser").' - '.$Config['UserFilesAbsolutePathRelative']; ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<?php
print '<!-- Includes CSS for Dolibarr theme -->'."\n";
// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
$themepath = dol_buildpath($conf->css, 1);
$themesubdir = '';
if (!empty($conf->modules_parts['theme'])) { // This slow down
foreach ($conf->modules_parts['theme'] as $reldir) {
if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
$themepath = dol_buildpath($reldir.$conf->css, 1);
$themesubdir = $reldir;
break;
}
}
}
//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
?>
<script type="text/javascript" src="js/fckxml.js"></script> <script type="text/javascript" src="js/fckxml.js"></script>
<script type="text/javascript"> <script type="text/javascript">
// Automatically detect the correct document.domain (#1919). // Automatically detect the correct document.domain (#1919).
@ -193,12 +208,12 @@ function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg )
</script> </script>
</head> </head>
<frameset cols="150,*" framespacing="3" border="1" style="border: 2px solid #CCCCCC;"> <frameset cols="200,*" framespacing="3" border="1" style="border: 2px solid #CCCCCC;">
<frame name="frmFolders" src="frmfolders.php" scrolling="auto" frameborder="1"> <frame name="frmFolders" src="frmfolders.php" scrolling="auto" frameborder="1">
<frameset rows="50,*,50" framespacing="0"> <frameset rows="50,*,70" framespacing="0">
<frame name="frmActualFolder" src="frmactualfolder.php" scrolling="no" frameborder="0"> <frame name="frmActualFolder" src="frmactualfolder.php" scrolling="no" frameborder="0">
<frame name="frmResourcesList" src="frmresourceslist.php" scrolling="auto" frameborder="0"> <frame name="frmResourcesList" src="frmresourceslist.php" scrolling="auto" frameborder="0">
<frameset cols="150,*,0" framespacing="0" border="0"> <frameset cols="200,*" framespacing="0" border="0">
<frame name="frmCreateFolder" src="frmcreatefolder.php" scrolling="no" frameborder="0"> <frame name="frmCreateFolder" src="frmcreatefolder.php" scrolling="no" frameborder="0">
<frame name="frmUpload" src="frmupload.php" scrolling="no" frameborder="0"> <frame name="frmUpload" src="frmupload.php" scrolling="no" frameborder="0">
<frame name="frmUploadWorker" src="javascript:void(0)" scrolling="no" frameborder="0"> <frame name="frmUploadWorker" src="javascript:void(0)" scrolling="no" frameborder="0">

View File

@ -22,6 +22,7 @@
define('NOTOKENRENEWAL', 1); // Disables token renewal define('NOTOKENRENEWAL', 1); // Disables token renewal
require '../../../../main.inc.php'; require '../../../../main.inc.php';
?> ?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!-- <!--
@ -50,6 +51,24 @@ require '../../../../main.inc.php';
<head> <head>
<title>Folder path</title> <title>Folder path</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<?php
print '<!-- Includes CSS for Dolibarr theme -->'."\n";
// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
$themepath = dol_buildpath($conf->css, 1);
$themesubdir = '';
if (!empty($conf->modules_parts['theme'])) { // This slow down
foreach ($conf->modules_parts['theme'] as $reldir) {
if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
$themepath = dol_buildpath($reldir.$conf->css, 1);
$themesubdir = $reldir;
break;
}
}
}
//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
print '<link rel="stylesheet" type="text/css" href="'.$themepath.'">'."\n";
?>
<link href="browser.css" type="text/css" rel="stylesheet"> <link href="browser.css" type="text/css" rel="stylesheet">
<script type="text/javascript"> <script type="text/javascript">
// Automatically detect the correct document.domain (#1919). // Automatically detect the correct document.domain (#1919).

View File

@ -22,6 +22,9 @@
define('NOTOKENRENEWAL', 1); // Disables token renewal define('NOTOKENRENEWAL', 1); // Disables token renewal
require '../../../../main.inc.php'; require '../../../../main.inc.php';
$langs->load("ecm");
?> ?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!-- <!--
@ -50,6 +53,24 @@ require '../../../../main.inc.php';
<head> <head>
<title>Create Folder</title> <title>Create Folder</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<?php
print '<!-- Includes CSS for Dolibarr theme -->'."\n";
// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
$themepath = dol_buildpath($conf->css, 1);
$themesubdir = '';
if (!empty($conf->modules_parts['theme'])) { // This slow down
foreach ($conf->modules_parts['theme'] as $reldir) {
if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
$themepath = dol_buildpath($reldir.$conf->css, 1);
$themesubdir = $reldir;
break;
}
}
}
//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
print '<link rel="stylesheet" type="text/css" href="'.$themepath.'">'."\n";
?>
<link href="browser.css" type="text/css" rel="stylesheet"> <link href="browser.css" type="text/css" rel="stylesheet">
<script type="text/javascript" src="js/common.js"></script> <script type="text/javascript" src="js/common.js"></script>
<script type="text/javascript"> <script type="text/javascript">
@ -123,15 +144,7 @@ window.onload = function()
<table class="fullHeight" cellSpacing="0" cellPadding="0" width="100%" border="0"> <table class="fullHeight" cellSpacing="0" cellPadding="0" width="100%" border="0">
<tr> <tr>
<td> <td>
<button type="button" style="WIDTH: 100%" onclick="CreateFolder();"> <button type="button" class="butAction" onclick="CreateFolder();"><?php echo $langs->trans("ECMNewSection"); ?></button>
<table cellSpacing="0" cellPadding="0" border="0">
<tr>
<td><?php echo img_picto_common('', 'treemenu/folder.gif', 'width="16" height="16"'); ?></td>
<td>&nbsp;</td>
<td class="nowrap">Create New Folder</td>
</tr>
</table>
</button>
</td> </td>
</tr> </tr>
</table> </table>

View File

@ -22,6 +22,7 @@
define('NOTOKENRENEWAL', 1); // Disables token renewal define('NOTOKENRENEWAL', 1); // Disables token renewal
require '../../../../main.inc.php'; require '../../../../main.inc.php';
?> ?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!-- <!--
@ -56,6 +57,24 @@ require '../../../../main.inc.php';
<title>Folders</title> <title>Folders</title>
<link href="browser.css" type="text/css" rel="stylesheet"> <link href="browser.css" type="text/css" rel="stylesheet">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<?php
print '<!-- Includes CSS for Dolibarr theme -->'."\n";
// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
$themepath = dol_buildpath($conf->css, 1);
$themesubdir = '';
if (!empty($conf->modules_parts['theme'])) { // This slow down
foreach ($conf->modules_parts['theme'] as $reldir) {
if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
$themepath = dol_buildpath($reldir.$conf->css, 1);
$themesubdir = $reldir;
break;
}
}
}
//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
print '<link rel="stylesheet" type="text/css" href="'.$themepath.'">'."\n";
?>
<script type="text/javascript" src="js/common.js"></script> <script type="text/javascript" src="js/common.js"></script>
<script type="text/javascript"> <script type="text/javascript">
@ -96,7 +115,7 @@ oListManager.AddItem = function( folderName, folderPath )
// Add the folder icon cell. // Add the folder icon cell.
var oCell = oRow.insertCell(-1); var oCell = oRow.insertCell(-1);
oCell.width = 16 ; oCell.width = 16 ;
oCell.innerHTML = sLink + '<img alt="" src="spacer.gif" width="16" height="16" border="0"><\/a>' ; oCell.innerHTML = sLink + ' <\/a>' ;
// Add the folder name cell. // Add the folder name cell.
oCell = oRow.insertCell(-1); oCell = oRow.insertCell(-1);

View File

@ -22,6 +22,7 @@
define('NOTOKENRENEWAL', 1); // Disables token renewal define('NOTOKENRENEWAL', 1); // Disables token renewal
require '../../../../main.inc.php'; require '../../../../main.inc.php';
?> ?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!-- <!--
@ -50,6 +51,24 @@ require '../../../../main.inc.php';
<head> <head>
<title>Resources</title> <title>Resources</title>
<link href="browser.css" type="text/css" rel="stylesheet"> <link href="browser.css" type="text/css" rel="stylesheet">
<?php
print '<!-- Includes CSS for Dolibarr theme -->'."\n";
// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
$themepath = dol_buildpath($conf->css, 1);
$themesubdir = '';
if (!empty($conf->modules_parts['theme'])) { // This slow down
foreach ($conf->modules_parts['theme'] as $reldir) {
if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
$themepath = dol_buildpath($reldir.$conf->css, 1);
$themesubdir = $reldir;
break;
}
}
}
//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
print '<link rel="stylesheet" type="text/css" href="'.$themepath.'">'."\n";
?>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<script type="text/javascript" src="js/common.js"></script> <script type="text/javascript" src="js/common.js"></script>
<script type="text/javascript"> <script type="text/javascript">

View File

@ -22,6 +22,7 @@
define('NOTOKENRENEWAL', 1); // Disables token renewal define('NOTOKENRENEWAL', 1); // Disables token renewal
require '../../../../main.inc.php'; require '../../../../main.inc.php';
?> ?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<!-- <!--
@ -50,6 +51,24 @@ require '../../../../main.inc.php';
<head> <head>
<title>File Upload</title> <title>File Upload</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<?php
print '<!-- Includes CSS for Dolibarr theme -->'."\n";
// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
$themepath = dol_buildpath($conf->css, 1);
$themesubdir = '';
if (!empty($conf->modules_parts['theme'])) { // This slow down
foreach ($conf->modules_parts['theme'] as $reldir) {
if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
$themepath = dol_buildpath($reldir.$conf->css, 1);
$themesubdir = $reldir;
break;
}
}
}
//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
print '<link rel="stylesheet" type="text/css" href="'.$themepath.'">'."\n";
?>
<link href="browser.css" type="text/css" rel="stylesheet" > <link href="browser.css" type="text/css" rel="stylesheet" >
<script type="text/javascript" src="js/common.js"></script> <script type="text/javascript" src="js/common.js"></script>
<script type="text/javascript"> <script type="text/javascript">
@ -128,14 +147,15 @@ window.onload = function()
<input type="hidden" name="token" value="<?php echo newToken(); ?>" /> <input type="hidden" name="token" value="<?php echo newToken(); ?>" />
<table class="fullHeight" cellspacing="0" cellpadding="0" width="100%" border="0"> <table class="fullHeight" cellspacing="0" cellpadding="0" width="100%" border="0">
<tr> <tr>
<td class="nowrap"> <td class="nowrap valignmiddle">
<span id="eUploadMessage">Upload a new file in this folder</span><br> <table width="100%" class="inline-block valignmiddle">
<table cellspacing="0" cellpadding="0" width="100%" border="0">
<tr> <tr>
<td width="100%"><input id="NewFile" name="NewFile" style="WIDTH: 100%" type="file"></td> <td><input id="NewFile" name="NewFile" type="file"></td>
<td class="nowrap">&nbsp;<input id="btnUpload" type="submit" value="Upload"></td> <td class="nowrap">&nbsp;<input id="btnUpload" type="submit" value="Upload" class="flat button"></td>
</tr> </tr>
</table> </table>
<!-- Section for upload result message -->
<span id="eUploadMessage"></span><br>
</td> </td>
</tr> </tr>
</table> </table>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 B