This commit is contained in:
2018-07-19 15:53:04 +00:00
parent 09d5376d94
commit 7fcc5c21de
9 changed files with 85 additions and 80 deletions

View File

@@ -174,9 +174,9 @@ namespace rockfishCore.Util
{
StringBuilder sb = new StringBuilder();
sb.Append("LICENSE DETAILS\r\n");
sb.Append("This key must be installed before: ");
sb.Append(ko.installByDate.ToString("D"));
sb.Append("\r\n");
// sb.Append("This key must be installed before: ");
// sb.Append(ko.installByDate.ToString("D"));
// sb.Append("\r\n");
//if (kg.SelectedLicenseType == "Web requested trial")
//{

View File

@@ -2,7 +2,7 @@ namespace rockfishCore.Util
{
public static class RfVersion
{
public const string NumberOnly="6.4";
public const string NumberOnly="6.5";
public const string Full = "Rockfish server " + NumberOnly;
}
}

View File

@@ -20,10 +20,18 @@ ul{
font-size: smaller;
}
@media screen and (max-width: 576px){ /* bump up font on smaller screen */
html{font-size: 20px}
.rf-content{
margin-top:80px;
}
}
}
.autocomplete-suggestions { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; border: 1px solid #999; background: #FFF; cursor: default; overflow: auto; -webkit-box-shadow: 1px 4px 3px rgba(50, 50, 50, 0.64); -moz-box-shadow: 1px 4px 3px rgba(50, 50, 50, 0.64); box-shadow: 1px 4px 3px rgba(50, 50, 50, 0.64); }
.autocomplete-suggestion { padding: 2px 5px; white-space: nowrap; overflow: hidden; }
.autocomplete-no-suggestion { padding: 2px 5px;}
.autocomplete-selected { background: #F0F0F0; }
.autocomplete-suggestions strong { font-weight: bold; color: #000; }
.autocomplete-group { padding: 2px 5px; font-weight: bold; font-size: 16px; color: #000; display: block; border-bottom: 1px solid #000; }

7
wwwroot/css/bootstrap.min.css vendored Normal file

File diff suppressed because one or more lines are too long

View File

@@ -11,78 +11,68 @@
<title>Rockfish loading....</title>
<!-- ICONS / MANIFEST -->
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?rfv=6.4.1">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?rfv=6.4.1">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?rfv=6.4.1">
<link rel="manifest" href="/manifest.json?rfv=6.4.1">
<link rel="mask-icon" href="/safari-pinned-tab.svg?rfv=6.4.1" color="#5bbad5">
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?rfv=6.5">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?rfv=6.5">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?rfv=6.5">
<link rel="manifest" href="/manifest.json?rfv=6.5">
<link rel="mask-icon" href="/safari-pinned-tab.svg?rfv=6.5" color="#5bbad5">
<meta name="theme-color" content="#ffffff">
<!-- 3rd party components fonts and icons -->
<link href="css/materialdesignicons.min.css?rfv=6.4.1" media="all" rel="stylesheet" type="text/css" />
<link href="css/materialdesignicons.min.css?rfv=6.5" media="all" rel="stylesheet" type="text/css" />
<link rel="stylesheet" href="css/bootstrap.min.css?rfv=6.5" type="text/css" />
<link rel="stylesheet" href="css/app.css?rfv=6.5" type="text/css" />
<link rel="stylesheet" href="css/mdi-bs4-compat.css?rfv=6.5" type="text/css" />
<!--BOOTSTRAP-->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" integrity="sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB"
crossorigin="anonymous">
<!-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.2/css/bootstrap.min.css" integrity="sha384-PsH8R72JQ3SOdhVi3uxftmaW6Vc51MKb0q5P2rRUpPvrszuE4W1povHYgTpBfshb"
crossorigin="anonymous"> -->
<link rel="stylesheet" href="css/app.css?rfv=6.4.1" type="text/css" />
<link rel="stylesheet" href="css/mdi-bs4-compat.css?rfv=6.4.1" type="text/css" />
<!-- <script src="js/lib/jquery-3.2.1.min.js"></script> -->
<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
<!-- third-party javascript -->
<script src="js/lib/page.js?rfv=6.4.1"></script>
<script src="js/lib/jquery.event.gevent.js?rfv=6.4.1"></script>
<script src="js/lib/jquery.gzserialize.js?rfv=6.4.1"></script>
<script src="js/lib/handlebars.runtime-v4.0.5.js?rfv=6.4.1"></script>
<script src="js/lib/store.min.js?rfv=6.4.1"></script>
<script src="js/lib/jquery.autocomplete.min.js?rfv=6.4.1"></script>
<script src="js/lib/moment.min.js?rfv=6.4.1"></script>
<script src="js/lib/jquery-3.3.1.min.js?rfv=6.5"></script>
<script src="js/lib/page.js?rfv=6.5"></script>
<script src="js/lib/jquery.event.gevent.js?rfv=6.5"></script>
<script src="js/lib/jquery.gzserialize.js?rfv=6.5"></script>
<script src="js/lib/handlebars.runtime-v4.0.5.js?rfv=6.5"></script>
<script src="js/lib/store.min.js?rfv=6.5"></script>
<script src="js/lib/jquery.autocomplete.min.js?rfv=6.5"></script>
<script src="js/lib/moment.min.js?rfv=6.5"></script>
<!-- our javascript -->
<!-- <script src="js/index.js?rfv=6.4.1"></script> -->
<script src="js/index.js" asp-append-version="true"></script>
<script src="js/app.util.js?rfv=6.4.1"></script>
<script src="js/app.api.js?rfv=6.4.1"></script>
<script src="js/app.utilB.js?rfv=6.4.1"></script>
<script src="js/app.nav.js?rfv=6.4.1"></script>
<script src="js/app.shell.js?rfv=6.4.1"></script>
<script src="js/app.fourohfour.js?rfv=6.4.1"></script>
<script src="js/app.authenticate.js?rfv=6.4.1"></script>
<script src="js/app.customers.js?rfv=6.4.1"></script>
<script src="js/app.customerEdit.js?rfv=6.4.1"></script>
<script src="js/app.customerSites.js?rfv=6.4.1"></script>
<script src="js/app.customerSiteEdit.js?rfv=6.4.1"></script>
<script src="js/app.purchases.js?rfv=6.4.1"></script>
<script src="js/app.purchaseEdit.js?rfv=6.4.1"></script>
<script src="js/app.license.js?rfv=6.4.1"></script>
<script src="js/app.licenseTemplates.js?rfv=6.4.1"></script>
<script src="js/app.licenseRequestEdit.js?rfv=6.4.1"></script>
<script src="js/app.licenses.js?rfv=6.4.1"></script>
<script src="js/app.licenseView.js?rfv=6.4.1"></script>
<script src="js/app.reportData.js?rfv=6.4.1"></script>
<script src="js/app.reportDataProdEmail.js?rfv=6.4.1"></script>
<script src="js/app.reportDataExpires.js?rfv=6.4.1"></script>
<script src="js/app.search.js?rfv=6.4.1"></script>
<script src="js/app.subscription.js?rfv=6.4.1"></script>
<script src="js/app.subnotify.js?rfv=6.4.1"></script>
<script src="js/app.templates.js?rfv=6.4.1"></script>
<script src="js/app.templateEdit.js?rfv=6.4.1"></script>
<script src="js/app.inbox.js?rfv=6.4.1"></script>
<script src="js/app.mailEdit.js?rfv=6.4.1"></script>
<script src="js/app.rfcaseEdit.js?rfv=6.4.1"></script>
<script src="js/app.rfcases.js?rfv=6.4.1"></script>
<script src="js/app.rfsettings.js?rfv=6.4.1"></script>
<!-- our javascript -->
<script src="js/index.js?rfv=6.5"></script>
<script src="js/app.util.js?rfv=6.5"></script>
<script src="js/app.api.js?rfv=6.5"></script>
<script src="js/app.utilB.js?rfv=6.5"></script>
<script src="js/app.nav.js?rfv=6.5"></script>
<script src="js/app.shell.js?rfv=6.5"></script>
<script src="js/app.fourohfour.js?rfv=6.5"></script>
<script src="js/app.authenticate.js?rfv=6.5"></script>
<script src="js/app.customers.js?rfv=6.5"></script>
<script src="js/app.customerEdit.js?rfv=6.5"></script>
<script src="js/app.customerSites.js?rfv=6.5"></script>
<script src="js/app.customerSiteEdit.js?rfv=6.5"></script>
<script src="js/app.purchases.js?rfv=6.5"></script>
<script src="js/app.purchaseEdit.js?rfv=6.5"></script>
<script src="js/app.license.js?rfv=6.5"></script>
<script src="js/app.licenseTemplates.js?rfv=6.5"></script>
<script src="js/app.licenseRequestEdit.js?rfv=6.5"></script>
<script src="js/app.licenses.js?rfv=6.5"></script>
<script src="js/app.licenseView.js?rfv=6.5"></script>
<script src="js/app.reportData.js?rfv=6.5"></script>
<script src="js/app.reportDataProdEmail.js?rfv=6.5"></script>
<script src="js/app.reportDataExpires.js?rfv=6.5"></script>
<script src="js/app.search.js?rfv=6.5"></script>
<script src="js/app.subscription.js?rfv=6.5"></script>
<script src="js/app.subnotify.js?rfv=6.5"></script>
<script src="js/app.templates.js?rfv=6.5"></script>
<script src="js/app.templateEdit.js?rfv=6.5"></script>
<script src="js/app.inbox.js?rfv=6.5"></script>
<script src="js/app.mailEdit.js?rfv=6.5"></script>
<script src="js/app.rfcaseEdit.js?rfv=6.5"></script>
<script src="js/app.rfcases.js?rfv=6.5"></script>
<script src="js/app.rfsettings.js?rfv=6.5"></script>
<!-- handlebars templates -->
<script src="js/templates/templates.js?rfv=6.4.1"></script>
<script src="js/templates/templates.js?rfv=6.5"></script>
<script>
@@ -112,16 +102,7 @@ window.onerror = function ( error ) {
<body class="rf-body">
<div id="app" class="container"></div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49"
crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js" integrity="sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T"
crossorigin="anonymous"></script>
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.3/umd/popper.min.js" integrity="sha384-vFJXuSJphROIrBnz7yo7oB41mKfc8JzQZiCq4NCceLEaO4IHwicKwpJf9c9IpFgh"
crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.2/js/bootstrap.min.js" integrity="sha384-alpBpkh1PFOepccYVYDB4do5UnbKysX5WZXm3XxPqe5iKTfUKjNkCk9SaVuEZflJ"
crossorigin="anonymous"></script> -->
<script src="js/lib/bootstrap.min.js?rfv=6.5"></script>
</body>
</html>

View File

@@ -27,7 +27,7 @@ app.api = (function() {
generateFromRequest,
licenseEmailResponse;
RockFishVersion = "6.4";
RockFishVersion = "6.5";
//////////////////////////////////////////////////////////////////////////////////////
// NOT AUTHORIZED ERROR HANDLER

7
wwwroot/js/lib/bootstrap.min.js vendored Normal file

File diff suppressed because one or more lines are too long

2
wwwroot/js/lib/jquery-3.3.1.min.js vendored Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long