Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
b6b67dc4
Commit
b6b67dc4
authored
14 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
New: Enhancement in actions list management. Show location in day view
parent
2e8d1801
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
htdocs/comm/action/index.php
+9
-5
9 additions, 5 deletions
htdocs/comm/action/index.php
with
9 additions
and
5 deletions
htdocs/comm/action/index.php
+
9
−
5
View file @
b6b67dc4
...
...
@@ -474,7 +474,7 @@ if (empty($action) || $action == 'show_month') // View by month
{
$style
=
'cal_other_month'
;
echo
' <td class="'
.
$style
.
'" width="14%" valign="top" nowrap="nowrap">'
;
show_day_events
(
$db
,
$max_day_in_prev_month
+
$tmpday
,
$prev_month
,
$prev_year
,
$month
,
$style
,
$eventarray
,
$conf
->
global
->
AGENDA_MAX_EVENTS_DAY_VIEW
,
$maxlength
,
$
new
param
);
show_day_events
(
$db
,
$max_day_in_prev_month
+
$tmpday
,
$prev_month
,
$prev_year
,
$month
,
$style
,
$eventarray
,
$conf
->
global
->
AGENDA_MAX_EVENTS_DAY_VIEW
,
$maxlength
,
$param
);
echo
" </td>
\n
"
;
}
/* Show days of the current month */
...
...
@@ -490,7 +490,7 @@ if (empty($action) || $action == 'show_month') // View by month
$style
=
'cal_current_month'
;
echo
' <td class="'
.
$style
.
'" width="14%" valign="top" nowrap="nowrap">'
;
show_day_events
(
$db
,
$tmpday
,
$month
,
$year
,
$month
,
$style
,
$eventarray
,
$conf
->
global
->
AGENDA_MAX_EVENTS_DAY_VIEW
,
$maxlength
,
$
new
param
);
show_day_events
(
$db
,
$tmpday
,
$month
,
$year
,
$month
,
$style
,
$eventarray
,
$conf
->
global
->
AGENDA_MAX_EVENTS_DAY_VIEW
,
$maxlength
,
$param
);
echo
" </td>
\n
"
;
}
/* Show days after the current month (next month) */
...
...
@@ -498,7 +498,7 @@ if (empty($action) || $action == 'show_month') // View by month
{
$style
=
'cal_other_month'
;
echo
' <td class="'
.
$style
.
'" width="14%" valign="top" nowrap="nowrap">'
;
show_day_events
(
$db
,
$tmpday
-
$max_day_in_month
,
$next_month
,
$next_year
,
$month
,
$style
,
$eventarray
,
$conf
->
global
->
AGENDA_MAX_EVENTS_DAY_VIEW
,
$maxlength
,
$
new
param
);
show_day_events
(
$db
,
$tmpday
-
$max_day_in_month
,
$next_month
,
$next_year
,
$month
,
$style
,
$eventarray
,
$conf
->
global
->
AGENDA_MAX_EVENTS_DAY_VIEW
,
$maxlength
,
$param
);
echo
"</td>
\n
"
;
}
$tmpday
++
;
...
...
@@ -519,7 +519,7 @@ else // View by day
echo
" </tr>
\n
"
;
echo
" <tr>
\n
"
;
echo
' <td class="'
.
$style
.
'" width="14%" valign="top" nowrap="nowrap">'
;
show_day_events
(
$db
,
$day
,
$month
,
$year
,
$month
,
$style
,
$eventarray
,
0
,
80
,
$
new
param
,
1
,
300
);
show_day_events
(
$db
,
$day
,
$month
,
$year
,
$month
,
$style
,
$eventarray
,
0
,
80
,
$param
,
1
,
300
);
echo
"</td>
\n
"
;
echo
" </tr>
\n
"
;
echo
'</table>'
;
...
...
@@ -561,7 +561,11 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
print
'<table class="nobordernopadding" width="100%">'
;
print
'<tr style="background: #EEEEEE"><td align="left" nowrap="nowrap">'
;
print
'<a href="'
.
DOL_URL_ROOT
.
'/comm/action/index.php?action=show_day&day='
.
str_pad
(
$day
,
2
,
"0"
,
STR_PAD_LEFT
)
.
'&month='
.
$month
.
'&year='
.
$year
.
'">'
;
print
'<a href="'
.
DOL_URL_ROOT
.
'/comm/action/index.php?'
;
print
'action=show_day&day='
.
str_pad
(
$day
,
2
,
"0"
,
STR_PAD_LEFT
);
print
$newparam
;
//.'&month='.$month.'&year='.$year;
print
'">'
;
if
(
$showinfo
)
print
dol_print_date
(
$curtime
,
'daytext'
);
else
print
dol_print_date
(
$curtime
,
'%d'
);
print
'</a>'
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment