Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
VIPSWeb
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
Container registry
Model registry
Operate
Environments
Monitor
Incidents
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
VIPS
VIPSWeb
Commits
497a088e
Commit
497a088e
authored
7 years ago
by
Tor-Einar Skog
Browse files
Options
Downloads
Patches
Plain Diff
Trying to integrate video
parent
b6a494cc
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
VIPSWeb/static/css/vipsweb.css
+18
-0
18 additions, 0 deletions
VIPSWeb/static/css/vipsweb.css
roughage/templates/roughage/nutrition.html
+7
-1
7 additions, 1 deletion
roughage/templates/roughage/nutrition.html
with
25 additions
and
1 deletion
VIPSWeb/static/css/vipsweb.css
+
18
−
0
View file @
497a088e
...
@@ -839,3 +839,21 @@ div.advertisement {
...
@@ -839,3 +839,21 @@ div.advertisement {
border
:
3px
solid
#008136
;
border
:
3px
solid
#008136
;
padding
:
10px
20px
25px
25px
;
padding
:
10px
20px
25px
25px
;
}
}
/* For embedding VIMEO etc responsively */
.responsive-video
{
position
:
relative
;
padding-bottom
:
56.25%
;
padding-top
:
60px
;
overflow
:
hidden
;
}
.responsive-video
iframe
,
.responsive-video
object
,
.responsive-video
embed
{
position
:
absolute
;
top
:
0
;
left
:
0
;
width
:
100%
;
height
:
100%
;
}
This diff is collapsed.
Click to expand it.
roughage/templates/roughage/nutrition.html
+
7
−
1
View file @
497a088e
...
@@ -34,9 +34,11 @@
...
@@ -34,9 +34,11 @@
<p>
<p>
Felt merket med * må fylles ut. Velg klimastasjon for årets klimadata, normaldata eller begge.
Felt merket med * må fylles ut. Velg klimastasjon for årets klimadata, normaldata eller begge.
</p>
</p>
<form
id=
"{{form_id}}"
>
<form
id=
"{{form_id}}"
>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-md-6"
>
<div
class=
"col-md-6"
>
<input
type=
"hidden"
name=
"timeZone"
value=
"Europe/Oslo"
/>
<input
type=
"hidden"
name=
"timeZone"
value=
"Europe/Oslo"
/>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<label
for=
"weatherStationId"
>
Målestasjon for årets værdata
</label>
<label
for=
"weatherStationId"
>
Målestasjon for årets værdata
</label>
...
@@ -89,7 +91,11 @@
...
@@ -89,7 +91,11 @@
</div>
</div>
<div
class=
"col-md-6"
>
<div
class=
"col-md-6"
>
<div
id=
"weatherStationSelectionMap"
style=
"height: 450px;max-height: 450px;"
>
<div
class=
"responsive-video"
>
<iframe
src=
"https://player.vimeo.com/video/147571372"
width=
"640"
height=
"360"
frameborder=
"0"
webkitallowfullscreen
mozallowfullscreen
allowfullscreen
></iframe>
<p><a
href=
"https://vimeo.com/147571372"
>
Grovformodellen 2015
</a>
from
<a
href=
"https://vimeo.com/nibio"
>
NIBIO
</a>
on
<a
href=
"https://vimeo.com"
>
Vimeo
</a>
.
</p>
</div>
<div
id=
"weatherStationSelectionMap"
style=
"height: 450px;max-height: 450px; margin: 15px;"
>
<div
id=
"popover"
></div>
<div
id=
"popover"
></div>
</div>
</div>
</div>
</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