Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP on upload page

Browse Source
This commit is contained in:
Laurent Destailleur 2024-10-13 14:29:02 +02:00
parent 611cd80255
commit 0f8b694d3f
4 changed files with 47 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/upload_page.php
View File

@ -107,7 +107,7 @@ $hookmanager->initHooks(array('uploadform'));
$uploadform = '';
$uploadform = '<div class="flex">';
$uploadform = '<div class="display-flex">';
$langs->load("bills");
$uploadform .= '
@ -154,7 +154,7 @@ print '<input type="hidden" name="action" value="uploadfile">';
print '<div class="center"><div class="center" style="padding: 30px;">';
print '<style>.menu_titre { padding-top: 7px; }</style>';
print '<div id="blockvmenusearch" class="tagtable center searchpage">'."\n";
print '<div id="blockupload" class="center">'."\n";
//print '<input name="filenamePDF" id="filenamePDF" type="hideobject">';
print $uploadform;

62
htdocs/main.inc.php
View File

@ -2317,8 +2317,40 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
}
}
print '<div class="login_block usedropdown">'."\n";
// Add block for tools
$toprightmenu .= '<div class="login_block_tools valignmiddle">';
$mode = -1;
$toprightmenu .= '<div class="inline-block nowrap" style="padding: 0px;">';
if (getDolGlobalString('MAIN_USE_TOP_MENU_SEARCH_DROPDOWN')) {
// Add search dropdown
$toprightmenu .= top_menu_search();
}
if (getDolGlobalString('MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN')) {
// Add the quick add object dropdown
$toprightmenu .= top_menu_quickadd();
}
if (getDolGlobalString('MAIN_USE_TOP_MENU_IMPORT_FILE')) {
// Add the import file link
$toprightmenu .= top_menu_importfile();
}
// Add bookmark dropdown
$toprightmenu .= top_menu_bookmark();
$toprightmenu .= '</div>';
$toprightmenu .= '</div>'."\n"; // end div class="login_block_tools"
// Add block for other tools
$toprightmenu .= '<div class="login_block_other valignmiddle">';
// Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
@ -2447,34 +2479,6 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
$toprightmenu .= '</div>'; // end div class="login_block_other"
// Add block for tools
$toprightmenu .= '<div class="login_block_tools valignmiddle">';
$mode = -1;
$toprightmenu .= '<div class="inline-block nowrap" style="padding: 0px;">';
if (getDolGlobalString('MAIN_USE_TOP_MENU_SEARCH_DROPDOWN')) {
// Add search dropdown
$toprightmenu .= top_menu_search();
}
if (getDolGlobalString('MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN')) {
// Add the quick add object dropdown
$toprightmenu .= top_menu_quickadd();
}
if (getDolGlobalString('MAIN_USE_TOP_MENU_IMPORT_FILE')) {
// Add the import file link
$toprightmenu .= top_menu_importfile();
}
// Add bookmark dropdown
$toprightmenu .= top_menu_bookmark();
$toprightmenu .= '</div>';
$toprightmenu .= '</div>'."\n";
// Add block for user photo and name
$toprightmenu .= '<div class="login_block_user">';
@ -2908,7 +2912,7 @@ function top_menu_importfile()
if (!empty($conf->use_javascript_ajax)) {
$html .= '<!-- div for upload file link -->
<div id="topmenu-uploadfile-dropdown" class="atoplogin dropdown inline-block">
<a accesskey="u" class="dropdown-togglex login-dropdown-a nofocusvisible" data-toggle="dropdown" href="'.DOL_URL_ROOT.'/core/upload_page.php" title="'.$langs->trans('UploadFile').' ('.$stringforfirstkey.' a)"><i class="fa fa-upload"></i></a>
<a accesskey="u" class="dropdown-togglex login-dropdown-a nofocusvisible" data-toggle="dropdown" href="'.DOL_URL_ROOT.'/core/upload_page.php" title="'.$langs->trans('UploadFile').' ('.$stringforfirstkey.' u)"><i class="fa fa-upload"></i></a>
</div>';
}

16
htdocs/theme/eldy/global.inc.php
View File

@ -1765,7 +1765,7 @@ div.ticketpublicarealist>form>div.div-table-responsive {
.display-flex {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
justify-content: space-between;
}
.flex-item {
flex:1;
@ -1774,7 +1774,7 @@ div.ticketpublicarealist>form>div.div-table-responsive {
border: 2px solid #888;
border-radius: 5px;
cursor: pointer;
tet-align: center;
text-align: center;
min-height: 40px;
background: #eee;
padding: 20px 10px 20px 10px;
@ -3380,10 +3380,11 @@ div.login a:hover {
.login_block_elem a span.atoplogin, .login_block_elem span.atoplogin {
vertical-align: middle;
}
div.login_block_tools, div.login_block_user {
div.login_block_tools {
margin-<?php echo $right ?>: 8px;
display: inline-block;
vertical-align: middle;
line-height: <?php echo $disableimages ? '25' : '51'; ?>px;
line-height: <?php echo $disableimages ? '25' : '53'; ?>px;
height: <?php echo $disableimages ? '25' : '51'; ?>px;
}
div.login_block_other {
@ -3392,9 +3393,14 @@ div.login_block_other {
clear: <?php echo $disableimages ? 'none' : 'both'; ?>;
padding-top: 0;
text-align: <?php echo $right ?>;
margin-<?php echo $right ?>: 8px;
max-width: 200px;
}
div.login_block_user {
display: inline-block;
vertical-align: middle;
line-height: <?php echo $disableimages ? '25' : '51'; ?>px;
height: <?php echo $disableimages ? '25' : '51'; ?>px;
}
.login_block_elem {
float: <?php echo $right ?>;

2
htdocs/theme/md/style.css.php
View File

@ -1964,7 +1964,7 @@ div.ticketpublicarealist>form>div.div-table-responsive {
border: 2px solid #888;
border-radius: 5px;
cursor: pointer;
tet-align: center;
text-align: center;
min-height: 40px;
background: #eee;
padding: 20px 10px 20px 10px;