From c7065cc3b806e30d32cb50b58e45568d4c0a8de7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 7 Jun 2016 13:15:38 +0200
Subject: [PATCH] Minor esthetic fixes
---
htdocs/comm/action/card.php | 6 +-
htdocs/core/class/html.formmargin.class.php | 2 +-
htdocs/core/tpl/resource_view.tpl.php | 54 +++++++++---------
htdocs/projet/list.php | 2 +-
htdocs/resource/element_resource.php | 3 +-
.../theme/eldy/img/object_calendargantt.png | Bin 0 -> 242 bytes
.../theme/eldy/img/object_calendarpertype.png | Bin 0 -> 198 bytes
htdocs/theme/eldy/img/object_resource.png | Bin 199 -> 197 bytes
htdocs/theme/eldy/style.css.php | 13 ++++-
htdocs/theme/md/img/object_calendargantt.png | Bin 0 -> 219 bytes
.../theme/md/img/object_calendarpertype.png | Bin 0 -> 221 bytes
.../theme/md/img/object_calendarperuser.png | Bin 106 -> 221 bytes
htdocs/theme/md/style.css.php | 2 +-
13 files changed, 45 insertions(+), 37 deletions(-)
create mode 100644 htdocs/theme/eldy/img/object_calendargantt.png
create mode 100644 htdocs/theme/eldy/img/object_calendarpertype.png
create mode 100644 htdocs/theme/md/img/object_calendargantt.png
create mode 100644 htdocs/theme/md/img/object_calendarpertype.png
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 7a2f231879d..4df296d19da 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1445,7 +1445,7 @@ if ($id > 0)
print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
- print img_picto($langs->trans("ViewCal"),'object_calendarweek','class="hideonsmartphone pictoactionview"').' <input type="submit" style="min-width: 120px" class="button buttonactionview" name="viewweek" value="'.$langs->trans("ViewWeek").'">';
+ print img_picto($langs->trans("ViewWeek"),'object_calendarweek','class="hideonsmartphone pictoactionview"').' <input type="submit" style="min-width: 120px" class="button buttonactionview" name="viewweek" value="'.$langs->trans("ViewWeek").'">';
print '</form>'."\n";
print '<form name="listactionsfilterday" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -1454,7 +1454,7 @@ if ($id > 0)
print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
- print img_picto($langs->trans("ViewCal"),'object_calendarday','class="hideonsmartphone pictoactionview"').' <input type="submit" style="min-width: 120px" class="button buttonactionview" name="viewday" value="'.$langs->trans("ViewDay").'">';
+ print img_picto($langs->trans("ViewDay"),'object_calendarday','class="hideonsmartphone pictoactionview"').' <input type="submit" style="min-width: 120px" class="button buttonactionview" name="viewday" value="'.$langs->trans("ViewDay").'">';
print '</form>'."\n";
print '<form name="listactionsfilterperuser" action="'.DOL_URL_ROOT.'/comm/action/peruser.php" method="POST" style="float: left; padding-right: 10px;">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -1463,7 +1463,7 @@ if ($id > 0)
print '<input type="hidden" name="month" value="'.dol_print_date($object->datep,'%m').'">';
print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
- print img_picto($langs->trans("ViewCal"),'object_calendarperuser','class="hideonsmartphone pictoactionview"').' <input type="submit" style="min-width: 120px" class="button buttonactionview" name="viewperuser" value="'.$langs->trans("ViewPerUser").'">';
+ print img_picto($langs->trans("ViewPerUser"),'object_calendarperuser','class="hideonsmartphone pictoactionview"').' <input type="submit" style="min-width: 120px" class="button buttonactionview" name="viewperuser" value="'.$langs->trans("ViewPerUser").'">';
print '</form>'."\n";
print '</div>';
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index a52238be1b9..6678d87ca60 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -255,7 +255,7 @@ class FormMargin
if (! empty($conf->product->enabled) && ! empty($conf->service->enabled))
{
- print '<tr class="impair">';
+ print '<tr class="liste_total">';
print '<td>'.$langs->trans('TotalMargin').'</td>';
print '<td align="right">'.price($marginInfo['pv_total'], null, null, null, null, $rounding).'</td>';
print '<td align="right">'.price($marginInfo['pa_total'], null, null, null, null, $rounding).'</td>';
diff --git a/htdocs/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php
index dd775662db6..7b2a6f43f4d 100644
--- a/htdocs/core/tpl/resource_view.tpl.php
+++ b/htdocs/core/tpl/resource_view.tpl.php
@@ -5,34 +5,33 @@
$form= new Form($db);
+print '<div class="tagtable centpercent noborder allwidth">';
+
+if($mode == 'edit' )
+{
+ print '<form class="tagtr liste_titre">';
+ print '<div class="tagtd">'.$langs->trans('Resource').'</div>';
+ print '<div class="tagtd">'.$langs->trans('Type').'</div>';
+ print '<div class="tagtd" align="center">'.$langs->trans('Busy').'</div>';
+ print '<div class="tagtd" align="center">'.$langs->trans('Mandatory').'</div>';
+ print '<div class="tagtd"></div>';
+ print '</form>';
+}
+else
+{
+ print '<form class="tagtr liste_titre">';
+ print '<div class="tagtd">'.$langs->trans('Resource').'</div>';
+ print '<div class="tagtd">'.$langs->trans('Type').'</div>';
+ print '<div class="tagtd" align="center">'.$langs->trans('Busy').'</div>';
+ print '<div class="tagtd" align="center">'.$langs->trans('Mandatory').'</div>';
+ print '<div class="tagtd"></div>';
+ print '</form>';
+}
+
if( (array) $linked_resources && count($linked_resources) > 0)
{
$var=true;
- print '<div class="tagtable centpercent noborder allwidth">';
-
- if($mode == 'edit' )
- {
- print '<form class="tagtr liste_titre">';
- print '<div class="tagtd">'.$langs->trans('Resource').'</div>';
- print '<div class="tagtd">'.$langs->trans('Type').'</div>';
- print '<div class="tagtd" align="center">'.$langs->trans('Busy').'</div>';
- print '<div class="tagtd" align="center">'.$langs->trans('Mandatory').'</div>';
- print '<div class="tagtd"></div>';
- print '</form>';
- }
- else
- {
- print '<form class="tagtr liste_titre">';
- print '<div class="tagtd">'.$langs->trans('Resource').'</div>';
- print '<div class="tagtd">'.$langs->trans('Type').'</div>';
- print '<div class="tagtd" align="center">'.$langs->trans('Busy').'</div>';
- print '<div class="tagtd" align="center">'.$langs->trans('Mandatory').'</div>';
- print '<div class="tagtd"></div>';
- print '</form>';
- }
-
-
foreach ($linked_resources as $linked_resource)
{
$var=!$var;
@@ -56,7 +55,6 @@ if( (array) $linked_resources && count($linked_resources) > 0)
print '<div class="tagtd" align="center">'.$form->selectyesno('mandatory',$linked_resource['mandatory']?1:0,1).'</div>';
print '<div class="tagtd" align="right"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div>';
print '</form>';
-
}
else
{
@@ -96,11 +94,13 @@ if( (array) $linked_resources && count($linked_resources) > 0)
}
}
- print '</div>';
}
else {
- print '<div class="warning">'.$langs->trans('NoResourceLinked').'</div>';
+ print '<div class="tagtr '.($var==true?"pair":"impair").'"><div class="tagtd opacitymedium">'.$langs->trans('NoResourceLinked').'</div></div>';
}
+
+print '</div>';
+
?>
<!-- END TEMPLATE resource_view.tpl.php -->
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 2e78ea94bbf..2f45d2b782b 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -425,7 +425,7 @@ if ($resql)
print $hookmanager->resPrint;
if (! empty($arrayfields['p.datec']['checked'])) print_liste_field_titre($arrayfields['p.datec']['label'],$_SERVER["PHP_SELF"],"p.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
if (! empty($arrayfields['p.tms']['checked'])) print_liste_field_titre($arrayfields['p.tms']['label'],$_SERVER["PHP_SELF"],"p.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
- if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'],$_SERVER["PHP_SELF"],"p.fk_statut","",$param,'align="center"',$sortfield,$sortorder);
+ if (! empty($arrayfields['p.fk_statut']['checked'])) print_liste_field_titre($arrayfields['p.fk_statut']['label'],$_SERVER["PHP_SELF"],"p.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
print "</tr>\n";
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index 59a95f6f57a..7cb5b74fac3 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -168,7 +168,7 @@ if($ret == -1) {
dol_print_error($db,$object->error);
exit;
}
-if(!$ret) {
+if (!$ret) {
print '<div class="warning">'.$langs->trans('NoResourceInDatabase').'</div>';
}
else
@@ -304,6 +304,7 @@ else
//print load_fiche_titre($langs->trans('ResourcesLinkedToElement'),'','');
+ // Show list of resource links
foreach ($object->available_resources as $modresources => $resources)
{
diff --git a/htdocs/theme/eldy/img/object_calendargantt.png b/htdocs/theme/eldy/img/object_calendargantt.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d727dd6f2428dc349cbdba254e041b1709d9a63
GIT binary patch
literal 242
zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!2~3a2>s>&Qfx`y?k+$Y2!1;6t_M<_1s;*b
z3=CW!K$y{KjmZq4AbW|YuPgflHg+xx>tvQSMnIu@PZ!4!iOb1z%wDrHI~wF(>;4Y`
zudc3+kUTw2H#spOAz*(Q@2bbQw$6@<n!&cwz`(#kWnJv<Wv#xfA%Y?->)IqwFr*vY
zS>qnM#V&;V>WOTFbO+Iux8t2nAKg0J9QESbU7HoHISjKN&yeU~&^b}|IB5gNhc~+`
cCN_97gjf657rkZ>2Renp)78&qol`;+00TQ!egFUf
literal 0
HcmV?d00001
diff --git a/htdocs/theme/eldy/img/object_calendarpertype.png b/htdocs/theme/eldy/img/object_calendarpertype.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba16a4ab6c0dfe3a033f2739a587e8c4b567d181
GIT binary patch
literal 198
zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!VDyL#uerODaPU;cPEB*=VV?2IYI$GA+Gbw
zw*3G9f7!BS(`LQ6di5%hZTl)U5Tvvu$S;_|;n|He5GTpo-G!lpRn`N@;VkfoEM{Qf
z`T)X=PHRkN00r4gJbhi+?{RXltFf1CoSO_3Qt)(f4B@z*Y{16McKJcT^$7|RsTw>Y
i#!7AiYi@TiGBMOF<2MpC+~@;T%i!ti=d#Wzp$PyHSUGC|
literal 0
HcmV?d00001
diff --git a/htdocs/theme/eldy/img/object_resource.png b/htdocs/theme/eldy/img/object_resource.png
index 8cda1f3f2202f020c2aa7f0438b72e06f559c83e..2d93019b62f353d5e43b2e617f940ab5b178071b 100644
GIT binary patch
delta 101
zcmX@kc$9I1%0xrA=m%`<+<eAQ8SgtWFfdqpx;Tb#Tu%;QVrCO%7Z+o9mk{M*<56^w
zYu0w=XwGJsz-7kAYih>I)z)Ukz$zQl$f3c(vMhj?LGuXzW!;$Bu|Pu@JYD@<);T3K
F0RZR@7*7BI
delta 101
zcmX@gc${&93KwH>kh>GZx^prwCn|ad+-71DV3S`w;mQ&Q1_nJ(7sn8e>&XF3%xt3U
z;$rOX5~5seJc{S^ba>VoXx)(D@R4+K@QO(k2@zPt$RHHScXhfFt2j_6gQu&X%Q~lo
FCIFu^8fO3i
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 20ee581f318..d7b0aeb1bb6 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -100,6 +100,7 @@ $fontsizesmaller='11';
$usegradienttop=(isset($conf->global->THEME_ELDY_TOPMENU_BACK1)?0:1);
$usegradienttitle=(isset($conf->global->THEME_ELDY_BACKTITLE1)?0:1);
$useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:1);
+$borderwith=2;
// Case of option always editable
if (! isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY=$colorbackbody;
@@ -800,7 +801,7 @@ img.photoref {
.underrefbanner {
}
.underbanner {
- border-bottom: 2px solid rgb(<?php echo $colortopbordertitle1 ?>);
+ border-bottom: <?php echo $borderwith ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
}
@@ -2199,7 +2200,7 @@ table.liste, table.noborder, table.formdoc, div.noborder {
border-collapse: separate !important;
border-spacing: 0px;
- border-top-width: 2px;
+ border-top-width: <?php echo $borderwith ?>px;
border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
border-top-style: solid;
@@ -2566,7 +2567,7 @@ div.liste_titre {
border-top-style: solid;
}
div.liste_titre_bydiv {
- border-top-width: 2px;
+ border-top-width: <?php echo $borderwith ?>px;
border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
border-top-style: solid;
@@ -2654,6 +2655,12 @@ form.liste_total div {
border-bottom: none;
}
+.margintable {
+ border-top-width: <?php echo $borderwith ?>px !important;
+ border-top-color: rgb(<?php echo $colortopbordertitle1 ?>) !important;
+ border-top-style: solid !important;
+}
+
.margintable td {
border: 0px !important;
}
diff --git a/htdocs/theme/md/img/object_calendargantt.png b/htdocs/theme/md/img/object_calendargantt.png
new file mode 100644
index 0000000000000000000000000000000000000000..b49fe7b2bfb4cab99e1c5a8835c35e7c12b0c690
GIT binary patch
literal 219
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|mn3BBRT^L+$+br7+<Z%{wL>4nJ
za0`PlBg3pY5<o%r5>H=O_6Kb2+{|VQM?)KcLOGr;jv*T7*G_cgYB1noQNOf#{imCj
z-GBS!SFi_59laoS$0^Zyh7PCC$^fPP3=`G{+}Zt?Q6VkKQ?+!9Py4m+`Cp$%-Q4w<
z<zi#u>i9<a=gsq@Dw9_KR50yR5cJ%lT0P;?30d`XlMYXt8(+%Ez+|z_@L|k0puG&9
Lu6{1-oD!M<Sno;W
literal 0
HcmV?d00001
diff --git a/htdocs/theme/md/img/object_calendarpertype.png b/htdocs/theme/md/img/object_calendarpertype.png
new file mode 100644
index 0000000000000000000000000000000000000000..244da5bedd05d02e58217b515d48708bc4052b1c
GIT binary patch
literal 221
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|mn3BBRT^L+$+br7+<Z%{wL>4nJ
za0`PlBg3pY5<o%r5>H=O_6Kb2T-KJ$)aTs=3gvmaIEHAPUpwI<Z-at>v%H6o%q>%y
zlP7{69bc$)uTyQ>`f1*m#q1O(>bzs@i1aurypLgrPtK0JD;vYz7j6kXb!U#syNZ^)
zE9*<v&pE}iciKyzr}J-hUOsYamFUhisTUtwqViezzp8zEbn(yppQ6%fk~+>@Vv#F=
PHZyp-`njxgN@xNA4pvVi
literal 0
HcmV?d00001
diff --git a/htdocs/theme/md/img/object_calendarperuser.png b/htdocs/theme/md/img/object_calendarperuser.png
index 98a013a40148fb41b2ab42dcdd6d609ee7d4016f..244da5bedd05d02e58217b515d48708bc4052b1c 100644
GIT binary patch
delta 192
zcmV;x06+g~-2sp!e*$7lM??Tb+dQVb00009a7bBm000XU000XU0RWnu7ytkO2XskI
zMF-#p2MRkmrYD}=0001PNkl<ZD9^2s(G7qg5JMkGOdQ%Z9LdO1;>V#P-iaobua-;G
z7Cs@7Ebak_SxChbz5uvPY`ER2fmcVNv{lO7oFwjegl^QYI&`m`$^^ZZ=}hIH+KJP|
u%BmH)W*X@5gj#O|5A`PY;?ew{`4t;x87xBz7FnnO0000<MNUMnLSTYzVoT-#
delta 76
zcmcc1m^DGg&Ct`uF{FYqS%LQtyHia~+hhmEHy>Cg>D`$S*0q6Qmxj}hv<ISzOh!zf
fS^QMpC0B4U+)rzp&83<d$p8eNu6{1-oD!M<CW{(n
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 87b5b13fa6d..fd8dfff0c44 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -857,7 +857,7 @@ img.photoref {
.underrefbanner {
}
.underbanner {
- border-bottom: <?php echo $borderwith; ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);;
+ border-bottom: <?php echo $borderwith; ?>px solid rgb(<?php echo $colortopbordertitle1 ?>);
}
--
GitLab