Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Greenlight
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Arbeitsgruppe Hardwarenahe IT-Systeme
Greenlight
Commits
79bb7823
Commit
79bb7823
authored
6 years ago
by
farhatahmad
Committed by
Jesus Federico
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fixed issues with application js order and flash messages (#387)
parent
404134aa
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/assets/javascripts/application.js
+2
-2
2 additions, 2 deletions
app/assets/javascripts/application.js
app/views/layouts/application.html.erb
+13
-9
13 additions, 9 deletions
app/views/layouts/application.html.erb
with
15 additions
and
11 deletions
app/assets/javascripts/application.js
+
2
−
2
View file @
79bb7823
...
@@ -26,9 +26,9 @@
...
@@ -26,9 +26,9 @@
// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
// about supported directives.
// about supported directives.
//
//
//= require turbolinks
//= require jquery
//= require jquery
//= require jquery_ujs
//= require tabler
//= require tabler
//= require tabler.plugins
//= require tabler.plugins
//= require
turbolink
s
//= require
jquery_uj
s
//= require_tree .
//= require_tree .
This diff is collapsed.
Click to expand it.
app/views/layouts/application.html.erb
+
13
−
9
View file @
79bb7823
...
@@ -39,18 +39,22 @@
...
@@ -39,18 +39,22 @@
<div
class=
"wrapper"
>
<div
class=
"wrapper"
>
<%
if
bigbluebutton_endpoint_default?
%>
<%
if
bigbluebutton_endpoint_default?
%>
<%=
render
"shared/error_banner"
do
%>
<div
class=
"alert alert-icon alert-danger text-center mb-0"
>
<div
class=
"flash alert d-inline"
>
<i
class=
"fas fa-exclamation-triangle"
></i>
<i
class=
"fas fa-exclamation-triangle"
></i>
<p
class=
"d-inline"
>
<%=
t
(
"test_install"
,
<p
class=
"d-inline"
>
<%=
t
(
"test_install"
,
href:
link_to
(
t
(
"docs"
).
downcase
,
"http://docs.bigbluebutton.org/install/greenlight-v2.html#2-install-greenlight"
,
target:
"_blank"
)
href:
link_to
(
t
(
"docs"
).
downcase
,
"http://docs.bigbluebutton.org/install/greenlight-v2.html#2-install-greenlight"
,
target:
"_blank"
)
).
html_safe
%>
).
html_safe
%>
<%
end
%>
</div>
</div>
<%
end
%>
<%
end
%>
<%
unless
Rails
.
configuration
.
banner_message
.
blank?
%>
<%
unless
Rails
.
configuration
.
banner_message
.
blank?
%>
<%=
render
"shared/error_banner"
do
%>
<div
class=
"alert alert-icon alert-danger text-center mb-0"
>
<div
class=
"flash alert d-inline"
>
<p
class=
"d-inline"
>
<%=
Rails
.
configuration
.
banner_message
%>
</p>
<p
class=
"d-inline"
>
<%=
Rails
.
configuration
.
banner_message
%>
</p>
<%
end
%>
</div>
</div>
<%
end
%>
<%
end
%>
<%=
yield
%>
<%=
yield
%>
...
...
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