From a9468ad84aea3abbd9752bd1521cc50630be467d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 8 Jul 2017 00:42:55 +0200 Subject: [PATCH] Look and feel v6 --- htdocs/adherents/subscription/card.php | 40 +++++++++++++------------- htdocs/adherents/subscription/info.php | 14 ++++++++- htdocs/adherents/type.php | 29 ++++++++++--------- htdocs/langs/en_US/products.lang | 4 +-- htdocs/product/reassortlot.php | 26 +++++------------ 5 files changed, 57 insertions(+), 56 deletions(-) diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php index 5cb10e31e6d..3faa45d7d84 100644 --- a/htdocs/adherents/subscription/card.php +++ b/htdocs/adherents/subscription/card.php @@ -187,7 +187,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') print ""; print ""; print "fk_bank."\">"; - + dol_fiche_head($head, 'general', $langs->trans("Subscription"), 0, 'payment'); $linkback = ''.$langs->trans("BackToList").''; @@ -199,7 +199,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') print ''.$langs->trans("Ref").''; print ''; print $form->showrefnav($object, 'rowid', $linkback, 1); - print ''; + print ''; // Member $adh->ref=$adh->getFullName($langs); @@ -248,15 +248,15 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') } print ''; - + dol_fiche_end(); - + print '
'; print ''; print '       '; print ''; print '
'; - + print ''; print "\n"; } @@ -274,7 +274,7 @@ if ($rowid && $action != 'edit') $head = subscription_prepare_head($object); - dol_fiche_head($head, 'general', $langs->trans("Subscription"), '', 'payment'); + dol_fiche_head($head, 'general', $langs->trans("Subscription"), -1, 'payment'); // Confirmation to delete subscription if ($action == 'delete') @@ -292,13 +292,13 @@ if ($rowid && $action != 'edit') $linkback = ''.$langs->trans("BackToList").''; dol_banner_tab($object, 'rowid', $linkback, 1); - + print '
'; - + print '
'; - + print ''; - + // Member $adh->ref=$adh->getFullName($langs); print ''; @@ -349,7 +349,7 @@ if ($rowid && $action != 'edit') print "
\n"; print '
'; - + print ''; dol_fiche_end(); @@ -379,11 +379,11 @@ if ($rowid && $action != 'edit') } print ''; - - + + print '
'; print ''; // ancre - + // Documents generes /* $filename = dol_sanitizeFileName($object->ref); @@ -391,18 +391,18 @@ if ($rowid && $action != 'edit') $urlsource = $_SERVER['PHP_SELF'] . '?facid=' . $object->id; $genallowed = $user->rights->facture->creer; $delallowed = $user->rights->facture->supprimer; - + print $formfile->showdocuments('facture', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang); $somethingshown = $formfile->numoffiles; */ // Show links to link elements //$linktoelem = $form->showLinkToObjectBlock($object, null, array('subscription')); $somethingshown = $form->showLinkedObjectBlock($object, ''); - + // Show links to link elements /*$linktoelem = $form->showLinkToObjectBlock($object,array('order')); if ($linktoelem) print ($somethingshown?'':'
').$linktoelem; - + // Link for paypal payment /* if (! empty($conf->paypal->enabled) && $object->statut != 0) { @@ -411,15 +411,15 @@ if ($rowid && $action != 'edit') } */ print '
'; - + // List of actions on element /* include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php'; $formactions = new FormActions($db); $somethingshown = $formactions->showactions($object, 'invoice', $socid); */ - - print '
'; + + print ''; } diff --git a/htdocs/adherents/subscription/info.php b/htdocs/adherents/subscription/info.php index 5c5799ec2a5..c83771d22ff 100644 --- a/htdocs/adherents/subscription/info.php +++ b/htdocs/adherents/subscription/info.php @@ -53,7 +53,17 @@ $result = $object->fetch($rowid); $head = subscription_prepare_head($object); -dol_fiche_head($head, 'info', $langs->trans("Subscription"), '', 'payment'); +dol_fiche_head($head, 'info', $langs->trans("Subscription"), -1, 'payment'); + +$linkback = ''.$langs->trans("BackToList").''; + +dol_banner_tab($object, 'rowid', $linkback, 1); + +print '
'; + +print '
'; + +print '
'; $object->info($rowid); @@ -64,5 +74,7 @@ print ''; print '
'; +dol_fiche_end(); + llxFooter(); $db->close(); diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index f54c89ffeba..a7b9fd7d3e8 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -347,8 +347,9 @@ if ($rowid > 0) /* - * Hotbar + * Buttons */ + print '
'; // Edit @@ -482,18 +483,8 @@ if ($rowid > 0) print '
'; print ''."\n"; - print ''; - print_liste_field_titre($langs->trans("Name")." / ".$langs->trans("Company"),$_SERVER["PHP_SELF"],"d.lastname",$param,"","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Login"),$_SERVER["PHP_SELF"],"d.login",$param,"","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Nature"),$_SERVER["PHP_SELF"],"d.morphy",$param,"","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"d.email",$param,"","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"d.statut,d.datefin",$param,"","",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("EndSubscription"),$_SERVER["PHP_SELF"],"d.datefin",$param,"",'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"",$param,"",'width="60" align="center"',$sortfield,$sortorder); - print "\n"; - // Lignes des champs de filtre - print ''; + print ''; print ''; @@ -516,6 +507,16 @@ if ($rowid > 0) print "\n"; + print ''; + print_liste_field_titre($langs->trans("Name")." / ".$langs->trans("Company"),$_SERVER["PHP_SELF"],"d.lastname",$param,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Login"),$_SERVER["PHP_SELF"],"d.login",$param,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Nature"),$_SERVER["PHP_SELF"],"d.morphy",$param,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"d.email",$param,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"d.statut,d.datefin",$param,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("EndSubscription"),$_SERVER["PHP_SELF"],"d.datefin",$param,"",'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Action"),$_SERVER["PHP_SELF"],"",$param,"",'width="60" align="center"',$sortfield,$sortorder); + print "\n"; + while ($i < $num && $i < $conf->liste_limit) { $objp = $db->fetch_object($resql); @@ -645,9 +646,9 @@ if ($rowid > 0) print '
'; print '
'; - print ''; + print ''; - print ''; + print ''; print '
'.$langs->trans("Ref").''.$object->id.'
'.$langs->trans("Ref").''.$object->id.'
'.$langs->trans("Label").'
'.$langs->trans("Label").'
'.$langs->trans("SubscriptionRequired").''; print $form->selectyesno("subscription",$object->subscription,1); diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index 3c47b188972..f33968e0ff9 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -26,8 +26,8 @@ ProductOrService=Product or Service ProductsAndServices=Products and Services ProductsOrServices=Products or Services ProductsOnSaleOnly=Products for sale only -ProductsOnPurchaseOnly=Product for purchase only -ProductsNotOnSell=Product not for sale and not for purchase +ProductsOnPurchaseOnly=Products for purchase only +ProductsNotOnSell=Products not for sale and not for purchase ProductsOnSellAndOnBuy=Products for sale and for purchase ServicesOnSaleOnly=Services for sale only ServicesOnPurchaseOnly=Services for purchase only diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php index 1d45e93590c..d3694e039eb 100644 --- a/htdocs/product/reassortlot.php +++ b/htdocs/product/reassortlot.php @@ -232,7 +232,7 @@ if ($resql) $moreforfilter.=''; } //$moreforfilter.=$langs->trans("StockTooLow").' '; - + if (! empty($moreforfilter)) { print '
'; @@ -257,7 +257,7 @@ if ($resql) print '
'; print ''; - + // Lignes des champs de filtre print ''; print '\n"; - + $product_static=new Product($db); $warehousetmp=new Entrepot($db); while ($i < min($num,$limit)) { $objp = $db->fetch_object($resql); - + // Multilangs if (! empty($conf->global->MAIN_MULTILANGS)) // si l'option est active { @@ -335,20 +335,20 @@ if ($resql) $product_static->label = $objp->label; $product_static->type=$objp->fk_product_type; $product_static->entity=$objp->entity; - + $warehousetmp->id=$objp->fk_entrepot; $warehousetmp->ref=$objp->warehouse_ref; $warehousetmp->label=$objp->warehouse_ref; $warehousetmp->fk_parent=$objp->warehouse_parent; print ''; - + // Ref print ''; - + // Label print ''; @@ -391,18 +391,6 @@ if ($resql) print ''; print ''; - if ($num > $conf->liste_limit) - { - if ($sref || $snom || $sall || GETPOST('search')) - { - print_barre_liste('', $page, "reassort.php", "&sref=".$sref."&snom=".$snom."&sall=".$sall."&tosell=".$tosell."&tobuy=".$tobuy, $sortfield, $sortorder,'',$num, 0, ''); - } - else - { - print_barre_liste('', $page, "reassort.php", "&sref=$sref&snom=$snom&fourn_id=$fourn_id".(isset($type)?"&type=$type":"")."&tosell=".$tosell."&tobuy=".$tobuy, $sortfield, $sortorder,'',$num, 0, ''); - } - } - $db->free($resql); }
'; @@ -304,14 +304,14 @@ if ($resql) print_liste_field_titre($langs->trans("Status").' ('.$langs->trans("Buy").')',$_SERVER["PHP_SELF"], "p.tobuy","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre(''); print "
'; print $product_static->getNomUrl(1,'',16); //if ($objp->stock_theorique < $objp->seuil_stock_alerte) print ' '.img_warning($langs->trans("StockTooLow")); print ''.$objp->label.'