andy/Saxonite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v1.2.6.4

Browse Source
This commit is contained in:
andy
2022-05-29 13:45:22 +01:00
parent d631ad0223
commit 833798c9f8
93 changed files with 2063 additions and 788 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaxoniteCoreWebOnline/wwwroot/css/sax-data.css
+23 -9
View File
@@ -77,7 +77,7 @@
.sax-results-paging
{
margin-right: 8px;
margin-right: 12px;
}
.sax-results-paging .sax-paging-info
@@ -236,7 +236,8 @@
overflow: hidden;
}
.sax-panel-item > .sax-header
.sax-panel-item > .sax-header,
.sax-panel-item > .row > .col > .sax-header
{
padding: 2px 8px;
min-height: 24px;
@@ -244,14 +245,16 @@
border-bottom: solid 1px #979797;
}
.sax-panel-item > .sax-header .sax-caption
.sax-panel-item > .sax-header .sax-caption,
.sax-panel-item > .row > .col > .sax-header .sax-caption
{
margin: 4px 0;
font-size: 1.2rem;
font-weight: bold;
}
.sax-panel-item > .sax-content
.sax-panel-item > .sax-content,
.sax-panel-item > .row > .col > .sax-content
{
margin: 4px 8px 2px 8px;
padding: 2px 2px;
@@ -271,18 +274,21 @@
border-bottom-right-radius: 8px;
}
.sax-alpha .sax-panel-item > .sax-header
.sax-alpha .sax-panel-item > .sax-header,
.sax-alpha .sax-panel-item > .row > .col > .sax-header
{
margin: 0 8px;
padding: 4px 0;
background-color: #fff;
}
.sax-alpha .sax-panel-item > .sax-header .sax-caption
.sax-alpha .sax-panel-item > .sax-header .sax-caption,
.sax-alpha .sax-panel-item > .row > .col > .sax-header .sax-caption
{
}
.sax-alpha .sax-panel-item > .sax-content
.sax-alpha .sax-panel-item > .sax-content,
.sax-alpha .sax-panel-item > .row > .col > .sax-content
{
background-color: #fff;
}
@@ -325,17 +331,25 @@
/* Organisations */
.sax-panel-item.Organisation,
.sax-panel-item.Organisation > .sax-header
.sax-panel-item.Organisation .sax-header
{
border-color: var(--color-alt3);
}
.sax-alpha .sax-panel-item.Organisation,
.sax-alpha .sax-panel-item.Organisation > .sax-header
.sax-alpha .sax-panel-item.Organisation .sax-header
{
border-color: #b0b0b0;
}
.sax-panel-item-list .sax-panel-item.Organisation img.OrganisationLogo
{
max-width: 48px;
max-height: 48px;
margin:4px 4px 2px 0;
border-radius: 2px;
}
/* Members */
.sax-panel-item.Member,
SaxoniteCoreWebOnline/wwwroot/css/sax-home.css
+18 -4
View File
@@ -12,12 +12,12 @@
{
min-width: 84px;
padding: 0 0 0 4px;
vertical-align:top;
vertical-align: top;
}
.sax-panel-item.Activity .ActivityReaction img
{
vertical-align:top;
vertical-align: top;
}
.sax-panel-item.Activity.sax-activity-reaction-1 .sax-header
@@ -67,7 +67,6 @@
border-bottom: 1px solid #b0b0b0;
}
#dlgActivity .sax-panel-item.Article .ArticleSummary,
#dlgActivity .sax-panel-item.Event .EventAt,
#dlgActivity .sax-panel-item.Event .EventSummary,
#dlgActivity .sax-panel-item.Opportunity .OpportunityOrganisation,
@@ -80,14 +79,29 @@
border-bottom: 1px solid #b0b0b0;
}
#dlgActivity .sax-panel-item.Article .ArticleSummary
{
margin: 0;
padding: 8px 8px;
font-size: 1.25rem;
font-weight: bold;
}
#dlgActivity .sax-panel-item.Article .ArticleOrigin
{
padding: 4px 8px;
padding: 6px 8px 2px 8px;
font-weight: bold;
background-color: #f8f8f8;
border-top: 1px solid #b0b0b0;
border-bottom: 1px solid #b0b0b0;
}
#dlgActivity .sax-panel-item.Article img.ArticleOrganisationLogo
{
max-width:64px;
max-height:64px;
}
#dlgActivity .sax-panel-item.Event .EventDetails,
#dlgActivity .sax-panel-item.Opportunity .OpportunityOutline
{
SaxoniteCoreWebOnline/wwwroot/js/sax-home.js
+2 -1
View File
@@ -90,7 +90,7 @@
}
sax.showActivityDetails = function (response)
{
//sax.debug('showActivityDetails', response);
sax.debug('showActivityDetails', response);
let $act = $('.sax-content', sax.$dlg.activity).empty();
let $ar = $('.ActivityReaction', sax.$dlg.activity.parent()).hide();
let item;
@@ -103,6 +103,7 @@
$('.ArticleSummary', $itm).text(item.summary).toggle(!!item.summary);
$('.ArticleAuthor', $itm).text(item.author);
$('.ArticleOrganisation', $itm).text(item.organisation);
$('img.ArticleOrganisationLogo', $itm).prop('src', item.organisationLogoUrl);
$('.ArticleOrigin', $itm).toggle(!!(item.author || item.organisation));
let segs = item.content.segments;
for (let segIdx = 0; segIdx < segs.length; segIdx++)
SaxoniteCoreWebOnline/wwwroot/js/sax-src-org.js
+1
View File
@@ -47,6 +47,7 @@
{
if (!item) return;
$('.sax-panel-messages', $pnl.results).hide().empty();
$('img.OrganisationLogo', $item).prop('src', item.logoUrl).toggle(!!item.logoUrl);
$('.OrganisationName', $item).text(item.name);
$('.OrganisationCategory', $item).text(item.categoryDesc);
$('.OrganisationSport', $item).text(item.sportName);
SaxoniteCoreWebOnline/wwwroot/js/sax-usr-org.js
+15 -12
View File
@@ -44,7 +44,7 @@
if (!item) return;
$('.OrganisationName', $item).text(item.name);
$('.OrganisationSport', $item).text(item.sportName);
$('.OrganisationRegionCountry', $item).text(item.regionNameCountry);
$('.OrganisationRegionPrimary', $item).text(item.regionPrimary.name);
$('.OrganisationMemberCount', $item).toggle(!!item.memberCount).find('.MemberCount').text(item.memberCount);
$('.OrganisationOpportunityCount', $item).toggle(!!item.opportunityCount).find('.MemberCount').text(item.opportunityCount);
@@ -94,7 +94,7 @@
{
//sax.debug('po.updateOrganisation', $item, item);
$('.OrganisationId', $frm.orgId).val(item.id);
po.data.$item = $item; po.data.item = item;
po.ajax.profileOrganisation = po.ajax.profileOrganisation || { url: sax.url.base + 'Account/Ajax/GetProfileOrganisation', formId: 'frmProfileOrganisationId', callbackFn: po.doUpdateOrganisation };
sax.doAjaxRequest(po.ajax.profileOrganisation, 50);
}
@@ -112,8 +112,8 @@
$('.OrganisationType', $frm.org).val(item.typeCode);
$('.OrganisationSportId', $frm.org).val(item.sportId);
$('.OrganisationSportCaption', $frm.org).val(item.sportName);
$('.OrganisationRegionIdCountry', $frm.org).val(item.regionIdCountry);
$('.OrganisationRegionCaptionCountry', $frm.org).val(item.regionNameCountry);
$('.OrganisationRegionIdPrimary', $frm.org).val(item.regionPrimary.id);
$('.OrganisationRegionNamePrimary', $frm.org).val(item.regionPrimary.name);
$('.OrganisationAbout', $frm.org).val(item.about);
$('.OrganisationFacilities', $frm.org).val(item.facilities);
$pnl.tblconMths.empty();
@@ -130,8 +130,8 @@
$('input.OrganisationAddressLine2', $frm.org).val(address.line2);
$('input.OrganisationAddressLine3', $frm.org).val(address.line3);
$('input.OrganisationAddressTown', $frm.org).val(address.town);
$('input.OrganisationAddressProvince', $frm.org).val(address.province);
$('input.OrganisationAddressCountry', $frm.org).val(address.country);
$('input.OrganisationAddressProvince', $frm.org).val(address.regionNameProvince);
$('input.OrganisationAddressCountry', $frm.org).val(address.regionNameCountry);
$('input.OrganisationAddressPostalCode', $frm.org).val(address.postalCode);
sax.openDialog($dlg.org, 720, 840);
}
@@ -143,6 +143,7 @@
if (!response) return;
sax.refreshControlValues(response.controlValues, $frm.org);
if (!response.success) return;
po.populateItem(po.data.$item, response.organisation);
$dlg.org.dialog('close');
po.cleanUp();
}
@@ -151,6 +152,8 @@
}
po.cleanUp = function ()
{
delete po.data.item;
delete po.data.$item;
}
//--------------------------------------------------------------
@@ -165,14 +168,14 @@
}
//--------------------------------------------------------------
po.selectOrgRegionCountry = function ()
po.selectOrgRegionPrimary = function ()
{
sax.mdl.selectRegion.fn.selectRegion({ caption: sax.dlg.title.selectRegion, regionId: $('.OrganisationRegionIdCountry', $frm.org).val(), typesInc: [30], fnCallback: po.onSelectOrgRegionCountry })
sax.mdl.selectRegion.fn.selectRegion({ caption: sax.dlg.title.selectRegion, regionId: $('.OrganisationRegionIdCountry', $frm.org).val(), typesInc: [30], fnCallback: po.onSelectOrgRegionPrimary })
}
po.onSelectOrgRegionCountry = function (region)
po.onSelectOrgRegionPrimary = function (region)
{
sax.clearControlError($('.OrganisationRegionIdCountry', $frm.org).val(region.id));
$('.OrganisationRegionCaptionCountry', $frm.org).val(region ? region.name : '');
sax.clearControlError($('.OrganisationRegionIdPrimary', $frm.org).val(region.id));
$('.OrganisationRegionNamePrimary', $frm.org).val(region ? region.name : '');
}
//--------------------------------------------------------------
@@ -240,7 +243,7 @@
$dlg.org = $('#dlgProfileOrganisation').dialog(opt);
$frm.org = $('#frmProfileOrganisation', $dlg.org);
$frm.org.on('dblclick', 'input.OrganisationSportCaption', po.selectOrgSport).on('click', 'button.SelectSport', po.selectOrgSport);
$frm.org.on('dblclick', 'input.OrganisationRegionCaptionCountry', po.selectOrgRegionCountry).on('click', 'button.SelectRegionCountry', po.selectOrgRegionCountry);
$frm.org.on('dblclick', 'input.OrganisationRegionNameCountry', po.selectOrgRegionPrimary).on('click', 'button.SelectOrganisationRegionPrimary', po.selectOrgRegionPrimary);
$frm.org.on('click', '.OrganisationContactMethods .sax-action.sax-add', po.addConMth);
$pnl.conMths = $('.OrganisationContactMethods', $frm.org);
$pnl.tblconMths = $('table.sax-data', $pnl.conMths);