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

Fix: When option to use optimize display for text borwser and blin

Browse Source 
person is on, box addon was broken.
This commit is contained in:
Laurent Destailleur 2014-07-29 00:50:57 +02:00
parent 096a61d5c0
commit c9d27383a4
10 changed files with 67 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/boxes/box_graph_invoices_permonth.php
View File

@ -197,6 +197,12 @@ class box_graph_invoices_permonth extends ModeleBoxes
}
}
if (empty($conf->use_javascript_ajax))
{
$langs->load("errors");
$mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
}
if (! $mesg)
{
$stringtoshow='';

6
htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
View File

@ -196,6 +196,12 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
}
}
if (empty($conf->use_javascript_ajax))
{
$langs->load("errors");
$mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
}
if (! $mesg)
{
$stringtoshow='';

6
htdocs/core/boxes/box_graph_orders_permonth.php
View File

@ -197,6 +197,12 @@ class box_graph_orders_permonth extends ModeleBoxes
}
}
if (empty($conf->use_javascript_ajax))
{
$langs->load("errors");
$mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
}
if (! $mesg)
{
$stringtoshow='';

6
htdocs/core/boxes/box_graph_orders_supplier_permonth.php
View File

@ -196,6 +196,12 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
}
}
if (empty($conf->use_javascript_ajax))
{
$langs->load("errors");
$mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
}
if (! $mesg)
{
$stringtoshow='';

6
htdocs/core/boxes/box_graph_product_distribution.php
View File

@ -301,6 +301,12 @@ class box_graph_product_distribution extends ModeleBoxes
}
}
if (empty($conf->use_javascript_ajax))
{
$langs->load("errors");
$mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
}
if (! $mesg)
{
$stringtoshow='';

6
htdocs/core/boxes/box_graph_propales_permonth.php
View File

@ -202,6 +202,12 @@ class box_graph_propales_permonth extends ModeleBoxes
}
}
if (empty($conf->use_javascript_ajax))
{
$langs->load("errors");
$mesg=$langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
}
if (! $mesg)
{
$stringtoshow='';

20
htdocs/core/class/html.formother.class.php
View File

@ -927,6 +927,7 @@ class FormOther
$arrayboxtoactivatelabel=array();
if (! empty($user->conf->$confuserzone))
{
$boxorder='';
$langs->load("boxes"); // Load label of boxes
foreach($boxactivated as $box)
{
@ -935,8 +936,23 @@ class FormOther
if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';
$arrayboxtoactivatelabel[$box->id]=$label; // We keep only boxes not shown for user, to show into combo list
}
// Class Form must have been already loaded
$selectboxlist=Form::selectarray('boxcombo', $arrayboxtoactivatelabel,'',1);
foreach($boxidactivatedforuser as $boxid)
{
if (empty($boxorder)) $boxorder.='A:';
$boxorder.=$boxid.',';
}
//var_dump($boxidactivatedforuser);
// Class Form must have been already loaded
$selectboxlist.='<form name="addbox" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
$selectboxlist.='<input type="hidden" name="addbox" value="addbox">';
$selectboxlist.='<input type="hidden" name="userid" value="'.$user->id.'">';
$selectboxlist.='<input type="hidden" name="areacode" value="'.$areacode.'">';
$selectboxlist.='<input type="hidden" name="boxorder" value="'.$boxorder.'">';
$selectboxlist.=Form::selectarray('boxcombo', $arrayboxtoactivatelabel,'',1);
if (empty($conf->use_javascript_ajax)) $selectboxlist.=' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
$selectboxlist.='</form>';
}
// Javascript code for dynamic actions

11
htdocs/index.php
View File

@ -46,6 +46,17 @@ if (!isset($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_IN
exit;
}
if (GETPOST('addbox')) // Add box (when submit is done from a form when ajax disabled)
{
require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
$zone=GETPOST('areacode');
$userid=GETPOST('userid');
$boxorder=GETPOST('boxorder');
$boxorder.=GETPOST('boxcombo');
$result=InfoBox::saveboxorder($db,$zone,$boxorder,$userid);
}
/*

1
htdocs/langs/en_US/errors.lang
View File

@ -153,3 +153,4 @@ WarningCloseAlways=Warning, closing is done even if amount differs between sourc
WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
WarningNotRelevant=Irrelevant operation for this dataset
WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.

1
htdocs/langs/en_US/main.lang
View File

@ -674,6 +674,7 @@ SetDemandReason=Set source
ViewPrivateNote=View notes
XMoreLines=%s line(s) hidden
PublicUrl=Public URL
AddBox=Add box
# Week day
Monday=Monday