Merge branch 'master' into backbone

Conflicts:
	NzbDrone.Web/Views/Settings/Indexers.cshtml
pull/6/head
Mark McDowall 12 years ago
commit 006e8988dc

@ -120,3 +120,23 @@
{
background-color: #616161;
}
.remove-newznab
{
padding: 3px 1px;
vertical-align: top;
border: none;
display: inline-block !important;
text-decoration: none !important;
color: #000000;
font-size: 19px;
line-height: 10px;
}
.remove-newznab:before {
cursor: pointer;
}
.add-newznab:before {
color: green;
}

@ -85,7 +85,7 @@
<p>
</p>
<a id="addNewznab" href="@Url.Action("AddNewznabProvider", "Settings")">
<img src="../../Content/Images/Plus.png" alt="Add Newznab Provider" width="20px" height="20px" />
<i class="icon-plus add-newznab"></i>
Add Newznab Provider</a>
<div id="newznabProviders">
@foreach (var provider in Model.NewznabDefinitions)

@ -15,8 +15,8 @@
</span>
@if(!Model.BuiltIn)
{
<a href="#" id="@Model.Id" class="deleteProvider" onclick="deleteProvider('@(Model.Id)'); return false;">
<img src="../../Content/Images/close.png" alt="Delete" width="22px" height="22px" /></a>
<a href="/settings/deletenewznabprovider?providerId=@Model.Id" id="@Model.Id" class="deleteProvider" onclick="deleteProvider('@(Model.Id)'); return false;">
<i class="icon-remove remove-newznab"></i></a>
}
</div>
<div class="providerOptions">

Loading…
Cancel
Save