From acd070dbc64a418d28689f982e97c4501aa3b19c Mon Sep 17 00:00:00 2001 From: Andy Howard Date: Sun, 13 Mar 2022 09:43:54 +0000 Subject: [PATCH] v1.2.4.4 --- ReadMe.md | 86 ++++++++++++------- .../Controllers/ArticleController-Ajax.cs | 6 +- .../Online/Models/Model_Article.cs | 1 + .../wwwroot/css/sax-main.css | 3 +- SaxoniteCoreWebOnline/wwwroot/js/sax-main.js | 2 +- SaxoniteStandardBase/Base/App/Sax-Version.cs | 2 +- .../Base/Bus/SaxActivityIndex.cs | 1 + 7 files changed, 66 insertions(+), 35 deletions(-) diff --git a/ReadMe.md b/ReadMe.md index 7619052..411ee8b 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -2,15 +2,69 @@ ## Sarand - Wawam collaboration -### Components +### Online Environment -#### HTML Editor Controls +#### Home Page Activities + +Informative items presented on Home page, primarily filters by Sports and regions associated with the user. +The type of activity determines the sequence and period for which they are presented. + +- Articles by individuals (journalists) or for organisations. + - Sequencened by publication date (newest first). + - Expiry up to 3 months after publication (user selectable on publication). +- Organisation Events. + - Sequenced by number of days until event happens, nearest first. + - Expires a number of days after events happens (user selectable). +- Organisation Opportunities. + - Sequencened by publication date (newest first). + - Expiry up to 1 month after publication (user selectable on publication). + +#### User Profile + +- User details: name, date of birth, country. +- User's sports, level of interest/participation and experience for each. +- User's organisations, editable where user has rights.- +- Articles: for journalists or members of orgsniations allowed to author articles. +- Events: members of orgsniations allowed to manage events. +- Opportunities: members of orgsniations allowed to manage opportunities. + +### Application Components + +#### Styling + +* Web resources: + * Colour analysis, including complementary etc. https://www.crispedge.com/color/556B2F + +##### Online + +* Colours: + * Base: #556B2F Dark Olive Green + * Darker: #445525, #33401c. Lighter: #768858, #99a682, #a6c275, #b7ce90. + + +#### Graphics + +##### Icons + +* Where to find icons: https://www.canva.com/learn/free-icons-download/ +* https://icons8.com +* https://www.smashingmagazine.com/category/freebies +* https://goodstuffnononsense.com/icons-category/free/ +* https://www.iconfinder.com/ + +##### Animated gifs + +* https://icons8.com/preloaders/ + +#### Page Functionality + +##### HTML Editor Controls * TinyMCE * NuGet package available but effectively doesn nothing - no longer able to copy script filles to aapplication folders. * Manually copy files from: https://www.tiny.cloud/get-tiny/self-hosted/ -## TinyMCE +###### TinyMCE * HTML editor * Journallist Articles etc @@ -29,29 +83,3 @@ let editorId = $("#textareaId").attr('id'); tinymce.get(editorId).show() | hide(); ``` - -### Styling - -* Web resources: - * Colour analysis, including complementary etc. https://www.crispedge.com/color/556B2F - -#### Online - -* Colours: - * Base: #556B2F Dark Olive Green - * Darker: #445525, #33401c. Lighter: #768858, #99a682, #a6c275, #b7ce90. - - -### Graphics - -#### Icons - -* Where to find icons: https://www.canva.com/learn/free-icons-download/ -* https://icons8.com -* https://www.smashingmagazine.com/category/freebies -* https://goodstuffnononsense.com/icons-category/free/ -* https://www.iconfinder.com/ - -#### Animated gifs - -* https://icons8.com/preloaders/ diff --git a/SaxoniteCoreWebOnline/Online/Controllers/ArticleController-Ajax.cs b/SaxoniteCoreWebOnline/Online/Controllers/ArticleController-Ajax.cs index 3d8246c..a0743ef 100644 --- a/SaxoniteCoreWebOnline/Online/Controllers/ArticleController-Ajax.cs +++ b/SaxoniteCoreWebOnline/Online/Controllers/ArticleController-Ajax.cs @@ -562,7 +562,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers } // Organisation. - SaxOrganisation organisation = AccountMgr.GetOrganisationById(article.OrganisationId); + SaxOrganisation organisation = AccountMgr.GetOrganisationById(organisationId); disposableItems.Add(organisation); // Create new item if required. @@ -572,8 +572,8 @@ namespace Saxonite.Net.Core.Web.Online.Controllers disposableItems.Add(article); } - // Populate item properties. - if (model.ArticleRegionId != null) + // Populate item properties. + if (model.ArticleRegionId != null) article.RegionIdPrimary = model.ExtractSysId(model.ArticleRegionId); if (model.ArticleSportId != null) article.SportIdPrimary = model.ExtractSysId(model.ArticleSportId); diff --git a/SaxoniteCoreWebOnline/Online/Models/Model_Article.cs b/SaxoniteCoreWebOnline/Online/Models/Model_Article.cs index 32f7037..a73dc52 100644 --- a/SaxoniteCoreWebOnline/Online/Models/Model_Article.cs +++ b/SaxoniteCoreWebOnline/Online/Models/Model_Article.cs @@ -80,6 +80,7 @@ namespace Saxonite.Net.Core.Web.Online.Models { return ParseDateFromForm(ArticlePublishOn); } + public String ArticleExpiresAfterDays { get; set; } //------------------------------------------------------------------- // Validation. diff --git a/SaxoniteCoreWebOnline/wwwroot/css/sax-main.css b/SaxoniteCoreWebOnline/wwwroot/css/sax-main.css index 3c21626..7c2bcbc 100644 --- a/SaxoniteCoreWebOnline/wwwroot/css/sax-main.css +++ b/SaxoniteCoreWebOnline/wwwroot/css/sax-main.css @@ -349,7 +349,7 @@ a:focus .ui-dialog .ui-dialog-buttonpane.ui-widget-content { margin-top: 0; - padding: 4px 16px 4px 16px; + padding: 4px 8px; background-color: transparent; border-color: #606060; border-color: var(--color-dialog); @@ -365,6 +365,7 @@ a:focus .ui-dialog .ui-dialog-buttonpane button { min-width: 60px; + margin:4px; padding: 6px 16px 4px 16px; color: #fff; background-color: #606060; diff --git a/SaxoniteCoreWebOnline/wwwroot/js/sax-main.js b/SaxoniteCoreWebOnline/wwwroot/js/sax-main.js index 22ab7aa..e7630c5 100644 --- a/SaxoniteCoreWebOnline/wwwroot/js/sax-main.js +++ b/SaxoniteCoreWebOnline/wwwroot/js/sax-main.js @@ -193,7 +193,7 @@ let $win = $(win); $dlg.dialog( { - minWidth: null, maxWidth: null, width: Math.min(width || 400, $win.width() * .90), + minWidth: null, maxWidth: null, width: Math.min(width || 400, $win.width() * .96), minHeight: null, maxHeight: null, height: Math.min(height || 320, $win.innerHeight() * .96) }).dialog('open'); return $dlg; diff --git a/SaxoniteStandardBase/Base/App/Sax-Version.cs b/SaxoniteStandardBase/Base/App/Sax-Version.cs index 763045c..c0b737c 100644 --- a/SaxoniteStandardBase/Base/App/Sax-Version.cs +++ b/SaxoniteStandardBase/Base/App/Sax-Version.cs @@ -18,7 +18,7 @@ namespace Saxonite.Net.Standard.Base.App //------------------------------------------------------------------- public static class Version { - private static String version { get; } = "1.2.4.2"; + private static String version { get; } = "1.2.4.4"; // Retrieve version. public static String GetFullVersion () { return version; } public static String GetAppVersion () diff --git a/SaxoniteStandardBase/Base/Bus/SaxActivityIndex.cs b/SaxoniteStandardBase/Base/Bus/SaxActivityIndex.cs index 048541f..26450ab 100644 --- a/SaxoniteStandardBase/Base/Bus/SaxActivityIndex.cs +++ b/SaxoniteStandardBase/Base/Bus/SaxActivityIndex.cs @@ -45,6 +45,7 @@ namespace Saxonite.Net.Standard.Base.Bus EffectiveOn, ExpiresOn, // Associated data. + // Derived properties. // Common. Notes, Flags,