github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-14 02:26:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #987 from tidusjar/dev

Browse source 
small changes
This commit is contained in:
Jamie 2017-01-24 18:29:13 +00:00 • committed by GitHub
commit c399d1631f
10 changed files with 79 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ombi.UI/Content/base.css
View file

@ -509,3 +509,11 @@ label {
background-position: center;
position: absolute; }
.list-group-item-dropdown {
position: relative;
display: block;
padding: 10px 15px;
margin-bottom: -1px;
background-color: #3e3e3e;
border: 1px solid transparent; }

2
Ombi.UI/Content/base.min.css vendored
View file

File diff suppressed because one or more lines are too long

10
Ombi.UI/Content/base.scss
View file

@ -632,3 +632,13 @@ $border-radius: 10px;
background-position:center;
position:absolute;
}
.list-group-item-dropdown {
position: relative;
display: block;
padding: 10px 15px;
margin-bottom: -1px;
background-color: #3e3e3e;
border: 1px solid transparent;
}

1
Ombi.UI/Content/bootstrap.css vendored
View file

@ -5259,6 +5259,7 @@ a.thumbnail.active {
background-color: #4e5d6c;
border: 1px solid transparent;
}
.list-group-item:first-child {
border-top-right-radius: 0;
border-top-left-radius: 0;

2
Ombi.UI/Content/site.js
View file

@ -94,7 +94,7 @@ function createBaseUrl(base, url) {
}
function createBaseUrl(url) {
function createLocalUrl(url) {
var base = $('#baseUrl').text();
if (base) {
if (url.charAt(0) === "/") {

41
Ombi.UI/Content/systemjs.config.js Normal file
View file

@ -0,0 +1,41 @@
/**
* System configuration for Angular 2 samples
* Adjust as necessary for your application needs.
*/
(function (global) {
System.config({
paths: {
// paths serve as alias
'npm:': '../node_modules/',
'app' : '../app/'
},
// map tells the System loader where to look for things
map: {
// our app is within the app folder
app: 'app',
// angular bundles
'@angular/core': 'npm:@angular/core/bundles/core.umd.js',
'@angular/common': 'npm:@angular/common/bundles/common.umd.js',
'@angular/compiler': 'npm:@angular/compiler/bundles/compiler.umd.js',
'@angular/platform-browser': 'npm:@angular/platform-browser/bundles/platform-browser.umd.js',
'@angular/platform-browser-dynamic': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
'@angular/http': 'npm:@angular/http/bundles/http.umd.js',
'@angular/router': 'npm:@angular/router/bundles/router.umd.js',
'@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
// other libraries
'rxjs': 'npm:rxjs'
},
// packages tells the System loader how to load when no filename and/or no extension
packages: {
app: {
main: './main.js',
defaultExtension: 'js'
},
rxjs: {
defaultExtension: 'js'
}
}
});
})(this);

7
Ombi.UI/Helpers/BaseUrlHelper.cs
View file

@ -290,16 +290,17 @@ namespace Ombi.UI.Helpers
return helper.Raw(asset);
}
public static IHtmlString GetSidebarUrl(this HtmlHelpers helper, NancyContext context, string url, string title)
public static IHtmlString GetSidebarUrl(this HtmlHelpers helper, NancyContext context, string url, string title, bool dropdown = false)
{
var content = GetLinkUrl(GetBaseUrl());
if (!string.IsNullOrEmpty(content))
{
url = $"/{content}{url}";
}
var dropdownClass = dropdown ? "list-group-item-dropdown" : string.Empty;
var returnString = context.Request.Path == url
? $"<a class=\"list-group-item active\" href=\"{url}\">{title}</a>"
: $"<a class=\"list-group-item\" href=\"{url}\">{title}</a>";
? $"<a class=\"list-group-item {dropdownClass} active\" href=\"{url}\">{title}</a>"
: $"<a class=\"list-group-item {dropdownClass}\" href=\"{url}\">{title}</a>";
return helper.Raw(returnString);
}

2
Ombi.UI/Views/Admin/SchedulerSettings.cshtml
View file

@ -139,7 +139,7 @@
var ev = $(e.currentTarget.children[0]);
ev.addClass("fa-spin");
var url = createBaseUrl("/admin/schedulerun");
var url = createLocalUrl("/admin/schedulerun");
$.ajax({
type: 'POST',
data: {key:id},

16
Ombi.UI/Views/Shared/Partial/_Sidebar.cshtml
View file

@ -16,11 +16,17 @@
@Html.GetSidebarUrl(Context, "/admin/sickrage", "SickRage")
@Html.GetSidebarUrl(Context, "/admin/headphones", "Headphones (beta)")
@Html.GetSidebarUrl(Context, "/admin/newsletter", "Newsletter Settings")
@Html.GetSidebarUrl(Context, "/admin/emailnotification", "Email Notifications")
@Html.GetSidebarUrl(Context, "/admin/pushbulletnotification", "Pushbullet Notifications")
@Html.GetSidebarUrl(Context, "/admin/pushovernotification", "Pushover Notifications")
@Html.GetSidebarUrl(Context, "/admin/slacknotification", "Slack Notifications")
@Html.GetSidebarUrl(Context, "/admin/discordnotification", "Discord Notifications")
<div class="dropdown">
<a href="#" class="dropdown-toggle list-group-item " data-toggle="dropdown">Notifications <span class="caret"></span><span style="font-size:16px;" class="pull-right hidden-xs showopacity glyphicon glyphicon-envelope"></span></a>
<ul class="dropdown-menu" role="menu">
@Html.GetSidebarUrl(Context, "/admin/emailnotification", "Email Notifications")
@Html.GetSidebarUrl(Context, "/admin/pushbulletnotification", "Pushbullet Notifications")
@Html.GetSidebarUrl(Context, "/admin/pushovernotification", "Pushover Notifications")
@Html.GetSidebarUrl(Context, "/admin/slacknotification", "Slack Notifications")
@Html.GetSidebarUrl(Context, "/admin/discordnotification", "Discord Notifications")
</ul>
</div>
@Html.GetSidebarUrl(Context, "/admin/logs", "Logs")
@Html.GetSidebarUrl(Context, "/admin/status", "Status")
@Html.GetSidebarUrl(Context, "/admin/scheduledjobs", "Scheduled Jobs")

3
Ombi.UI/Views/UserLogin/Username.cshtml
View file

@ -31,12 +31,11 @@
<script>
$(function () {
var base = '@Html.GetBaseUrl()';
$('#contentBody').on('click', '#loginBtn', function (e) {
e.preventDefault();
var url = createBaseUrl(base, '/userlogin/login');
var url = createLocalUrl('/userlogin/login');
var $form = $('#usernameForm');
$.ajax({
type: 'POST',