From 9a6f22a86e15832bcaa3aa78c588a25d61afc4ac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 5 Jan 2014 15:46:39 +0100
Subject: [PATCH] Fix: W3C no form into table. Fix: Css style overflowwithjm
 has been superseded by maxwidthonsmartphone Fix: Style button disabled was
 not visible with jmobile Fix: Rounding corner with jmobile

---
 htdocs/core/lib/company.lib.php      | 64 ++++++++++++++--------------
 htdocs/product/composition/fiche.php |  4 +-
 htdocs/public/test/test_arrays.php   |  2 +-
 htdocs/societe/consumption.php       | 11 ++---
 htdocs/theme/eldy/style.css.php      | 23 +++++-----
 5 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index c08be97cac4..58ad856a62b 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -523,16 +523,16 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     global $bc;
 
     $form= new Form($db);
-    
+
     $sortfield = GETPOST("sortfield",'alpha');
     $sortorder = GETPOST("sortorder",'alpha');
     $search_status		= GETPOST("search_status",'int');
     if ($search_status=='') $search_status=1; // always display activ customer first
     $search_name = GETPOST("search_name",'alpha');
-    
+
     if (! $sortorder) $sortorder="ASC";
     if (! $sortfield) $sortfield="p.lastname";
-    
+
     $i=-1;
 
     $contactstatic = new Contact($db);
@@ -556,18 +556,17 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     $title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ContactsForCompany") : $langs->trans("ContactsAddressesForCompany"));
     print_fiche_titre($title,$buttoncreate,'');
 
-    print "\n".'<table class="noborder" width="100%">'."\n";
-
-    
-    $param="socid=".$object->id;
-    if ($search_status != '') $param.='&amp;search_status='.$search_status;
-    if ($search_name != '') $param.='&amp;search_name='.urlencode($search_name);
-    
     print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
     print '<input type="hidden" name="socid" value="'.$object->id.'">';
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    
+
+    print "\n".'<table class="noborder" width="100%">'."\n";
+
+    $param="socid=".$object->id;
+    if ($search_status != '') $param.='&amp;search_status='.$search_status;
+    if ($search_name != '') $param.='&amp;search_name='.urlencode($search_name);
+
     $colspan=8;
     print '<tr class="liste_titre">';
     print_liste_field_titre($langs->trans("Name"),$_SERVER["PHP_SELF"],"p.lastname","",$param,'',$sortfield,$sortorder);
@@ -576,8 +575,8 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     print_liste_field_titre($langs->trans("PhoneMobile"),$_SERVER["PHP_SELF"],"p.phone_mobile","",$param,'',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("Fax"),$_SERVER["PHP_SELF"],"p.fax","",$param,'',$sortfield,$sortorder);
     print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"p.email","",$param,'',$sortfield,$sortorder);
-    if (! empty($conf->skype->enabled)) 
-    { 
+    if (! empty($conf->skype->enabled))
+    {
       $colspan++;
       print '<td>'.$langs->trans("Skype").'</td>';
     }
@@ -594,44 +593,45 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
         print '<td>&nbsp;</td>';
     }
     print "</tr>";
-    
-    
+
+
     print '<tr class="liste_titre">';
     print '<td class="liste_titre">';
     print '<input type="text" class="flat" name="search_name" size="20" value="'.$search_name.'">';
     print '</td>';
-    
+
     print '<td>&nbsp;</td>';
-     print '<td>&nbsp;</td>';
-    
     print '<td>&nbsp;</td>';
-    
+
     print '<td>&nbsp;</td>';
-    
-     print '<td>&nbsp;</td>';
-    if (! empty($conf->skype->enabled)) 
-    { 
+
+    print '<td>&nbsp;</td>';
+
+    print '<td>&nbsp;</td>';
+    if (! empty($conf->skype->enabled))
+    {
       $colspan++;
       print '<td>&nbsp;</td>';
     }
-    print '<td class="liste_titre">';
+    // Status
+    print '<td class="liste_titre maxwidthonsmartphone">';
     print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status);
     print '</td>';
-      		
+
     print "<td>&nbsp;</td>";
     if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
     {
     	$colspan++;
         print '<td>&nbsp;</td>';
     }
-        		
-    
+
+
     print '<td class="liste_titre" align="right">';
     print '<input type="image" class="liste_titre" name="button_search" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
     print '</td>';
-    
+
     print "</tr>";
-    
+
 
     $sql = "SELECT p.rowid, p.lastname, p.firstname, p.fk_pays, p.poste, p.phone, p.phone_mobile, p.fax, p.email, p.skype, p.statut ";
     $sql .= ", p.civilite, p.address, p.zip, p.town";
@@ -681,12 +681,12 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
             print '<td>';
             print dol_print_email($obj->email,$obj->rowid,$object->id,'AC_EMAIL');
             print '</td>';
-            if (! empty($conf->skype->enabled)) 
+            if (! empty($conf->skype->enabled))
             {
                 print '<td>';
                 print dol_print_skype($obj->skype,$obj->rowid,$object->id,'AC_SKYPE');
                 print '</td>';
-            }   
+            }
 
 			print '<td>'.$contactstatic->getLibStatut(5).'</td>';
 
@@ -761,6 +761,8 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     }
     print "\n</table>\n";
 
+    print '</form>'."\n";
+
     print "<br>\n";
 ?>
 <div id="dialog" title="<?php echo dol_escape_htmltag($langs->trans('Address')); ?>" style="display: none;">
diff --git a/htdocs/product/composition/fiche.php b/htdocs/product/composition/fiche.php
index f770e48b715..7b35aa158c6 100644
--- a/htdocs/product/composition/fiche.php
+++ b/htdocs/product/composition/fiche.php
@@ -375,7 +375,7 @@ if ($id > 0 || ! empty($ref))
 			print '<tr>';
 			print '<td colspan="2">'.$langs->trans("TotalBuyingPriceMin").': ';
 			if ($atleastonenotdefined) print $langs->trans("Unknown").' ('.$langs->trans("SomeSubProductHaveNoPrices").')';
-			print '</td>'; 
+			print '</td>';
 			print '<td align="right">'.($atleastonenotdefined?'':price($total,'','',0,0,-1,$conf->currency)).'</td>';
 			if (! empty($conf->stock->enabled)) print '<td class="liste_total" align="right">&nbsp;</td>';
 			print '</tr>';
@@ -436,7 +436,7 @@ if ($id > 0 || ! empty($ref))
 			if (! empty($conf->categorie->enabled))
 			{
 				print '<tr><td>'.$langs->trans("CategoryFilter").' &nbsp; </td>';
-				print '<td class="overflowwithjm200">'.$form->select_all_categories(0, $parent).'</td></tr>';
+				print '<td class="maxwidthonsmartphone">'.$form->select_all_categories(0, $parent).'</td></tr>';
 			}
 			print '</table>';
 			print '</form>';
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index fb8274e5524..4a4e7bc6f74 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -4,7 +4,7 @@ define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
 
 require '../../main.inc.php';
 
-if (empty($conf->global->MAIN_FEATURES_LEVEL))
+if (!empty($conf->global->MAIN_FEATURES_LEVEL))
 {
 	print "Page available onto dev environment only";
 	exit;
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 16d2c4fea7d..20110c63315 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2012-2013 Philippe Berthet     <berthet@systune.be>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * Version V1.1 Initial version of Philippe Berthet
  * Version V2   Change to be compatible with 3.4 and enhanced to be more generic
@@ -102,10 +102,6 @@ if (empty($socid))
 $head = societe_prepare_head($object);
 dol_fiche_head($head, 'consumption', $langs->trans("ThirdParty"),0,'company');
 
-print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="socid" value="'.$socid.'">';
-
 print '<table class="border" width="100%">';
 print '<tr><td width="25%">'.$langs->trans('ThirdPartyName').'</td>';
 print '<td colspan="3">';
@@ -158,6 +154,11 @@ dol_fiche_end();
 print '<br>';
 
 
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="socid" value="'.$socid.'">'."\n";
+
+
 $sql_select='';
 if ($type_element == 'invoice')
 { // Customer : show products from invoices
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 04aa243db61..c767f5b956e 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1354,7 +1354,7 @@ div.tabs {
 /*    margin: 0px 0px 2px 6px;
     padding: 0px 6px 3px 0px; */
     text-align: <?php print $left; ?>;
-
+    margin-left: 4px !important;
 	clear:both;
 	height:100%;
 }
@@ -2758,7 +2758,7 @@ a.tab span.ui-btn-inner
 }
 
 .ui-link {
-	color: rgb(<?php print $colortext; ?>) !important;
+	color: rgb(<?php print $colortext; ?>);
 }
 .liste_titre .ui-link {
 	color: #<?php print $colortexttitle; ?> !important;
@@ -2840,10 +2840,21 @@ ul.ulmenu {
 	border: 1px solid #ccc;
 	text-shadow: none;
 }
+.ui-body-c .ui-link, .ui-body-c .ui-link:visited, .ui-body-c .ui-link:hover {
+	color: rgb(<?php print $colortext; ?>);
+}
 .ui-btn-up-c .vsmenudisabled {
 	color: #<?php echo $colorshadowtitle; ?> !important;
 	text-shadow: none !important;
 }
+.ui-controlgroup-horizontal .ui-btn.ui-first-child {
+-webkit-border-top-left-radius: 6px;
+border-top-left-radius: 6px;
+}
+.ui-controlgroup-horizontal .ui-btn.ui-last-child {
+-webkit-border-top-right-radius: 6px;
+border-top-right-radius: 6px;
+}
 .alilevel1 {
     color: #<?php echo $colortexttitle; ?> !important;
 	text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>;
@@ -2856,14 +2867,6 @@ ul.ulmenu {
 	background-image: -o-linear-gradient( #ddd,#d1d1d1 ) !important;
 	background-image: linear-gradient( #ddd,#d1d1d1 ) !important;
 }
-<?php if ($dol_use_jmobile) { ?>
-.overflowwithjm200
-{
-	max-width: 200px;
-	overflow: hidden;
-	white-space: nowrap;
-}
-<?php } ?>
 
 <?php
 if (is_object($db)) $db->close();