Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
UNL Resource Scheduler
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
Digital Experience Group
UNL Resource Scheduler
Commits
f24aff5c
Commit
f24aff5c
authored
6 years ago
by
Jeff Sturek
Browse files
Options
Downloads
Patches
Plain Diff
Kiosk layout fixes so displays correctly
parent
d8a7254f
Branches
Branches containing commit
No related tags found
1 merge request
!9
Kiosk layout fixes so displays correctly
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
views/fixed.erb
+4
-2
4 additions, 2 deletions
views/fixed.erb
views/reserve.erb
+3
-1
3 additions, 1 deletion
views/reserve.erb
views/resource_calendar.erb
+2
-2
2 additions, 2 deletions
views/resource_calendar.erb
with
9 additions
and
5 deletions
views/fixed.erb
+
4
−
2
View file @
f24aff5c
...
...
@@ -70,7 +70,7 @@
</header>
<main
class=
"dcf-main"
id=
"dcf-main"
role=
"main"
tabindex=
"-1"
>
<%
unless
defined?
(
kiosk_mode
)
&&
kiosk_mode
==
'true'
%>
<!-- TemplateBeginEditable name="hero" -->
<div
class=
"dcf-hero dcf-hero-default"
>
<!-- TemplateEndEditable -->
...
...
@@ -102,6 +102,7 @@
</div>
<!-- TemplateEndEditable -->
</div>
<%
end
%>
<div
class=
"dcf-main-content dcf-wrapper"
>
<!-- TemplateBeginEditable name="maincontentarea" -->
<div
class=
"dcf-bleed"
>
...
...
@@ -137,7 +138,6 @@
<%
end
%>
<%
else
%>
<%
session
.
delete
(
:notice
)
%>
<%
session
.
delete
(
"notice"
)
%>
<%
end
%>
<%=
yield
%>
</div>
...
...
@@ -145,6 +145,7 @@
<!-- TemplateEndEditable -->
</div>
</main>
<%
unless
defined?
(
kiosk_mode
)
&&
kiosk_mode
==
'true'
%>
<footer
class=
"dcf-footer"
id=
"dcf-footer"
role=
"contentinfo"
>
<!-- TemplateBeginEditable name="optionalfooter" -->
<!-- TemplateEndEditable -->
...
...
@@ -154,6 +155,7 @@
<!-- TemplateEndEditable -->
<%=
ERB
.
new
(
File
.
read
(
File
.
expand_path
(
"
#{
ROOT
}
/public/wdn/templates_5.0/includes/global/footer-global-2.html"
))).
result
%>
</footer>
<%
end
%>
<%=
ERB
.
new
(
File
.
read
(
File
.
expand_path
(
"
#{
ROOT
}
/public/wdn/templates_5.0/includes/global/noscript.html"
))).
result
%>
<%=
ERB
.
new
(
File
.
read
(
File
.
expand_path
(
"
#{
ROOT
}
/public/wdn/templates_5.0/includes/global/js-body.html"
))).
result
.
gsub
(
'$DEP_VERSION$'
,
template_dep_version
)
%>
<!-- TemplateBeginEditable name="jsbody" -->
...
...
This diff is collapsed.
Click to expand it.
views/reserve.erb
+
3
−
1
View file @
f24aff5c
...
...
@@ -20,9 +20,10 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar
%>
<div
id=
"pagetitle"
>
<h3>
<%=
reservation
.
nil?
?
'Reserve Time for '
:
'Edit Reservation for '
%><%=
resource
.
name
%>
</h3>
<h3
class=
"dcf-txt-h5"
>
<%=
reservation
.
nil?
?
'Reserve Time for '
:
'Edit Reservation for '
%><%=
resource
.
name
%>
</h3>
</div>
<div
class=
"dcf-clear-both"
>
<form
action=
""
method=
"POST"
>
<section
class=
"dcf-grid dcf-col-gap-vw"
>
<div
class=
"dcf-col-100% dcf-col-67%-start@sm"
>
...
...
@@ -212,6 +213,7 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar
</div>
</section>
</form>
</div>
<%
append_script_declaration
(
%q[var ordinal = function(number) {
var mod = number % 100;
...
...
This diff is collapsed.
Click to expand it.
views/resource_calendar.erb
+
2
−
2
View file @
f24aff5c
...
...
@@ -9,7 +9,7 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar
<div
id=
"pagetitle"
>
<div
id=
"kioskLogo"
></div>
<h1
class=
"
clear-top
dcf-float-left"
>
<h1
class=
"dcf-float-left
dcf-txt-h4 dcf-lh-4 dcf-txt-middle
"
>
<%=
resource
.
name
%>
</h1>
</div>
...
...
@@ -19,7 +19,7 @@ EIGHT_PM_MINUTES = 1200 # end time of calendar
<%
if
@user
%>
<a
class=
"unl-font-sans"
href=
"/kiosk-logout/?url_redirect=
<%=
url_encode
(
"/
#{
@space
.
url_name
}
/resources/
#{
resource
.
id
}
/calendar/?kiosk_mode=true"
)
%>
"
>
Log Out
</a>
<%
end
%>
<a
class=
"dcf-btn dcf-btn-primary"
href=
"/
<%=
@space
.
url_name
%>
/resources/
<%=
resource
.
id
%>
/reserve/?kiosk_mode=true"
>
Reserve
<%=
resource
.
name
%>
</a>
<a
class=
"dcf-btn dcf-btn-primary
dcf-txt-2xs
"
href=
"/
<%=
@space
.
url_name
%>
/resources/
<%=
resource
.
id
%>
/reserve/?kiosk_mode=true"
>
Reserve
<%=
resource
.
name
%>
</a>
</div>
<%
end
%>
...
...
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