Skip to content

Commit dd0eabe

Browse files
eldyeldy
committed
Merge branch 'master' of [email protected]:/DoliCloud/dolimods
2 parents 10dc7d8 + ac306fc commit dd0eabe

File tree

10 files changed

+43
-41
lines changed

10 files changed

+43
-41
lines changed

‎htdocs/concatpdf/admin/about.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@
5454
$help_url='';
5555
llxHeader('', '', $help_url);
5656

57-
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
57+
$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.img_picto($langs->trans("BackToModuleList"), 'back', 'class="pictofixedwidth"').'<span class="hideonsmartphone">'.$langs->trans("BackToModuleList").'</span></a>';
58+
5859
print_fiche_titre($langs->trans("ConcatPdfSetup"), $linkback, 'setup');
5960

6061
$head = array();

‎htdocs/concatpdf/admin/concatpdf.php‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,15 @@
174174
$help_url='EN:Module_Concat_PDF;FR:Module_Concat_PDF_FR;ES:Módulo_Concat_PDF';
175175
llxHeader('', 'ConcatPdf', $help_url);
176176

177-
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
177+
$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.img_picto($langs->trans("BackToModuleList"), 'back', 'class="pictofixedwidth"').'<span class="hideonsmartphone">'.$langs->trans("BackToModuleList").'</span></a>';
178+
178179
print_fiche_titre($langs->trans("ConcatPdfSetup"), $linkback, 'setup');
179180

180181
clearstatcache();
181182

182183

184+
$head = array();
185+
183186
$h=0;
184187
$head[$h][0] = $_SERVER["PHP_SELF"];
185188
$head[$h][1] = $langs->trans("Setup");
@@ -191,13 +194,9 @@
191194
$head[$h][2] = 'tababout';
192195
$h++;
193196

194-
if ((float) DOL_VERSION < 8.0) {
195-
dol_fiche_head($head, 'tabsetup', '');
196-
} else {
197-
dol_fiche_head($head, 'tabsetup', '', -1);
198-
}
197+
dol_fiche_head($head, 'tabsetup', '', -1);
199198

200-
if (! empty($conf->global->PDF_SECURITY_ENCRYPTION)) {
199+
if (getDolGlobalString('PDF_SECURITY_ENCRYPTION')) {
201200
print info_admin($langs->trans("WarningConcatPDFIsNotCompatibleWithOptionReadOnlyPDF", $langs->transnoentities("ProtectAndEncryptPdfFiles")), 0, 0, '1', 'error');
202201
}
203202

@@ -209,15 +208,15 @@
209208
}
210209

211210
// Show dir for each module
212-
print '<div class="opacitymedium">';
211+
print '<div class="opacitymedium hideonsmartphone">';
213212
print $langs->trans("ConcatPDfTakeFileFrom").'<br><br>';
214213
foreach ($modules as $module => $moduletrans) {
215214
$outputdir=$conf->concatpdf->dir_output.'/'.$module;
216215
print '* '.str_replace('{s1}', $moduletrans['picto'], $langs->trans("ConcatPDfTakeFileFrom2", '{s1}'.$langs->transnoentitiesnoconv($moduletrans['label']), $outputdir));
217216
print '<br>';
218217
}
219-
print '</div>';
220218
print '<br>';
219+
print '</div>';
221220

222221
print '<br>';
223222

@@ -240,7 +239,6 @@
240239
print '<tr class="oddeven">';
241240
print '<td>'.$langs->trans("EnableMultipleConcatenation").'</td>';
242241
print '<td align="center" width="20">&nbsp;</td>';
243-
244242
print '<td align="center" width="100">';
245243
if (! empty($conf->use_javascript_ajax)) {
246244
print ajax_constantonoff('CONCATPDF_MULTIPLE_CONCATENATION_ENABLED', '', 0);
@@ -290,7 +288,7 @@
290288
if (count($listoffiles)) {
291289
print $formfile->showdocuments('concatpdf', $module, $outputdir, $_SERVER["PHP_SELF"].'?module='.$module, 0, $user->admin, '', 0, 0, 0, 0, 0, '', $moduletrans['picto'].$langs->trans("PathDirectory").' '.$outputdir);
292290
} else {
293-
print '<div class="titre paddingbottom">'.$moduletrans['picto'].$langs->trans("PathDirectory").' '.$outputdir.' :</div>';
291+
print '<div class="titre paddingbottom wordwrap">'.$moduletrans['picto'].$langs->trans("PathDirectory").' '.$outputdir.'</div>';
294292
print '<span class="opacitymedium">'.$langs->trans("NoPDFFileFound").'</span><br>';
295293
}
296294

‎htdocs/google/admin/about.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@
5959
$help_url='';
6060
llxHeader('', '', $help_url);
6161

62-
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
62+
$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.img_picto($langs->trans("BackToModuleList"), 'back', 'class="pictofixedwidth"').'<span class="hideonsmartphone">'.$langs->trans("BackToModuleList").'</span></a>';
63+
6364
print_fiche_titre($langs->trans("GoogleSetup"), $linkback, 'setup');
6465

6566
$head=googleadmin_prepare_head();

‎htdocs/google/admin/google.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,11 @@
112112
$arrayofcss=array();
113113
llxHeader('', $langs->trans("GoogleSetup"), $help_url, '', 0, 0, $arrayofjs, $arrayofcss);
114114

115-
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
115+
$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.img_picto($langs->trans("BackToModuleList"), 'back', 'class="pictofixedwidth"').'<span class="hideonsmartphone">'.$langs->trans("BackToModuleList").'</span></a>';
116+
116117
print_fiche_titre($langs->trans("GoogleSetup"), $linkback, 'setup');
117-
print '<br>';
118118

119+
print '<br>';
119120

120121

121122
print '<form name="googleconfig" action="'.$_SERVER["PHP_SELF"].'" method="post">';

‎htdocs/google/admin/google_ad.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@
7676
$help_url='EN:Module_Google_EN|FR:Module_Google|ES:Modulo_Google';
7777
llxHeader('', $langs->trans("GoogleSetup"), $help_url);
7878

79-
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
79+
$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.img_picto($langs->trans("BackToModuleList"), 'back', 'class="pictofixedwidth"').'<span class="hideonsmartphone">'.$langs->trans("BackToModuleList").'</span></a>';
80+
8081
print_fiche_titre($langs->trans("GoogleSetup"), $linkback, 'setup');
8182

8283

‎htdocs/google/admin/google_an.php‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@
2727
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
2828
dol_include_once("/google/lib/google.lib.php");
2929

30-
if (!$user->admin) accessforbidden();
30+
$langs->loadLangs(array("google@google", "admin", "other"));
3131

32-
$langs->load("google@google");
33-
$langs->load("admin");
34-
$langs->load("other");
32+
if (!$user->admin) accessforbidden();
3533

3634
$def = array();
3735
$actiontest = GETPOST("test");
@@ -72,7 +70,8 @@
7270
$help_url='EN:Module_Google_EN|FR:Module_Google|ES:Modulo_Google';
7371
llxHeader('', $langs->trans("GoogleSetup"), $help_url);
7472

75-
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
73+
$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.img_picto($langs->trans("BackToModuleList"), 'back', 'class="pictofixedwidth"').'<span class="hideonsmartphone">'.$langs->trans("BackToModuleList").'</span></a>';
74+
7675
print_fiche_titre($langs->trans("GoogleSetup"), $linkback, 'setup');
7776

7877

@@ -93,7 +92,7 @@
9392

9493
print '<tr class="liste_titre">';
9594
print '<td>'.$langs->trans("Parameter")."</td>";
96-
print "<td>".$langs->trans("Value")."</td>";
95+
print "<td></td>";
9796
print "<td>".$langs->trans("Example")."</td>";
9897
print "</tr>";
9998
// GA id

‎htdocs/google/admin/google_calsync.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,8 @@
412412
$arrayofcss=array();
413413
llxHeader('', $langs->trans("GoogleSetup"), $help_url, '', 0, 0, $arrayofjs, $arrayofcss);
414414

415-
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
415+
$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.img_picto($langs->trans("BackToModuleList"), 'back', 'class="pictofixedwidth"').'<span class="hideonsmartphone">'.$langs->trans("BackToModuleList").'</span></a>';
416+
416417
print_fiche_titre($langs->trans("GoogleSetup"), $linkback, 'setup');
417418

418419
if (! function_exists("openssl_open")) {

‎htdocs/google/admin/google_contactsync.php‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -742,9 +742,9 @@
742742
$arrayofcss=array();
743743
llxHeader('', $langs->trans("GoogleSetup"), $help_url, '', 0, 0, $arrayofjs, $arrayofcss);
744744

745-
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
746-
print_fiche_titre($langs->trans("GoogleSetup"), $linkback, 'setup');
745+
$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.img_picto($langs->trans("BackToModuleList"), 'back', 'class="pictofixedwidth"').'<span class="hideonsmartphone">'.$langs->trans("BackToModuleList").'</span></a>';
747746

747+
print_fiche_titre($langs->trans("GoogleSetup"), $linkback, 'setup');
748748

749749
if (! function_exists("openssl_open")) {
750750
print '<br><div class="warning">Warning: PHP Module \'openssl\' is not installed</div><br>';
@@ -804,16 +804,18 @@ function initfields()
804804
//'prospectsonly'=>$langs->trans("ProspectsOnly"),
805805
'0'=>$langs->trans("No")
806806
);
807-
print $form->selectarray('GOOGLE_DUPLICATE_INTO_THIRDPARTIES', $arraytmp, getDolGlobalString('GOOGLE_DUPLICATE_INTO_THIRDPARTIES'));
808-
print '<br>';
807+
print $form->selectarray('GOOGLE_DUPLICATE_INTO_THIRDPARTIES', $arraytmp, getDolGlobalString('GOOGLE_DUPLICATE_INTO_THIRDPARTIES'), 0, 0, 0, '', 0, 0, 0, '', 'maxwidth150');
808+
print '<br><br>';
809809
}
810810
if (isModEnabled('societe')) {
811811
print img_picto('', 'contact', 'class="pictofixedwidth"').$langs->trans("GoogleEnableSyncToContacts").' ';
812-
print $form->selectyesno("GOOGLE_DUPLICATE_INTO_CONTACTS", GETPOSTISSET("GOOGLE_DUPLICATE_INTO_CONTACTS") ? GETPOST('GOOGLE_DUPLICATE_INTO_CONTACTS') : getDolGlobalString('GOOGLE_DUPLICATE_INTO_CONTACTS'), 1, false, 0, 1).'<br>';
812+
print $form->selectyesno("GOOGLE_DUPLICATE_INTO_CONTACTS", GETPOSTISSET("GOOGLE_DUPLICATE_INTO_CONTACTS") ? GETPOST('GOOGLE_DUPLICATE_INTO_CONTACTS') : getDolGlobalString('GOOGLE_DUPLICATE_INTO_CONTACTS'), 1, false, 0, 1);
813+
print '<br><br>';
813814
}
814815
if (isModEnabled('adherent')) {
815816
print img_picto('', 'member', 'class="pictofixedwidth"').$langs->trans("GoogleEnableSyncToMembers").' ';
816-
print $form->selectyesno("GOOGLE_DUPLICATE_INTO_MEMBERS", GETPOSTISSET("GOOGLE_DUPLICATE_INTO_MEMBERS") ? GETPOST("GOOGLE_DUPLICATE_INTO_MEMBERS") : getDolGlobalString('GOOGLE_DUPLICATE_INTO_MEMBERS'), 1, false, 0, 1).'<br>';
817+
print $form->selectyesno("GOOGLE_DUPLICATE_INTO_MEMBERS", GETPOSTISSET("GOOGLE_DUPLICATE_INTO_MEMBERS") ? GETPOST("GOOGLE_DUPLICATE_INTO_MEMBERS") : getDolGlobalString('GOOGLE_DUPLICATE_INTO_MEMBERS'), 1, false, 0, 1);
818+
print '<br><br>';
817819
}
818820

819821

@@ -875,8 +877,8 @@ function initfields()
875877
print '<table class="noborder centpercent">';
876878

877879
print '<tr class="liste_titre">';
878-
print '<td class="titlefieldcreate">'.$langs->trans("Parameter").' ('.$langs->trans("ParametersForGoogleAPIv3Usage", "Contact").')'."</td>";
879-
print "<td>".$langs->trans("Value")."</td>";
880+
print '<td class="titlefieldcreate" colspan="2">'.$langs->trans("Parameter").' ('.$langs->trans("ParametersForGoogleAPIv3Usage", "Contact").')'."</td>";
881+
//print "<td></td>";
880882
print "<td>".$langs->trans("Note")."</td>";
881883
print "</tr>";
882884

@@ -935,7 +937,7 @@ function initfields()
935937
// Login is in GOOGLE_CONTACT_LOGIN (only in module Google)
936938
// ID and SECRET are OAUTH_GOOGLE-CONTACT_ID and OAUTH_GOOGLE-CONTACT_SECRET so shared with OAuth module.
937939
if (!getDolGlobalString('GOOGLE_CONTACT_LOGIN') || !getDolGlobalString('OAUTH_GOOGLE-CONTACT_ID') || !getDolGlobalString('OAUTH_GOOGLE-CONTACT_SECRET')) {
938-
print $langs->trans("FillAndSaveGoogleAccount");
940+
print '<span class="opacitymedium">'.$langs->trans("FillAndSaveGoogleAccount").'</span>';
939941
} else {
940942
// https://developers.google.com/identity/protocols/OAuth2UserAgent
941943
// $completeoauthurl=$oauthurl;

‎htdocs/google/admin/google_gmaps.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@
9090
$help_url='EN:Module_Google_EN|FR:Module_Google|ES:Modulo_Google';
9191
llxHeader('', $langs->trans("GoogleSetup"), $help_url);
9292

93-
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
93+
$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.img_picto($langs->trans("BackToModuleList"), 'back', 'class="pictofixedwidth"').'<span class="hideonsmartphone">'.$langs->trans("BackToModuleList").'</span></a>';
94+
9495
print_fiche_titre($langs->trans("GoogleSetup"), $linkback, 'setup');
9596

9697

‎htdocs/google/admin/google_other.php‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@
2727
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
2828
dol_include_once("/google/lib/google.lib.php");
2929

30-
if (!$user->admin) accessforbidden();
30+
$langs->loadLangs(array("google@google", "admin", "other"));
3131

32-
$langs->load("google@google");
33-
$langs->load("admin");
34-
$langs->load("other");
32+
if (!$user->admin) accessforbidden();
3533

3634
$def = array();
3735
$actiontest = GETPOST("test");
@@ -58,7 +56,8 @@
5856
$help_url='EN:Module_Google_EN|FR:Module_Google|ES:Modulo_Google';
5957
llxHeader('', $langs->trans("GoogleSetup"), $help_url);
6058

61-
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
59+
$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.img_picto($langs->trans("BackToModuleList"), 'back', 'class="pictofixedwidth"').'<span class="hideonsmartphone">'.$langs->trans("BackToModuleList").'</span></a>';
60+
6261
print_fiche_titre($langs->trans("GoogleSetup"), $linkback, 'setup');
6362

6463

@@ -79,7 +78,7 @@
7978

8079
print '<tr class="liste_titre">';
8180
print '<td>'.$langs->trans("Parameter")."</td>";
82-
print "<td>".$langs->trans("Value")."</td>";
81+
print "<td></td>";
8382
print "<td>".$langs->trans("Example")."</td>";
8483
print "</tr>";
8584

@@ -105,8 +104,6 @@
105104
print "</form>\n";
106105

107106

108-
dol_htmloutput_mesg($mesg);
109-
110107
llxFooter();
111108

112109
$db->close();

0 commit comments

Comments
 (0)