#16 [Module] add: change picto

Evarisk · Nov 2, 2022 · 656c5d2 · 656c5d2
1 parent 0d5c2ed
commit 656c5d2
Show file tree

Hide file tree

Showing 37 changed files with 166 additions and 135 deletions.
diff --git a/admin/about.php b/admin/about.php
@@ -66,11 +66,11 @@
 // Subheader
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1'.'">'.$langs->trans("BackToModuleList").'</a>';
 
-print load_fiche_titre($title, $linkback, 'object_dolisirh@dolisirh');
+print load_fiche_titre($title, $linkback, 'dolisirh_red@dolisirh');
 
 // Configuration header
 $head = dolisirhAdminPrepareHead();
-print dol_get_fiche_head($head, 'about', '', 0, 'dolisirh@dolisirh');
+print dol_get_fiche_head($head, 'about', $title, -1, 'dolisirh_red@dolisirh');
 
 print $modDoliSIRH->getDescLong();
 

diff --git a/admin/certificate.php b/admin/certificate.php
@@ -76,56 +76,109 @@
 // Subheader
 $linkback = '<a href="'.($backtopage ?: DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
 
-print load_fiche_titre($title, $linkback, 'dolisirh@dolisirh');
+print load_fiche_titre($title, $linkback, 'object_'.$certificate->picto);
 
 // Configuration header
 $head = dolisirhAdminPrepareHead();
-print dol_get_fiche_head($head, 'certificate', '', -1, "certificate@dolisirh");
+print dol_get_fiche_head($head, 'certificate', $title, -1, 'dolisirh_red@dolisirh');
 
-// Certificate
-print load_fiche_titre($langs->transnoentities("CertificateData"), '', 'object_certificate@dolisirh');
+print load_fiche_titre($pictos[$type] . $langs->trans($type), '', '', 0, $langs->trans($type));
+print '<hr>';
 
-print '<table class="noborder centpercent">';
-
-print '<tr class="liste_titre">';
-print '<td>' . $langs->transnoentities("Parameters") . '</td>';
-print '<td>' . $langs->transnoentities("Description") . '</td>';
-print '<td class="center">' . $langs->transnoentities("Status") . '</td>';
-print '</tr>';
-
-print '<tr class="oddeven"><td>';
-print $langs->trans('PrefillDate');
-print "</td><td>";
-print $langs->trans('PrefillDateDescription');
-print '</td>';
-print '<td class="center">';
-print ajax_constantonoff('DOLISIRH_TIMESHEET_PREFILL_DATE');
-print '</td>';
-print '</tr>';
+/*
+ *  Numbering module
+ */
 
-print '<tr class="oddeven"><td>';
-print $langs->trans('AddAttendantsConf');
-print "</td><td>";
-print $langs->trans('AddAttendantsDescription');
-print '</td>';
-print '<td class="center">';
-print ajax_constantonoff('DOLISIRH_TIMESHEET_ADD_ATTENDANTS');
-print '</td>';
-print '</tr>';
+print load_fiche_titre($langs->trans("DoliSIRHCertificateNumberingModule"), '', '');
 
-print '<tr class="oddeven"><td>';
-print $langs->trans('CheckDateEnd');
-print "</td><td>";
-print $langs->trans('CheckDateEndDescription');
-print '</td>';
-print '<td class="center">';
-print ajax_constantonoff('DOLISIRH_TIMESHEET_CHECK_DATE_END');
-print '</td>';
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td class="nowrap">'.$langs->trans("Example").'</td>';
+print '<td class="center">'.$langs->trans("Status").'</td>';
+print '<td class="center">'.$langs->trans("ShortInfo").'</td>';
 print '</tr>';
 
-print '</table>';
+clearstatcache();
+
+$dir = dol_buildpath("/custom/dolisirh/core/modules/dolisirh/dolisirh/certificat/");
+if (is_dir($dir)) {
+    $handle = opendir($dir);
+    if (is_resource($handle)) {
+        while (($file = readdir($handle)) !== false ) {
+            if (!is_dir($dir.$file) || (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')) {
+                $filebis = $file;
+
+                $classname = preg_replace('/\.php$/', '', $file);
+                $classname = preg_replace('/-.*$/', '', $classname);
+
+                if (!class_exists($classname) && is_readable($dir.$filebis) && (preg_match('/mod_/', $filebis) || preg_match('/mod_/', $classname)) && substr($filebis, dol_strlen($filebis) - 3, 3) == 'php') {
+                    // Charging the numbering class
+                    require_once $dir.$filebis;
+
+                    $module = new $classname($db);
+
+                    if ($module->isEnabled()) {
+                        print '<tr class="oddeven"><td>';
+                        print $langs->trans($module->name);
+                        print "</td><td>";
+                        print $module->info();
+                        print '</td>';
+
+                        // Show example of numbering module
+                        print '<td class="nowrap">';
+                        $tmp = $module->getExample();
+                        if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
+                        elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+                        else print $tmp;
+                        print '</td>';
+
+                        print '<td class="center">';
+                        $confType = 'DOLISIRH_CERTIFICATE_ADDON';
+                        if ($conf->global->$confType == $file || $conf->global->$confType.'.php' == $file) {
+                            print img_picto($langs->trans("Activated"), 'switch_on');
+                        }
+                        else {
+                            print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&value='.preg_replace('/\.php$/', '', $file).'&const='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+                        }
+                        print '</td>';
+
+                        // Example for listing risks action
+                        $htmltooltip = '' . $langs->trans("Version") . ': <b>' . $module->getVersion() . '</b><br>';
+
+                        require_once __DIR__ . '/../class/dolisirh/'.$type.'document.class.php';
+                        $classdocumentname = $type.'Document';
+                        $object_document   = new $classdocumentname($db);
+
+                        $nextval = $module->getNextValue($object_document);
+                        if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+                            $htmltooltip .= $langs->trans("NextValue").': ';
+                            if ($nextval) {
+                                if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+                                    $nextval = $langs->trans($nextval);
+                                $htmltooltip .= $nextval.'<br>';
+                            } else {
+                                $htmltooltip .= $langs->trans($module->error).'<br>';
+                            }
+                        }
+
+                        print '<td class="center">';
+                        print $form->textwithpicto('', $htmltooltip, 1, 0);
+                        if ($conf->global->$confType.'.php' == $file) { // If module is the one used, we show existing errors
+                            if (!empty($module->error)) dol_htmloutput_mesg($module->error, '', 'error', 1);
+                        }
+                        print '</td>';
+                        print "</tr>";
+                    }
+                }
+            }
+        }
+        closedir($handle);
+    }
+}
 
 // Page end
 print dol_get_fiche_end();
 llxFooter();
-$db->close();
+$db->close();
diff --git a/admin/dolisirhdocuments.php b/admin/dolisirhdocuments.php
@@ -210,11 +210,11 @@
 }
 $selectorAnchor .= '</select>';
 
-print load_fiche_titre($title, $selectorAnchor, 'dolisirh.png@dolisirh');
+print load_fiche_titre($title, $selectorAnchor, 'dolisirh_red.png@dolisirh');
 
 // Configuration header
 $head = dolisirhAdminPrepareHead();
-print dol_get_fiche_head($head, 'dolisirhdocuments', '', -1, "dolisirh@dolisirh");
+print dol_get_fiche_head($head, 'dolisirhdocuments', $title, -1, 'dolisirh_red@dolisirh');
 
 foreach ($types as $type => $documentType) {
 	print load_fiche_titre($pictos[$type] . $langs->trans($type), '', '', 0, $langs->trans($type));

diff --git a/admin/project.php b/admin/project.php
@@ -113,11 +113,11 @@
 // Subheader
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1'.'">'.$langs->trans("BackToModuleList").'</a>';
 
-print load_fiche_titre($title, $linkback, 'object_dolisirh@dolisirh');
+print load_fiche_titre($title, $linkback, 'dolisirh_red@dolisirh');
 
 // Configuration header
 $head = dolisirhAdminPrepareHead();
-print dol_get_fiche_head($head, 'projecttasks', '', -1, 'dolisirh@dolisirh');
+print dol_get_fiche_head($head, 'projecttasks', $title, -1, 'dolisirh_red@dolisirh');
 
 // Project
 print load_fiche_titre($langs->transnoentities("HRProject"), '', 'project');

diff --git a/admin/setup.php b/admin/setup.php
@@ -82,11 +82,11 @@
 // Subheader
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1'.'">'.$langs->trans("BackToModuleList").'</a>';
 
-print load_fiche_titre($title, $linkback, 'dolisirh@dolisirh');
+print load_fiche_titre($title, $linkback, "dolisirh_red@dolisirh");
 
 // Configuration header
 $head = dolisirhAdminPrepareHead();
-print dol_get_fiche_head($head, 'settings', '', -1, "dolisirh@dolisirh");
+print dol_get_fiche_head($head, 'settings', $title, -1, 'dolisirh_red@dolisirh');
 
 // Setup page goes here
 echo '<span class="opacitymedium">'.$langs->trans("DoliSIRHSetupPage").'</span><br><br>';

diff --git a/admin/timesheet.php b/admin/timesheet.php
@@ -76,11 +76,11 @@
 // Subheader
 $linkback = '<a href="'.($backtopage ?: DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
 
-print load_fiche_titre($title, $linkback, 'dolisirh@dolisirh');
+print load_fiche_titre($title, $linkback, 'object_'.$timesheet->picto);
 
 // Configuration header
 $head = dolisirhAdminPrepareHead();
-print dol_get_fiche_head($head, 'timesheet', '', -1, "timesheet@dolisirh");
+print dol_get_fiche_head($head, 'timesheet', $title, -1, 'dolisirh_red@dolisirh');
 
 //Time spent
 print load_fiche_titre($langs->transnoentities("TimeSheetData"), '', 'object_timesheet@dolisirh');

diff --git a/class/certificate.class.php b/class/certificate.class.php
@@ -721,7 +721,7 @@ public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss
 
 		$result = '';
 
-		$label = '<i class="fas fa-user-graduate"></i> <u>'.$langs->trans("Certificate").'</u>';
+		$label = '<i class="fas fa-user-graduate" style="color: #d35968;"></i> <u>'.$langs->trans("Certificate").'</u>';
 		if (isset($this->status)) {
 			$label .= ' '.$this->getLibStatut(5);
 		}
@@ -765,10 +765,9 @@ public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss
 			$linkend = '</a>';
 		}
 
-		$result .= $linkstart;
-
-		if ($withpicto) $result .= '<i class="fas fa-user-graduate"></i>' . ' ';
-		if ($withpicto != 2) {
+        if ($withpicto) $result .= '<i class="fas fa-user-graduate" style="color: #d35968;"></i>' . ' ';
+        $result .= $linkstart;
+        if ($withpicto != 2) {
 			$result .= $this->ref;
 		}
 

diff --git a/class/timesheet.class.php b/class/timesheet.class.php
@@ -569,7 +569,7 @@ public function getNomUrl(int $withpicto = 0, string $option = '', int $notoolti
 
 		$result = '';
 
-		$label = '<i class="fas fa-calendar-check"></i> <u>'.$langs->trans("TimeSheet").'</u>';
+		$label = '<i class="fas fa-calendar-check" style="color: #d35968;"></i> <u>'.$langs->trans("TimeSheet").'</u>';
 		if (isset($this->status)) {
 			$label .= ' '.$this->getLibStatut(5);
 		}
@@ -613,9 +613,8 @@ public function getNomUrl(int $withpicto = 0, string $option = '', int $notoolti
 			$linkend = '</a>';
 		}
 
-		$result .= $linkstart;
-
-		if ($withpicto) $result .= '<i class="fas fa-calendar-check"></i>' . ' ';
+		if ($withpicto) $result .= '<i class="fas fa-calendar-check" style="color: #d35968;"></i>' . ' ';
+        $result .= $linkstart;
 		if ($withpicto != 2) {
 			$result .= $this->ref;
 		}

diff --git a/core/modules/modDolisirh.class.php b/core/modules/modDolisirh.class.php
@@ -66,7 +66,7 @@ public function __construct($db)
 			'barcode' 					=> 0,
 			'models' 					=> 1,
 			'theme' 					=> 0,
-			'css' 						=> array(),
+			'css' 						=> array("/dolisirh/css/dolisirh_all.css"),
 			'js' 						=> array(),
 			'hooks' 					=> array(
 				  'data' 				=> array(
@@ -215,7 +215,7 @@ public function __construct($db)
 
 		// Main menu entries to add
 		$langs->load('dolisirh@dolisirh');
-		$pictopath = dol_buildpath('/custom/dolisirh/img/dolisirh.png.png', 1);
+		$pictopath = dol_buildpath('/custom/dolisirh/img/dolisirh_red.png', 1);
 		$pictoDoliSIRH = img_picto('', $pictopath, '', 1, 0, 0, '', 'pictoDoliSIRH');
 
 		$this->menu = array();
@@ -321,7 +321,7 @@ public function __construct($db)
 			'fk_menu'  => 'fk_mainmenu=dolisirh',
 			'type'     => 'top',
 			'titre'    => $langs->trans('DoliSIRH'),
-			'prefix'   =>  '<i class="fas fa-home pictofixedwidth"></i>  ',
+			'prefix'   =>  '<i class="fas fa-home pictofixedwidth"></i>',
 			'mainmenu' => 'dolisirh',
 			'leftmenu' => '',
 			'url'      => '/dolisirh/dolisirhindex.php',
@@ -337,7 +337,7 @@ public function __construct($db)
 			'fk_menu'  => 'fk_mainmenu=dolisirh',
 			'type'     => 'left',
 			'titre'    => $langs->trans('TimeSheet'),
-			'prefix'   => '<i class="fas fa-calendar-check pictofixedwidth"></i> ',
+			'prefix'   => '<i class="fas fa-calendar-check pictofixedwidth"></i>',
 			'mainmenu' => 'dolisirh',
 			'leftmenu' => 'timesheet',
 			'url'      => '/dolisirh/view/timesheet/timesheet_list.php',
@@ -353,7 +353,7 @@ public function __construct($db)
 			'fk_menu'  => 'fk_mainmenu=dolisirh',
 			'type'     => 'left',
 			'titre'    => $langs->trans('Certificate'),
-			'prefix'   => '<i class="fas fa-user-graduate pictofixedwidth"></i> ',
+			'prefix'   => '<i class="fas fa-user-graduate pictofixedwidth"></i>',
 			'mainmenu' => 'dolisirh',
 			'leftmenu' => 'certificate',
 			'url'      => '/dolisirh/view/certificate/certificate_list.php',
@@ -385,7 +385,7 @@ public function __construct($db)
 			'fk_menu'  => 'fk_mainmenu=dolisirh',
 			'type'     => 'left',
 			'titre'    => $langs->trans('Categories'),
-			'prefix'   => '<i class="fas fa-tags pictofixedwidth"></i>  ',
+			'prefix'   => '<i class="fas fa-tags pictofixedwidth"></i>',
 			'mainmenu' => 'dolisirh',
 			'leftmenu' => 'timesheettags',
 			'url'      => '/categories/index.php?type=timesheet',
@@ -401,7 +401,7 @@ public function __construct($db)
             'fk_menu'  => 'fk_mainmenu=dolisirh',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
             'type'     => 'left',			                // This is a Left menu entry
             'titre'    => $langs->trans('Tools'),
-            'prefix'   => '<i class="fas fa-wrench pictofixedwidth"></i>  ',
+            'prefix'   => '<i class="fas fa-wrench pictofixedwidth"></i>',
             'mainmenu' => 'dolisirh',
             'leftmenu' => 'dolisirhtools',
             'url'      => '/dolisirh/view/dolisirhtools.php',
@@ -417,7 +417,7 @@ public function __construct($db)
 			'fk_menu'  => 'fk_mainmenu=dolisirh',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'type'     => 'left',			                // This is a Left menu entry
 			'titre'    => $langs->trans('DoliSIRHConfig'),
-			'prefix'   => '<i class="fas fa-cog pictofixedwidth"></i>  ',
+			'prefix'   => '<i class="fas fa-cog pictofixedwidth"></i>',
 			'mainmenu' => 'dolisirh',
 			'leftmenu' => 'dolisirhconfig',
 			'url'      => '/dolisirh/admin/setup.php',
@@ -433,7 +433,7 @@ public function __construct($db)
 			'fk_menu'  => 'fk_mainmenu=dolisirh',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'type'     => 'left',			                // This is a Left menu entry
 			'titre'    => $langs->transnoentities('MinimizeMenu'),
-			'prefix'   => '<i class="fas fa-chevron-circle-left pictofixedwidth"></i> ',
+			'prefix'   => '<i class="fas fa-chevron-circle-left pictofixedwidth"></i>',
 			'mainmenu' => 'dolisirh',
 			'leftmenu' => '',
 			'url'      => '',

diff --git a/css/dolisirh.css b/css/dolisirh.css
@@ -2695,8 +2695,4 @@
   td > .riskassessment-task-container {
     min-width: 0;
   }
-}
-.imgTabTitle {
-  max-height: 32px;
-  vertical-align: middle;
-}
+}
diff --git a/css/dolisirh.min.css b/css/dolisirh.min.css
diff --git a/css/dolisirh_all.css b/css/dolisirh_all.css
@@ -0,0 +1,7 @@
+div.mainmenu.dolisirh {
+    background-image: none;
+}
+
+div.mainmenu.dolisirh::before {
+    content: "\f2c2";
+}
diff --git a/css/scss/style.scss b/css/scss/style.scss
@@ -6,9 +6,4 @@
 @import "table/table";
 @import "modal/modal";
 
-@import "responsive/responsive";
-
-.imgTabTitle {
-  max-height: 32px;
-  vertical-align: middle;
-}
+@import "responsive/responsive";
diff --git a/dolisirhindex.php b/dolisirhindex.php
@@ -71,7 +71,7 @@
 
 llxHeader('', $title . ' ' . $dolisirh->version, $help_url, '', 0, 0, $morejs, $morecss);
 
-print load_fiche_titre($title . ' ' . $dolisirh->version, '', 'dolisirh.png@dolisirh');
+print load_fiche_titre($title . ' ' . $dolisirh->version, '', 'dolisirh_red.png@dolisirh');
 
 // End of page
 llxFooter();

diff --git a/img/dolisirh.png b/img/dolisirh.png
diff --git a/img/dolisirh32px.png b/img/dolisirh32px.png
diff --git a/img/dolisirh_red.png b/img/dolisirh_red.png
diff --git a/img/object_certificate.png b/img/object_certificate.png
diff --git a/img/object_certificate_small.png b/img/object_certificate_small.png
diff --git a/img/object_dolisirh.png b/img/object_dolisirh.png
diff --git a/img/object_dolisirh256px.png b/img/object_dolisirh256px.png
diff --git a/img/object_dolisirh_red.png b/img/object_dolisirh_red.png
diff --git a/img/object_timesheet.png b/img/object_timesheet.png
diff --git a/img/object_timesheet_small.png b/img/object_timesheet_small.png