diff --git a/apps/maarch_entreprise/Views/signature-book.component.html b/apps/maarch_entreprise/Views/signature-book.component.html index ecf2da7fb43925fb2e051f951295f8e73926bc73..093543fa5e241f5c0313f537b594cafacd01bd7c 100755 --- a/apps/maarch_entreprise/Views/signature-book.component.html +++ b/apps/maarch_entreprise/Views/signature-book.component.html @@ -13,10 +13,10 @@ </i> </div> <div title="{{signatureBook.lang.visaWorkflow}}" class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 3}" (click)="changeSignatureBookLeftContent(3)"> - <i class="fa fa-certificate fa-2x"></i> + <i class="fa fa-list-ol fa-2x"></i> </div> <div title="{{signatureBook.lang.progression}}" class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 4}" (click)="changeSignatureBookLeftContent(4)"> - <i class="fa fa-line-chart fa-2x"></i> + <i class="fa fa-history fa-2x"></i> </div> <div title="{{signatureBook.lang.links}}" class="item" [ngClass]="{'activeTabSignatureBook': headerTab == 5}" (click)="changeSignatureBookLeftContent(5)"> <i class="fa fa-link fa-2x"></i> diff --git a/apps/maarch_entreprise/actions/process.php b/apps/maarch_entreprise/actions/process.php index bd5edf92b41cce98cb5393075817f57ecfabe890..1bd89dbf3f272d162a3eea05e34a73e7f7591ede 100755 --- a/apps/maarch_entreprise/actions/process.php +++ b/apps/maarch_entreprise/actions/process.php @@ -293,7 +293,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module $frm_str .= '<input type="hidden" name="' . $key . '" id="' . $key . '" value="' . $data[$key]['show_value'] . '" readonly="readonly" class="readonly" style="border:none;" />'; - + $frm_str .= '<div onClick="$(\'return_previsualise\').style.display=\'none\';" id="return_previsualise" style="cursor: pointer; display: none; border-radius: 10px; box-shadow: 10px 10px 15px rgba(0, 0, 0, 0.4); padding: 10px; width: auto; height: auto; position: absolute; top: 0; left: 0; z-index: 999; background-color: rgba(255, 255, 255, 0.9); border: 3px solid #459ed1;">'; $frm_str .= '<input type="hidden" id="identifierDetailFrame" value="" />'; $frm_str .= '</div>'; @@ -355,7 +355,6 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module $frm_str .= 'style="width: 200px; max-width: 150px; border: medium none; color: rgb(102, 102, 102); height: 60px;"'; $frm_str .= 'title="'.$indexes[$key]['show_value'].'" alt="'.$indexes[$key]['show_value'].'" >'.$values_fields->{$key}; $frm_str .= '</textarea>'; - $frm_str .= '</td >'; $frm_str .= '</tr>'; } @@ -517,7 +516,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module $frm_str .= '<span onclick="loadTab(\''.$res_id.'\',\''.$coll_id.'\',\''._DOC_HISTORY.'\',\''.$pathScriptTab.'\',\'history\');return false;" ' . 'onmouseover="this.style.cursor=\'pointer\';" class="categorie" style="width:90%;">'; $frm_str .= '<span id="history_tab" class="tab_module" style="color:#1C99C5;"><i class="fa fa-plus-square-o"></i></span>' - . ' <i class="fa fa-line-chart fa-2x" title="'._DOC_HISTORY.'"></i> <sup><span style="display:none;"></span></sup>'; + . ' <i class="fa fa-history fa-2x" title="'._DOC_HISTORY.'"></i> <sup><span style="display:none;"></span></sup>'; $frm_str .= '</span>'; $frm_str .= '</td>'; } @@ -574,7 +573,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module $frm_str .= '<span onclick="loadTab(\''.$res_id.'\',\''.$coll_id.'\',\''._DIFF_LIST_COPY.'\',\''.$pathScriptTab.'\',\'difflist\');return false;" ' . 'onmouseover="this.style.cursor=\'pointer\';" class="categorie" style="width:90%;">'; $frm_str .= '<span id="difflist_tab" class="tab_module" style="color:#1C99C5;"><i class="fa fa-plus-square-o"></i></span>' - . ' <i class="fa fa-gear fa-2x" title="'._DIFF_LIST_COPY.'"></i> <sup><span style="display:none;"></span></sup>'; + . ' <i class="fa fa-share-alt fa-2x" title="'._DIFF_LIST_COPY.'"></i> <sup><span style="display:none;"></span></sup>'; $frm_str .= '</span>'; $frm_str .= '</td>'; } @@ -654,7 +653,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module $frm_str .= '<span onclick="loadTab(\''.$res_id.'\',\''.$coll_id.'\',\''._VISA_WORKFLOW.'\',\''.$pathScriptTab.'\',\'visa\');return false;" ' . 'onmouseover="this.style.cursor=\'pointer\';" class="categorie" style="width:90%;">'; $frm_str .= '<span id="visa_tab" class="tab_module" style="color:#1C99C5;"><i class="fa fa-plus-square-o"></i></span><b> ' - . '<i id="visa_tab_img" class="fa fa-certificate fa-2x" title="'._VISA_WORKFLOW.'"></i><span id="visa_tab_badge"></span>'; + . '<i id="visa_tab_img" class="fa fa-list-ol fa-2x" title="'._VISA_WORKFLOW.'"></i><span id="visa_tab_badge"></span>'; $frm_str .= '</span>'; $frm_str .= '</td>'; @@ -677,7 +676,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module $frm_str .= '<span onclick="loadTab(\''.$res_id.'\',\''.$coll_id.'\',\''.urlencode(_AVIS_WORKFLOW).'\',\''.$pathScriptTab.'\',\'avis\');return false;" ' . 'onmouseover="this.style.cursor=\'pointer\';" class="categorie" style="width:90%;">'; $frm_str .= '<span id="avis_tab" class="tab_module" style="color:#1C99C5;"><i class="fa fa-plus-square-o"></i></span><b> ' - . '<i id="avis_tab_img" class="fa fa-check-square fa-2x" title="'._AVIS_WORKFLOW.'"></i><span id="avis_tab_badge"></span>'; + . '<i id="avis_tab_img" class="fa fa-commenting fa-2x" title="'._AVIS_WORKFLOW.'"></i><span id="avis_tab_badge"></span>'; $frm_str .= '</span>'; $frm_str .= '</td>'; diff --git a/apps/maarch_entreprise/actions/validate_mail.php b/apps/maarch_entreprise/actions/validate_mail.php index 283227c42fd262852b6816e43c9f6c39e6d2fc4b..6fd641639e1ccc7ae10f0c49807f12e8146b85fa 100755 --- a/apps/maarch_entreprise/actions/validate_mail.php +++ b/apps/maarch_entreprise/actions/validate_mail.php @@ -1136,7 +1136,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module $frm_str .= '<span onclick="loadTab(\''.$res_id.'\',\''.$coll_id.'\',\''._DOC_HISTORY.'\',\''.$pathScriptTab.'\',\'history\');return false;" ' . 'onmouseover="this.style.cursor=\'pointer\';" class="categorie" style="width:90%;">'; $frm_str .= '<span id="history_tab" class="tab_module" style="color:#1C99C5;"><i class="fa fa-plus-square-o"></i></span>'; - $frm_str .= ' <i class="fa fa-line-chart fa-2x" title="'. _DOC_HISTORY.'"></i><sup><span style="display:none;"></span></sup>'; + $frm_str .= ' <i class="fa fa-history fa-2x" title="'. _DOC_HISTORY.'"></i><sup><span style="display:none;"></span></sup>'; $frm_str .= '</span>'; $frm_str .= '</td>'; } @@ -1189,7 +1189,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module $frm_str .= '<span class="diff_list_history" style="width: 90%; cursor: pointer;" onmouseover="this.style.cursor=\'pointer\';" onclick="loadTab(\''.$res_id.'\',\''.$coll_id.'\',\''._DIFF_LIST_HISTORY.'\',\''.$pathScriptTab.'\',\'difflistHistory\');return false;">'; $frm_str .= '<span id="difflistHistory_tab" class="tab_module" style="color:#1C99C5;"><i class="fa fa-plus-square-o"></i></span>'; - $frm_str .= '<b> <i class="fa fa-history fa-2x" title="'. _DIFF_LIST_HISTORY.'"></i><sup><span style="display:none;"></span></sup></b>'; + $frm_str .= '<b> <i class="fa fa-share-alt fa-2x" title="'. _DIFF_LIST_HISTORY.'"></i><sup><span style="display:none;"></span></sup></b>'; $frm_str .= '</span>'; $frm_str .= '</td>'; } diff --git a/apps/maarch_entreprise/indexing_searching/details.php b/apps/maarch_entreprise/indexing_searching/details.php index a41c0f0716ca77cee77a7c2403e5811ab23b8eb2..3093efd2c95b2c4fa6e394382d274331bec98ba4 100755 --- a/apps/maarch_entreprise/indexing_searching/details.php +++ b/apps/maarch_entreprise/indexing_searching/details.php @@ -608,7 +608,7 @@ if ((!empty($_SESSION['error']) && ! ($_SESSION['indexation'] )) ) if ($core->is_module_loaded('visa')) { $pathScriptTab = 'index.php?display=true&page=show_visa_tab&module=visa&resId='.$s_id.'&collId='.$coll_id.'&destination='.$destination.'&fromDetail=true'; - $uniqueString .= '<div id="visa_tab" class="fa fa-retweet DetailsTabFunc " style="font-size:2em;padding-left: 15px;'; + $uniqueString .= '<div id="visa_tab" class="fa fa-list-ol DetailsTabFunc " style="font-size:2em;padding-left: 15px;'; $uniqueString .='padding-right: 15px;" title="'._VISA_WORKFLOW.'" onclick="loadSpecificTab(\'uniqueDetailsIframe\',\''.$pathScriptTab.'\');tabClicked(\'visa_tab\',true);"> <sup id="visa_tab_badge"></sup></div>'; //LOAD TOOLBAR BADGE $toolbarBagde_script = 'index.php?display=true&module=visa&page=load_toolbar_visa&resId='.$s_id.'&collId='.$coll_id; @@ -617,7 +617,7 @@ if ((!empty($_SESSION['error']) && ! ($_SESSION['indexation'] )) ) if ($core->is_module_loaded('avis')) { $pathScriptTab = 'index.php?display=true&page=show_avis_tab&module=avis&resId='.$s_id.'&collId='.$coll_id.'&fromDetail=true'; - $uniqueString .= '<div id="avis_tab" class="fa fa-commenting-o DetailsTabFunc " style="font-size:2em;padding-left: 15px;'; + $uniqueString .= '<div id="avis_tab" class="fa fa-commenting DetailsTabFunc " style="font-size:2em;padding-left: 15px;'; $uniqueString .= 'padding-right: 15px;" title="'._AVIS_WORKFLOW.'" onclick="loadSpecificTab(\'uniqueDetailsIframe\',\''.$pathScriptTab.'\');tabClicked(\'avis_tab\',true);"> <sup id="avis_tab_badge"></sup></div><div id="page_circuit_avis" style="overflow-x: hidden;">'; $uniqueString .= '</div>'; @@ -669,7 +669,7 @@ if ((!empty($_SESSION['error']) && ! ($_SESSION['indexation'] )) ) // $note = ''; $pathScriptTab = 'index.php?display=true&module=notes&page=notes&identifier=' . $s_id . '&origin=document&coll_id=' . $coll_id . '&load&size=full'; - $uniqueString .= '<div id="notes_tab" class="fa fa-sticky-note DetailsTabFunc" style="font-size:2em;padding-left: 15px;padding-right: 15px;" title="'. _NOTES.'" onclick="loadSpecificTab(\'uniqueDetailsIframe\',\''.$pathScriptTab.'\');;tabClicked(\'notes_tab\',true);"> <sup id="notes_tab_badge"></sup></div>'; + $uniqueString .= '<div id="notes_tab" class="fa fa-pencil DetailsTabFunc" style="font-size:2em;padding-left: 15px;padding-right: 15px;" title="'. _NOTES.'" onclick="loadSpecificTab(\'uniqueDetailsIframe\',\''.$pathScriptTab.'\');;tabClicked(\'notes_tab\',true);"> <sup id="notes_tab_badge"></sup></div>'; //LOAD TOOLBAR BADGE $toolbarBagde_script = 'index.php?display=true&module=notes&page=load_toolbar_notes&resId='.$s_id.'&collId='.$coll_id; $uniqueString .='<script>loadToolbarBadge(\'notes_tab\',\''.$toolbarBagde_script.'\');</script>'; @@ -1330,4 +1330,4 @@ if($_SESSION['indexation'] == true && $category == 'outgoing'){ $detailsExport .= "</body></html>"; $_SESSION['doc_convert'] = array(); $_SESSION['doc_convert']['details_result'] = $detailsExport; -$_SESSION['info'] = ''; \ No newline at end of file +$_SESSION['info'] = ''; diff --git a/apps/maarch_entreprise/template/documents_list_copies.html b/apps/maarch_entreprise/template/documents_list_copies.html index be077dd0b9d118036aa837f5e75d815dec501e11..242cacdb80b19ee7094a71818e1b0739690e180f 100755 --- a/apps/maarch_entreprise/template/documents_list_copies.html +++ b/apps/maarch_entreprise/template/documents_list_copies.html @@ -160,7 +160,7 @@ Mods <td style="font-size:10px;" width ="50px">##func_bool_see_multi_contacts##</td> <td style="font-size:10px;" width ="30px">##func_bool_see_notes##</td> <td style="font-size:10px;" width ="30px">##showActionFA|#defineLang|_ATTACHMENTS#|paperclip|loadRepList('#loadValue|res_id#')|#loadValue|count_attachment# == 0##</td> - <td style="font-size:10px;" width ="30px">##showActionFA|#defineLang|_WF#|gear|loadDiffList('#loadValue|res_id#')##</td> + <td style="font-size:10px;" width ="30px">##showActionFA|#defineLang|_WF#|share-alt|loadDiffList('#loadValue|res_id#')##</td> <td style="font-size:10px;" width ="30px" >##showIconDocument##</td> <td style="font-size:10px;" width ="30px" >##showIconDetails##</td> <td style="font-size:12px; color:red;" width="15px">##ifStatement|'#loadValue|viewed#'!=null|<span style="cursor:pointer;background: #FFC200;color: white;padding: 3px;border-radius: 7px;font-weight:bold;">#loadValue|viewed#</span>|##</td> diff --git a/apps/maarch_entreprise/template/documents_list_search_adv.html b/apps/maarch_entreprise/template/documents_list_search_adv.html index 97cf5799706f76306dc162e7d4f08410544fb690..34a51b45a136a760a3ed08999281b9cb66e3d461 100755 --- a/apps/maarch_entreprise/template/documents_list_search_adv.html +++ b/apps/maarch_entreprise/template/documents_list_search_adv.html @@ -152,7 +152,7 @@ Mods <td style="font-size:10px;" width ="50px">##func_bool_see_multi_contacts##</td> <td style="font-size:10px;" width ="30px">##func_bool_see_notes##</td> <td style="font-size:10px;" width ="30px">##showActionAdvResultFA|#defineLang|_ATTACHMENTS#|paperclip|loadRepList('#loadValue|res_id#', 'FT')|#loadValue|count_attachment# == 0##</td> - <td style="font-size:10px;" width ="30px">##showActionFA|#defineLang|_WF#|gear|loadDiffList('#loadValue|res_id#')##</td> + <td style="font-size:10px;" width ="30px">##showActionFA|#defineLang|_WF#|share-alt|loadDiffList('#loadValue|res_id#')##</td> <td style="font-size:10px;" width ="30px" >##ifStatement|'#loadValue|filename#'!=null|#showIconDocument#|## </td> <td style="font-size:10px;" width ="30px" >##showIconDetails##</td> </tr> diff --git a/apps/maarch_entreprise/template/documents_list_with_attachments.html b/apps/maarch_entreprise/template/documents_list_with_attachments.html index 4085a5765adc8f34f6e1ed3515d505513740c151..5e14e2aa1b444dedf34b31af3471865261233b06 100755 --- a/apps/maarch_entreprise/template/documents_list_with_attachments.html +++ b/apps/maarch_entreprise/template/documents_list_with_attachments.html @@ -155,8 +155,8 @@ Mods <td style="font-size:10px;" width ="50px">##func_bool_see_multi_contacts##</td> <td style="font-size:10px;" width ="30px">##func_bool_see_notes##</td> <td style="font-size:10px;" width ="30px">##showActionBasketsFA|#defineLang|_ATTACHMENTS#|paperclip|loadRepList('#loadValue|res_id#', 'baskets')|#loadValue|count_attachment# == 0##</td> - <td style="font-size:10px;" width ="30px">##showActionFA|#defineLang|_WF#|gear|loadDiffList('#loadValue|res_id#')##</td> - <td style="font-size:10px;" width ="30px" >##ifStatement|'#loadValue|filename#'!=null|#showIconDocument#|##</td> + <td style="font-size:10px;" width ="30px">##showActionFA|#defineLang|_WF#|share-alt|loadDiffList('#loadValue|res_id#')##</td> + <td style="font-size:10px;" width ="30px" >##ifStatement|'#loadValue|filename#'!=null|#showIconDocument#|##</td> <td style="font-size:10px;" width ="30px" >##showIconDetails##</td> </tr> </table> diff --git a/modules/avis/template/documents_list_with_avis.html b/modules/avis/template/documents_list_with_avis.html index 47e2830d526bda0a864bf603196f5c7f95f03b4a..cdc781426789da34a44e3a16bbe1ccc20315c9fc 100755 --- a/modules/avis/template/documents_list_with_avis.html +++ b/modules/avis/template/documents_list_with_avis.html @@ -155,7 +155,7 @@ Mods <td style="font-size:10px;" width ="50px">##func_bool_see_multi_contacts##</td> <td style="font-size:10px;" width ="30px">##func_bool_see_notes##</td> <td style="font-size:10px;" width ="30px">##showActionFA|#defineLang|_ATTACHMENTS#|paperclip|loadRepList('#loadValue|res_id#')|#loadValue|count_attachment# == 0##</td> - <td style="font-size:10px;" width ="30px">##showActionFA|#defineLang|_WF#|gear|loadDiffList('#loadValue|res_id#')##</td> + <td style="font-size:10px;" width ="30px">##showActionFA|#defineLang|_WF#|share-alt|loadDiffList('#loadValue|res_id#')##</td> <td style="font-size:10px;" width ="30px" >##showIconDocument##</td> <td style="font-size:10px;" width ="30px" >##showIconDetails##</td> </tr> diff --git a/modules/visa/template/documents_list_with_signatory.html b/modules/visa/template/documents_list_with_signatory.html index d0cdcb13c3cb8b204770d8e66f06ea1700b86d83..63ec35647f461ca3d7d2ac8650961d320aeb49c8 100755 --- a/modules/visa/template/documents_list_with_signatory.html +++ b/modules/visa/template/documents_list_with_signatory.html @@ -144,7 +144,7 @@ Mods <td style="font-size:10px;" width ="50px">##func_bool_see_multi_contacts##</td> <td style="font-size:10px;" width ="30px">##func_bool_see_notes##</td> <td style="font-size:10px;" width ="30px">##showActionFA|#defineLang|_ATTACHMENTS#|paperclip|loadRepList('#loadValue|res_id#')|#loadValue|count_attachment# == 0##</td> - <td style="font-size:10px;" width ="30px">##showActionFA|#defineLang|_WF#|gear|loadDiffList('#loadValue|res_id#')##</td> + <td style="font-size:10px;" width ="30px">##showActionFA|#defineLang|_WF#|share-alt|loadDiffList('#loadValue|res_id#')##</td> <td style="font-size:10px;" width ="30px" >##showIconDocument##</td> <td style="font-size:10px;" width ="30px" >##showIconDetails##</td> </tr>