Some minor look fixes.

2015-10-22 19:13:16 +02:00 · 2015-10-22 19:13:16 +02:00 · 531ef43a27
commit 531ef43a27
parent 9f21ea58a3
6 changed files with 45 additions and 33 deletions
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@ -246,7 +246,7 @@ if ($resql)
    print '<input type="text" class="flat" size="6" name="search_ref_supplier value="'.dol_escape_htmltag($search_ref_supplier).'">';
    print '</td>';
    print '<td class="liste_titre">';
-    print '<input type="text" class="flat" size="12" name="search_name" value="'.dol_escape_htmltag($search_name).'">';
+    print '<input type="text" class="flat" size="8" name="search_name" value="'.dol_escape_htmltag($search_name).'">';
    print '</td>';
    print '<td class="liste_titre">&nbsp;</td>';
    //print '<td class="liste_titre">&nbsp;</td>';
@ -292,9 +292,10 @@ if ($resql)
        			$userstatic->id=$val['id'];
        			$userstatic->lastname=$val['lastname'];
        			$userstatic->firstname=$val['firstname'];
-        			print $userstatic->getNomUrl(1);
+        			print '<div class="float">'.$userstatic->getNomUrl(1);
        			$j++;
-        			if ($j < $nbofsalesrepresentative) print '<br/>';
+        			if ($j < $nbofsalesrepresentative) print ', ';
+        			print '</div>';
        		}
        	}
        	else print $langs->trans("NoSalesRepresentativeAffected");
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@ -176,22 +176,24 @@ class FormFile
 	            $out .= '<input type="hidden" id="'.$htmlname.'_link_section_id"  name="link_section_id" value="'.$sectionid.'">';
 	            $out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

-	            $out .= '<table width="100%" class="nobordernopadding">';
-	            $out .= '<tr>';
-	            $out .= '<td valign="middle" class="nowrap">';
-	            $out .= $langs->trans("URLToLink") . ': ';
+	            $out .= '<div>';
+	            $out .= '<div class="float" style="padding-right: 10px;">';
+	            $out .= '<label for="link">'.$langs->trans("URLToLink") . '</label>: ';
 	            $out .= '<input type="text" name="link" size="'.$maxlength.'" id="link">';
-	            $out .= ' &nbsp; ' . $langs->trans("Label") . ': ';
+	            $out .= '</div>';
+	            $out .= '<div class="float" style="padding-right: 10px;">';
+	            $out .= '<label for="label">'.$langs->trans("Label") . '</label>: ';
 	            $out .= '<input type="text" name="label" id="label">';
 	            $out .= '<input type="hidden" name="objecttype" value="' . $object->element . '">';
 	            $out .= '<input type="hidden" name="objectid" value="' . $object->id . '">';
-	            $out .= '&nbsp;';
+	            $out .= '</div>';
+	            $out .= '<div class="float" style="padding-right: 10px;">';
 	            $out .= '<input type="submit" class="button" name="linkit" value="'.$langs->trans("ToLink").'"';
 	            $out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm)?' disabled':'');
 	            $out .= '>';
-	            $out .= '</td></tr>';
-	            $out .= '</table>';
-
+	            $out .= '</div>';
+                $out .= '</div>';
+                $out .= '<div class="clearboth"></div>';
 	            $out .= '</form><br>';
 	            $parameters = array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''), 'url'=>$url, 'perm'=>$perm);
 	            $res = $hookmanager->executeHooks('formattachOptions',$parameters,$object);
@ -492,7 +494,7 @@ class FormFile
            $out.= '<input type="hidden" name="action" value="builddoc">';
            $out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

-            $out.= '<div class="titre">'.$titletoshow.'</div>';
+            $out.= load_fiche_titre($titletoshow, '', '');
            $out.= '<table class="liste formdoc noborder" summary="listofdocumentstable" width="100%">';

            $out.= '<tr class="liste_titre">';
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@ -520,7 +520,7 @@ if ($action == 'create')

            dol_fiche_head('');

-            print '<table class="border" width="100%">';
+            print '<table class="border centpercent">';

            // Ref
            print '<tr><td width="30%" class="fieldrequired">';
@ -662,6 +662,8 @@ if ($action == 'create')


            print '<br>';
+            
+            
            print '<table class="noborder" width="100%">';


@ -1533,9 +1535,9 @@ else if ($id || $ref)
 	 */
 	if ($action != 'presend')
 	{
-		print '<table width="100%"><tr><td width="50%" valign="top">';
-
-		$objectref = dol_sanitizeFileName($object->ref);
+        print '<div class="fichecenter"><div class="fichehalfleft">';
+	    
+        $objectref = dol_sanitizeFileName($object->ref);
 		$filedir = $conf->expedition->dir_output . "/sending/" .$objectref;

 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
@ -1552,14 +1554,14 @@ else if ($id || $ref)
 		//$linktoelem = $form->showLinkToObjectBlock($object);
 		//if ($linktoelem) print '<br>'.$linktoelem;

-		print '</td><td valign="top" width="50%">';
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';

 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 		$formactions=new FormActions($db);
 		$somethingshown=$formactions->showactions($object,'shipping',$socid);

-		print '</td></tr></table>';
+		print '</div></div></div>';
 	}

 	/*
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@ -105,6 +105,7 @@ AddPhoto=Add photo
 ListOfStockMovements=List of stock movements
 BuyingPrice=Buying price
 PriceForEachProduct=Products with specific prices
+NoPriceSpecificToCustomer=This customer has no specific prices. All standard prices for products/services will be used.
 SupplierCard=Supplier card
 CommercialCard=Commercial card
 AllWays=Path to find your product in stock
@ -298,6 +299,6 @@ LastUpdated=Last updated
 CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is 
 PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product with tag
+IncludingProductWithTag=Including product/service with tag
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@ -216,7 +216,7 @@ if ($object->id)
    include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';


-    // Merge propal PDF docuemnt PDF files
+    // Merge propal PDF document PDF files
    if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
    {
    	$filetomerge = new Propalmergepdfproduct($db);
@ -233,7 +233,8 @@ if ($object->id)
    	$filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', 'name', SORT_ASC, 1);

    	// For each file build select list with PDF extention
-    	if (count($filearray) > 0) {
+    	if (count($filearray) > 0) 
+    	{
    		print '<br>';
    		// Actual file to merge is :
    		if (count($filetomerge->lines) > 0) {
@ -315,19 +316,23 @@ if ($object->id)
    				$checked = '';
    				$filename = $filetoadd['name'];

-    				if ($conf->global->MAIN_MULTILANGS) {
-    					if (array_key_exists($filetoadd['name'] . '_' . $delauft_lang, $filetomerge->lines)) {
+    				if ($conf->global->MAIN_MULTILANGS) 
+    				{
+    					if (array_key_exists($filetoadd['name'] . '_' . $delauft_lang, $filetomerge->lines)) 
+    					{
    						$filename = $filetoadd['name'] . ' - ' . $langs->trans('Language_' . $delauft_lang);
    						$checked = ' checked ';
    					}
-    				} else {
-    					if (array_key_exists($filetoadd['name'], $filetomerge->lines)) {
+    				}
+    				else 
+    				{
+    					if (array_key_exists($filetoadd['name'], $filetomerge->lines)) 
+    					{
    						$checked = ' checked ';
    					}
    				}

    				print  '<tr class="' . $style . '"><td>';
-
    				print  '<input type="checkbox" ' . $checked . ' name="filetoadd[]" id="filetoadd" value="' . $filetoadd['name'] . '">' . $filename . '</input>';
    				print  '</td></tr>';
    			}
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@ -447,8 +447,6 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {

 		print_barre_liste($langs->trans('PriceForEachProduct'), $page, $_SERVEUR ['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords);

-		if (count($prodcustprice->lines) > 0) {
-
 			print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
 			print '<input type="hidden" name="id" value="' . $object->id . '">';

@ -467,6 +465,8 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 			print '<td>&nbsp;</td>';
 			print '</tr>';

+		if (count($prodcustprice->lines) > 0) {
+
 			print '<tr class="liste_titre">';
 			print '<td><input type="text" class="flat" name="search_soc" value="' . $search_soc . '" size="20"></td>';
 			print '<td colspan="8">&nbsp;</td>';
@ -522,13 +522,14 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {

 				print "</tr>\n";
 			}
+		} else {
+			print '<tr '.$bc[false].'><td colspan="10">'.$langs->trans('NoPriceSpecificToCustomer').'</td></tr>';
+		}
+
 			print "</table>";

 			print "</form>";
-		} else {
-			print $langs->trans('None');
-		}
-
+		
 		/* ************************************************************************** */
 		/*                                                                            */
 		/* Barre d'action                                                             */