Skip to content

Commit

Permalink
Merge pull request #352 from nicolas-eoxia/clean_img_files
Browse files Browse the repository at this point in the history
#346 [IMG] clean: change name img
  • Loading branch information
nicolas-eoxia authored Jul 7, 2023
2 parents a162556 + e4a6480 commit bcb07af
Show file tree
Hide file tree
Showing 13 changed files with 16 additions and 10 deletions.
4 changes: 2 additions & 2 deletions admin/project.php
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,11 @@
llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss);

// Subheader
print load_fiche_titre($title, '', 'dolisirh_red@dolisirh');
print load_fiche_titre($title, '', 'dolisirh_color@dolisirh');

// Configuration header
$head = dolisirhAdminPrepareHead();
print dol_get_fiche_head($head, 'projecttasks', $title, -1, 'dolisirh_red@dolisirh');
print dol_get_fiche_head($head, 'projecttasks', $title, -1, 'dolisirh_color@dolisirh');

// Project
print load_fiche_titre($langs->transnoentities("HRProject"), '', 'project');
Expand Down
4 changes: 2 additions & 2 deletions admin/setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -285,11 +285,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_red@dolisirh");
print load_fiche_titre($title, $linkback, "dolisirh_color@dolisirh");

// Configuration header
$head = dolisirhAdminPrepareHead();
print dol_get_fiche_head($head, 'settings', $title, -1, 'dolisirh_red@dolisirh');
print dol_get_fiche_head($head, 'settings', $title, -1, 'dolisirh_color@dolisirh');

// Setup page goes here
echo '<span class="opacitymedium">'.$langs->trans("DoliSIRHSetupPage").'</span><br><br>';
Expand Down
2 changes: 1 addition & 1 deletion admin/timesheet.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@

// Configuration header
$head = dolisirhAdminPrepareHead();
print dol_get_fiche_head($head, 'timesheet', $title, -1, 'dolisirh_red@dolisirh');
print dol_get_fiche_head($head, 'timesheet', $title, -1, 'dolisirh_color@dolisirh');

print load_fiche_titre($langs->trans("TimeSheetManagement"), '', 'object_'.$object->picto);
print '<hr>';
Expand Down
2 changes: 1 addition & 1 deletion class/actions_dolisirh.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ function getDiffTimestampEvent() {
<?php }

if ($parameters['currentcontext'] == 'userihm') {
$pictopath = dol_buildpath('/custom/dolisirh/img/dolisirh_red.png', 1);
$pictopath = dol_buildpath('/custom/dolisirh/img/dolisirh_color.png', 1);
$picto = img_picto('', $pictopath, '', 1, 0, 0, '', 'pictoModule');

$out = '<tr class="oddeven"><td>' . $picto . $langs->trans('TimeSpentDatasetOrder') . '</td>';
Expand Down
6 changes: 3 additions & 3 deletions core/modules/modDoliSIRH.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function __construct($db)
$this->editor_url = 'https://evarisk.com';
$this->version = '1.3.1';
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
$this->picto = 'dolisirh_red@dolisirh';
$this->picto = 'dolisirh_color@dolisirh';

$this->module_parts = array(
'triggers' => 1,
Expand Down Expand Up @@ -164,8 +164,8 @@ public function __construct($db)
}

$this->tabs = array();
$pictopath = dol_buildpath('/custom/dolisirh/img/dolisirh_red.png', 1);
$pictoDoliSIRH = img_picto('', $pictopath, '', 1, 0, 0, '', 'pictoDoliSIRH');
$pictopath = dol_buildpath('/custom/dolisirh/img/dolisirh_color.png', 1);
$pictoDoliSIRH = img_picto('', $pictopath, '', 1, 0, 0, '', 'pictoModule');
$this->tabs[] = array('data' => 'user:+workinghours:' . $pictoDoliSIRH . $langs->trans('WorkingHours') . ':dolisirh@dolisirh:$user->rights->user->self->creer:/custom/dolisirh/view/workinghours_card.php?id=__ID__'); // To add a new tab identified by code tabname1

$this->dictionaries = array();
Expand Down
2 changes: 2 additions & 0 deletions documents/temp/index.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?php
//Silence is golden
6 changes: 5 additions & 1 deletion dolisirhindex.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,8 @@
$morehtmlright .= ' ' . img_picto($langs->trans('Filter') . ' ' . $langs->trans('User'), 'user', 'class="paddingright pictofixedwidth"') . $form->select_dolusers($userID, 'search_userid', '', null, 0, '', null, 0, 0, 0, ' AND u.employee = 1', 0, '', 'maxwidth300', 1);
$morehtmlright .= '<div class="wpeo-button button-primary button-square-30 select-dataset-dashboard-info" style="color: white !important;"><i class="button-icon fas fa-redo"></i></div>';

require_once __DIR__ . '/../saturne/core/tpl/index/index_view.tpl.php';
require_once __DIR__ . '/../saturne/core/tpl/index/index_view.tpl.php';

// End of page
llxFooter();
$db->close();
File renamed without changes
Binary file removed img/object_certificate.png
Binary file not shown.
Binary file removed img/object_certificate_small.png
Binary file not shown.
File renamed without changes
Binary file removed img/object_timesheet.png
Binary file not shown.
Binary file removed img/object_timesheet_small.png
Binary file not shown.

0 comments on commit bcb07af

Please sign in to comment.