mirror of
https://github.com/Radarr/Radarr
synced 2024-12-26 01:38:24 +00:00
Merge branch 'markus101'
This commit is contained in:
commit
0ca70bc971
3 changed files with 23 additions and 27 deletions
|
@ -3,7 +3,7 @@
|
||||||
<script type="text/javascript" src="../../Scripts/2011.1.315/telerik.window.min.js"></script>
|
<script type="text/javascript" src="../../Scripts/2011.1.315/telerik.window.min.js"></script>
|
||||||
|
|
||||||
@section TitleContent{
|
@section TitleContent{
|
||||||
Add Existing Series
|
Add Series
|
||||||
}
|
}
|
||||||
|
|
||||||
@section MainContent{
|
@section MainContent{
|
||||||
|
|
|
@ -44,10 +44,10 @@
|
||||||
|
|
||||||
@using (Html.BeginForm("SaveQuality", "Settings", FormMethod.Post, new {id = "form", name = "form"}))
|
@using (Html.BeginForm("SaveQuality", "Settings", FormMethod.Post, new {id = "form", name = "form"}))
|
||||||
{
|
{
|
||||||
<fieldset>
|
<fieldset style="position: relative;">
|
||||||
<legend>Quality</legend>
|
<legend>Quality</legend>
|
||||||
|
|
||||||
<div class="rightSide" style="float: right; width: 65%;">
|
<div id="top">
|
||||||
<div class="config-section">
|
<div class="config-section">
|
||||||
<div class="config-group">
|
<div class="config-group">
|
||||||
<div class="config-title">@Html.LabelFor(m => m.DefaultQualityProfileId)</div>
|
<div class="config-title">@Html.LabelFor(m => m.DefaultQualityProfileId)</div>
|
||||||
|
@ -59,12 +59,10 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div id="bottom" style="float: left; padding-bottom: 55px;">
|
||||||
<div id="leftSide" style="width:35%;">
|
|
||||||
<div style="padding-top: 10px;">
|
|
||||||
<div style="padding-left: 7px; margin-bottom: 5px;">
|
<div style="padding-left: 7px; margin-bottom: 5px;">
|
||||||
<a id="addItem" style="text-decoration:none;" href="@Url.Action("AddProfile", "Settings")">
|
<a id="addItem" style="text-decoration:none;" href="@Url.Action("AddProfile", "Settings")">
|
||||||
<img src="../../Content/Images/Plus.png" alt="Add New Profile" />
|
<img src="../../Content/Images/Plus.png" alt="Add New Profile" width="20px" height="20px" />
|
||||||
<h4 style="margin-left: 3px; display: inline; color: Black;">Add New Profile</h4></a>
|
<h4 style="margin-left: 3px; display: inline; color: Black;">Add New Profile</h4></a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -76,13 +74,9 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div style="margin-top: 10px; padding-left: 5px;">
|
<input type="submit" id="save_button" value="Save" disabled="disabled" style="position: absolute; bottom: 0px; display: block; padding-left: 5px;"/>
|
||||||
<input type="submit" id="save_button" value="Save" disabled="disabled" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</fieldset>
|
</fieldset>
|
||||||
}
|
}
|
||||||
<div id="result" class="hiddenResult"></div>
|
<div id="result" class="hiddenResult"></div>
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
@ -115,7 +109,7 @@
|
||||||
},
|
},
|
||||||
success: function (data, textStatus, jqXHR) {
|
success: function (data, textStatus, jqXHR) {
|
||||||
if (data == "ok") {
|
if (data == "ok") {
|
||||||
$("#div_" + id).remove();
|
$("#profile_" + id).remove();
|
||||||
removeOption(id);
|
removeOption(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
.quality-selectee { width: 75px; padding: 1px; padding-left: 3px; padding-right: 3px; margin: 2px; float: left; }
|
.quality-selectee { width: 75px; padding: 1px; padding-left: 3px; padding-right: 3px; margin: 2px; float: left; cursor: default; }
|
||||||
.quality-selecting { background: #85AEF9; }
|
.quality-selecting { background: #85AEF9; }
|
||||||
.quality-selected { background: #065EFE; color: white; }
|
.quality-selected { background: #065EFE; color: white; }
|
||||||
</style>
|
</style>
|
||||||
|
@ -24,18 +24,18 @@
|
||||||
string nameBox = String.Format("{0}_Name", idClean);
|
string nameBox = String.Format("{0}_Name", idClean);
|
||||||
string cutoff = String.Format("{0}_Cutoff", idClean);
|
string cutoff = String.Format("{0}_Cutoff", idClean);
|
||||||
|
|
||||||
<div class="profileSectionEditor" id="div_@(ViewData["ProfileId"])">
|
<div class="profileSectionEditor" id="profile_@(ViewData["ProfileId"])" style="float: left; height: 175px; width: 285px; margin-bottom: -14px;">
|
||||||
|
|
||||||
<fieldset style="width:264px; margin:5px; margin-top: 0px; border-color:#CCCCCD">
|
<fieldset style="width:264px; margin:5px; margin-top: 0px; border-color:#CCCCCD">
|
||||||
<div class="header">
|
<div class="header">
|
||||||
<div id="qualityHeader" style="padding-bottom: 5px; margin: 0px;">
|
<div id="qualityHeader" style="padding-bottom: 5px; margin: 0px;">
|
||||||
<h2 style="display:inline; padding-right: 4px; margin-left: 4px;" id="@title">@{Html.DisplayTextFor(m => m.Name);}</h2>
|
<h2 style="display:inline; padding-right: 4px; margin-left: 4px;" id="@title">@{Html.DisplayTextFor(m => m.Name);}</h2>
|
||||||
<a href="#" id="@Model.QualityProfileId" class="deleteRow" onclick="deleteProfile('@ViewData["ProfileId"]'); return false;" style="float:right; padding-top:15px; padding-right: 5px;"><img src="../../Content/Images/X.png" alt="Delete"/></a>
|
<a href="#" id="@Model.QualityProfileId" class="deleteRow" onclick="deleteProfile('@ViewData["ProfileId"]'); return false;" style="float:right; padding-top:8px; padding-right: 5px;"><img src="../../Content/Images/X.png" alt="Delete" width="20px" height="20px"/></a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="config-group" style="width: 255px; margin-bottom: 5px; margin-left: 5px;">
|
<div class="config-group" style="width: 255px; margin-bottom: 5px; margin-left: 5px;">
|
||||||
<div class="config-title">@Html.LabelFor(x => x.Name)</div>
|
<div class="config-title">@Html.LabelFor(x => x.Name)</div>
|
||||||
<div class="config-value">@Html.TextBoxFor(x => x.Name, new { maxlength = 16 })</div>
|
<div class="config-value">@Html.TextBoxFor(x => x.Name, new { maxlength = 15 })</div>
|
||||||
<div class="config-validation">@Html.ValidationMessageFor(x => x.Name)</div>
|
<div class="config-validation">@Html.ValidationMessageFor(x => x.Name)</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -89,6 +89,8 @@
|
||||||
|
|
||||||
$("#@allowedStringName").empty().val(result);
|
$("#@allowedStringName").empty().val(result);
|
||||||
$('#@selectable .quality-selectee').disableSelection();
|
$('#@selectable .quality-selectee').disableSelection();
|
||||||
|
|
||||||
|
$('#@cutoff option').each(function () { if ($(this).text().indexOf('Unknown') > -1) $('#@cutoff option').remove(':contains("' + $(this).text() + '")'); });
|
||||||
});
|
});
|
||||||
|
|
||||||
$("#@nameBox").keyup(function () {
|
$("#@nameBox").keyup(function () {
|
||||||
|
|
Loading…
Reference in a new issue