Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions web/Pages/Index/_Links.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
<li>
<a class="tab-lnk active" href="#stars">Stars</a>
</li>
@*
<li>
<a class="tab-lnk" href="#mail">Mail</a>
</li>
*@

@*<li>
<a class="tab-lnk" href="#mail">Mail</a>
</li>

<li>
<a class="tab-lnk" href="#subscriptions">Subscriptions</a>
</li>
<li>
<a class="tab-lnk " href="#run-list">Report Runs</a>
</li>
@* <li>
<li>
<a class="tab-lnk" href="#atlas-history">Atlas History</a>
</li> *@
</li>
<li>
<a class="tab-lnk" href="#groups">Groups</a>
</li>
</li>*@
</ul>
</nav>

Expand Down
3 changes: 2 additions & 1 deletion web/Pages/Shared/_EmailTemplate.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
<a href='@Configuration["AppSettings:base_url"]/users?id=@ViewBag.Sender.UserId'>@ViewBag.Sender.FullnameCalc</a>
} else {
@ViewBag.Sender.Fullname_calc
} shared something with you!
}
shared something with you!
</td>
</tr>
<tr><td height="30"></td></tr>
Expand Down
42 changes: 20 additions & 22 deletions web/Pages/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@

@if (ViewData["Title"] != null && ViewData["Title"].ToString().Length > 0)
{
<title>@ViewData["Title"] | Atlas BI Library</title>
<title>@ViewData["Title"] | Genesis Analytics</title>
}
else
{
<title>Home | Atlas BI Library</title>
<title>Home | Genesis Analytics</title>
}

<link rel="preload" href="@Helpers.UrlHelpers.FontHash("/font/fontawesome/webfonts/fa-regular-400.woff2", Cache)" as="font" type="font/woff2" crossorigin />
Expand All @@ -46,11 +46,11 @@
<script src="/js/purify.min.js"></script>
<script>
__jsnlog_configure = function (JL) {
JL.setOptions({
"defaultAjaxUrl":"/analytics/trace"
})
JL.setOptions({
"defaultAjaxUrl": "/analytics/trace"
})
};
try { __jsnlog_configure(JL); } catch(e) {};
try { __jsnlog_configure(JL); } catch (e) { };
</script>
</head>
<body class="is-flex is-flex-direction-column has-background-white">
Expand Down Expand Up @@ -100,14 +100,14 @@
<div class="navbar-menu is-flex-grow-0" id="atlas-main-nav">
<div class="navbar-end">
@* @{ var r = new Random();
var randomNumber = r.Next(); }
<a class="navbar-item" href="/#mail" aria-label="mail">
<span class="icon is-medium is-relative">
<i class="far fa-lg fa-envelope"></i>
<span title="mail count" class="badge" id="nav_unread_message_count">0</span>
</span>
<span class="hide-desktop">Mail</span>
</a> *@
var randomNumber = r.Next(); }
<a class="navbar-item" href="/#mail" aria-label="mail">
<span class="icon is-medium is-relative">
<i class="far fa-lg fa-envelope"></i>
<span title="mail count" class="badge" id="nav_unread_message_count">0</span>
</span>
<span class="hide-desktop">Mail</span>
</a> *@

@if (User.HasPermission("Edit User Permissions") || User.HasPermission("Edit Role Permissions") || User.HasPermission("Create Parameters") || User.HasPermission("Delete Parameters"))
{
Expand Down Expand Up @@ -176,11 +176,11 @@
<div class="navbar-item has-dropdown is-hoverable is-boxed">
<div class="navbar-link is-arrowless">
<span class="icon is-medium">
<i class="fas fa-lg fa-user"></i>
</span>
<span class="icon is-small">
<i class="fa-solid fa-caret-down"></i>
</span>
<i class="fas fa-lg fa-user"></i>
</span>
<span class="icon is-small">
<i class="fa-solid fa-caret-down"></i>
</span>
</div>
<div class="navbar-dropdown">
<a class="navbar-item" href="/users">Your profile</a>
Expand All @@ -197,9 +197,7 @@
<div class="field toggle">
<input type="hidden" id="enable-administrator" value="@User.HasAdminEnabled()">
<input id="switch-enable-administrator" type="checkbox" name="switch-enable-administrator" class="switch is-rounded is-info"
@if(@User.HasAdminEnabled() == "Y"){
<text>checked="checked"</text>
} >
@if (@User.HasAdminEnabled() == "Y") { <text> checked="checked" </text> }>
<label class="py-0" for="switch-enable-administrator"><strong>Admin</strong></label>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions web/Pages/Shared/_footer.cshtml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@inject IConfiguration Configuration
@inject IConfiguration Configuration
@inject IMemoryCache Cache
@using Newtonsoft.Json;
<footer class="footer">
<div class="container">
<div class="columns">
<div class="column is-one-third">
<img src="@Cache.Get("logo")" width="133" height="40" alt="site logo" />
@*<img src="@Cache.Get("logo")" width="133" height="40" alt="site logo" />*@
<p class="mt-4 mb-2">
@Configuration["footer:subtitle"]
</p>
Expand Down
4 changes: 3 additions & 1 deletion web/Pages/Users/Index.cshtml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ public ActionResult OnGetSharedObjects()
HttpContext.Response.Headers.Add("Pragma", "no-cache"); // HTTP 1.0.
HttpContext.Response.Headers.Add("Expires", "0"); // Proxies.

ViewData["SharedToMe"] = (
var sharedToMeList = (
from o in _context.SharedItems
where o.SharedToUserId == User.GetUserId()
orderby o.ShareDate descending
Expand All @@ -331,6 +331,8 @@ orderby o.ShareDate descending
Url = o.Url
}
).ToList();

ViewData["SharedToMe"] = sharedToMeList.DistinctBy(t => t.Name).ToList();
ViewData["SharedFromMe"] = (
from o in _context.SharedItems
where o.SharedFromUserId == User.GetUserId()
Expand Down
Binary file modified web/wwwroot/favicon.ico
Binary file not shown.
Binary file modified web/wwwroot/img/favicon.ico
Binary file not shown.
Binary file added web/wwwroot/img/genesis-logo-circle 138x40.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/wwwroot/img/genesis-logo-circle 30x30.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/wwwroot/img/genesis-logo-circle 40x40.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/wwwroot/img/genesis-logo-circle base.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/wwwroot/img/genesis-logo-circle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion web/wwwroot/js/search.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
element.remove();
}

d.title = 'Search: ' + value + ' | Atlas BI Library';
d.title = 'Search: ' + value + ' | Genesis Analytics';

history.replaceState(
{
Expand Down
2 changes: 1 addition & 1 deletion web/wwwroot/js/search.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.