Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
rescheduled 🗓️
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
c3lingo
rescheduled 🗓️
Commits
c702af87
Verified
Commit
c702af87
authored
3 months ago
by
Felix Eckhofer
Browse files
Options
Downloads
Patches
Plain Diff
Open links on calendar page in new window
Requested by korfuri. If people complain maybe make it a preference.
parent
e2e6f4aa
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/views/assignments/by_user.html.erb
+1
-1
1 addition, 1 deletion
app/views/assignments/by_user.html.erb
app/views/sessions/_session.html.erb
+2
-2
2 additions, 2 deletions
app/views/sessions/_session.html.erb
with
3 additions
and
3 deletions
app/views/assignments/by_user.html.erb
+
1
−
1
View file @
c702af87
...
...
@@ -43,7 +43,7 @@
<td>
<%=
assignment
.
session
.
starts_at
.
strftime
(
'%H:%M'
)
%>
</td>
<td>
<%=
assignment
.
session
.
ends_at
.
strftime
(
'%H:%M'
)
%>
</td>
<td>
<%=
assignment
.
session
.
stage
.
name
%>
</td>
<td>
<%=
link_to
assignment
.
session
.
title
,
assignment
.
session
.
url
,
target:
"_
top
"
%>
</td>
<td>
<%=
link_to
assignment
.
session
.
title
,
assignment
.
session
.
url
,
target:
"_
blank
"
%>
</td>
<td>
<%
assignment
.
session
.
assignments
.
map
(
&
:user
).
each
do
|
other_user
|
%><%=
render
partial:
'application/user_avatar'
,
locals:
{
user:
other_user
}
%><%
end
%>
</td>
</tr>
<%
end
%>
...
...
This diff is collapsed.
Click to expand it.
app/views/sessions/_session.html.erb
+
2
−
2
View file @
c702af87
...
...
@@ -3,7 +3,7 @@
<div
class=
"session shadow hover:shadow-lg overflow-scroll text-sm w-full !h-full min-h-full hover:!min-h-max
<%=
session
.
translators_needed?
?
"translators-needed"
:
"no-translators-needed"
%>
<%=
session
.
backup_needed?
?
"backup-needed"
:
"no-backup-needed"
%>
<%=
session
.
assignees?
?
"has-assignees"
:
"no-assignees"
%>
<%=
(
session
.
ends_at
<
Time
.
now
?
"past"
:
""
)
%>
"
>
<h4>
<small
class=
"text-2xs uppercase font-light bg-black/10 rounded-sm p-1 mr-1 lang-
<%=
session
.
language
%>
"
>
<%=
session
.
language
%>
</small>
<%
unless
session
.
recorded
%>
<span
aria-label=
"Session is not recorded"
title=
"Session is not recorded"
><svg
class=
"inline-block -mt-0.5 w-5 h-5"
fill=
"#000000"
version=
"1.1"
viewBox=
"0 0 512 512"
xmlns=
"http://www.w3.org/2000/svg"
><path
d=
"m255-1c-141 0-256 115-256 256s115 256 256 256 256-115 256-256-115-256-256-256zm0 17c63 0 121 25 163 65l-65 65-19-48c-0.85-2.6-4.3-5.1-7.7-5.1h-142c-3.4 0-6 1.7-7.7 5.1l-21 55h-49c-17 0-31 14-31 31v169c0 17 14 31 31 31h6.7l-34 34c-39-43-64-100-64-162 0-131 108-239 239-239zm60 239c0 33-26 60-60 60-14 0-26-4.4-36-12l84-83c7.3 9.9 12 22 12 36zm-119 0c0-33 26-60 60-60 14 0 26 4.5 36 12l-84 83c-7.4-9.9-12-22-12-36zm108-60c-13-11-30-17-48-17-43 0-77 34-77 77 0 18 6.2 35 17 48l-64 63h-25c-7.7 0-14-6-14-14v-169c0-7.7 6-14 14-14h55c3.4 0 6.8-2.6 7.7-5.1l21-55h130l19 50-36 36zm-97 120c13 11 30 17 48 17 43 0 77-34 77-77 0-18-6.1-35-16-48l38-38h49c7.7 0 14 6 14 14v169c0 7.7-6 14-14 14h-247l51-51zm48 179c-63 0-120-25-163-65l46-46h265c17 0 31-14 32-31v-169c0-17-14-31-31-31h-34l60-59c39 43 64 100 64 162-1e-3 131-108 239-239 239z"
/><path
d=
"m383 187c-9.4 0-17 7.7-17 17s7.7 17 17 17 17-7.7 17-17-7.7-17-17-17z"
/></svg></span>
<%
end
%>
<%=
link_to
session
.
title
,
session
.
url
,
target:
"_
top
"
%>
<%=
link_to
session
.
title
,
session
.
url
,
target:
"_
blank
"
%>
</h4>
<div
class=
"relative"
>
<span
class=
"session-time text-xs mr-1"
>
...
...
@@ -52,7 +52,7 @@
<div>
<ul
class=
"flex flex-wrap text-xs gap-1"
>
<%
session
.
speakers
.
each
do
|
speaker
|
%>
<li>
<%=
link_to
speaker
.
name
,
conference_speaker_path
(
session
.
conference
,
speaker
.
ref_id
),
target:
"_
top
"
,
class:
"underline"
%>
</li>
<li>
<%=
link_to
speaker
.
name
,
conference_speaker_path
(
session
.
conference
,
speaker
.
ref_id
),
target:
"_
blank
"
,
class:
"underline"
%>
</li>
<%
end
%>
</uL>
</div>
...
...
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