mirror/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2025-01-02 21:34:35 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Leonardo Galli 2017-09-10 15:58:47 +02:00
commit e7c9217dc0
13 changed files with 113 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/UI/Activity/Blacklist/BlacklistLayout.js
View file

@ -80,6 +80,7 @@ module.exports = Marionette.Layout.extend({
var leftSideButtons = { var leftSideButtons = {
type : 'default', type : 'default',
storeState : false, storeState : false,
collapse: true,
items : [ items : [
{ {
title : 'Clear Blacklist', title : 'Clear Blacklist',

BIN
src/UI/Content/Fonts/opensans-light.woff2 Normal file
View file

Binary file not shown.

BIN
src/UI/Content/Fonts/opensans-regular.woff2 Normal file
View file

Binary file not shown.

BIN
src/UI/Content/Fonts/opensans-semibold.woff2 Normal file
View file

Binary file not shown.

BIN
src/UI/Content/Fonts/ubuntumono-regular.woff2 Normal file
View file

Binary file not shown.

10
src/UI/Content/Overrides/bootstrap.less vendored
View file

@ -80,3 +80,13 @@
.table-responsive { .table-responsive {
overflow-x: visible; overflow-x: visible;
} }
.navbar-nav {
margin-bottom : 20px;
}
.navbar-brand {
@media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
padding : 22px 15px !important;
}
}

10
src/UI/Content/font.less
View file

@ -6,6 +6,7 @@
src: local('Open Sans Light'), src: local('Open Sans Light'),
local('OpenSans-Light'), local('OpenSans-Light'),
url('./fonts/opensans-light.eot?#iefix') format('embedded-opentype'), url('./fonts/opensans-light.eot?#iefix') format('embedded-opentype'),
url('./fonts/opensans-light.woff2') format('woff2'),
url('./fonts/opensans-light.woff') format('woff'), url('./fonts/opensans-light.woff') format('woff'),
url('./fonts/opensans-light.ttf') format('truetype'); url('./fonts/opensans-light.ttf') format('truetype');
} }
@ -18,6 +19,7 @@
src: local('Open Sans'), src: local('Open Sans'),
local('OpenSans'), local('OpenSans'),
url('./fonts/opensans-regular.eot?#iefix') format('embedded-opentype'), url('./fonts/opensans-regular.eot?#iefix') format('embedded-opentype'),
url('./fonts/opensans-regular.woff2') format('woff2'),
url('./fonts/opensans-regular.woff') format('woff'), url('./fonts/opensans-regular.woff') format('woff'),
url('./fonts/opensans-regular.ttf') format('truetype') url('./fonts/opensans-regular.ttf') format('truetype')
} }
@ -30,6 +32,7 @@
src: local('Open Sans SemiBold'), src: local('Open Sans SemiBold'),
local('OpenSans-SemiBold'), local('OpenSans-SemiBold'),
url('./fonts/opensans-semibold.eot?#iefix') format('embedded-opentype'), url('./fonts/opensans-semibold.eot?#iefix') format('embedded-opentype'),
url('./fonts/opensans-semibold.woff2') format('woff2'),
url('./fonts/opensans-semibold.woff') format('woff'), url('./fonts/opensans-semibold.woff') format('woff'),
url('./fonts/opensans-semibold.ttf') format('truetype') url('./fonts/opensans-semibold.ttf') format('truetype')
} }
@ -39,9 +42,10 @@
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: url('./fonts/ubuntumono-regular.eot'); src: url('./fonts/ubuntumono-regular.eot');
src: local('Open Sans'), src: local('Ubuntu Mono'),
local('OpenSans'), local('Ubuntu-Mono'),
url('./fonts/ubuntumono-regular.eot?#iefix') format('embedded-opentype'), url('./fonts/ubuntumono-regular.eot?#iefix') format('embedded-opentype'),
url('./fonts/ubuntumono-regular.woff2') format('woff'),
url('./fonts/ubuntumono-regular.woff') format('woff'), url('./fonts/ubuntumono-regular.woff') format('woff'),
url('./fonts/ubuntumono-regular.ttf') format('truetype') url('./fonts/ubuntumono-regular.ttf') format('truetype')
} }

10
src/UI/Content/theme.less
View file

@ -48,6 +48,16 @@
display : inline-block; display : inline-block;
} }
@media (max-width: @screen-sm-max) {
.x-toolbar-left-1 {
display: block;
}
.btn-group {
display: block;
}
}
.sorting-buttons { .sorting-buttons {
.sorting-title { .sorting-title {
display : inline-block; display : inline-block;

5
src/UI/Movies/Editor/MovieEditorLayout.js
View file

@ -97,16 +97,17 @@ module.exports = Marionette.Layout.extend({
this.leftSideButtons = { this.leftSideButtons = {
type : 'default', type : 'default',
storeState : false, storeState : false,
collapse: true,
items : [ items : [
{ {
title : 'Update Library', title : 'Update library',
icon : 'icon-sonarr-refresh', icon : 'icon-sonarr-refresh',
command : 'refreshmovie', command : 'refreshmovie',
successMessage : 'Library was updated!', successMessage : 'Library was updated!',
errorMessage : 'Library update failed!' errorMessage : 'Library update failed!'
}, },
{ {
title : 'Delete Selected', title : 'Delete selected',
icon : 'icon-radarr-delete-white', icon : 'icon-radarr-delete-white',
className: 'btn-danger', className: 'btn-danger',
callback : this._deleteSelected callback : this._deleteSelected

117
src/UI/Navbar/NavbarLayoutTemplate.hbs
View file

@ -1,46 +1,81 @@
<!-- Static navbar --> <!-- Static navbar -->
<div class="navbar navbar-nzbdrone" role="navigation"> <div class="navbar navbar-nzbdrone" role="navigation">
<div class="container-fluid"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle navbar-inverse" data-toggle="collapse" data-target=".navbar-collapse"> <button type="button" class="navbar-toggle navbar-inverse" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
<span class="icon-sonarr-navbar-collapsed fa-lg"></span> <span class="icon-sonarr-navbar-collapsed fa-lg"></span>
</button> </button>
<a class="navbar-brand" href="{{UrlBase}}/"> <a class="navbar-brand" href="{{UrlBase}}/">
<!--<img src="{{UrlBase}}/Content/Images/logo.png?v=2" alt="Radarr">--> <img src="{{UrlBase}}/Content/Images/logos/128.png" class="visible-md visible-lg">
<img src="{{UrlBase}}/Content/Images/logos/128.png" class="visible-lg"/> <img src="{{UrlBase}}/Content/Images/logos/64.png" class="visible-sm">
<img src="{{UrlBase}}/Content/Images/logos/64.png" class="visible-md visible-sm"/> <div class="visible-xs">
<span class="visible-xs"> <img src="{{UrlBase}}/Content/Images/logos/32.png"/>
<img src="{{UrlBase}}/Content/Images/logos/32.png"/> <span class="logo-text">Radarr</span>
<span class="logo-text">Radarr</span>
</span>
</a>
</div>
<div class="navbar-collapse collapse x-navbar-collapse">
<ul class="nav navbar-nav">
<li><a href="{{UrlBase}}/addmovies" class="x-series-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-add"></i> Add Movies</a></li>
<li><a href="{{UrlBase}}/" class="x-series-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-series"></i> Movies</a></li>
<li><a href="{{UrlBase}}/calendar" class="x-calendar-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-calendar"></i> Calendar</a></li>
<li><a href="{{UrlBase}}/activity" class="x-activity-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-activity"></i> Activity<span id="x-queue-count" class="navbar-info"></span></a></li>
<li><a href="{{UrlBase}}/wanted" class="x-wanted-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-wanted"></i> Wanted</a></li>
<li><a href="{{UrlBase}}/settings" class="x-settings-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-settings"></i> Settings</a></li>
<li><a href="{{UrlBase}}/system" class="x-system-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-system"></i> System<span id="x-health" class="navbar-info"></span></a></li>
<li><a href="https://radarr.video/donate.html" target="_blank"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-donate"></i> Donate</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="active screen-size"></li>
</ul>
</div><!--/.nav-collapse -->
</div><!--/.container-fluid -->
<div class="col-md-12 search">
<div class="col-md-6 col-md-offset-3">
<div class="input-group">
<span class="input-group-addon"><i class="fa fa-search"></i></span>
<input type="text" class="col-md-6 form-control x-series-search" placeholder="Search the movies in your library">
</div>
</div> </div>
</a>
</div>
<div class="navbar-collapse collapse x-navbar-collapse">
<ul class="nav navbar-nav">
<li>
<a href="{{UrlBase}}/addmovies" class="x-series-nav">
<i class="icon-sonarr-navbar-icon icon-sonarr-add" aria-hidden="true"></i>
Add Movies
</a>
</li>
<li>
<a href="{{UrlBase}}/" class="x-series-nav">
<i class="icon-sonarr-navbar-icon icon-sonarr-navbar-series" aria-hidden="true"></i>
Movies
</a>
</li>
<li>
<a href="{{UrlBase}}/calendar" class="x-calendar-nav">
<i class="icon-sonarr-navbar-icon icon-sonarr-navbar-calendar" aria-hidden="true"></i>
Calendar
</a>
</li>
<li>
<a href="{{UrlBase}}/activity" class="x-activity-nav">
<i class="icon-sonarr-navbar-icon icon-sonarr-navbar-activity" aria-hidden="true"></i>
Activity <span id="x-queue-count" class="navbar-info"></span>
</a>
</li>
<li>
<a href="{{UrlBase}}/wanted" class="x-wanted-nav">
<i class="icon-sonarr-navbar-icon icon-sonarr-navbar-wanted" aria-hidden="true"></i>
Wanted
</a>
</li>
<li>
<a href="{{UrlBase}}/settings" class="x-settings-nav">
<i class="icon-sonarr-navbar-icon icon-sonarr-navbar-settings" aria-hidden="true"></i>
Settings
</a>
</li>
<li>
<a href="{{UrlBase}}/system" class="x-system-nav">
<i class="icon-sonarr-navbar-icon icon-sonarr-navbar-system" aria-hidden="true"></i>
System <span id="x-health" class="navbar-info"></span>
</a>
</li>
<li>
<a href="https://radarr.video/donate.html" target="_blank">
<i class="icon-sonarr-navbar-icon icon-sonarr-navbar-donate" aria-hidden="true"></i>
Donate
</a>
</li>
</ul>
</div> </div>
</div>
<div class="col-md-12 search">
<div class="col-md-6 col-md-offset-3">
<div class="input-group">
<span class="input-group-addon">
<i class="fa fa-search"></i>
</span>
<input type="text" class="col-md-6 form-control x-series-search" placeholder="Search the movies in your library">
</div>
</div>
</div>
</div> </div>

2
src/UI/System/Backup/BackupLayout.js
View file

@ -41,7 +41,7 @@ module.exports = Marionette.Layout.extend({
leftSideButtons : { leftSideButtons : {
type : 'default', type : 'default',
storeState : false, storeState : false,
collapse : false, collapse : true,
items : [ items : [
{ {
title : 'Backup', title : 'Backup',

1
src/UI/Wanted/Cutoff/CutoffUnmetLayout.js
View file

@ -97,6 +97,7 @@ module.exports = Marionette.Layout.extend({
var leftSideButtons = { var leftSideButtons = {
type : 'default', type : 'default',
storeState : false, storeState : false,
collapse: true,
items : [ items : [
{ {
title : 'Search Selected', title : 'Search Selected',

6
src/UI/index.html
View file

@ -88,8 +88,8 @@
</div> </div>
<div id="control-panel-region" class="control-panel"></div> <div id="control-panel-region" class="control-panel"></div>
<div id="errors"></div> <div id="errors"></div>
</body>
<script type="text/javascript"> <script>
window.NzbDrone = { window.NzbDrone = {
ApiRoot : 'API_ROOT', ApiRoot : 'API_ROOT',
ApiKey : 'API_KEY', ApiKey : 'API_KEY',
@ -106,4 +106,6 @@
<script src="/templates.js"></script> <script src="/templates.js"></script>
<script src="/vendor.js"></script> <script src="/vendor.js"></script>
<script src="/main.js"></script> <script src="/main.js"></script>
</body>
</html> </html>