Skip to content

Commit 1cba893

Browse files
jgauffinjgauffin
committed
Only thing left is to get webpack to include the chart CSS :(
1 parent b7e774b commit 1cba893

File tree

58 files changed

+37293
-72611
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+37293
-72611
lines changed

‎src/Server/Coderr.Server.App/Modules/Messaging/Templating/Layout/Template.html‎

Lines changed: 8 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@
2525
width: 100% !important;
2626
}
2727

28-
a { color: #2e8bcc }
28+
a {
29+
color: #59C1D5
30+
}
2931

3032
.btn {
31-
background-color: #0094da;
33+
background-color: #59C1D5;
3234
color: #FFF;
3335
cursor: pointer;
3436
display: inline-block;
@@ -46,7 +48,7 @@
4648
}
4749

4850
.callout a {
49-
color: #2ba6cb;
51+
color: #59C1D5;
5052
font-weight: 700;
5153
}
5254

@@ -71,11 +73,6 @@
7173

7274
a.ms { background-color: #000 !important }
7375

74-
.sidebar .soc-btn {
75-
display: block;
76-
width: 100%
77-
}
78-
7976
.hdeader.container table td.label { padding: 15px 15px 15px 0 }
8077

8178
table.footer-wrap {
@@ -152,32 +149,6 @@
152149
margin-left: 5px;
153150
}
154151

155-
ul.sidebar {
156-
background: #ebebeb;
157-
display: block;
158-
list-style-type: none
159-
}
160-
161-
ul.sidebar li {
162-
display: block;
163-
margin: 0
164-
}
165-
166-
ul.sidebar li a {
167-
border-bottom: 1px solid #777;
168-
border-top: 1px solid #FFF;
169-
color: #666;
170-
cursor: pointer;
171-
display: block;
172-
margin: 0;
173-
padding: 10px 16px;
174-
text-decoration: none;
175-
}
176-
177-
ul.sidebar li a.last { border-bottom-width: 0 }
178-
179-
ul.sidebar li a h1, ul.sidebar li a h2, ul.sidebar li a h3, ul.sidebar li a h4, ul.sidebar li a h5, ul.sidebar li a h6, ul.sidebar li a p { margin-bottom: 0 !important }
180-
181152
.container {
182153
clear: both !important;
183154
display: block !important;
@@ -216,9 +187,7 @@
216187

217188
table.head-wrap, table.body-wrap, .content table, .column table { width: 100% }
218189

219-
@media only screen and max-width
220-
221-
600px {
190+
@media only screen and (max-width: 600px) {
222191

223192

224193
a[class="btn"] {
@@ -239,12 +208,12 @@
239208
</style>
240209
</head>
241210
<body bgcolor="#FFFFFF">
242-
<table class="head-wrap" bgcolor="#2e8bcc">
211+
<table class="head-wrap" bgcolor="#444444">
243212
<tr>
244213
<td></td>
245214
<td class="header container">
246215
<div style="width: 100%">
247-
<table bgcolor="#2e8bcc" width="100%">
216+
<table bgcolor="#444444" width="100%">
248217
<tr>
249218
<td>
250219
<img src="cid:logo2.png" style="" alt=""/>

‎src/Server/Coderr.Server.App/Modules/Messaging/Templating/Layout/logo2.png‎

-2.98 KB
Loading

‎src/Server/Coderr.Server.ReportAnalyzer/Inbound/Handlers/Reports/ReportAnalyzer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public async Task Analyze(IMessageContext context, ErrorReportEntity report)
109109

110110
if (incident.IsClosed)
111111
{
112-
if (incident.IsReportIgnored(applicationVersion))
112+
if (applicationVersion != null && incident.IsReportIgnored(applicationVersion))
113113
{
114114
_logger.Info("Ignored report since it's for a version less that the solution version: " + JsonConvert.SerializeObject(report));
115115
incident.WasJustIgnored();

‎src/Server/Coderr.Server.ReportAnalyzer/Tagging/Handlers/IdentifyTagsFromIncident.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ private void ExtractTagsFromCollections(ReportAddedToIncident e, TagIdentifierCo
6363
{
6464
// Comma seperated tags
6565
if (collection.Properties.TryGetValue("OneTrueTags", out var tagsStr)
66-
&& collection.Properties.TryGetValue("ErrTags", out tagsStr))
66+
|| collection.Properties.TryGetValue("ErrTags", out tagsStr))
6767
{
6868
try
6969
{

‎src/Server/Coderr.Server.Web/Areas/Installation/Controllers/SetupController.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,12 @@ public ActionResult Completed(string displayError = null)
105105
return View();
106106
}
107107

108+
109+
public ActionResult Stats()
110+
{
111+
return View();
112+
}
113+
108114
public ActionResult Errors()
109115
{
110116
var model = new ErrorTrackingViewModel();

‎src/Server/Coderr.Server.Web/Areas/Installation/Controllers/SqlController.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,6 @@ public ActionResult Validate()
102102

103103
public override Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
104104
{
105-
ViewBag.PrevLink = Url.GetPreviousWizardStepLink();
106-
ViewBag.NextLink = Url.GetNextWizardStepLink();
107105
ViewBag.PrevLink = Url.GetPreviousWizardStepLink();
108106
ViewBag.NextLink = Url.GetNextWizardStepLink();
109107
return base.OnActionExecutionAsync(context, next);

‎src/Server/Coderr.Server.Web/Areas/Installation/Views/Setup/ErrorTracking.cshtml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@
99
<h2>Error tracking</h2>
1010
<p>
1111
To correct bugs faster we have activated coderr in the community server. By completing this
12-
setup, you allow us to collect error information (i.e. bugs in Coderr Community Server) and send it to our own hosted service.
12+
setup, you give use the permission to collect error information (i.e. bugs in Coderr Community Server) and send them to our own hosted service.
1313
</p>
1414
<p>
1515
You can optionally enter your email address to get notifications when the errors in your
1616
installation have been corrected and released.
1717
</p>
1818
<p>
19-
<em>(We might also contact you if we need more information
20-
about the error)</em>
19+
<em>(We might also contact you if we need more information about the error)</em>
2120
</p>
2221
<form method="post" action="@Url.Action("Errors")">
2322
@Html.ValidationSummary(false)

‎src/Server/Coderr.Server.Web/Areas/Installation/Views/Setup/Index.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<p>
1515
To start, you must enter the password from the <code>Installation/Password</code> setting in <code>appsettings.json</code>.
1616
</p>
17-
<form method="post" action="@Url.Action("Index")">
17+
<form method="post" asp-action="Index">
1818
@Html.ValidationSummary()
1919
<input type="text" name="key" class="form-control" placeholder="Enter the value installation password" style="width:100%" autofocus /><br/>
2020
<input type="submit" value="Continue" class="btn btn-primary"/>

‎src/Server/Coderr.Server.Web/Areas/Installation/Views/Setup/Stats.cshtml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
@{
2+
ViewBag.Title = "Installation - Usage statistics";
3+
}
4+
<div class="container">
5+
<div class="col-lg-12">
6+
7+
<h2>Usage statistics</h2>
8+
<p>
9+
By continuing with the setup, you allow us to collect anonymous usage statistics. The data is specified below.
10+
</p>
11+
<pre style="background: #444444; color: #cccccc;"><code>{
12+
Guid InstallationId; // Cannot be used to identify you, your company or your servers.
13+
YearMonth DateTime; // year+month for the usage
14+
Applications[]: // One entry per application that you have added to Coderr
15+
{
16+
ApplicationdId: int; // Id of a specific application
17+
IncidentCount: int; // Number of new incidents created the given month
18+
ReportCount: int; // Number of error reports received the given month
19+
}
20+
}</code></pre>
21+
@Html.Raw(ViewBag.PrevLink)
22+
@Html.Raw(ViewBag.NextLink)
23+
<br />
24+
</div>
25+
</div>

‎src/Server/Coderr.Server.Web/Areas/Installation/Views/Setup/Support.cshtml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,19 @@
55
}
66
<div class="container">
77
<div class="col-lg-12">
8-
<h2>Free Support</h2>
9-
<p>Do you want to get 30 days of free email support?</p>
10-
<p>No strings attached. You can optionally extend the support after the 30 days.</p>
8+
<h2>Getting started help</h2>
9+
<p>Do you want to get FREE help during the first month? We can answer questions regarding your configuration or help you get the most out of Coderr.</p>
1110
<form method="post" action="@Url.Action("Support")" style="width: 100%" class="form">
1211
@Html.ValidationSummary(false)
1312
<div>
1413
<input asp-for="CompanyName" class="form-control" placeholder="Company name" autofocus="autofocus" />
1514
<input type="email" asp-for="Email" class="form-control" placeholder="Your email address" />
1615
</div>
17-
<div><small class="text-muted form-text">(Leave fields empty if you do not want to sign up)</small></div>
16+
<div><small class="text-muted form-text">(Leave the fields empty if you do not want to sign up)</small></div>
1817
<div>&nbsp;</div>
1918
<br />
2019
@Html.Raw(ViewBag.PrevLink)
21-
<input type="submit" class="btn btn-primary" value="Signup" />
20+
<input type="submit" class="btn btn-primary" value="Get FREE help" />
2221
@Html.Raw(ViewBag.NextLink)
2322
</form>
2423
</div>

0 commit comments

Comments
 (0)