mirror of
https://github.com/Radarr/Radarr.git
synced 2024-09-11 12:02:35 +02:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
4d5a5ed2c1
@ -138,6 +138,35 @@ body {
|
||||
}
|
||||
}
|
||||
|
||||
body.debug {
|
||||
&:after {
|
||||
background-color: #222222;
|
||||
color: white;
|
||||
text-transform: uppercase;
|
||||
padding: 17px 25px;
|
||||
position: fixed;
|
||||
font-size: 15px;
|
||||
font-weight: bold;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
opacity:.9;
|
||||
z-index: 9999;
|
||||
content: "X-Small";
|
||||
|
||||
@media (min-width: @screen-sm-min) {
|
||||
content: "Small";
|
||||
}
|
||||
|
||||
@media (min-width: @screen-md-min) {
|
||||
content: "Medium";
|
||||
}
|
||||
|
||||
@media (min-width: @screen-lg-min) {
|
||||
content: "Large";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.footer {
|
||||
font-size : 13px;
|
||||
font-weight : lighter;
|
||||
|
@ -30,7 +30,7 @@ new Router();
|
||||
var app = new Marionette.Application();
|
||||
|
||||
app.addInitializer(function() {
|
||||
console.log('starting application');
|
||||
console.log("starting application");
|
||||
});
|
||||
|
||||
app.addInitializer(SignalRBroadcaster.appInitializer, { app : app });
|
||||
@ -40,21 +40,34 @@ app.addInitializer(Tooltip.appInitializer, { app : app });
|
||||
app.addInitializer(function() {
|
||||
Backbone.history.start({
|
||||
pushState : true,
|
||||
root : ServerStatusModel.get('urlBase')
|
||||
root : ServerStatusModel.get("urlBase")
|
||||
});
|
||||
RouteBinder.bind();
|
||||
AppLayout.navbarRegion.show(new NavbarLayout());
|
||||
$('body').addClass('started');
|
||||
$("body").addClass("started");
|
||||
});
|
||||
|
||||
app.addInitializer(UiSettingsController.appInitializer);
|
||||
|
||||
app.addInitializer(function() {
|
||||
var footerText = ServerStatusModel.get('version');
|
||||
if (ServerStatusModel.get('branch') !== 'master') {
|
||||
footerText += '<br>' + ServerStatusModel.get('branch');
|
||||
var isDebug = ServerStatusModel.get("isDebug");
|
||||
var isProduction = ServerStatusModel.get("isProduction");
|
||||
|
||||
if (isDebug === true) {
|
||||
$("body").addClass("debug");
|
||||
}
|
||||
$('#footer-region .version').html(footerText);
|
||||
|
||||
if (isProduction === true) {
|
||||
$("body").addClass("production");
|
||||
}
|
||||
});
|
||||
|
||||
app.addInitializer(function() {
|
||||
var footerText = ServerStatusModel.get("version");
|
||||
if (ServerStatusModel.get("branch") !== "master") {
|
||||
footerText += "<br>" + ServerStatusModel.get("branch");
|
||||
}
|
||||
$("#footer-region .version").html(footerText);
|
||||
});
|
||||
|
||||
app.start();
|
||||
|
Loading…
Reference in New Issue
Block a user