nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 15:42:48 -05:00
Code Activity

webfonts and styling

Browse Source
This commit is contained in:
Kyle Spearrin
2018-03-23 15:51:54 -04:00
parent 78363bcd5e
commit bbaafab04b
11 changed files with 241 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/Admin/Views/Home/Index.cshtml
View File

@ -60,29 +60,29 @@
<div class="row">
<div class="col-md">
<dl class="row">
<dt class="col-sm-4">Core Installed</dt>
<dd class="col-sm-8">
<dt class="col-sm-5">Core Installed</dt>
<dd class="col-sm-7">
<span id="core-installed">@Model.CurrentVersion</span>
<i class="fa fa-check text-success d-none" id="core-success" title="You are up to date!"></i>
<i class="fa fa-warning text-warning d-none" id="core-warning"
title="This version is not the latest. You should update."></i>
</dd>
<dt class="col-sm-4">Core Latest</dt>
<dd class="col-sm-8">
<dt class="col-sm-5">Core Latest</dt>
<dd class="col-sm-7">
<span id="core-latest" title="Checking version..."><i class="fa fa-spinner fa-spin"></i></span>
</dd>
<dt class="col-sm-4">Web Installed</dt>
<dd class="col-sm-8">
<dt class="col-sm-5">Web Installed</dt>
<dd class="col-sm-7">
<span id="web-installed"><i class="fa fa-spinner fa-spin" title="Checking version..."></i></span>
<i class="fa fa-check text-success d-none" id="web-success" title="You are up to date!"></i>
<i class="fa fa-warning text-warning d-none" id="web-warning"
title="This version is not the latest. You should update."></i>
</dd>
<dt class="col-sm-4">Web Latest</dt>
<dd class="col-sm-8">
<dt class="col-sm-5">Web Latest</dt>
<dd class="col-sm-7">
<span id="web-latest"><i class="fa fa-spinner fa-spin" title="Checking version..."></i></span>
</dd>
</dl>
@ -101,83 +101,83 @@
<h3>SMTP</h3>
@if(Model.GlobalSettings.Mail.Smtp == null)
{
<p class="text-muted">Not configured</p>
<p class="text-muted">Not configured</p>
}
else
{
<dl class="row">
<dt class="col-sm-3">Host</dt>
<dd class="col-sm-9">
@(string.IsNullOrWhiteSpace(Model.GlobalSettings.Mail.Smtp.Host) ? "-" : Model.GlobalSettings.Mail.Smtp.Host)
</dd>
<dl class="row">
<dt class="col-sm-4 col-lg-3">Host</dt>
<dd class="col-sm-8 col-lg-9">
@(string.IsNullOrWhiteSpace(Model.GlobalSettings.Mail.Smtp.Host) ? "-" : Model.GlobalSettings.Mail.Smtp.Host)
</dd>
<dt class="col-sm-3">Port</dt>
<dd class="col-sm-9">@Model.GlobalSettings.Mail.Smtp.Port</dd>
<dt class="col-sm-4 col-lg-3">Port</dt>
<dd class="col-sm-8 col-lg-9">@Model.GlobalSettings.Mail.Smtp.Port</dd>
<dt class="col-sm-3">SSL</dt>
<dd class="col-sm-9">@(Model.GlobalSettings.Mail.Smtp.Ssl ? "Yes" : "No")</dd>
<dt class="col-sm-4 col-lg-3">SSL</dt>
<dd class="col-sm-8 col-lg-9">@(Model.GlobalSettings.Mail.Smtp.Ssl ? "Yes" : "No")</dd>
<dt class="col-sm-3">Credentials</dt>
<dd class="col-sm-9">@(Model.GlobalSettings.Mail.Smtp.UseDefaultCredentials ? "Default" : "Provided")</dd>
<dt class="col-sm-4 col-lg-3">Credentials</dt>
<dd class="col-sm-8 col-lg-9">@(Model.GlobalSettings.Mail.Smtp.UseDefaultCredentials ? "Default" : "Provided")</dd>
<dt class="col-sm-3">Username</dt>
<dd class="col-sm-9">
@(string.IsNullOrWhiteSpace(Model.GlobalSettings.Mail.Smtp.Username) ? "-" : Model.GlobalSettings.Mail.Smtp.Username)
</dd>
</dl>
<dt class="col-sm-4 col-lg-3">Username</dt>
<dd class="col-sm-8 col-lg-9">
@(string.IsNullOrWhiteSpace(Model.GlobalSettings.Mail.Smtp.Username) ? "-" : Model.GlobalSettings.Mail.Smtp.Username)
</dd>
</dl>
}
<h3>Other</h3>
<dl class="row">
<dt class="col-sm-3">Installation Id</dt>
<dd class="col-sm-9">
<dt class="col-sm-4 col-lg-3">Installation Id</dt>
<dd class="col-sm-8 col-lg-9">
@if(Model.GlobalSettings.Installation?.Id != null)
{
<code>@Model.GlobalSettings.Installation.Id</code>
<code>@Model.GlobalSettings.Installation.Id</code>
}
else
{
<text>-</text>
<text>-</text>
}
</dd>
<dt class="col-sm-3">User Registraion</dt>
<dd class="col-sm-9">@(Model.GlobalSettings.DisableUserRegistration ? "Disabled" : "Enabled")</dd>
<dt class="col-sm-4 col-lg-3">User Registraion</dt>
<dd class="col-sm-8 col-lg-9">@(Model.GlobalSettings.DisableUserRegistration ? "Disabled" : "Enabled")</dd>
<dt class="col-sm-3">Push Notifications Relay</dt>
<dd class="col-sm-9">
<dt class="col-sm-4 col-lg-3">Push Notifications</dt>
<dd class="col-sm-8 col-lg-9">
@if(Bit.Core.Utilities.CoreHelpers.SettingHasValue(Model.GlobalSettings.PushRelayBaseUri))
{
<span><i class="fa fa-check"></i> Configured</span>
<span><i class="fa fa-check"></i> Configured</span>
}
else
{
<span class="text-muted">Not configured</span>
<span class="text-muted">Not configured</span>
}
</dd>
<dt class="col-sm-3">Yubico 2FA</dt>
<dd class="col-sm-9">
<dt class="col-sm-4 col-lg-3">Yubico 2FA</dt>
<dd class="col-sm-8 col-lg-9">
@if(Bit.Core.Utilities.CoreHelpers.SettingHasValue(Model.GlobalSettings.Yubico?.Key) && Bit.Core.Utilities.CoreHelpers.SettingHasValue(Model.GlobalSettings.Yubico?.ClientId))
{
<span><i class="fa fa-check"></i> Configured</span>
<span><i class="fa fa-check"></i> Configured</span>
}
else
{
<span class="text-muted">Not configured</span>
<span class="text-muted">Not configured</span>
}
</dd>
<dt class="col-sm-3">Duo 2FA</dt>
<dd class="col-sm-9">
<dt class="col-sm-4 col-lg-3">Duo 2FA</dt>
<dd class="col-sm-8 col-lg-9">
@if(Bit.Core.Utilities.CoreHelpers.SettingHasValue(Model.GlobalSettings.Duo?.AKey))
{
<span><i class="fa fa-check"></i> Configured</span>
<span><i class="fa fa-check"></i> Configured</span>
}
else
{
<span class="text-muted">Not configured</span>
<span class="text-muted">Not configured</span>
}
</dd>
</dl>

4
src/Admin/Views/Organizations/Edit.cshtml
View File

@ -85,7 +85,7 @@
</div>
</div>
</div>
<div class="form-check">
<div class="form-check mb-3">
<input type="checkbox" class="form-check-input" asp-for="Enabled">
<label class="form-check-label" asp-for="Enabled"></label>
</div>
@ -441,7 +441,7 @@
<input type="checkbox" class="form-check-input" asp-for="UseEvents">
<label class="form-check-label" asp-for="UseEvents"></label>
</div>
<div class="form-check">
<div class="form-check mb-3">
<input type="checkbox" class="form-check-input" asp-for="UsersGetPremium">
<label class="form-check-label" asp-for="UsersGetPremium"></label>
</div>

24
src/Admin/Views/Organizations/_ViewInformation.cshtml
View File

@ -1,20 +1,20 @@
@model OrganizationViewModel
<dl class="row">
<dt class="col-sm-2">Id</dt>
<dd class="col-sm-10"><code>@Model.Organization.Id</code></dd>
<dt class="col-sm-4 col-lg-3">Id</dt>
<dd class="col-sm-8 col-lg-9"><code>@Model.Organization.Id</code></dd>
<dt class="col-sm-2">Users</dt>
<dd class="col-sm-10">@Model.UserCount</dd>
<dt class="col-sm-4 col-lg-3">Users</dt>
<dd class="col-sm-8 col-lg-9">@Model.UserCount</dd>
<dt class="col-sm-2">Owners</dt>
<dd class="col-sm-10">@(string.IsNullOrWhiteSpace(Model.Owners) ? "None" : Model.Owners)</dd>
<dt class="col-sm-4 col-lg-3">Owners</dt>
<dd class="col-sm-8 col-lg-9">@(string.IsNullOrWhiteSpace(Model.Owners) ? "None" : Model.Owners)</dd>
<dt class="col-sm-2">Admins</dt>
<dd class="col-sm-10">@(string.IsNullOrWhiteSpace(Model.Admins) ? "None" : Model.Admins)</dd>
<dt class="col-sm-4 col-lg-3">Admins</dt>
<dd class="col-sm-8 col-lg-9">@(string.IsNullOrWhiteSpace(Model.Admins) ? "None" : Model.Admins)</dd>
<dt class="col-sm-2">Created</dt>
<dd class="col-sm-10">@Model.Organization.CreationDate.ToString()</dd>
<dt class="col-sm-4 col-lg-3">Created</dt>
<dd class="col-sm-8 col-lg-9">@Model.Organization.CreationDate.ToString()</dd>
<dt class="col-sm-2">Modified</dt>
<dd class="col-sm-10">@Model.Organization.RevisionDate.ToString()</dd>
<dt class="col-sm-4 col-lg-3">Modified</dt>
<dd class="col-sm-8 col-lg-9">@Model.Organization.RevisionDate.ToString()</dd>
</dl>

1
src/Admin/Views/Shared/_Layout.cshtml
View File

@ -6,6 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>@ViewData["Title"] - Bitwarden Admin Portal</title>
<link rel="stylesheet" href="~/css/webfonts.css" />
<environment include="Development">
<link rel="stylesheet" href="~/lib/font-awesome/css/font-awesome.css" />
<link rel="stylesheet" href="~/css/site.css" />

10
src/Admin/Views/Users/Edit.cshtml
View File

@ -74,7 +74,7 @@
</div>
</div>
</div>
<div class="form-check">
<div class="form-check mb-3">
<input type="checkbox" class="form-check-input" asp-for="EmailVerified">
<label class="form-check-label" asp-for="EmailVerified"></label>
</div>
@ -87,7 +87,7 @@
</div>
</div>
</div>
<div class="form-check">
<div class="form-check mb-3">
<input type="checkbox" class="form-check-input" asp-for="Premium">
<label class="form-check-label" asp-for="Premium"></label>
</div>
@ -108,7 +108,7 @@
</div>
<h2>Billing</h2>
<div class="row">
<div class="col-sm">
<div class="col-md">
<div class="form-group">
<div class="form-group">
<label asp-for="Gateway"></label>
@ -119,7 +119,7 @@
</div>
</div>
</div>
<div class="col-sm">
<div class="col-md">
<div class="form-group">
<label asp-for="GatewayCustomerId"></label>
<div class="input-group">
@ -132,7 +132,7 @@
</div>
</div>
</div>
<div class="col-sm">
<div class="col-md">
<div class="form-group">
<label asp-for="GatewaySubscriptionId"></label>
<div class="input-group">

20
src/Admin/Views/Users/_ViewInformation.cshtml
View File

@ -1,17 +1,17 @@
@model UserViewModel
<dl class="row">
<dt class="col-sm-2">Id</dt>
<dd class="col-sm-10"><code>@Model.User.Id</code></dd>
<dt class="col-sm-4 col-lg-3">Id</dt>
<dd class="col-sm-8 col-lg-9"><code>@Model.User.Id</code></dd>
<dt class="col-sm-2">Items</dt>
<dd class="col-sm-10">@Model.CipherCount</dd>
<dt class="col-sm-4 col-lg-3">Items</dt>
<dd class="col-sm-8 col-lg-9">@Model.CipherCount</dd>
<dt class="col-sm-2">Created</dt>
<dd class="col-sm-10">@Model.User.CreationDate.ToString()</dd>
<dt class="col-sm-4 col-lg-3">Created</dt>
<dd class="col-sm-8 col-lg-9">@Model.User.CreationDate.ToString()</dd>
<dt class="col-sm-2">Modified</dt>
<dd class="col-sm-10">@Model.User.RevisionDate.ToString()</dd>
<dt class="col-sm-4 col-lg-3">Modified</dt>
<dd class="col-sm-8 col-lg-9">@Model.User.RevisionDate.ToString()</dd>
<dt class="col-sm-2">Account Modified</dt>
<dd class="col-sm-10">@Model.User.AccountRevisionDate.ToString()</dd>
<dt class="col-sm-4 col-lg-3">Account Modified</dt>
<dd class="col-sm-8 col-lg-9">@Model.User.AccountRevisionDate.ToString()</dd>
</dl>