diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php index a9f36965ca1..ebe0549a902 100644 --- a/htdocs/admin/system/about.php +++ b/htdocs/admin/system/about.php @@ -62,7 +62,7 @@ print load_fiche_titre($langs->trans("ExternalResources"), '', 'title_setup'); print '
'; print '
'; -print '
'.img_picto_common('', 'dolibarr_box.png', 'height="100"').'
'; +print '
'.img_picto_common('', 'dolibarr_box.png', 'height="100"').'
'; print $langs->trans("DolibarrLicense").' : '; print '
  • '; print 'GNU-GPL v3+
  • '; diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index 162151102e2..fa1b2fc64e1 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -342,6 +342,7 @@ if ($mode == 'overwrite') { print img_info().' '.$langs->trans("SomeTranslationAreUncomplete"); $urlwikitranslatordoc = 'https://wiki.dolibarr.org/index.php/Translator_documentation'; print ' ('.str_replace('{s1}', ''.$langs->trans("Here").'', $langs->trans("SeeAlso", '{s1}')).')
    '; + print '
    '; print $langs->trans("TranslationOverwriteDesc", $langs->transnoentitiesnoconv("Language"), $langs->transnoentitiesnoconv("TranslationKey"), $langs->transnoentitiesnoconv("NewTranslationStringToShow"))."\n"; print ' ('.$langs->trans("TranslationOverwriteDesc2").').'."
    \n"; print '
'; @@ -511,7 +512,7 @@ if ($mode == 'searchkey') { print '
'; print ''; - print ''."\n"; diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 835120bd922..9486244ce93 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -1191,6 +1191,7 @@ function get_left_menu_home($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = $newmenu->add('/admin/system/modules.php?mainmenu=home&leftmenu=admintools_info', $langs->trans('Modules'), 2); $newmenu->add('/admin/triggers.php?mainmenu=home&leftmenu=admintools_info', $langs->trans('Triggers'), 2); $newmenu->add('/admin/system/filecheck.php?mainmenu=home&leftmenu=admintools_info', $langs->trans('FileCheck'), 2); + $newmenu->add('/admin/system/about.php?mainmenu=home&leftmenu=admintools_info', $langs->trans('ExternalResources'), 2); } $newmenu->add('/admin/system/browser.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoBrowser'), 1); $newmenu->add('/admin/system/os.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoOS'), 1); @@ -1205,7 +1206,6 @@ function get_left_menu_home($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = $newmenu->add("/admin/tools/dolibarr_import.php?mainmenu=home&leftmenu=admintools", $langs->trans("Restore"), 1); $newmenu->add("/admin/tools/update.php?mainmenu=home&leftmenu=admintools", $langs->trans("MenuUpgrade"), 1); $newmenu->add("/admin/tools/purge.php?mainmenu=home&leftmenu=admintools", $langs->trans("Purge"), 1); - $newmenu->add('/admin/system/about.php?mainmenu=home&leftmenu=admintools', $langs->trans('ExternalResources'), 1); if (isModEnabled('product') || isModEnabled('service')) { $langs->load("products"); diff --git a/htdocs/core/modules/printing/printipp.modules.php b/htdocs/core/modules/printing/printipp.modules.php index 453aa32157a..88dd5f7efbb 100644 --- a/htdocs/core/modules/printing/printipp.modules.php +++ b/htdocs/core/modules/printing/printipp.modules.php @@ -291,7 +291,8 @@ class printing_printipp extends PrintingDriver */ public function listJobs($module = null) { - global $conf; + global $langs; + $error = 0; $html = ''; include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php'; @@ -304,7 +305,8 @@ class printing_printipp extends PrintingDriver $ipp->setAuthentication($this->user, $this->password); } // select printer uri for module order, propal,... - $sql = "SELECT rowid,printer_uri,printer_name FROM ".MAIN_DB_PREFIX."printer_ipp WHERE module = '".$this->db->escape((string) $module)."'"; + $sql = "SELECT rowid, printer_uri, printer_name"; + $sql .= " FROM ".MAIN_DB_PREFIX."printer_ipp WHERE module = '".$this->db->escape((string) $module)."'"; $result = $this->db->query($sql); if ($result) { $obj = $this->db->fetch_object($result); @@ -324,22 +326,27 @@ class printing_printipp extends PrintingDriver } $html .= '
'; + print '
'; //print $formadmin->select_language($langcode,'langcode',0,null,$langs->trans("All"),0,0,'',1); print $formadmin->select_language($langcode, 'langcode', 0, array(), 0, 0, 0, 'maxwidth250', 1); print '
'; $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; - $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; $html .= ''."\n"; + $jobs = $ipp->jobs_attributes; - //$html .= '
'.print_r($jobs,true).'
'; + //$html .= '
'.print_r($jobs, true).'
'; + foreach ($jobs as $value) { $html .= ''; $html .= ''; + $html .= ''; $html .= ''; - $html .= ''; - $html .= ''; + $html .= ''; + $file = $value->job_name->_value0; + $html .= ''; $html .= ''; $html .= ''; $html .= ''; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 1b54d8af1b8..9da7dab5d9a 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -89,6 +89,8 @@ $leftmenuwidth = 240; @phan-var-force array{h:int,l:int,s:int,a:int} $colortextlinkHsla '; +$borderradius = getDolGlobalString('THEME_ELDY_USEBORDERONTABLE') ? getDolGlobalInt('THEME_ELDY_BORDER_RADIUS', 6) : 0; + ?> /*
IdOwnerPrinterFileStatusCancelID'.$langs->trans("Date").''.$langs->trans("Owner").''.$langs->trans("Printer").''.$langs->trans("File").''.$langs->trans("Status").'Job URI
'.$value->job_id->_value0.''.$value->date_time_at_creation->_value0.''.$value->job_originating_user_name->_value0.''.$value->printer_uri->_value0.''.$value->job_name->_value0.''.$value->job_printer_uri->_value0.''.dolPrintHTML($file).''.$value->job_state->_value0.''.$value->job_uri->_value0.'