lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Buttons not visible

Browse Source
This commit is contained in:
Laurent Destailleur 2010-07-27 07:43:38 +00:00
parent 3fab2d962f
commit 37d1faa021
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/adherents/fiche.php
View File

@ -1378,11 +1378,12 @@ if ($rowid && $action != 'edit')
}
// Envoi fiche par mail
if ($adh->statut >= 1 && $adh->email)
if ($adh->statut >= 1)
{
if ($user->rights->adherent->creer)
{
print "<a class=\"butAction\" href=\"fiche.php?rowid=$adh->id&action=sendinfo\">".$langs->trans("SendCardByMail")."</a>\n";
if ($adh->email) print "<a class=\"butAction\" href=\"fiche.php?rowid=$adh->id&action=sendinfo\">".$langs->trans("SendCardByMail")."</a>\n";
else print "<a class=\"butActionRefused\" href=\"#\" title=\"".dol_escape_htmltag($langs->trans("NoEMail"))."\">".$langs->trans("SendCardByMail")."</a>\n";
}
else
{
@ -1447,11 +1448,11 @@ if ($rowid && $action != 'edit')
$isinspip=$adh->is_in_spip();
if ($isinspip == 1)
{
print "<a class=\"butAction\" href=\"fiche.php?rowid=$adh->id&action=del_spip\">Suppression dans Spip</a>\n";
print "<a class=\"butAction\" href=\"fiche.php?rowid=$adh->id&action=del_spip\">".$langs->trans("DeleteIntoSpip")."</a>\n";
}
if ($isinspip == 0)
{
print "<a class=\"butAction\" href=\"fiche.php?rowid=$adh->id&action=add_spip\">Ajout dans Spip</a>\n";
print "<a class=\"butAction\" href=\"fiche.php?rowid=$adh->id&action=add_spip\">".$langs->trans("AddIntoSpip")."</a>\n";
}
if ($isinspip == -1) {
print '<br><font class="error">Failed to connect to SPIP: '.$adh->error.'</font>';

2
htdocs/langs/en_US/members.lang
View File

@ -85,7 +85,7 @@ SubscriptionNotReceived=Subscription never received
SubscriptionLateShort=Late
SubscriptionNotReceivedShort=Never received
ListOfSubscriptions=List of subscriptions
SendCardByMail=Send card
SendCardByMail=Send card by Email
AddMember=Add member
MemberType=Member type
NoTypeDefinedGoToSetup=No member types defined. Go to setup - Members types

2
htdocs/langs/fr_FR/members.lang
View File

@ -85,7 +85,7 @@ SubscriptionNotReceived=Cotisation non reçue
SubscriptionLateShort=En retard
SubscriptionNotReceivedShort=Non reçue
ListOfSubscriptions=Liste des cotisations
SendCardByMail=Envoyer fiche
SendCardByMail=Envoyer fiche par mail
AddMember=Ajouter adhérent
MemberType=Type d'adhérent
NoTypeDefinedGoToSetup=Aucun type d'adhérent défini. Allez dans Configuration -> Types d'adhérents

13
htdocs/user/fiche.php
View File

@ -111,10 +111,10 @@ if ($_REQUEST["action"] == 'confirm_enable' && $_REQUEST["confirm"] == "yes")
if ($_GET["id"] <> $user->id)
{
$message='';
$edituser = new User($db);
$edituser->fetch($_GET["id"]);
if (!empty($conf->file->main_limit_users))
{
$nb = $edituser->getNbOfUsers(1);
@ -165,9 +165,9 @@ if ($_POST["action"] == 'add' && $canadduser)
$message='<div class="error">'.$langs->trans("LoginNotDefined").'</div>';
$action="create"; // Go back to create page
}
$edituser = new User($db);
if (!empty($conf->file->main_limit_users))
{
$nb = $edituser->getNbOfUsers(1);
@ -1134,10 +1134,11 @@ else
print '<a class="butAction" href="fiche.php?id='.$fuser->id.'&amp;action=password">'.$langs->trans("ReinitPassword").'</a>';
}
if (($user->id != $_GET["id"] && $caneditpassword) && $fuser->email && $fuser->login && !$fuser->ldap_sid &&
if (($user->id != $_GET["id"] && $caneditpassword) && $fuser->login && !$fuser->ldap_sid &&
(empty($conf->global->MAIN_MODULE_MULTICOMPANY) || ($fuser->entity == $conf->entity)) )
{
print '<a class="butAction" href="fiche.php?id='.$fuser->id.'&amp;action=passwordsend">'.$langs->trans("SendNewPassword").'</a>';
if ($fuser->email) print '<a class="butAction" href="fiche.php?id='.$fuser->id.'&amp;action=passwordsend">'.$langs->trans("SendNewPassword").'</a>';
else print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendNewPassword").'</a>';
}
}