Skip to content

Commit

Permalink
Better responsive
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed Oct 19, 2017
1 parent 5e2d662 commit abd5251
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 11 deletions.
19 changes: 14 additions & 5 deletions htdocs/adherents/index.php
Expand Up @@ -162,7 +162,8 @@

if ($conf->use_javascript_ajax)
{
print '<table class="noborder nohover" width="100%">';
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
print '<tr '.$bc[0].'><td align="center" colspan="2">';

Expand Down Expand Up @@ -199,6 +200,7 @@
print $SommeA+$SommeB+$SommeC+$SommeD;
print '</td></tr>';
print '</table>';
print '</div>';
}

print '<br>';
Expand Down Expand Up @@ -234,6 +236,7 @@
}
}

print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<th>'.$langs->trans("Subscriptions").'</th>';
Expand Down Expand Up @@ -261,7 +264,8 @@
print '<td align="right">'.price($tot)."</td>";
print "<td align=\"right\">".price(price2num($numb>0?($tot/$numb):0,'MT'))."</td>";
print "</tr>\n";
print "</table><br>\n";
print "</table></div>";
print "<br>\n";


print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
Expand All @@ -283,6 +287,7 @@
$resql=$db->query($sql);
if ($resql)
{
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<th colspan="4">'.$langs->trans("LastMembersModified",$max).'</th></tr>';
Expand Down Expand Up @@ -319,7 +324,8 @@
$i++;
}
}
print "</table><br>";
print "</table></div>";
print "<br>";
}
else
{
Expand All @@ -344,6 +350,7 @@
$resql=$db->query($sql);
if ($resql)
{
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<th colspan="5">'.$langs->trans("LastSubscriptionsModified",$max).'</th></tr>';
Expand Down Expand Up @@ -379,7 +386,8 @@
$i++;
}
}
print "</table><br>";
print "</table></div>";
print "<br>";
}
else
{
Expand All @@ -388,6 +396,7 @@


// Summary of members by type
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<th>'.$langs->trans("MembersTypes").'</th>';
Expand Down Expand Up @@ -416,7 +425,7 @@
print '</tr>';

print "</table>\n";

print "</div>";

print '</div></div></div>';

Expand Down
2 changes: 2 additions & 0 deletions htdocs/core/lib/project.lib.php
Expand Up @@ -1147,6 +1147,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=

$arrayidtypeofcontact=array();

print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';

$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
Expand Down Expand Up @@ -1346,6 +1347,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
}

print "</table>";
print '</div>';

if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE))
{
Expand Down
2 changes: 2 additions & 0 deletions htdocs/langs/en_US/main.lang
Expand Up @@ -818,6 +818,8 @@ Websites=Web sites
Events=Events
EMailTemplates=Emails templates
FileNotShared=File not shared to exernal public
Project=Project
Projects=Projects
# Week day
Monday=Monday
Tuesday=Tuesday
Expand Down
2 changes: 0 additions & 2 deletions htdocs/langs/en_US/projects.lang
Expand Up @@ -3,8 +3,6 @@ RefProject=Ref. project
ProjectRef=Project ref.
ProjectId=Project Id
ProjectLabel=Project label
Project=Project
Projects=Projects
ProjectsArea=Projects Area
ProjectStatus=Project status
SharedProject=Everybody
Expand Down
7 changes: 7 additions & 0 deletions htdocs/product/index.php
Expand Up @@ -134,6 +134,8 @@
$prodser[$objp->fk_product_type][$status]=$objp->total;
}


print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
if (! empty($conf->product->enabled))
Expand Down Expand Up @@ -188,11 +190,13 @@
print $total;
print '</td></tr>';
print '</table>';
print '</div>';

if (! empty($conf->categorie->enabled) && ! empty($conf->global->CATEGORY_GRAPHSTATS_ON_PRODUCTS))
{
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
print '<br>';
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Categories").'</th></tr>';
print '<tr '.$bc[0].'><td align="center" colspan="2">';
Expand Down Expand Up @@ -246,6 +250,7 @@
print $total;
print '</td></tr>';
print '</table>';
print '</div>';
}
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';

Expand Down Expand Up @@ -281,6 +286,7 @@
if (isset($_GET["type"]) && $_GET["type"] == 0) $transRecordedType = $langs->trans("LastRecordedProducts",$max);
if (isset($_GET["type"]) && $_GET["type"] == 1) $transRecordedType = $langs->trans("LastRecordedServices",$max);

print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';

$colnb=5;
Expand Down Expand Up @@ -355,6 +361,7 @@
$db->free($result);

print "</table>";
print '</div>';
print '<br>';
}
}
Expand Down
12 changes: 8 additions & 4 deletions htdocs/projet/graph_opportunities.inc.php
@@ -1,4 +1,4 @@
<?php
<?php
if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
{
$sql = "SELECT p.fk_opp_status as opp_status, cls.code, COUNT(p.rowid) as nb, SUM(p.opp_amount) as opp_amount, SUM(p.opp_amount * p.opp_percent) as ponderated_opp_amount";
Expand Down Expand Up @@ -48,7 +48,8 @@
$db->free($resql);

$ponderated_opp_amount = $ponderated_opp_amount / 100;


print '<div class="div-table-responsive-no-min">';
print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("OpportunitiesStatusForOpenedProjects").'</th></tr>'."\n";
$var=true;
Expand All @@ -67,7 +68,7 @@
$dataseries[]=array('label'=>$labelstatus,'data'=>(isset($valsamount[$status])?(float) $valsamount[$status]:0));
if (! $conf->use_javascript_ajax)
{

print '<tr class="oddeven">';
print '<td>'.$labelstatus.'</td>';
print '<td align="right"><a href="list.php?statut='.$status.'">'.price((isset($valsamount[$status])?(float) $valsamount[$status]:0), 0, '', 1, -1, -1, $conf->currency).'</a></td>';
Expand All @@ -88,7 +89,10 @@
//print $langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')';
print $form->textwithpicto($langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')', $langs->trans("OpportunityPonderatedAmountDesc"), 1);
print '</td><td align="right">'.price(price2num($ponderated_opp_amount,'MT'), 0, '', 1, -1, -1, $conf->currency).'</td></tr>';
print "</table><br>";
print "</table>";
print "</div>";

print "<br>";
}
else
{
Expand Down
2 changes: 2 additions & 0 deletions htdocs/projet/index.php
Expand Up @@ -159,6 +159,7 @@
print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';


print '<div class="div-table-responsive-no-min">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print_liste_field_titre("OpenedProjectsByThirdparties",$_SERVER["PHP_SELF"],"s.nom","","",'',$sortfield,$sortorder);
Expand Down Expand Up @@ -213,6 +214,7 @@
dol_print_error($db);
}
print "</table>";
print '</div>';

if (! empty($conf->global->PROJECT_SHOW_PROJECT_LIST_ON_PROJECT_AREA))
{
Expand Down

0 comments on commit abd5251

Please sign in to comment.