Fix asset URI when in dev mode

master
Daniel Berteaud 10 years ago
parent 66a00c637f
commit ce77729ef8
  1. 5
      templates/default/header.html.ep
  2. 9
      templates/default/js_common.html.ep

@ -4,7 +4,10 @@
<title><%= $title %></title> <title><%= $title %></title>
<meta name="viewport" content="width=device-width, initial-scale=1"/> <meta name="viewport" content="width=device-width, initial-scale=1"/>
<meta name="description" content=" <%=l 'VROOM_DESC' %>" /> <meta name="description" content=" <%=l 'VROOM_DESC' %>" />
<% my @css = qw(css/bootstrap.css css/bootstrap-switch.css css/toc-scroll.css css/bootstrap-datepicker3.css css/vroom.css); %> <%
my @css = qw(bootstrap.css bootstrap-switch.css toc-scroll.css bootstrap-datepicker3.css vroom.css);
@css = map { $self->url_for('/') . 'css/' . $_ } @css;
%>
<%=css @css %> <%=css @css %>
<link rel="icon" type="image/png" href="<%= $self->url_for('/img/favicon.png') %>" /> <link rel="icon" type="image/png" href="<%= $self->url_for('/img/favicon.png') %>" />
</head> </head>

@ -8,16 +8,17 @@
var roomName; var roomName;
</script> </script>
<% <%
my @js = qw(js/jquery-1.11.3.js js/bootstrap.js js/notify-combined.js js/bootstrap-switch.js js/jquery.bootpag.js js/toc.js js/bootstrap-datepicker.js); my @js = qw(jquery-1.11.3.js bootstrap.js notify-combined.js bootstrap-switch.js jquery.bootpag.js toc.js bootstrap-datepicker.js);
# Load supported languages for datpicker, if they exists # Load supported languages for datpicker, if they exists
foreach my $l ($self->get_supported_lang){ foreach my $l ($self->get_supported_lang){
if (-e 'public/js/datepicker-locales/bootstrap-datepicker.' . $l . '.js'){ if (-e 'public/js/datepicker-locales/bootstrap-datepicker.' . $l . '.js'){
push @js, 'js/datepicker-locales/bootstrap-datepicker.' . $l . '.js'; push @js, 'datepicker-locales/bootstrap-datepicker.' . $l . '.js';
} }
} }
push @js, 'js/vroom.js'; push @js, 'vroom.js';
if (stash('page') && stash('page') eq 'room'){ if (stash('page') && stash('page') eq 'room'){
push @js, qw(js/simplewebrtc.bundle.js js/jquery.browser.js js/sprintf.js js/FileSaver.js js/jquery.tinytimer.js js/etherpad.js); push @js, qw(simplewebrtc.bundle.js jquery.browser.js sprintf.js FileSaver.js jquery.tinytimer.js etherpad.js);
} }
@js = map { $self->url_for('/') . 'js/' . $_ } @js;
%> %>
<%=js @js %> <%=js @js %>

Loading…
Cancel
Save