QUAL: Move the public css file into the public directory

Dolibarr · Jul 27, 2024 · 57ad79a · 57ad79a
1 parent fbdc94c
commit 57ad79a
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 33 deletions.
diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php
@@ -346,23 +346,6 @@
 	print '</tr>';
 	*/
 
-	/*if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2)
-	{
-		// Show logo for module
-		print '<tr class="oddeven"><td>' . $langs->trans("TicketsShowModuleLogo") . '</td>';
-		print '<td class="left">';
-		if ($conf->use_javascript_ajax) {
-			print ajax_constantonoff('TICKET_SHOW_MODULE_LOGO');
-		} else {
-			$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-			print $form->selectarray("TICKET_SHOW_MODULE_LOGO", $arrval, getDolGlobalInt('TICKET_SHOW_MODULE_LOGO'));
-		}
-		print '</td>';
-		print '<td class="center">';
-		print $form->textwithpicto('', $langs->trans("TicketsShowModuleLogoHelp"), 1, 'help');
-		print '</td>';
-		print '</tr>';
-	}*/
 
 	// Show logo for company
 	print '<tr class="oddeven"><td>'.$langs->trans("TicketsShowCompanyLogo").'</td>';

diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
@@ -510,7 +510,7 @@
 
 $arrayofjs = array();
 
-$arrayofcss = array('/opensurvey/css/style.css', getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE', '/ticket/').'css/styles.css.php');
+$arrayofcss = array(getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE', '/public/ticket/').'css/styles.css.php');
 
 llxHeaderTicket($langs->trans("CreateTicket"), "", 0, 0, $arrayofjs, $arrayofcss);
 

diff --git a/htdocs/ticket/css/styles.css.php → htdocs/public/ticket/css/styles.css.php b/htdocs/ticket/css/styles.css.php → htdocs/public/ticket/css/styles.css.php
@@ -16,7 +16,7 @@
  */
 
 /**
- *		\file       htdocs/ticket/css/styles.css.php
+ *		\file       htdocs/public/ticket/css/styles.css.php
  *		\brief      File for CSS style sheet for ticket module
  */
 
@@ -45,7 +45,7 @@
 
 session_cache_limiter('public');
 
-require_once '../../main.inc.php';
+require_once '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 // Define css type
@@ -63,15 +63,6 @@
 	min-height: 100%; height: 100%;
 }
 
-html {
-<?php
-if (getDolGlobalString('TICKET_SHOW_MODULE_LOGO')) {
-	print 'background: url("../public/img/bg_ticket.png") no-repeat 95% 90%;';
-}
-?>
-}
-
-
 div.ticketform {
 	font-family: arial;
 	position: static;
@@ -131,3 +122,10 @@
 		margin-right: 0;
 	}
 }
+
+.ticketform {
+	a.butAction {
+		box-shadow: 3px 3px 10px #ddd;
+		/* background-color: #666; */
+	}
+}
diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php
@@ -82,7 +82,7 @@
 }
 
 $arrayofjs = array();
-$arrayofcss = array(getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE', '/ticket/').'css/styles.css.php');
+$arrayofcss = array(getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE', '/public/ticket/').'css/styles.css.php');
 
 llxHeaderTicket($langs->trans('Tickets'), "", 0, 0, $arrayofjs, $arrayofcss);
 

diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
@@ -189,7 +189,7 @@
 }
 
 $arrayofjs = array();
-$arrayofcss = array(getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE', '/ticket/').'css/styles.css.php');
+$arrayofcss = array(getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE', '/public/ticket/').'css/styles.css.php');
 
 llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 

diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
@@ -237,7 +237,7 @@
 }
 
 $arrayofjs = array();
-$arrayofcss = array(getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE', '/ticket/').'css/styles.css.php');
+$arrayofcss = array(getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE', '/public/ticket/').'css/styles.css.php');
 
 llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
@@ -2940,7 +2940,7 @@ public function newMessage($user, &$action, $private = 1, $public_area = 0)
 
 								// If public interface is not enable, use link to internal page into mail
 								$url_public_ticket = (getDolGlobalInt('TICKET_ENABLE_PUBLIC_INTERFACE') ?
-										(getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE') !== '' ? getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE') . '/view.php' : dol_buildpath('/public/ticket/view.php', 2)) : dol_buildpath('/ticket/card.php', 2)).'?track_id='.$object->track_id;
+										(getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE') !== '' ? getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE') . '/view.php' : dol_buildpath('/public/ticket/view.php', 2)) : dol_buildpath('/ticket/card.php', 2)).'?track_id='.urlencode($object->track_id);
 
 								$message .= '<br>'.$langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer').' : <a href="'.$url_public_ticket.'">'.$object->track_id.'</a><br>';