首頁 探索 說明
登入
iProspective
/
dolibarr
3
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

FIX #yogosha11774

Laurent Destailleur 2 年之前
父節點
3e6e4cc428
當前提交
d4acad4a7a
共有 3 個文件被更改，包括 45 次插入 和 22 次删除
分割檢視 顯示文件統計
  1. 5 1
      htdocs/install/default.css
  2. 1 0
      htdocs/support/inc.php
  3. 39 21
      htdocs/support/index.php

+ 5 - 1
htdocs/install/default.css
查看文件 

@@ -129,6 +129,10 @@ a.button.runupgrade {
 
     padding: 10px;
 
 }
 
 
+tr.title.tablesupport-title {
 
+    height: 100px;
 
+}
 
+
 
 /* Force values for small screen 570 */
 
 @media only screen and (max-width: 570px)
 
 {
 
@@ -464,7 +468,7 @@ table.login.tablesupport .title {
 
 }
 
 
 table.tablesupport {
 
-	min-height: 250px;
 
+	min-height: 300px;
 
 	border: 1px solid #E0E0E0;
 
     background: #FFF;
 
 }

+ 1 - 0
htdocs/support/inc.php
查看文件 

@@ -236,6 +236,7 @@ function pHeader($soutitre, $next, $action = 'none')
 
 	// On force contenu dans format sortie
 
 	header("Content-type: text/html; charset=".$conf->file->character_set_client);
 
 	header("X-Content-Type-Options: nosniff");
 
+	header("X-Frame-Options: SAMEORIGIN"); // Frames allowed only if on same domain (stop some XSS attacks)
 
 
 	print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">'."\n";
 
 	print '<head>'."\n";

+ 39 - 21
htdocs/support/index.php
查看文件 

@@ -77,17 +77,22 @@ print '<div style="width: 100%; text-align: center"><div class="inline-block blo
 
 print "\n";
 
 
 // Forum/wiki support
 
-print '<table class="login tablesupport" width="100%">';
 
-print '<tr class="title" valign="top">';
 
+print '<table class="login tablesupport" width="100%" style="margin-top: 20px">';
 
+print '<tr class="title tablesupport-title" valign="top">';
 
 print '<td width="100%" align="left" valign="middle">';
 
 
-print '<table summary="who"><tr><td>'.img_picto('', 'who.png', 'class="valignmiddle"', 1).'</td><td>';
 
+print '<table summary="who"><tr><td>'.img_picto('', 'who.png', 'class="valignmiddle paddingright"', 1).'</td><td>';
 
 
 print '<span style="'.$style1.'">'.$langs->trans("CommunitySupport").'</span>';
 
 print '<span class="small">';
 
-print '<br><span class="opacitymedium">'.$langs->trans("TypeOfSupport").':</span> <span style="'.$style2.'">'.$langs->trans("TypeSupportCommunauty").'</span>';
 
-print '<br><span class="opacitymedium">'.$langs->trans("TypeOfHelp").'/'.$langs->trans("Efficiency").'/'.$langs->trans("Price").':</span> ';
 
-print $langs->trans("TypeHelpDev").'/'.img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1).'/'.img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1);
 
+print '<br><span class="opacitymedium">'.$langs->trans("TypeOfSupport").':</span> ';
 
+print '<span style="'.$style2.'">'.$langs->trans("TypeSupportCommunauty").'</span>';
 
+print '<br><span class="opacitymedium">'.$langs->trans("TypeOfHelp").':</span> ';
 
+print $langs->trans("TypeHelpDev");
 
+print '<br><span class="opacitymedium">'.$langs->trans("Efficiency").':</span> ';
 
+print img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1);
 
+print '<br><span class="opacitymedium">'.$langs->trans("Price").':</span> ';
 
+print img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1);
 
 print '</span>';
 
 
 print '</td></tr></table>';
 
@@ -109,6 +114,7 @@ if (preg_match('/es/i', $langs->defaultlang)) {
 
 if (preg_match('/de/i', $langs->defaultlang)) {
 
 	$urlwiki = 'https://wiki.dolibarr.org/index.php/Hauptseite';
 
 }
 
+print '<div class="wordbreak">';
 
 print '<br>'.$langs->trans("ForDocumentationSeeWiki", $urlwiki, $urlwiki);
 
 print '<br>';
 
 $urlforum = 'https://www.dolibarr.org/forum/';
 
@@ -132,6 +138,7 @@ print '<br>'.$langs->trans("ForAnswersSeeForum", $urlforumlocal, $urlforumlocal)
 
 if ($urlforumlocal != $urlforum) {
 
 	print '<b><a href="'.$urlforum.'">'.$urlforum.'</a></b>';
 
 }
 
+print '</div>';
 
 print '</td></tr></table>';
 
 print '</td>';
 
 print '</tr>';
 
@@ -141,17 +148,22 @@ print "\n";
 
 print '</div><div class="inline-block blocksupport">';
 
 
 // EMail support
 
-print '<table class="login tablesupport" width="100%">';
 
-print '<tr class="title" valign="top">';
 
+print '<table class="login tablesupport" width="100%" style="margin-top: 20px">';
 
+print '<tr class="title tablesupport-title" valign="top">';
 
 print '<td width="100%" align="left" valign="middle">';
 
 
-print '<table summary="mail"><tr><td>'.img_picto('', 'mail.png', 'class="valignmiddle"', 1).'</td><td>';
 
+print '<table summary="mail"><tr><td>'.img_picto('', 'mail.png', 'class="valignmiddle paddingright"', 1).'</td><td>';
 
 
 print '<span style="'.$style1.'">'.$langs->trans("EMailSupport").'</span>';
 
 print '<span class="small">';
 
-print '<br><span class="opacitymedium">'.$langs->trans("TypeOfSupport").':</span> <span style="'.$style2.'">'.$langs->trans("TypeSupportCommercial").'</span>';
 
-print '<br><span class="opacitymedium">'.$langs->trans("TypeOfHelp").'/'.$langs->trans("Efficiency").'/'.$langs->trans("Price").':</span> ';
 
-print $langs->trans("TypeHelpOnly").'/'.img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1).'/'.img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1);
 
+print '<br><span class="opacitymedium">'.$langs->trans("TypeOfSupport").':</span> ';
 
+print '<span style="'.$style2.'">'.$langs->trans("TypeSupportCommercial").'</span>';
 
+print '<br><span class="opacitymedium">'.$langs->trans("TypeOfHelp").':</span>';
 
+print $langs->trans("TypeHelpOnly");
 
+print '<br><span class="opacitymedium">'.$langs->trans("Efficiency").':</span>';
 
+print img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1);
 
+print '<br><span class="opacitymedium">'.$langs->trans("Price").':</span> ';
 
+print img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1);
 
 print '</span>';
 
 
 print '</td></tr></table>';
 
@@ -163,8 +175,9 @@ print '<td align="center" valign="top">';
 
 print '<table class="nocellnopadd">';
 
 print '<tr><td align="center">';
 
 print '<br><span class="opacitymedium">'.$langs->trans("ToSeeListOfAvailableRessources").'</span><br>';
 
+print '<br>';
 
 print '<b><a href="'.$urlwiki.'">'.$langs->trans("ClickHere").'</a></b><br>';
 
-print '<br><br>';
 
+print '<br>';
 
 print '<br><br>';
 
 print '</td></tr></table>';
 
 print '</td>';
 
@@ -176,18 +189,22 @@ print '</div><div class="inline-block blocksupport">';
 
 
 
 // Other support
 
-print '<table class="login tablesupport" width="100%">';
 
-print '<tr class="title">';
 
+print '<table class="login tablesupport" width="100%" style="margin-top: 20px">';
 
+print '<tr class="title tablesupport-title">';
 
 print '<td width="100%" align="left" valign="middle">';
 
 
-print '<table summary="special"><tr><td>'.img_picto('', 'pagemaster.png', 'class="valignmiddle"', 1).'</td><td>';
 
+print '<table summary="special"><tr><td>'.img_picto('', 'pagemaster.png', 'class="valignmiddle paddingright"', 1).'</td><td>';
 
 
 print '<span style="'.$style1.'">'.$langs->trans("OtherSupport").'</span>';
 
 print '<span class="small">';
 
-print '<br><span class="opacitymedium">'.$langs->trans("TypeOfSupport").':</span> <span style="'.$style2.'">'.$langs->trans("TypeSupportCommercial").'</span>';
 
-//print '<br>'.$langs->trans("Efficiency").'/'.$langs->trans("Price").': '.img_picto_common('','redstar').img_picto_common('','redstar').img_picto_common('','redstar').' / '.img_picto_common('','star');
 
-print '<br><span class="opacitymedium">'.$langs->trans("TypeOfHelp").'/'.$langs->trans("Efficiency").'/'.$langs->trans("Price").':</span> ';
 
-print $langs->trans("TypeHelpDevForm").'/?/?';
 
+print '<br><span class="opacitymedium">'.$langs->trans("TypeOfSupport").':</span> ';
 
+print '<span style="'.$style2.'">'.$langs->trans("TypeSupportCommercial").'</span>';
 
+print '<br><span class="opacitymedium wordbreak">'.$langs->trans("TypeOfHelp").':</span>';
 
+print $langs->trans("TypeHelpDevForm");
 
+print '<br><span class="opacitymedium">'.$langs->trans("Efficiency").':</span>';
 
+print img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1);
 
+print '<br><span class="opacitymedium">'.$langs->trans("Price").':</span> ';
 
+print img_picto_common('', 'star', 'class="valignmiddle"', 1);
 
 print '</span>';
 
 
 print '</td></tr></table>';
 
@@ -199,8 +216,9 @@ print '<td align="center" valign="top">';
 
 print '<table class="nocellnopadd">';
 
 print '<tr><td align="center">';
 
 print '<br><span class="opacitymedium">'.$langs->trans("ToSeeListOfAvailableRessources").'</span><br>';
 
+print '<br>';
 
 print '<b><a href="'.$urlwiki.'">'.$langs->trans("ClickHere").'</a></b><br>';
 
-print '<br><br>';
 
+print '<br>';
 
 print '<br><br>';
 
 print '</td></tr></table>';
 
 print '</td>';